From owner-svn-ports-head@FreeBSD.ORG Sat May 10 00:29:35 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 286CA21F; Sat, 10 May 2014 00:29:35 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 15D5DB63; Sat, 10 May 2014 00:29:35 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4A0TYod067715; Sat, 10 May 2014 00:29:34 GMT (envelope-from amdmi3@svn.freebsd.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4A0TYLh067713; Sat, 10 May 2014 00:29:34 GMT (envelope-from amdmi3@svn.freebsd.org) Message-Id: <201405100029.s4A0TYLh067713@svn.freebsd.org> From: Dmitry Marakasov Date: Sat, 10 May 2014 00:29:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r353555 - head/x11-wm/aewm X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 10 May 2014 00:29:35 -0000 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 .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 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