svn commit: r368600 - head/www/mahara

[Antoine Brodin]

Author: antoine
Date: Fri Sep 19 21:24:53 2014
New Revision: 368600
URL: http://svnweb.freebsd.org/changeset/ports/368600
QAT: https://qat.redports.org/buildarchive/r368600/

Log:
  Allow staging as a regular user
  Bump portrevision as some files were not packaged with intended owner

Modified:
  head/www/mahara/Makefile

Modified: head/www/mahara/Makefile
==============================================================================
--- head/www/mahara/Makefile	Fri Sep 19 21:13:32 2014	(r368599)
+++ head/www/mahara/Makefile	Fri Sep 19 21:24:53 2014	(r368600)
@@ -3,6 +3,7 @@
 
 PORTNAME=	mahara
 PORTVERSION=	1.9.1
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://launchpad.net/${PORTNAME}/1.9/${PORTVERSION}/+download/
 
@@ -11,7 +12,7 @@ COMMENT=	Open source ePortfolio system
 
 LICENSE=	GPLv3
 
-USES=tar:bzip2
+USES=		tar:bzip2
 USE_PHP=	session json curl xml xmlrpc openssl simplexml
 
 OPTIONS_DEFINE=	MYSQL PGSQL
@@ -30,20 +31,16 @@ MAHARADIR?=	www/mahara
 MAHARADATADIR?=	www/maharadata
 
 pre-install:
-	@${FIND} -s -d ${WRKSRC} -type f | ${SED} "s?${WRKSRC}?${MAHARADIR}?g" >${PLIST}
+	@${ECHO_CMD} -e '@owner ${WWWOWN}\n at group ${WWWGRP}' > ${PLIST}
+	@${FIND} -s -d ${WRKSRC} -type f | ${SED} "s?${WRKSRC}?${MAHARADIR}?g" >> ${PLIST}
 	@${FIND} -s -d ${WRKSRC} -type d  | ${SED} "s?${WRKSRC}?@dirrm ${MAHARADIR}?g" >> ${PLIST}
 	@${ECHO} @dirrmtry ${MAHARADATADIR} >> ${PLIST}
+	@${ECHO_CMD} -e '@owner root\n at group wheel' >> ${PLIST}
 
 do-install:
 	@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}
 	@${INSTALL} -d ${STAGEDIR}${PREFIX}/${MAHARADATADIR}
-
-	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}${WWWDIR}
-	@${ECHO_CMD} '@exec ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}${WWWDIR}' >> ${TMPPLIST}
 	@${CHMOD} -R 755 ${STAGEDIR}${WWWDIR}
-	@${ECHO_CMD} '@exec ${CHMOD} -R 755 ${STAGEDIR}${WWWDIR}' >> ${TMPPLIST}
-
 	@${CHMOD} -R a+w ${STAGEDIR}${PREFIX}/${MAHARADATADIR}
-	@${ECHO_CMD} '@exec ${CHMOD} -R a+w ${STAGEDIR}${PREFIX}/${MAHARADATADIR}' >> ${TMPPLIST}
 
 .include <bsd.port.mk>