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

Collapse All | Expand All

(-)b/www/cakephp21/Makefile (-14 / +14 lines)
Lines 26-32 NO_BUILD= yes Link Here
26
USES=		gettext
26
USES=		gettext
27
USE_PHP=	ctype session
27
USE_PHP=	ctype session
28
WANT_PHP_WEB=	yes
28
WANT_PHP_WEB=	yes
29
DEFAULT_PHP_VER=5
29
DEFAULT_VERSIONS=	php=5
30
30
31
CAKE_CONF_FILES=	\
31
CAKE_CONF_FILES=	\
32
		app/Config/acl.php \
32
		app/Config/acl.php \
Lines 51-57 MEMCACHE_DESC= Enable Memcached caching engine client Link Here
51
CONFDIR=	${PREFIX}/${CONFDIR_REL}
51
CONFDIR=	${PREFIX}/${CONFDIR_REL}
52
CONFDIR_REL=	${APACHEETCDIR}/Includes
52
CONFDIR_REL=	${APACHEETCDIR}/Includes
53
53
54
NO_STAGE=	yes
55
.include <bsd.port.pre.mk>
54
.include <bsd.port.pre.mk>
56
55
57
WITH_PHP_CGI?=	/cgi-bin/php
56
WITH_PHP_CGI?=	/cgi-bin/php
Lines 141-183 post-patch: Link Here
141
140
142
do-install:
141
do-install:
143
	@cd ${WRKSRC} && ${COPYTREE_SHARE} \
142
	@cd ${WRKSRC} && ${COPYTREE_SHARE} \
144
		".htaccess app lib index.php plugins vendors" ${WWWDIR}
143
		".htaccess app lib index.php plugins vendors" ${STAGEDIR}${WWWDIR}
145
144
146
.if ! ${PORT_OPTIONS:MPROD}
145
.if ! ${PORT_OPTIONS:MPROD}
147
# If installed in development mode, get rid of .htaccess files,
146
# If installed in development mode, get rid of .htaccess files,
148
# as noted by:
147
# as noted by:
149
# http://book.cakephp.org/view/42/The-Configuration-Class#CakePHP-Core-Configuration-Variables-44
148
# http://book.cakephp.org/view/42/The-Configuration-Class#CakePHP-Core-Configuration-Variables-44
150
	@${FIND} ${WWWDIR} -type f -name .htaccess -exec ${RM} {} \;
149
	@${FIND} ${STAGEDIR}${WWWDIR} -type f -name .htaccess -exec ${RM} {} \;
151
	@${ECHO_CMD} '@exec ${FIND} ${WWWDIR:S|^${PREFIX}/|%D/|} -type f -name .htaccess -exec ${RM} {} \;' >> ${TMPPLIST}
150
	@${ECHO_CMD} '@exec ${FIND} ${WWWDIR:S|^${PREFIX}/|%D/|} -type f -name .htaccess -exec ${RM} {} \;' >> ${TMPPLIST}
152
.endif
151
.endif
153
152
154
# Get rid of the empty placeholder files
153
# Get rid of the empty placeholder files
155
	@${FIND} ${WWWDIR} -type f -name empty -size 0 -exec ${RM} {} \;
154
	@${FIND} ${STAGEDIR}${WWWDIR} -type f -name empty -size 0 -exec ${RM} {} \;
156
	@${ECHO_CMD} '@exec ${FIND} ${WWWDIR:S|^${PREFIX}/|%D/|} -type f -name empty -size 0 -exec ${RM} {} \;' >> ${TMPPLIST}
155
	@${ECHO_CMD} '@exec ${FIND} ${WWWDIR:S|^${PREFIX}/|%D/|} -type f -name empty -size 0 -exec ${RM} {} \;' >> ${TMPPLIST}
157
156
158
	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}
157
	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}${WWWDIR}
159
	@${ECHO_CMD} '@exec ${CHOWN} -R ${WWWOWN}:${WWWGRP} \
158
	@${ECHO_CMD} '@exec ${CHOWN} -R ${WWWOWN}:${WWWGRP} \
160
		${WWWDIR:S|^${PREFIX}/|%D/|}' >> ${TMPPLIST}
159
		${WWWDIR:S|^${PREFIX}/|%D/|}' >> ${TMPPLIST}
