From owner-svn-ports-head@FreeBSD.ORG Mon Oct 28 06:08:58 2013 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 ESMTP id 48950E7; Mon, 28 Oct 2013 06:08:58 +0000 (UTC) (envelope-from dinoex@FreeBSD.org) 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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 261F02483; Mon, 28 Oct 2013 06:08:58 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9S68v7l043023; Mon, 28 Oct 2013 06:08:57 GMT (envelope-from dinoex@svn.freebsd.org) Received: (from dinoex@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9S68vPO043022; Mon, 28 Oct 2013 06:08:57 GMT (envelope-from dinoex@svn.freebsd.org) Message-Id: <201310280608.r9S68vPO043022@svn.freebsd.org> From: Dirk Meyer Date: Mon, 28 Oct 2013 06:08:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r331830 - head/x11-wm/afterstep 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.14 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: Mon, 28 Oct 2013 06:08:58 -0000 Author: dinoex Date: Mon Oct 28 06:08:57 2013 New Revision: 331830 URL: http://svnweb.freebsd.org/changeset/ports/331830 Log: - use STAGEDIR Modified: head/x11-wm/afterstep/Makefile Modified: head/x11-wm/afterstep/Makefile ============================================================================== --- head/x11-wm/afterstep/Makefile Mon Oct 28 05:48:20 2013 (r331829) +++ head/x11-wm/afterstep/Makefile Mon Oct 28 06:08:57 2013 (r331830) @@ -18,15 +18,14 @@ RUN_DEPENDS= asclock:${PORTSDIR}/x11-clo CONFLICTS?= afterstep-2* PORTSCOUT= limit:^1\.[0-9.]*$$ NO_LATEST_LINK= yes -NO_STAGE= yes +USES= imake manpages USE_XORG= xpm xext x11 -USES= imake +USE_CSTD= gnu89 INSTALL_TARGET= install install.man MANCOMPRESSED= yes -MAN1= afterstep.1 Animate.1 Audio.1 Auto.1 Banner.1 Pager.1 Wharf.1 CFLAGS+= -Wno-return-type -USE_CSTD= gnu89 +MAN1= afterstep.1 Animate.1 Audio.1 Auto.1 Banner.1 Pager.1 Wharf.1 SRCDIRS= afterstep \ modules/Animate modules/Audio modules/Auto \ @@ -48,14 +47,14 @@ pre-build: @ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${SH} MakeMakefiles post-install: - @ ${MKDIR} ${PREFIX}/lib/X11/afterstep/backgrounds/ - ${INSTALL_DATA} ${WRKSRC}/backgrounds/* ${PREFIX}/lib/X11/afterstep/backgrounds/ - @ ${MKDIR} ${PREFIX}/lib/X11/afterstep/sounds/ - ${INSTALL_DATA} ${WRKSRC}/sounds/* ${PREFIX}/lib/X11/afterstep/sounds/ - @ ${MKDIR} ${PREFIX}/include/X11/pixmaps/ + @ ${MKDIR} ${STAGEDIR}${PREFIX}/lib/X11/afterstep/backgrounds/ + ${INSTALL_DATA} ${WRKSRC}/backgrounds/* ${STAGEDIR}${PREFIX}/lib/X11/afterstep/backgrounds/ + @ ${MKDIR} ${STAGEDIR}${PREFIX}/lib/X11/afterstep/sounds/ + ${INSTALL_DATA} ${WRKSRC}/sounds/* ${STAGEDIR}${PREFIX}/lib/X11/afterstep/sounds/ + @ ${MKDIR} ${STAGEDIR}${PREFIX}/include/X11/pixmaps/ .if defined(WITH_HICOLOR_ICONS) - ${INSTALL_DATA} ${WRKSRC}/icons/*.xpm ${PREFIX}/include/X11/pixmaps/ - ${INSTALL_DATA} ${FILESDIR}/monitor_bsd.xpm ${PREFIX}/include/X11/pixmaps/ + ${INSTALL_DATA} ${WRKSRC}/icons/*.xpm ${STAGEDIR}${PREFIX}/include/X11/pixmaps/ + ${INSTALL_DATA} ${FILESDIR}/monitor_bsd.xpm ${STAGEDIR}${PREFIX}/include/X11/pixmaps/ .else .if !defined(BATCH) @${ECHO_MSG} "===> Note: to use the hi-color icons," @@ -65,12 +64,12 @@ post-install: @for i in AFstep.xpm penguin.xpm monitor_bsd.xpm; do \ ${CP} ${FILESDIR}/$$i ${WRKSRC}/icons/8bit/; \ done - ${INSTALL_DATA} ${WRKSRC}/icons/8bit/*.xpm ${PREFIX}/include/X11/pixmaps/ - ${INSTALL_DATA} ${WRKSRC}/icons/eyecon.xpm ${PREFIX}/include/X11/pixmaps/ + ${INSTALL_DATA} ${WRKSRC}/icons/8bit/*.xpm ${STAGEDIR}${PREFIX}/include/X11/pixmaps/ + ${INSTALL_DATA} ${WRKSRC}/icons/eyecon.xpm ${STAGEDIR}${PREFIX}/include/X11/pixmaps/ .endif - @ ${MKDIR} ${PREFIX}/lib/X11/afterstep/doc/ + @ ${MKDIR} ${STAGEDIR}${PREFIX}/lib/X11/afterstep/doc/ @for i in CHANGES CREDITS README README.8bit INSTALL FAQ module-interface.txt; do \ - ${INSTALL_DATA} ${WRKSRC}/$$i ${PREFIX}/lib/X11/afterstep/doc/; \ + ${INSTALL_DATA} ${WRKSRC}/$$i ${STAGEDIR}${PREFIX}/lib/X11/afterstep/doc/; \ done .include