Attachment 142919 Details for Bug 190023 – file.diff

[patch] file.diff

file.diff (text/plain), 3.34 KB, created by joe on 2014-05-20 18:40:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: joe

Created: 2014-05-20 18:40:00 UTC

Size: 3.34 KB

patch

obsolete

>diff --git a/www/cakephp22/Makefile b/www/cakephp22/Makefile
>index 01f5efc..3345559 100644
>--- a/www/cakephp22/Makefile
>+++ b/www/cakephp22/Makefile
>@@ -25,7 +25,7 @@ NO_BUILD=	yes
> USES=		gettext
> USE_PHP=	ctype session
> WANT_PHP_WEB=	yes
>-DEFAULT_PHP_VER=5
>+DEFAULT_VERSIONS=	php=5
> 
> CAKE_CONF_FILES=	\
> 		app/Config/acl.php \
>@@ -50,7 +50,6 @@ MEMCACHE_DESC=	Enable Memcached caching engine client
> CONFDIR=	${PREFIX}/${CONFDIR_REL}
> CONFDIR_REL=	${APACHEETCDIR}/Includes
> 
>-NO_STAGE=	yes
> .include <bsd.port.pre.mk>
> 
> WITH_PHP_CGI?=	/cgi-bin/php
>@@ -140,43 +139,44 @@ post-patch:
> 
> do-install:
> 	@cd ${WRKSRC} && ${COPYTREE_SHARE} \
>-		".htaccess app lib index.php plugins vendors" ${WWWDIR}
>+		".htaccess app lib index.php plugins vendors" ${STAGEDIR}${WWWDIR}
> 
> .if empty(PORT_OPTIONS:MPROD)
> # If installed in development mode, get rid of .htaccess files,
> # as noted by:
> # http://book.cakephp.org/view/42/The-Configuration-Class#CakePHP-Core-Configuration-Variables-44
>-	@${FIND} ${WWWDIR} -type f -name .htaccess -exec ${RM} {} \;
>+	@${FIND} ${STAGEDIR}${WWWDIR} -type f -name .htaccess -exec ${RM} {} \;
> 	@${ECHO_CMD} '@exec ${FIND} ${WWWDIR:S|^${PREFIX}/|%D/|} -type f -name .htaccess -exec ${RM} {} \;' >> ${TMPPLIST}
> .endif
> 
> # Get rid of the empty placeholder files
>-	@${FIND} ${WWWDIR} -type f -name empty -size 0 -exec ${RM} {} \;
>+	@${FIND} ${STAGEDIR}${WWWDIR} -type f -name empty -size 0 -exec ${RM} {} \;
> 	@${ECHO_CMD} '@exec ${FIND} ${WWWDIR:S|^${PREFIX}/|%D/|} -type f -name empty -size 0 -exec ${RM} {} \;' >> ${TMPPLIST}
> 
>-	@${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}
> 
> # Fix the permissions of the Cake console script
>-	@${CHMOD} 755 ${WWWDIR}/${CAKE_CONSOLE}
>+	@${CHMOD} 755 ${STAGEDIR}${WWWDIR}/${CAKE_CONSOLE}
> 	@${ECHO_CMD} '@exec ${CHMOD} 755 ${WWWDIR}/${CAKE_CONSOLE}' >> ${TMPPLIST}
> 
> post-install:
> 	@for i in ${CAKE_CONF_FILES}; do \
> 		if [ ! -f ${WWWDIR}/$$i -a -f ${WRKSRC}/$$i.default ]; then \
>-			${INSTALL_DATA} ${WRKSRC}/$$i.default ${WWWDIR}/$$i; \
>+			${INSTALL_DATA} ${WRKSRC}/$$i.default ${STAGEDIR}${WWWDIR}/$$i; \
> 		fi \
> 	done
> .if ${PORT_OPTIONS:MAP}
>-	@if [ -d "${CONFDIR}" ]; then \
>-	  ${CP} ${WRKDIR}/${CONF} ${CONFDIR}/cakephp.conf; \
>+	@${MKDIR} ${STAGEDIR}${CONFDIR}
>+	@if [ -d "${STAGEDIR}${CONFDIR}" ]; then \
>+	  ${CP} ${WRKDIR}/${CONF} ${STAGEDIR}${CONFDIR}/cakephp.conf; \
> 	else \
> 	  ${ECHO_MSG} "" ; \
> 	  ${ECHO_MSG} "Please check your Apache 2.x installation -" ; \
>@@ -187,8 +187,8 @@ post-install:
> 	fi
> .endif
> .if ${PORT_OPTIONS:MDOCS}
>-	@${INSTALL} -d ${DOCSDIR}
>-	@cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
>+	@${INSTALL} -d ${STAGEDIR}${DOCSDIR}
>+	@cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
> .endif
> 	@${CAT} ${PKGMESSAGE}
> .if ${CGI_EXT} == "-cgi"

Actions: View | Diff

Attachments on bug 190023: 142919 | 144182