161
	@${FIND} ${WWWDIR} -type f -print0 | ${XARGS} -0 ${CHMOD} 644
160
	@${FIND} ${STAGEDIR}${WWWDIR} -type f -print0 | ${XARGS} -0 ${CHMOD} 644
162
	@${ECHO_CMD} '@exec ${FIND} ${WWWDIR} -type f -print0 | \
161
	@${ECHO_CMD} '@exec ${FIND} ${WWWDIR} -type f -print0 | \
163
		${XARGS} -0 ${CHMOD} 644' >> ${TMPPLIST}
162
		${XARGS} -0 ${CHMOD} 644' >> ${TMPPLIST}
164
	@${FIND} ${WWWDIR} -type d -print0 | ${XARGS} -0 ${CHMOD} 755
163
	@${FIND} ${STAGEDIR}${WWWDIR} -type d -print0 | ${XARGS} -0 ${CHMOD} 755
165
	@${ECHO_CMD} '@exec ${FIND} ${WWWDIR} -type d -print0 | \
164
	@${ECHO_CMD} '@exec ${FIND} ${WWWDIR} -type d -print0 | \
166
		${XARGS} -0 ${CHMOD} 755' >> ${TMPPLIST}
165
		${XARGS} -0 ${CHMOD} 755' >> ${TMPPLIST}
167
166
168
# Fix the permissions of the Cake console script
167
# Fix the permissions of the Cake console script
169
	@${CHMOD} 755 ${WWWDIR}/${CAKE_CONSOLE}
168
	@${CHMOD} 755 ${STAGEDIR}${WWWDIR}/${CAKE_CONSOLE}
170
	@${ECHO_CMD} '@exec ${CHMOD} 755 ${WWWDIR}/${CAKE_CONSOLE}' >> ${TMPPLIST}
169
	@${ECHO_CMD} '@exec ${CHMOD} 755 ${WWWDIR}/${CAKE_CONSOLE}' >> ${TMPPLIST}
171
170
172
post-install:
171
post-install:
173
	@for i in ${CAKE_CONF_FILES}; do \
172
	@for i in ${CAKE_CONF_FILES}; do \
174
		if [ ! -f ${WWWDIR}/$$i -a -f ${WRKSRC}/$$i.default ]; then \
173
		if [ ! -f ${WWWDIR}/$$i -a -f ${WRKSRC}/$$i.default ]; then \
175
			${INSTALL_DATA} ${WRKSRC}/$$i.default ${WWWDIR}/$$i; \
174
			${INSTALL_DATA} ${WRKSRC}/$$i.default ${STAGEDIR}${WWWDIR}/$$i; \
176
		fi \
175
		fi \
177
	done
176
	done
178
.if ${PORT_OPTIONS:MAP}
177
.if ${PORT_OPTIONS:MAP}
179
	@if [ -d "${CONFDIR}" ]; then \
178
	@${MKDIR} ${STAGEDIR}${CONFDIR}
180
	  ${CP} ${WRKDIR}/${CONF} ${CONFDIR}/cakephp.conf; \
179
	@if [ -d "${STAGEDIR}${CONFDIR}" ]; then \
180
	  ${CP} ${WRKDIR}/${CONF} ${STAGEDIR}${CONFDIR}/cakephp.conf; \
181
	else \
181
	else \
182
	  ${ECHO_MSG} "" ; \
182
	  ${ECHO_MSG} "" ; \
183
	  ${ECHO_MSG} "Please check your Apache 2.x installation -" ; \
183
	  ${ECHO_MSG} "Please check your Apache 2.x installation -" ; \
Lines 188-195 post-install: Link Here
188
	fi
188
	fi
189
.endif
189
.endif
190
.if ${PORT_OPTIONS:MDOCS}
190
.if ${PORT_OPTIONS:MDOCS}
191
	@${INSTALL} -d ${DOCSDIR}
191
	@${INSTALL} -d ${STAGEDIR}${DOCSDIR}
192
	@cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
192
	@cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
193
.endif
193
.endif
194
	@${CAT} ${PKGMESSAGE}
194
	@${CAT} ${PKGMESSAGE}
195
.if ${CGI_EXT} == "-cgi"
195
.if ${CGI_EXT} == "-cgi"

Return to bug 190021