ports/190226: [patch] Add staging support to www/mahara

Joseph Benden joe at thrallingpenguin.com
Sun May 25 21:30:00 UTC 2014


>Number:         190226
>Category:       ports
>Synopsis:       [patch] Add staging support to www/mahara
>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:   Sun May 25 21: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 at lucy:/usr/obj/usr/src/sys/GENERIC  amd64
>Description:
Adds staging support to www/mahara.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff --git a/www/mahara/Makefile b/www/mahara/Makefile
index 7a588ca..75c6532 100644
--- a/www/mahara/Makefile
+++ b/www/mahara/Makefile
@@ -9,13 +9,12 @@ MASTER_SITES=	http://launchpad.net/${PORTNAME}/1.1/${PORTVERSION}/+download/
 MAINTAINER=	wen at FreeBSD.org
 COMMENT=	An open source ePortfolio system
 
-USE_BZIP2=	yes
+USES=		tar:bzip2
 USE_PHP=	session json curl xml xmlrpc openssl simplexml
 
 OPTIONS_DEFINE=	MYSQL PGSQL
 OPTIONS_DEFAULT=	MYSQL
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MMYSQL}
@@ -42,15 +41,15 @@ pre-install:
 	@${ECHO} @dirrm ${MAHARADATADIR} >> ${PLIST}
 
 do-install:
-	@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${WWWDIR}
-	@${INSTALL} -d ${PREFIX}/${MAHARADATADIR}
+	@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}
+	@${INSTALL} -d ${STAGEDIR}${PREFIX}/${MAHARADATADIR}
 
-	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}
+	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}${WWWDIR}
 	@${ECHO_CMD} '@exec ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}' >> ${TMPPLIST}
-	@${CHMOD} -R 755 ${WWWDIR}
+	@${CHMOD} -R 755 ${STAGEDIR}${WWWDIR}
 	@${ECHO_CMD} '@exec ${CHMOD} -R 755 ${WWWDIR}' >> ${TMPPLIST}
 
-	@${CHMOD} -R a+w ${PREFIX}/${MAHARADATADIR}
+	@${CHMOD} -R a+w ${STAGEDIR}${PREFIX}/${MAHARADATADIR}
 	@${ECHO_CMD} '@exec ${CHMOD} -R a+w ${PREFIX}/${MAHARADATADIR}' >> ${TMPPLIST}
 
 post-install:


>Release-Note:
>Audit-Trail:
>Unformatted:


More information about the freebsd-ports-bugs mailing list