From 5d6bf0ff2fd7c8e73ff2557dafaecfaec0a8e134 Mon Sep 17 00:00:00 2001 From: Dirk Meyer Date: Mon, 28 Oct 2013 05:18:54 +0000 Subject: [PATCH] - use STAGEDIR --- deskutils/openproj/Makefile | 8 +++----- devel/gperf/Makefile | 2 +- www/twig/Makefile | 18 +++++++----------- 3 files changed, 11 insertions(+), 17 deletions(-) diff --git a/deskutils/openproj/Makefile b/deskutils/openproj/Makefile index 30b5f08fa78f..08e8f96e5a7a 100644 --- a/deskutils/openproj/Makefile +++ b/deskutils/openproj/Makefile @@ -10,8 +10,6 @@ COMMENT= A free, open source Project Manager 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 diff --git a/devel/gperf/Makefile b/devel/gperf/Makefile index 45c7a4e4956c..d68d265c1105 100644 --- a/devel/gperf/Makefile +++ b/devel/gperf/Makefile @@ -12,8 +12,8 @@ COMMENT= Generates perfect hash functions for sets of keywords LICENSE= GPLv2 CONFLICTS= ace+tao-[0-9]* -NO_STAGE= yes +USES= manpages GNU_CONFIGURE= yes MAKE_JOBS_UNSAFE= yes CONFIGURE_ARGS+= --docdir=${DOCSDIR} diff --git a/www/twig/Makefile b/www/twig/Makefile index 486829d48cb6..085a27b29a09 100644 --- a/www/twig/Makefile +++ b/www/twig/Makefile @@ -13,7 +13,6 @@ COMMENT= Web Based Email Client and Scheduler 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.inc.php3 dbconfig.inc.php3 \ 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