pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/x11/matchbox-panel



Module Name:    pkgsrc
Committed By:   nia
Date:           Tue May 13 11:27:23 UTC 2025

Modified Files:
        pkgsrc/x11/matchbox-panel: Makefile

Log Message:
matchbox-panel: Improve detection of APM

Right now this package wrongly detects APM as being available on
NetBSD/sparc64 and NetBSD/alpha, leading to PLIST errors on those
platforms. It also fails to package on Linux platforms that don't
ship apm.h by default (which might be _most_ at this point).

Instead of assuming APM is available by default, only assume it's
available if the headers are in the expected places (which is what
the configure script checks anyway).

While this could be centralized in mk/platform, it's unlikely
to be widely useful considering how deprecated APM is as both
a hardware feature and API.


To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 pkgsrc/x11/matchbox-panel/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/matchbox-panel/Makefile
diff -u pkgsrc/x11/matchbox-panel/Makefile:1.38 pkgsrc/x11/matchbox-panel/Makefile:1.39
--- pkgsrc/x11/matchbox-panel/Makefile:1.38     Sun Nov 12 13:24:17 2023
+++ pkgsrc/x11/matchbox-panel/Makefile  Tue May 13 11:27:23 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2023/11/12 13:24:17 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2025/05/13 11:27:23 nia Exp $
 #
 
 DISTNAME=              matchbox-panel-0.9.2
@@ -28,11 +28,7 @@ MAKE_ENV+=           PKGLOCALEDIR=${PKGLOCALEDIR}
 .include "../../mk/bsd.prefs.mk"
 
 PLIST_VARS=            apm
-.if ${OPSYS} == "DragonFly" || ${OPSYS} == "SunOS" || \
-    (${OPSYS} == "NetBSD" && \
-      (${MACHINE_ARCH} == "x86_64" || ${MACHINE_CPU} == "aarch64"))
-# Nada
-.else
+.if exists(/usr/include/apm.h) || exists(/usr/include/machine/apmvar.h)
 PLIST.apm=             yes
 .endif
 



Home | Main Index | Thread Index | Old Index