svn commit: r396825 - head/x11-wm/aewm
Baptiste Daroussin
bapt at FreeBSD.org
Sun Sep 13 14:11:09 UTC 2015
Author: bapt
Date: Sun Sep 13 14:11:08 2015
New Revision: 396825
URL: https://svnweb.freebsd.org/changeset/ports/396825
Log:
Convert to option helpers
Fix building with xft
Use proper options for gtk2
Modified:
head/x11-wm/aewm/Makefile
Modified: head/x11-wm/aewm/Makefile
==============================================================================
--- head/x11-wm/aewm/Makefile Sun Sep 13 14:09:14 2015 (r396824)
+++ head/x11-wm/aewm/Makefile Sun Sep 13 14:11:08 2015 (r396825)
@@ -3,17 +3,18 @@
PORTNAME= aewm
PORTVERSION= 1.2.7
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11-wm
MASTER_SITES= http://www.red-bean.com/decklin/aewm/
MAINTAINER= ports at FreeBSD.org
COMMENT= ICCCM-compliant window manager based on 9wm
+OPTIONS_DEFINE= DOCS GTK2 XFT
+
USES= gmake
MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}" XROOT="${LOCALBASE}"
USE_XORG= x11 xext xt xaw
-WANT_GNOME= yes
# XXX should use LICENSE instead of installing it as part of documentation,
# but our license framework does not support XFree86 license at this moment
@@ -22,19 +23,13 @@ PORTDOCS= DESIGN LICENSE NEWS README TOD
GTKCLIENTS= aemenu-gtk aepanel-gtk
XAWCLIENTS= aemenu-xaw aepanel-xaw aesession set-gnome-pda
-.include <bsd.port.pre.mk>
+GTK2_USE= GNOME=gtk20
+GTK2_PLIST_FILES= bin/aemenu-gtk bin/aepanel-gtk
-.if ${HAVE_GNOME:Mgtk20} != ""
-USE_GNOME= gtk20
-PLIST_FILES= bin/aemenu-gtk bin/aepanel-gtk
-.endif
-
-.if defined(WITH_XFT)
-XORG+= xft
-MAKE_ENV+= DEFINES="-DXFT" \
+XFT_USE= XORG=xft
+XFT_MAKE_ENV+= DEFINES="-DXFT" \
EXTRA_INC="`pkg-config --cflags xft`" \
EXTRA_LIBS="`pkg-config --libs xft`"
-.endif
post-patch:
@${REINPLACE_CMD} -e '/^SUBDIR/s| clients||' ${WRKSRC}/Makefile
@@ -42,36 +37,38 @@ post-patch:
${WRKSRC}/clients/lib/aeclients.h ${WRKSRC}/src/aewm.h
post-build:
-.if ${HAVE_GNOME:Mgtk20} != ""
- cd ${WRKSRC}/clients && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} \
- ${GTKCLIENTS} ${XAWCLIENTS}
-.else
cd ${WRKSRC}/clients && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} \
${XAWCLIENTS}
-.endif
+
+post-build-GTK2-on:
+ cd ${WRKSRC}/clients && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} \
+ ${GTKCLIENTS}
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/src/aewm ${STAGEDIR}${PREFIX}/bin
.for i in ${XAWCLIENTS}
${INSTALL_PROGRAM} ${WRKSRC}/clients/${i} ${STAGEDIR}${PREFIX}/bin
.endfor
-.if ${HAVE_GNOME:Mgtk20} != ""
+ ${INSTALL_MAN} ${WRKSRC}/src/aewm.1x ${STAGEDIR}${MAN1PREFIX}/man/man1/aewm.1
+ ${INSTALL_MAN} ${WRKSRC}/clients/aeclients.1x \
+ ${STAGEDIR}${MAN1PREFIX}/man/man1/aeclients.1
+ @${MKDIR} ${STAGEDIR}${PREFIX}/etc/aewm
+ ${INSTALL_DATA} ${WRKSRC}/src/aewmrc.sample ${STAGEDIR}${PREFIX}/etc/aewm
+ ${INSTALL_DATA} ${WRKSRC}/clients/clientsrc.sample ${STAGEDIR}${PREFIX}/etc/aewm
+
+do-install-GTK2-on:
.for i in ${GTKCLIENTS}
${INSTALL_PROGRAM} ${WRKSRC}/clients/${i} ${STAGEDIR}${PREFIX}/bin
.endfor
${LN} -sf aemenu-gtk ${STAGEDIR}${PREFIX}/bin/aemenu
${LN} -sf aepanel-gtk ${STAGEDIR}${PREFIX}/bin/aepanel
-.else
+
+do-install-GTK2-off:
${LN} -sf aemenu-xaw ${STAGEDIR}${PREFIX}/bin/aemenu
${LN} -sf aepanel-xaw ${STAGEDIR}${PREFIX}/bin/aepanel
-.endif
- ${INSTALL_MAN} ${WRKSRC}/src/aewm.1x ${STAGEDIR}${MAN1PREFIX}/man/man1/aewm.1
- ${INSTALL_MAN} ${WRKSRC}/clients/aeclients.1x \
- ${STAGEDIR}${MAN1PREFIX}/man/man1/aeclients.1
- @${MKDIR} ${STAGEDIR}${PREFIX}/etc/aewm
- ${INSTALL_DATA} ${WRKSRC}/src/aewmrc.sample ${STAGEDIR}${PREFIX}/etc/aewm
- ${INSTALL_DATA} ${WRKSRC}/clients/clientsrc.sample ${STAGEDIR}${PREFIX}/etc/aewm
+
+do-install-DOCS-on:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
More information about the svn-ports-all
mailing list