Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 20 May 2014 14:28:56 GMT
From:      Joseph Benden <joe@thrallingpenguin.com>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/190008: [patch] Add staging support to www/atutor
Message-ID:  <201405201428.s4KESu8C094109@cgiserv.freebsd.org>
Resent-Message-ID: <201405201430.s4KEU0wM043748@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         190008
>Category:       ports
>Synopsis:       [patch] Add staging support to www/atutor
>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:   Tue May 20 14: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@lucy:/usr/obj/usr/src/sys/GENERIC  amd64
>Description:
Adds staging support to www/atutor.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff --git a/www/atutor/Makefile b/www/atutor/Makefile
index e7365c5..5ca5467 100644
--- a/www/atutor/Makefile
+++ b/www/atutor/Makefile
@@ -13,7 +13,6 @@ COMMENT=	An Open Source Web-based Learning Content Management System (LCMS)
 USE_PHP=	session mbstring zlib mysql
 WRKSRC=		${WRKDIR}/ATutor
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 NO_BUILD=	yes
@@ -30,15 +29,15 @@ pre-install:
 	@${FIND} -s -d ${WRKSRC} -type d  | ${SED} "s?${WRKSRC}?@dirrm ${ATUTDIR}?g" >> ${PLIST}
 
 do-install:
-	@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${WWWDIR}
-	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}
+	@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}
+	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}${WWWDIR}
 	@${ECHO_CMD} '@exec ${CHOWN} -R ${WWWOWN}:${WWWGRP} \
 		${WWWDIR}' >> ${TMPPLIST}
-	@${FIND} ${WWWDIR} -type d -exec ${CHMOD} a+x {} \;
-	@${INSTALL_DATA} -d ${ATUTDATDIR}
-	@${CHMOD} 777 ${ATUTDATDIR}
+	@${FIND} ${STAGEDIR}${WWWDIR} -type d -exec ${CHMOD} a+x {} \;
+	@${INSTALL_DATA} -d ${STAGEDIR}${ATUTDATDIR}
+	@${CHMOD} 777 ${STAGEDIR}${ATUTDATDIR}
 	@${ECHO_CMD} '@exec ${CHMOD} 777 ${ATUTDATDIR}' >> ${TMPPLIST}
-	@${CHMOD} 666 ${WWWDIR}/${ATUTCONFIG}
+	@${CHMOD} 666 ${STAGEDIR}${WWWDIR}/${ATUTCONFIG}
 	@${ECHO_CMD} '@exec ${CHMOD} 666 \
 		${WWWDIR}/${ATUTCONFIG}' >> ${TMPPLIST}
 


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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405201428.s4KESu8C094109>