From 5ce913013c774846ec3455c33223e0abbb4ec7f7 Mon Sep 17 00:00:00 2001 From: Antoine Brodin Date: Sun, 19 Oct 2014 16:13:52 +0000 Subject: - Allow staging as a regular user - Bump portrevision as the @exec chown was not applied to the right files --- www/e107/Makefile | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) (limited to 'www/e107') diff --git a/www/e107/Makefile b/www/e107/Makefile index 8e9ae7f2a1ae..d1441bc35e3e 100644 --- a/www/e107/Makefile +++ b/www/e107/Makefile @@ -3,6 +3,7 @@ PORTNAME= e107 PORTVERSION= 1.0.4 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}%20v${PORTVERSION} DISTNAME= ${PORTNAME}_${PORTVERSION}_full @@ -28,20 +29,13 @@ post-extract: @cd ${WRKDIR} && ${MV} e107.robots.txt ${WRKSRC} pre-install: - @${FIND} -s -d ${WRKSRC} -type f | ${SED} "s#${WRKSRC}#${E107DIR}#g" >${PLIST} - @${FIND} -s -d ${WRKSRC} -type d | ${SED} "s#${WRKSRC}#@dirrm ${E107DIR}#g" >> ${PLIST} + @${ECHO_CMD} -e '@owner ${WWWOWN}\n@group ${WWWGRP}' > ${PLIST} + @${FIND} -s -d ${WRKSRC} -type f | ${SED} "s#${WRKSRC}#${E107DIR}#g" >> ${PLIST} + @${FIND} -s -d ${WRKSRC} -type d | ${SED} "s#${WRKSRC}#@dir ${E107DIR}#g" >> ${PLIST} + @${ECHO_CMD} -e '@owner\n@group' >> ${PLIST} do-install: @cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR} - @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}${WWWDIR} @${CHMOD} -R 755 ${STAGEDIR}${WWWDIR} - @${ECHO_CMD} '@exec ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}${WWWDIR}' \ - >> ${TMPPLIST} - @${ECHO_CMD} '@exec ${CHMOD} -R 755 ${STAGEDIR}${WWWDIR}' \ - >> ${TMPPLIST} - -post-install: - @${CAT} ${PKGMESSAGE} - .include -- cgit v1.2.3