Date: Mon, 19 May 2014 19:22:09 GMT From: Joseph Benden <joe@thrallingpenguin.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/189970: [patch] Add staging support to www/codeigniter Message-ID: <201405191922.s4JJM9kN020673@cgiserv.freebsd.org> Resent-Message-ID: <201405191930.s4JJU05f000166@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 189970
>Category: ports
>Synopsis: [patch] Add staging support to www/codeigniter
>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: Mon May 19 19:30: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/codeigniter.
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff --git a/www/codeigniter/Makefile b/www/codeigniter/Makefile
index 9e30fbe..42402f6 100644
--- a/www/codeigniter/Makefile
+++ b/www/codeigniter/Makefile
@@ -73,7 +73,6 @@ ODBC= Install ODBC support for PHP
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 +158,24 @@ confighelp:
@${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
+ @${FIND} ${STAGEDIR}${WWWDIR} -type f -print0 | ${XARGS} -0 ${CHMOD} 644
@${ECHO_CMD} '@exec ${FIND} ${WWWDIR} -type f -print0 | \
${XARGS} -0 ${CHMOD} 644' >> ${TMPPLIST}
- @${FIND} ${WWWDIR} -type d -print0 | ${XARGS} -0 ${CHMOD} 755
+ @${FIND} ${STAGEDIR}${WWWDIR} -type d -print0 | ${XARGS} -0 ${CHMOD} 755
@${ECHO_CMD} '@exec ${FIND} ${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; \
+ ${CP} -p ${STAGEDIR}${WWWDIR}/$$i.sample ${STAGEDIR}${WWWDIR}/$$i; \
else \
${ECHO_MSG} "===> Customized ${WWWDIR}/$$i has not been overwritten"; \
if [ ! -z "$UPGRADE_TOOL" ]; then \
@@ -186,7 +185,7 @@ post-install:
done
.if ${PORT_OPTIONS:MAPACHE}
@if [ -d "${CONFDIR}" ]; then \
- ${CP} ${WRKDIR}/${CONF} ${CONFDIR}/codeigniter.conf; \
+ ${CP} ${WRKDIR}/${CONF} ${STAGEDIR}${CONFDIR}/codeigniter.conf; \
else \
${ECHO_MSG} "" ; \
${ECHO_MSG} "Please check your Apache 2.x installation -" ; \
@@ -197,7 +196,7 @@ post-install:
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 --git a/www/codeigniter/pkg-plist b/www/codeigniter/pkg-plist
index 3a58519..5449178 100644
--- a/www/codeigniter/pkg-plist
+++ b/www/codeigniter/pkg-plist
@@ -207,6 +207,19 @@
%%WWWDIR%%/system/libraries/Zip.php
%%WWWDIR%%/system/libraries/index.html
%%WWWDIR%%/system/libraries/javascript/Jquery.php
+%%WWWDIR%%/%%CI_CONF_DIR%%/autoload.php
+%%WWWDIR%%/%%CI_CONF_DIR%%/config.php
+%%WWWDIR%%/%%CI_CONF_DIR%%/constants.php
+%%WWWDIR%%/%%CI_CONF_DIR%%/database.php
+%%WWWDIR%%/%%CI_CONF_DIR%%/doctypes.php
+%%WWWDIR%%/%%CI_CONF_DIR%%/foreign_chars.php
+%%WWWDIR%%/%%CI_CONF_DIR%%/hooks.php
+%%WWWDIR%%/%%CI_CONF_DIR%%/migration.php
+%%WWWDIR%%/%%CI_CONF_DIR%%/mimes.php
+%%WWWDIR%%/%%CI_CONF_DIR%%/profiler.php
+%%WWWDIR%%/%%CI_CONF_DIR%%/routes.php
+%%WWWDIR%%/%%CI_CONF_DIR%%/smileys.php
+%%WWWDIR%%/%%CI_CONF_DIR%%/user_agents.php
@dirrm %%WWWDIR%%/system/libraries/javascript
@dirrm %%WWWDIR%%/system/libraries/Cache/drivers
@dirrm %%WWWDIR%%/system/libraries/Cache
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405191922.s4JJM9kN020673>