Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 5 Oct 2014 09:25:28 +0000 (UTC)
From:      Antoine Brodin <antoine@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r370045 - head/www/atutor
Message-ID:  <201410050925.s959PSa9076405@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: antoine
Date: Sun Oct  5 09:25:28 2014
New Revision: 370045
URL: https://svnweb.freebsd.org/changeset/ports/370045
QAT: https://qat.redports.org/buildarchive/r370045/

Log:
  Allow staging as a regular user

Modified:
  head/www/atutor/Makefile

Modified: head/www/atutor/Makefile
==============================================================================
--- head/www/atutor/Makefile	Sun Oct  5 09:21:53 2014	(r370044)
+++ head/www/atutor/Makefile	Sun Oct  5 09:25:28 2014	(r370045)
@@ -13,8 +13,6 @@ COMMENT=	Open Source Web-based Learning 
 USE_PHP=	session mbstring zlib mysql
 WRKSRC=		${WRKDIR}/ATutor
 
-.include <bsd.port.pre.mk>
-
 NO_BUILD=	yes
 PLIST=		${WRKDIR}/plist
 SUB_FILES=	pkg-message
@@ -24,24 +22,17 @@ ATUTDATDIR=	${WWWDIR}/content
 ATUTCONFIG=	include/config.inc.php
 
 pre-install:
-	@${FIND} -s -d ${WRKSRC} -type f | ${SED} "s?${WRKSRC}?${ATUTDIR}?g" >${PLIST}
-	@${ECHO} @dirrm ${ATUTDIR}/content >> ${PLIST}
-	@${FIND} -s -d ${WRKSRC} -type d  | ${SED} "s?${WRKSRC}?@dirrm ${ATUTDIR}?g" >> ${PLIST}
+	@${ECHO_CMD} -e '@owner ${WWWOWN}\n@group ${WWWGRP}' > ${PLIST}
+	@${FIND} -s -d ${WRKSRC} -type f | ${SED} "s?${WRKSRC}?${ATUTDIR}?g" >> ${PLIST}
+	@${ECHO} @dir ${ATUTDIR}/content >> ${PLIST}
+	@${FIND} -s -d ${WRKSRC} -type d  | ${SED} "s?${WRKSRC}?@dir ${ATUTDIR}?g" >> ${PLIST}
+	@${ECHO_CMD} -e '@owner\n@group' >> ${PLIST}
 
 do-install:
 	@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}
-	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}${WWWDIR}
-	@${ECHO_CMD} '@exec ${CHOWN} -R ${WWWOWN}:${WWWGRP} \
-		${WWWDIR}' >> ${TMPPLIST}
 	@${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 ${STAGEDIR}${WWWDIR}/${ATUTCONFIG}
-	@${ECHO_CMD} '@exec ${CHMOD} 666 \
-		${WWWDIR}/${ATUTCONFIG}' >> ${TMPPLIST}
-
-post-install:
-	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>



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