svn commit: r351754 - head/x11-wm/pwm

[Baptiste Daroussin]

Author: bapt
Date: Tue Apr 22 06:38:06 2014
New Revision: 351754
URL: http://svnweb.freebsd.org/changeset/ports/351754
QAT: https://qat.redports.org/buildarchive/r351754/

Log:
  Support stage
  Use @sample

Modified:
  head/x11-wm/pwm/Makefile
  head/x11-wm/pwm/pkg-plist

Modified: head/x11-wm/pwm/Makefile
==============================================================================
--- head/x11-wm/pwm/Makefile	Tue Apr 22 06:36:07 2014	(r351753)
+++ head/x11-wm/pwm/Makefile	Tue Apr 22 06:38:06 2014	(r351754)
@@ -3,22 +3,19 @@
 
 PORTNAME=	pwm
 PORTVERSION=	2007.07.20
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://modeemi.fi/~tuomov/dl/ \
 		http://schot.a-eskwadraat.nl/files/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.//g}
 
 MAINTAINER=	schot at a-eskwadraat.nl
-COMMENT=	A lightweight window manager with emphasis on usability
+COMMENT=	lightweight window manager with emphasis on usability
 
 USE_XORG=	x11
 USES=		gmake
 MAKE_ENV=	X11_PREFIX="${LOCALBASE}" HAS_SYSTEM_ASPRINTF=1
 
-MAN1=		pwm.1x
-
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|^PREFIX=|PREFIX?=|g ; \
@@ -29,17 +26,12 @@ post-patch:
 		 s|-pedantic-errors||g' ${WRKSRC}/system.mk
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/pwm ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/pwm.1x ${MANPREFIX}/man/man1
-	@${MKDIR} ${PREFIX}/etc/pwm
-	${INSTALL_DATA} ${WRKSRC}/etc/pwm/*.conf ${PREFIX}/etc/pwm
-.if !exists(${PREFIX}/etc/pwm/pwm.conf)
-	${CP} ${PREFIX}/etc/pwm/sample.conf ${PREFIX}/etc/pwm/pwm.conf
-.endif
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/LICENSE ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/config.txt ${DOCSDIR}
-.endif
+	${INSTALL_PROGRAM} ${WRKSRC}/pwm ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/pwm.1x ${STAGEDIR}${MANPREFIX}/man/man1
+	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/pwm ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/etc/pwm/*.conf ${STAGEDIR}${PREFIX}/etc/pwm
+	${MV} ${STAGEDIR}${PREFIX}/etc/pwm/sample.conf ${STAGEDIR}${PREFIX}/etc/pwm/pwm.conf.sample
+	${INSTALL_DATA} ${WRKSRC}/LICENSE ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/config.txt ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

Modified: head/x11-wm/pwm/pkg-plist
==============================================================================
--- head/x11-wm/pwm/pkg-plist	Tue Apr 22 06:36:07 2014	(r351753)
+++ head/x11-wm/pwm/pkg-plist	Tue Apr 22 06:38:06 2014	(r351754)
@@ -4,9 +4,8 @@ etc/pwm/keys-default.conf
 etc/pwm/look-beoslike.conf
 etc/pwm/look-brownsteel.conf
 etc/pwm/menus-default.conf
- at unexec if cmp -s %B/sample.conf %B/pwm.conf; then rm -f %B/pwm.conf; fi
-etc/pwm/sample.conf
- at exec if [ ! -e %B/pwm.conf ]; then cp %B/sample.conf %B/pwm.conf; fi
+ at sample etc/pwm/pwm.conf.sample
+man/man1/pwm.1x.gz
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE
 %%PORTDOCS%%%%DOCSDIR%%/config.txt
 %%PORTDOCS%%@dirrm %%DOCSDIR%%