Date: Wed, 21 May 2014 00:15:40 GMT From: Joseph Benden <joe@thrallingpenguin.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/190044: [patch] Add staging support to www/entrans Message-ID: <201405210015.s4L0FeFg083604@cgiserv.freebsd.org> Resent-Message-ID: <201405210020.s4L0K0aF037829@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 190044
>Category: ports
>Synopsis: [patch] Add staging support to www/entrans
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Wed May 21 00:20:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator: Joseph Benden
>Release: FreeBSD 11
>Organization:
>Environment:
FreeBSD lucy 11.0-CURRENT FreeBSD 11.0-CURRENT #4 r264887: Thu Apr 24 12:43:46 MST 2014 root@lucy:/usr/obj/usr/src/sys/GENERIC amd64
>Description:
Adds staging support to www/entrans.
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff --git a/www/entrans/Makefile b/www/entrans/Makefile
index 6d29e9d..cdcd580 100644
--- a/www/entrans/Makefile
+++ b/www/entrans/Makefile
@@ -20,7 +20,6 @@ PLIST= ${WRKDIR}/pkg-plist
PORTDOCS= README INSTALL COPYING AUTHORS HACKING THANKS
-NO_STAGE= yes
pre-install:
cd ${WRKSRC} && ${FIND} -s * -type f | \
${SED} -e 's|^|${ENTRANS}/|' > ${PLIST} \
@@ -31,14 +30,14 @@ pre-install:
${WRKSRC}/conf/database.conf.php.sample ${WRKSRC}/conf/database.conf.php; fi
do-install:
- -@${MKDIR} ${PREFIX}/${ENTRANS}
- @${CHOWN} ${WWWOWN}:${WWWGRP} ${PREFIX}/${ENTRANS}
- @${CHMOD} 755 ${PREFIX}/${ENTRANS}
- ${CP} -R ${WRKSRC}/ ${PREFIX}/${ENTRANS}
+ -@${MKDIR} ${STAGEDIR}${PREFIX}/${ENTRANS}
+ @${CHOWN} ${WWWOWN}:${WWWGRP} ${STAGEDIR}${PREFIX}/${ENTRANS}
+ @${CHMOD} 755 ${STAGEDIR}${PREFIX}/${ENTRANS}
+ ${CP} -R ${WRKSRC}/ ${STAGEDIR}${PREFIX}/${ENTRANS}
.if !defined(NOPORTDOCS)
- @${MKDIR} ${DOCSDIR}
+ @${MKDIR} ${STAGEDIR}${DOCSDIR}
.for i in ${PORTDOCS}
- ${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}/${i}
+ ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}/${i}
.endfor
.endif
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405210015.s4L0FeFg083604>