ports/189777: [patch] www/codeigniter staging, change url
Zsolt Udvari
udvzsolt at gmail.com
Tue May 13 17:10:02 UTC 2014
>Number: 189777
>Category: ports
>Synopsis: [patch] www/codeigniter staging, change url
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Tue May 13 17:10:01 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator: Zsolt Udvari
>Release: FreeBSD 10.0-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD bsd-zsolt 10.0-RELEASE FreeBSD 10.0-RELEASE #0 r260789: Thu Jan 16 22:34:59 UTC 2014 root at snap.freebsd.org:/usr/obj/usr/src/sys/GENERIC amd64
>Description:
www/codeigniter staging support
change url to http://ellislab.com/codeigniter
>How-To-Repeat:
>Fix:
--- codeigniter.diff begins here ---
diff -ur codeigniter.orig/Makefile codeigniter/Makefile
--- codeigniter.orig/Makefile 2014-05-13 18:52:44.000000000 +0200
+++ codeigniter/Makefile 2014-05-13 19:02:33.000000000 +0200
@@ -13,6 +13,8 @@
USES= zip
+NEED_ROOT=yes
+
CONFLICTS= codeigniter-1.[0-9]*
NO_BUILD= yes
@@ -73,7 +75,6 @@
PGSQL_DESC= Install PostgreSQL support for PHP
SQLITE_DESC= Install SQLite support for PHP
-NO_STAGE= yes
.include <bsd.port.pre.mk>
.if ${PORT_OPTIONS:MAPACHE}
@@ -159,24 +160,24 @@
@${ECHO_MSG} ""
do-install:
- @cd ${WRKSRC} && ${COPYTREE_SHARE} "${STD_BITS}" ${WWWDIR}
+ @cd ${WRKSRC} && ${COPYTREE_SHARE} "${STD_BITS}" ${STAGEDIR}${WWWDIR}
@for i in ${CI_CONF_FILES}; do \
- ${INSTALL_DATA} ${WRKSRC}/$$i ${WWWDIR}/$$i.sample; \
+ ${INSTALL_DATA} ${WRKSRC}/$$i ${STAGEDIR}${WWWDIR}/$$i.sample; \
done
- @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}
+ @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}${WWWDIR}
@${ECHO_CMD} '@exec ${CHOWN} -R ${WWWOWN}:${WWWGRP} \
- ${WWWDIR:S|^${PREFIX}/|%D/|}' >> ${TMPPLIST}
- @${FIND} ${WWWDIR} -type f -print0 | ${XARGS} -0 ${CHMOD} 644
- @${ECHO_CMD} '@exec ${FIND} ${WWWDIR} -type f -print0 | \
+ ${STAGEDIR}${WWWDIR:S|^${PREFIX}/|%D/|}' >> ${TMPPLIST}
+ @${FIND} ${STAGEDIR}${WWWDIR} -type f -print0 | ${XARGS} -0 ${CHMOD} 644
+ @${ECHO_CMD} '@exec ${FIND} ${STAGEDIR}${WWWDIR} -type f -print0 | \
${XARGS} -0 ${CHMOD} 644' >> ${TMPPLIST}
- @${FIND} ${WWWDIR} -type d -print0 | ${XARGS} -0 ${CHMOD} 755
- @${ECHO_CMD} '@exec ${FIND} ${WWWDIR} -type d -print0 | \
+ @${FIND} ${STAGEDIR}${WWWDIR} -type d -print0 | ${XARGS} -0 ${CHMOD} 755
+ @${ECHO_CMD} '@exec ${FIND} ${STAGEDIR}${WWWDIR} -type d -print0 | \
${XARGS} -0 ${CHMOD} 755' >> ${TMPPLIST}
post-install:
@for i in ${CI_CONF_FILES}; do \
- if [ ! -f ${WWWDIR}/$$i ]; then \
- ${CP} -p ${WWWDIR}/$$i.sample ${WWWDIR}/$$i; \
+ if [ ! -f ${STAGEDIR}${WWWDIR}/$$i ]; then \
+ ${CP} -p ${STAGEDIR}${WWWDIR}/$$i.sample ${STAGEDIR}${WWWDIR}/$$i; \
else \
${ECHO_MSG} "===> Customized ${WWWDIR}/$$i has not been overwritten"; \
if [ ! -z "$UPGRADE_TOOL" ]; then \
@@ -197,7 +198,7 @@
fi
.endif
.if ${PORT_OPTIONS:MDOCS}
- @cd ${WRKSRC}/user_guide && ${COPYTREE_SHARE} . ${DOCSDIR}
+ @cd ${WRKSRC}/user_guide && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
.endif
@${CAT} ${PKGMESSAGE}
diff -ur codeigniter.orig/pkg-descr codeigniter/pkg-descr
--- codeigniter.orig/pkg-descr 2014-05-13 18:52:44.000000000 +0200
+++ codeigniter/pkg-descr 2014-05-13 19:03:06.000000000 +0200
@@ -2,4 +2,4 @@
built for PHP coders who need a simple and elegant toolkit to create
full-featured web applications.
-WWW: http://codeigniter.com/
+WWW: http://ellislab.com/codeigniter
--- codeigniter.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list