Attachment 142914 Details for Bug 190018 – file.diff

[patch] file.diff

file.diff (text/plain), 1.79 KB, created by joe on 2014-05-20 17:50:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: joe

Created: 2014-05-20 17:50:00 UTC

Size: 1.79 KB

patch

obsolete

>diff --git a/www/cakephp11/Makefile b/www/cakephp11/Makefile
>index 9515c3c..a2d8ee7 100644
>--- a/www/cakephp11/Makefile
>+++ b/www/cakephp11/Makefile
>@@ -22,7 +22,7 @@ NO_BUILD=	yes
> 
> USE_PHP=	pcre session
> WANT_PHP_WEB=	yes
>-DEFAULT_PHP_VER=5
>+DEFAULT_VERSIONS=	php=5
> 
> SUB_FILES=	pkg-message
> 
>@@ -36,7 +36,6 @@ PLIST_SUB+=	CONFDIR=${CONFDIR_REL}
> CONFDIR=	${PREFIX}/${CONFDIR_REL}
> CONFDIR_REL=	${APACHEETCDIR}/Includes
> 
>-NO_STAGE=	yes
> .include <bsd.port.pre.mk>
> 
> WITH_PHP_CGI?=	/cgi-bin/php
>@@ -97,19 +96,20 @@ confighelp:
> 	@${ECHO_MSG} ""
> 
> do-install:
>-	@${MKDIR} ${WWWDIR}
>+	@${MKDIR} ${STAGEDIR}${WWWDIR}
> 	@${CP} -R ${WRKSRC}/.htaccess \
> 			${WRKSRC}/app \
> 			${WRKSRC}/cake \
> 			${WRKSRC}/index.php \
>-			${WRKSRC}/vendors ${WWWDIR}
>-	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}
>-	@${FIND} ${WWWDIR} -type f -print0 | ${XARGS} -0 ${CHMOD} 644
>-	@${FIND} ${WWWDIR} -type d -print0 | ${XARGS} -0 ${CHMOD} 755
>+			${WRKSRC}/vendors ${STAGEDIR}${WWWDIR}
>+	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}${WWWDIR}
>+	@${FIND} ${STAGEDIR}${WWWDIR} -type f -print0 | ${XARGS} -0 ${CHMOD} 644
>+	@${FIND} ${STAGEDIR}${WWWDIR} -type d -print0 | ${XARGS} -0 ${CHMOD} 755
> 
> post-install:
>-	@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 -" ; \
>@@ -119,8 +119,8 @@ post-install:
> 	  ${FALSE} ; \
> 	fi
> .if ${PORT_OPTIONS:MDOCS}
>-	@${MKDIR} ${DOCSDIR}
>-	@${INSTALL_DATA} ${WRKSRC}/docs/*.txt ${DOCSDIR}
>+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
>+	@${INSTALL_DATA} ${WRKSRC}/docs/*.txt ${STAGEDIR}${DOCSDIR}
> .endif
> 	@${CAT} ${PKGMESSAGE}
> .if ${CGI_EXT} == "-cgi"

Actions: View | Diff

Attachments on bug 190018: 142914