View | Details | Raw Unified | Return to bug 189970 | Differences between
and this patch

Collapse All | Expand All

(-)b/www/codeigniter/Makefile (-9 / +8 lines)
Lines 73-79 ODBC= Install ODBC support for PHP Link Here
73
PGSQL_DESC=	Install PostgreSQL support for PHP
73
PGSQL_DESC=	Install PostgreSQL support for PHP
74
SQLITE_DESC=	Install SQLite support for PHP
74
SQLITE_DESC=	Install SQLite support for PHP
75
75
76
NO_STAGE=	yes
77
.include <bsd.port.pre.mk>
76
.include <bsd.port.pre.mk>
78
77
79
.if ${PORT_OPTIONS:MAPACHE}
78
.if ${PORT_OPTIONS:MAPACHE}
Lines 159-182 confighelp: Link Here
159
	@${ECHO_MSG} ""
158
	@${ECHO_MSG} ""
160
159
161
do-install:
160
do-install:
162
	@cd ${WRKSRC} && ${COPYTREE_SHARE} "${STD_BITS}" ${WWWDIR}
161
	@cd ${WRKSRC} && ${COPYTREE_SHARE} "${STD_BITS}" ${STAGEDIR}${WWWDIR}
163
	@for i in ${CI_CONF_FILES}; do \
162
	@for i in ${CI_CONF_FILES}; do \
164
		${INSTALL_DATA} ${WRKSRC}/$$i ${WWWDIR}/$$i.sample; \
163
		${INSTALL_DATA} ${WRKSRC}/$$i ${STAGEDIR}${WWWDIR}/$$i.sample; \
165
	done
164
	done
166
	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}
165
	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}${WWWDIR}
167
	@${ECHO_CMD} '@exec ${CHOWN} -R ${WWWOWN}:${WWWGRP} \
166
	@${ECHO_CMD} '@exec ${CHOWN} -R ${WWWOWN}:${WWWGRP} \
168
		${WWWDIR:S|^${PREFIX}/|%D/|}' >> ${TMPPLIST}
167
		${WWWDIR:S|^${PREFIX}/|%D/|}' >> ${TMPPLIST}
169
	@${FIND} ${WWWDIR} -type f -print0 | ${XARGS} -0 ${CHMOD} 644
168
	@${FIND} ${STAGEDIR}${WWWDIR} -type f -print0 | ${XARGS} -0 ${CHMOD} 644
170
	@${ECHO_CMD} '@exec ${FIND} ${WWWDIR} -type f -print0 | \
169
	@${ECHO_CMD} '@exec ${FIND} ${WWWDIR} -type f -print0 | \
171
		${XARGS} -0 ${CHMOD} 644' >> ${TMPPLIST}
170
		${XARGS} -0 ${CHMOD} 644' >> ${TMPPLIST}
172
	@${FIND} ${WWWDIR} -type d -print0 | ${XARGS} -0 ${CHMOD} 755
171
	@${FIND} ${STAGEDIR}${WWWDIR} -type d -print0 | ${XARGS} -0 ${CHMOD} 755
173
	@${ECHO_CMD} '@exec ${FIND} ${WWWDIR} -type d -print0 | \
172
	@${ECHO_CMD} '@exec ${FIND} ${WWWDIR} -type d -print0 | \
174
		${XARGS} -0 ${CHMOD} 755' >> ${TMPPLIST}
173
		${XARGS} -0 ${CHMOD} 755' >> ${TMPPLIST}
175
174
176
post-install:
175
post-install:
177
	@for i in ${CI_CONF_FILES}; do \
176
	@for i in ${CI_CONF_FILES}; do \
178
		if [ ! -f ${WWWDIR}/$$i ]; then \
177
		if [ ! -f ${WWWDIR}/$$i ]; then \
179
			${CP} -p ${WWWDIR}/$$i.sample ${WWWDIR}/$$i; \
178
			${CP} -p ${STAGEDIR}${WWWDIR}/$$i.sample ${STAGEDIR}${WWWDIR}/$$i; \
