Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 12 Oct 2014 15:59:52 +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: r370726 - head/www/limesurvey
Message-ID:  <201410121559.s9CFxqwD024901@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: antoine
Date: Sun Oct 12 15:59:52 2014
New Revision: 370726
URL: https://svnweb.freebsd.org/changeset/ports/370726
QAT: https://qat.redports.org/buildarchive/r370726/

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

Modified:
  head/www/limesurvey/Makefile

Modified: head/www/limesurvey/Makefile
==============================================================================
--- head/www/limesurvey/Makefile	Sun Oct 12 15:43:46 2014	(r370725)
+++ head/www/limesurvey/Makefile	Sun Oct 12 15:59:52 2014	(r370726)
@@ -3,6 +3,7 @@
 
 PORTNAME=	limesurvey
 PORTVERSION=	1.91
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	SF/${PORTNAME}/1._LimeSurvey_stable/${PORTVERSION}+/
 DISTNAME=	${PORTNAME}${PORTVERSION:S^.^^}plus-build10232-20110608
@@ -70,20 +71,23 @@ do-install:
 .endif
 	@cd "${WRKSRC}" && ${COPYTREE_SHARE} . "${STAGEDIR}${WWWDIR}"
 	${MKDIR} "${STAGEDIR}${WWWDIR}"/tmp
-	${CHOWN} -R "${WWWOWN}:${WWWGRP}" "${STAGEDIR}${WWWDIR}"
 	${CHMOD} 755 "${STAGEDIR}${WWWDIR}"/tmp
 	${CHMOD} 755 "${STAGEDIR}${WWWDIR}"/templates
 	${CHMOD} 755 "${STAGEDIR}${WWWDIR}"/upload
-	${CHOWN} -R 0 "${STAGEDIR}${WWWDIR}"/admin
 	${CHMOD} -R go-w "${STAGEDIR}${WWWDIR}"/admin
 
 post-install:
-	@${CAT} ${PKGMESSAGE}
-	@${ECHO_CMD} "@owner www" >> ${TMPPLIST}
-	@${ECHO_CMD} "@group www" >> ${TMPPLIST}
-	@${FIND} -s -d ${STAGEDIR}${WWWDIR} -type f -print | \
+	@${ECHO_CMD} "@group ${WWWGRP}" >> ${TMPPLIST}
+	@${FIND} -s -d ${STAGEDIR}${WWWDIR}/admin -type f -print | \
 		${SED} -e "s#${STAGEDIR}${PREFIX}/##g" >> ${TMPPLIST}
-	@${FIND} -s -d ${STAGEDIR}${WWWDIR} -type d  -print | \
-		${SED} -E -e "s#${STAGEDIR}${PREFIX}/#@dirrm #g" >> ${TMPPLIST}
+	@${FIND} -s -d ${STAGEDIR}${WWWDIR}/admin -type d -print | \
+		${SED} -E -e "s#${STAGEDIR}${PREFIX}/#@dir #g" >> ${TMPPLIST}
+	@${ECHO_CMD} "@owner ${WWWOWN}" >> ${TMPPLIST}
+	@${FIND} -s -d ${STAGEDIR}${WWWDIR} ! -path "${STAGEDIR}${WWWDIR}/admin/*" -type f -print | \
+		${SED} -e "s#${STAGEDIR}${PREFIX}/##g" >> ${TMPPLIST}
+	@${FIND} -s -d ${STAGEDIR}${WWWDIR} -type d ! -path "${STAGEDIR}${WWWDIR}/admin*" -print | \
+		${SED} -E -e "s#${STAGEDIR}${PREFIX}/#@dir #g" >> ${TMPPLIST}
+	@${ECHO_CMD} "@owner" >> ${TMPPLIST}
+	@${ECHO_CMD} "@group" >> ${TMPPLIST}
 
 .include <bsd.port.mk>



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