svn commit: r353555 - head/x11-wm/aewm

[Dmitry Marakasov]

Author: amdmi3
Date: Sat May 10 00:29:34 2014
New Revision: 353555
URL: http://svnweb.freebsd.org/changeset/ports/353555
QAT: https://qat.redports.org/buildarchive/r353555/

Log:
  - Support staging

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

Modified: head/x11-wm/aewm/Makefile
==============================================================================
--- head/x11-wm/aewm/Makefile	Sat May 10 00:28:18 2014	(r353554)
+++ head/x11-wm/aewm/Makefile	Sat May 10 00:29:34 2014	(r353555)
@@ -15,7 +15,6 @@ MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}"
 USE_XORG=	x11 xext xt xaw
 WANT_GNOME=	yes
 
-MAN1=		aeclients.1 aewm.1
 # XXX should use LICENSE instead of installing it as part of documentation,
 # but our license framework does not support XFree86 license at this moment
 PORTDOCS=	DESIGN LICENSE NEWS README TODO
@@ -23,7 +22,6 @@ PORTDOCS=	DESIGN LICENSE NEWS README TOD
 GTKCLIENTS=	aemenu-gtk aepanel-gtk
 XAWCLIENTS=	aemenu-xaw aepanel-xaw aesession set-gnome-pda
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 .if ${HAVE_GNOME:Mgtk20} != ""
@@ -53,35 +51,27 @@ post-build:
 .endif
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/src/aewm ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/src/aewm ${STAGEDIR}${PREFIX}/bin
 .for i in ${XAWCLIENTS}
-	${INSTALL_PROGRAM} ${WRKSRC}/clients/${i} ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/clients/${i} ${STAGEDIR}${PREFIX}/bin
 .endfor
 .if ${HAVE_GNOME:Mgtk20} != ""
 .for i in ${GTKCLIENTS}
-	${INSTALL_PROGRAM} ${WRKSRC}/clients/${i} ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/clients/${i} ${STAGEDIR}${PREFIX}/bin
 .endfor
-	${LN} -sf aemenu-gtk ${PREFIX}/bin/aemenu
-	${LN} -sf aepanel-gtk ${PREFIX}/bin/aepanel
+	${LN} -sf aemenu-gtk ${STAGEDIR}${PREFIX}/bin/aemenu
+	${LN} -sf aepanel-gtk ${STAGEDIR}${PREFIX}/bin/aepanel
 .else
-	${LN} -sf aemenu-xaw ${PREFIX}/bin/aemenu
-	${LN} -sf aepanel-xaw ${PREFIX}/bin/aepanel
+	${LN} -sf aemenu-xaw ${STAGEDIR}${PREFIX}/bin/aemenu
+	${LN} -sf aepanel-xaw ${STAGEDIR}${PREFIX}/bin/aepanel
 .endif
-	${INSTALL_MAN} ${WRKSRC}/src/aewm.1x ${MANPREFIX}/man/man1/aewm.1
+	${INSTALL_MAN} ${WRKSRC}/src/aewm.1x ${STAGEDIR}${MAN1PREFIX}/man/man1/aewm.1
 	${INSTALL_MAN} ${WRKSRC}/clients/aeclients.1x \
-		${MANPREFIX}/man/man1/aeclients.1
-	@${MKDIR} ${PREFIX}/etc/aewm
-	${INSTALL_DATA} ${WRKSRC}/src/aewmrc.sample ${PREFIX}/etc/aewm
-	${INSTALL_DATA} ${WRKSRC}/clients/clientsrc.sample ${PREFIX}/etc/aewm
-.if !exists(${PREFIX}/etc/aewm/aewmrc)
-	cd ${PREFIX}/etc/aewm && ${CP} aewmrc.sample aewmrc
-.endif
-.if !exists(${PREFIX}/etc/aewm/clientsrc)
-	cd ${PREFIX}/etc/aewm && ${CP} clientsrc.sample clientsrc
-.endif
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
-.endif
+		${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
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.post.mk>

Modified: head/x11-wm/aewm/pkg-plist
==============================================================================
--- head/x11-wm/aewm/pkg-plist	Sat May 10 00:28:18 2014	(r353554)
+++ head/x11-wm/aewm/pkg-plist	Sat May 10 00:29:34 2014	(r353555)
@@ -11,4 +11,6 @@ etc/aewm/aewmrc.sample
 @unexec if cmp -s %D/etc/aewm/clientsrc.sample %D/etc/aewm/clientsrc; then rm -f %D/etc/aewm/clientsrc; fi
 etc/aewm/clientsrc.sample
 @exec if [ ! -e %D/etc/aewm/clientsrc ]; then cp %D/etc/aewm/clientsrc.sample %D/etc/aewm/clientsrc; fi
+man/man1/aeclients.1.gz
+man/man1/aewm.1.gz
 @dirrmtry etc/aewm