180
		else \
179
		else \
181
			${ECHO_MSG} "===> Customized ${WWWDIR}/$$i has not been overwritten"; \
180
			${ECHO_MSG} "===> Customized ${WWWDIR}/$$i has not been overwritten"; \
182
			if [ ! -z "$UPGRADE_TOOL" ]; then \
181
			if [ ! -z "$UPGRADE_TOOL" ]; then \
Lines 186-192 post-install: Link Here
186
	done
185
	done
187
.if ${PORT_OPTIONS:MAPACHE}
186
.if ${PORT_OPTIONS:MAPACHE}
188
	@if [ -d "${CONFDIR}" ]; then \
187
	@if [ -d "${CONFDIR}" ]; then \
189
	  ${CP} ${WRKDIR}/${CONF} ${CONFDIR}/codeigniter.conf; \
188
	  ${CP} ${WRKDIR}/${CONF} ${STAGEDIR}${CONFDIR}/codeigniter.conf; \
190
	else \
189
	else \
191
	  ${ECHO_MSG} "" ; \
190
	  ${ECHO_MSG} "" ; \
192
	  ${ECHO_MSG} "Please check your Apache 2.x installation -" ; \
191
	  ${ECHO_MSG} "Please check your Apache 2.x installation -" ; \
Lines 197-203 post-install: Link Here
197
	fi
196
	fi
198
.endif
197
.endif
199
.if ${PORT_OPTIONS:MDOCS}
198
.if ${PORT_OPTIONS:MDOCS}
200
	@cd ${WRKSRC}/user_guide && ${COPYTREE_SHARE} . ${DOCSDIR}
199
	@cd ${WRKSRC}/user_guide && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
201
.endif
200
.endif
202
201
203
	@${CAT} ${PKGMESSAGE}
202
	@${CAT} ${PKGMESSAGE}
(-)b/www/codeigniter/pkg-plist (+13 lines)
Lines 207-212 Link Here
207
%%WWWDIR%%/system/libraries/Zip.php
207
%%WWWDIR%%/system/libraries/Zip.php
208
%%WWWDIR%%/system/libraries/index.html
208
%%WWWDIR%%/system/libraries/index.html
209
%%WWWDIR%%/system/libraries/javascript/Jquery.php
209
%%WWWDIR%%/system/libraries/javascript/Jquery.php
210
%%WWWDIR%%/%%CI_CONF_DIR%%/autoload.php
211
%%WWWDIR%%/%%CI_CONF_DIR%%/config.php
212
%%WWWDIR%%/%%CI_CONF_DIR%%/constants.php
213
%%WWWDIR%%/%%CI_CONF_DIR%%/database.php
214
%%WWWDIR%%/%%CI_CONF_DIR%%/doctypes.php
215
%%WWWDIR%%/%%CI_CONF_DIR%%/foreign_chars.php
216
%%WWWDIR%%/%%CI_CONF_DIR%%/hooks.php
217
%%WWWDIR%%/%%CI_CONF_DIR%%/migration.php
218
%%WWWDIR%%/%%CI_CONF_DIR%%/mimes.php
219
%%WWWDIR%%/%%CI_CONF_DIR%%/profiler.php
220
%%WWWDIR%%/%%CI_CONF_DIR%%/routes.php
221
%%WWWDIR%%/%%CI_CONF_DIR%%/smileys.php
222
%%WWWDIR%%/%%CI_CONF_DIR%%/user_agents.php
210
@dirrm %%WWWDIR%%/system/libraries/javascript
223
@dirrm %%WWWDIR%%/system/libraries/javascript
211
@dirrm %%WWWDIR%%/system/libraries/Cache/drivers
224
@dirrm %%WWWDIR%%/system/libraries/Cache/drivers
212
@dirrm %%WWWDIR%%/system/libraries/Cache
225
@dirrm %%WWWDIR%%/system/libraries/Cache

Return to bug 189970