svn commit: r345836 - in head/x11-wm/wmanager: . files

[Baptiste Daroussin]

Author: bapt
Date: Mon Feb 24 13:15:55 2014
New Revision: 345836
URL: http://svnweb.freebsd.org/changeset/ports/345836
QAT: https://qat.redports.org/buildarchive/r345836/

Log:
  Support stage
  Properly support DOCS and EXAMPLES options
  Modernize

Deleted:
  head/x11-wm/wmanager/files/pkg-message.in
Modified:
  head/x11-wm/wmanager/Makefile
  head/x11-wm/wmanager/pkg-plist

Modified: head/x11-wm/wmanager/Makefile
==============================================================================
--- head/x11-wm/wmanager/Makefile	Mon Feb 24 13:13:55 2014	(r345835)
+++ head/x11-wm/wmanager/Makefile	Mon Feb 24 13:15:55 2014	(r345836)
@@ -3,7 +3,7 @@
 
 PORTNAME=	wmanager
 PORTVERSION=	0.2.1
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_DEBIAN_POOL}
 DISTNAME=	${PORTNAME}_${PORTVERSION}.orig
@@ -11,42 +11,31 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}.ori
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	X11 window manager selector
 
-LIB_DEPENDS=	fltk.1:${PORTSDIR}/x11-toolkits/fltk
+LIB_DEPENDS=	libfltk.so:${PORTSDIR}/x11-toolkits/fltk
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
+USES=		gmake
 USE_XORG=	x11 xext
 USE_GL=		gl
-USE_GMAKE=	yes
-MAKE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
-		PTHREAD_LIBS="${PTHREAD_LIBS}"
 
-OPTIONS_DEFINE=	ADDONS
+OPTIONS_DEFINE=	ADDONS DOCS EXAMPLES
 OPTIONS_DEFAULT=ADDONS
 ADDONS_DESC=	Install the helper scripts and manpages
+OPTIONS_SUB=	yes
 
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
-
-.if ${PORT_OPTIONS:MADDONS}
-RUN_DEPENDS+=	wmanager-loop:${PORTSDIR}/x11-wm/wmanager-addons
-.endif
+ADDONS_RUNDEPENDS=	wmanager-loop:${PORTSDIR}/x11-wm/wmanager-addons
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/wmanager ${PREFIX}/bin
-.if !defined(NOPORTDOCS)
-	${SED} -e "s@%%DOCSDIR%%@${DOCSDIR}@; s@%%EXAMPLESDIR%%@${EXAMPLESDIR}@" ${FILESDIR}/pkg-message.in > ${PKGMESSAGE}
-	@${MKDIR} ${DOCSDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/wmanager ${STAGEDIR}${PREFIX}/bin
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for file in FAQ HISTORY INSTALL NEWS README TODO
-	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR}
 .endfor
-	@${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/.wmanagerrc ${EXAMPLESDIR}/wmanagerrc_sample
-	${INSTALL_DATA} ${WRKSRC}/.xinitrc ${EXAMPLESDIR}/xinitrc_sample
-.else
-	${RM} -f ${PKGMESSAGE}
-.endif
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/.wmanagerrc ${STAGEDIR}${EXAMPLESDIR}/wmanagerrc_sample
+	${INSTALL_DATA} ${WRKSRC}/.xinitrc ${STAGEDIR}${EXAMPLESDIR}/xinitrc_sample
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/x11-wm/wmanager/pkg-plist
==============================================================================
--- head/x11-wm/wmanager/pkg-plist	Mon Feb 24 13:13:55 2014	(r345835)
+++ head/x11-wm/wmanager/pkg-plist	Mon Feb 24 13:15:55 2014	(r345836)
@@ -1,11 +1,11 @@
 bin/wmanager
-%%PORTDOCS%%%%DOCSDIR%%/FAQ
-%%PORTDOCS%%%%DOCSDIR%%/HISTORY
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%%%EXAMPLESDIR%%/wmanagerrc_sample
-%%PORTDOCS%%%%EXAMPLESDIR%%/xinitrc_sample
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%DOCS%%%%DOCSDIR%%/FAQ
+%%DOCS%%%%DOCSDIR%%/HISTORY
+%%DOCS%%%%DOCSDIR%%/INSTALL
+%%DOCS%%%%DOCSDIR%%/NEWS
+%%DOCS%%%%DOCSDIR%%/README
+%%DOCS%%%%DOCSDIR%%/TODO
+%%EXAMPLES%%%%EXAMPLESDIR%%/wmanagerrc_sample
+%%EXAMPLES%%%%EXAMPLESDIR%%/xinitrc_sample
+%%EXAMPLES%%@dirrm %%EXAMPLESDIR%%
+%%DOCS%%@dirrm %%DOCSDIR%%