From owner-svn-ports-all@FreeBSD.ORG Mon Oct 28 05:18:55 2013 Return-Path: Delivered-To: svn-ports-all@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 2734D2A4; Mon, 28 Oct 2013 05:18:55 +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 150152232; Mon, 28 Oct 2013 05:18:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9S5Is4o000377; Mon, 28 Oct 2013 05:18:54 GMT (envelope-from dinoex@svn.freebsd.org) Received: (from dinoex@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9S5Ist8000369; Mon, 28 Oct 2013 05:18:54 GMT (envelope-from dinoex@svn.freebsd.org) Message-Id: <201310280518.r9S5Ist8000369@svn.freebsd.org> From: Dirk Meyer Date: Mon, 28 Oct 2013 05:18:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r331828 - in head: deskutils/openproj devel/gperf www/twig X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Oct 2013 05:18:55 -0000 Author: dinoex Date: Mon Oct 28 05:18:54 2013 New Revision: 331828 URL: http://svnweb.freebsd.org/changeset/ports/331828 Log: - use STAGEDIR Modified: head/deskutils/openproj/Makefile head/devel/gperf/Makefile head/www/twig/Makefile Modified: head/deskutils/openproj/Makefile ============================================================================== --- head/deskutils/openproj/Makefile Mon Oct 28 03:39:14 2013 (r331827) +++ head/deskutils/openproj/Makefile Mon Oct 28 05:18:54 2013 (r331828) @@ -10,8 +10,6 @@ COMMENT= A free, open source Project Man RUN_DEPENDS= java:${PORTSDIR}/java/javavmwrapper -NO_STAGE= yes - USE_JAVA= yes JAVA_VERSION= 1.6+ NO_BUILD= yes @@ -23,8 +21,8 @@ SUB_FILES= openproj.sh do-install: cd ${WRKSRC} \ - && ${FIND} ${DATAFILES} -type d -exec ${MKDIR} ${DATADIR}/{} \; \ - && ${FIND} ${DATAFILES} -type f -exec ${INSTALL_DATA} {} ${DATADIR}/{} \; - ${INSTALL_SCRIPT} ${WRKDIR}/openproj.sh ${PREFIX}/bin/openproj + && ${FIND} ${DATAFILES} -type d -exec ${MKDIR} ${STAGEDIR}${DATADIR}/{} \; \ + && ${FIND} ${DATAFILES} -type f -exec ${INSTALL_DATA} {} ${STAGEDIR}${DATADIR}/{} \; + ${INSTALL_SCRIPT} ${WRKDIR}/openproj.sh ${STAGEDIR}${PREFIX}/bin/openproj .include Modified: head/devel/gperf/Makefile ============================================================================== --- head/devel/gperf/Makefile Mon Oct 28 03:39:14 2013 (r331827) +++ head/devel/gperf/Makefile Mon Oct 28 05:18:54 2013 (r331828) @@ -12,8 +12,8 @@ COMMENT= Generates perfect hash function LICENSE= GPLv2 CONFLICTS= ace+tao-[0-9]* -NO_STAGE= yes +USES= manpages GNU_CONFIGURE= yes MAKE_JOBS_UNSAFE= yes CONFIGURE_ARGS+= --docdir=${DOCSDIR} Modified: head/www/twig/Makefile ============================================================================== --- head/www/twig/Makefile Mon Oct 28 03:39:14 2013 (r331827) +++ head/www/twig/Makefile Mon Oct 28 05:18:54 2013 (r331828) @@ -13,7 +13,6 @@ COMMENT= Web Based Email Client and Sche USE_PHP= ctype imap openssl pgsql pcre posix session tokenizer xml zlib .endif -NO_STAGE= yes NO_BUILD= yes TWIG?= www/twig @@ -26,17 +25,14 @@ USERFILES= announcements.inc.php3 config login.header.inc.php3 mainmenu.inc.php3 newusergroups.inc.php3 do-install: - -${MKDIR} ${PREFIX}/${TWIG}/config - @(cd ${WRKSRC} && ${CP} ${ROOTFILES} ${PREFIX}/${TWIG}/ ) - @(cd ${WRKSRC} && ${CP} -R features ${PREFIX}/${TWIG}/ ) - @(cd ${WRKSRC} && ${CP} -R images ${PREFIX}/${TWIG}/ ) - @(cd ${WRKSRC} && ${CP} -R lib ${PREFIX}/${TWIG}/ ) - @(cd ${WRKSRC}/config && ${CP} ${CONFFILES} ${PREFIX}/${TWIG}/config/ ) + -${MKDIR} ${STAGEDIR}${PREFIX}/${TWIG}/config + @(cd ${WRKSRC} && ${CP} ${ROOTFILES} ${STAGEDIR}${PREFIX}/${TWIG}/ ) + @(cd ${WRKSRC} && ${CP} -R features ${STAGEDIR}${PREFIX}/${TWIG}/ ) + @(cd ${WRKSRC} && ${CP} -R images ${STAGEDIR}${PREFIX}/${TWIG}/ ) + @(cd ${WRKSRC} && ${CP} -R lib ${STAGEDIR}${PREFIX}/${TWIG}/ ) + @(cd ${WRKSRC}/config && ${CP} ${CONFFILES} ${STAGEDIR}${PREFIX}/${TWIG}/config/ ) .for i in ${USERFILES} - @${CP} ${WRKSRC}/config/${i} ${PREFIX}/${TWIG}/config/${i}-dist - @if test ! -f ${PREFIX}/${TWIG}/config/${i} ; then \ - ${CP} ${WRKSRC}/config/${i} ${PREFIX}/${TWIG}/config/${i}; \ - fi + @${CP} ${WRKSRC}/config/${i} ${STAGEDIR}${PREFIX}/${TWIG}/config/${i}-dist .endfor .include