cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make use of the new APM_ARCHS.

Browse Source 
"looks good" jasper@
This commit is contained in:
ajacoutot 2010-03-21 11:35:26 +00:00
parent c4c7ece3ba
commit 12bea17ac0
8 changed files with 33 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sysutils/conky/Makefile
View File

@ -1,7 +1,6 @@
# $OpenBSD: Makefile,v 1.12 2009/11/23 16:46:20 benoit Exp $
# $OpenBSD: Makefile,v 1.13 2010/03/21 11:35:26 ajacoutot Exp $
# we use "macppc" and not "powerpc" on purpose here ; i.e. apm(4) needed
ONLY_FOR_ARCHS= amd64 arm i386 macppc sparc sparc64
ONLY_FOR_ARCHS= ${APM_ARCHS}
COMMENT= light-weight system monitor

5
sysutils/wmapm/Makefile
View File

@ -1,7 +1,6 @@
# $OpenBSD: Makefile,v 1.21 2010/02/28 19:31:54 matthieu Exp $
# $OpenBSD: Makefile,v 1.22 2010/03/21 11:35:26 ajacoutot Exp $
# we use "macppc" and not "powerpc" on purpose here ; i.e. apm(4) needed
ONLY_FOR_ARCHS= amd64 arm i386 loongson macppc sparc sparc64
ONLY_FOR_ARCHS= ${APM_ARCHS}
COMMENT= wm-dockapp; APM/battery monitor

5
sysutils/xbatt/Makefile
View File

@ -1,8 +1,7 @@
# $OpenBSD: Makefile,v 1.22 2010/02/28 19:31:54 matthieu Exp $
# $OpenBSD: Makefile,v 1.23 2010/03/21 11:35:26 ajacoutot Exp $
# $FreeBSD: Makefile,v 1.4 1997/03/10 12:07:35 asami Exp $
# we use "macppc" and not "powerpc" on purpose here ; i.e. apm(4) needed
ONLY_FOR_ARCHS= amd64 arm i386 loongson macppc sparc sparc64
ONLY_FOR_ARCHS= ${APM_ARCHS}
COMMENT= laptop battery status display for X11

5
x11/asapm/Makefile
View File

@ -1,7 +1,6 @@
# $OpenBSD: Makefile,v 1.21 2010/02/28 19:31:54 matthieu Exp $
# $OpenBSD: Makefile,v 1.22 2010/03/21 11:35:26 ajacoutot Exp $
# we use "macppc" and not "powerpc" on purpose here ; i.e. apm(4) needed
ONLY_FOR_ARCHS= amd64 arm i386 macppc loongson sparc sparc64
ONLY_FOR_ARCHS= ${APM_ARCHS}
COMMENT= Advanced Power Management monitor utility for X

16
x11/gnome/applets2/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.85 2010/02/28 19:31:54 matthieu Exp $
# $OpenBSD: Makefile,v 1.86 2010/03/21 11:35:26 ajacoutot Exp $
COMMENT-main= applets for use with the GNOME panel
COMMENT-battstat= GNOME applet for monitoring battery level
@ -52,14 +52,6 @@ LIB_DEPENDS-main= ${LIB_DEPENDS} \
PSEUDO_FLAVORS= no_battstat
FLAVOR?=
# not all powerpc support apm(4), hence the use of ${MACHINE} and macppc
.if ${MACHINE_ARCH} != "amd64" && ${MACHINE_ARCH} != "arm" \
&& ${MACHINE_ARCH} != "i386" && ${MACHINE} != "macppc" \
&& ${MACHINE} != "loongson" && ${MACHINE_ARCH} != "sparc" \
&& ${MACHINE_ARCH} != "sparc64"
FLAVOR+= no_battstat
.endif
MULTI_PACKAGES= -main
.if ${FLAVOR:L:Mno_battstat}
CONFIGURE_ARGS+= --disable-battstat
@ -90,3 +82,9 @@ pre-configure:
.include <bsd.port.mk>
CONFIGURE_ARGS+= --sysconfdir="${SYSCONFDIR}/gnome"
.for m in ${MACHINE_ARCH} ${MACHINE}
.if ${APM_ARCHS:L:M$m}
FLAVOR+= no_battstat
.endif
.endfor

15
x11/icewm/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.40 2009/08/11 08:42:08 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.41 2010/03/21 11:35:26 ajacoutot Exp $
COMMENT= small and fast window manager
@ -28,13 +28,6 @@ LIB_DEPENDS= Imlib.>=19::graphics/imlib
USE_X11= Yes
# not all powerpc support apm(4), hence the use of ${MACHINE} and macppc
.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "i386" \
|| ${MACHINE} == "macppc" || ${MACHINE_ARCH} == "sparc" \
|| ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "sparc64"
PATCH_LIST= patch-* apm-*
.endif
CONFIGURE_STYLE=gnu
CONFIGURE_ARGS= --with-imlib=${PREFIX}/bin \
--with-docdir=${PREFIX}/share/doc \
@ -64,3 +57,9 @@ pre-configure:
${SUBST_CMD} ${WRKSRC}/doc/icewm-7.html
.include <bsd.port.mk>
.for m in ${MACHINE_ARCH} ${MACHINE}
.if ${APM_ARCHS:L:M$m}
PATCH_LIST= patch-* apm-*
.endif
.endfor

19
x11/matchbox/matchbox-panel/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.20 2009/12/21 20:46:02 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.21 2010/03/21 11:35:26 ajacoutot Exp $
# XXX hardcoded apm list
COMMENT= window bar for holding application launchers
@ -16,15 +16,6 @@ WANTLIB= X11 Xext Xft Xrender c fontconfig freetype m z \
pango-1.0 pangoft2-1.0 pangoxft-1.0 png Xau Xdmcp expat \
pthread-stubs xcb
# not all powerpc support apm(4), hence the use of ${MACHINE} and macppc
.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "arm" \
|| ${MACHINE_ARCH} == "i386" || ${MACHINE} == "macppc" \
|| ${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "sparc64"
PKG_ARGS+=-DAPM=1
.else
PKG_ARGS+=-DAPM=0
.endif
CONFIGURE_STYLE=gnu
CONFIGURE_ARGS+=--enable-nls
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng" \
@ -33,3 +24,11 @@ CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng"
LDFLAGS="-L${LOCALBASE}/lib"
.include <bsd.port.mk>
.for m in ${MACHINE_ARCH} ${MACHINE}
.if ${APM_ARCHS:L:M$m}
PKG_ARGS+=-DAPM=1
.else
PKG_ARGS+=-DAPM=0
.endif
.endfor

4
x11/xfce4/xfce4-battery/Makefile
View File

@ -1,6 +1,6 @@
# $OpenBSD: Makefile,v 1.24 2010/02/28 19:31:54 matthieu Exp $
# $OpenBSD: Makefile,v 1.25 2010/03/21 11:35:26 ajacoutot Exp $
ONLY_FOR_ARCHS= amd64 arm i386 loongson powerpc sparc
ONLY_FOR_ARCHS= ${APM_ARCHS}
COMMENT= Xfce4 battery monitor panel plugin