Support stage

Properly support DOCS and EXAMPLES options
Modernize

3 files changed, 24 insertions, 39 deletions

diff --git a/x11-wm/wmanager/Makefile b/x11-wm/wmanager/Makefile
index 265f5261b4b2..6970dd1ffdac 100644
--- a/x11-wm/wmanager/Makefile
+++ b/x11-wm/wmanager/Makefile
@@ -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}.orig
 MAINTAINER=	ports@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
-
-.include <bsd.port.post.mk>
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/.wmanagerrc ${STAGEDIR}${EXAMPLESDIR}/wmanagerrc_sample
+	${INSTALL_DATA} ${WRKSRC}/.xinitrc ${STAGEDIR}${EXAMPLESDIR}/xinitrc_sample
+
+.include <bsd.port.mk>
diff --git a/x11-wm/wmanager/files/pkg-message.in b/x11-wm/wmanager/files/pkg-message.in
deleted file mode 100644
index cfcbdd901146..000000000000
--- a/x11-wm/wmanager/files/pkg-message.in
+++ /dev/null
@@ -1,4 +0,0 @@
-Documentation has been installed in %%DOCSDIR%%/ and
-example files in %%EXAMPLESDIR%%/
-You are advised to have a look at the sample .wmanagerrc
-and .xinitrc files available there.
diff --git a/x11-wm/wmanager/pkg-plist b/x11-wm/wmanager/pkg-plist
index ae20520e9ea3..f45b38aa179e 100644
--- a/x11-wm/wmanager/pkg-plist
+++ b/x11-wm/wmanager/pkg-plist
@@ -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%%