svn commit: r367989 - head/www/wikindx

[Antoine Brodin]

Author: antoine
Date: Thu Sep 11 21:53:51 2014
New Revision: 367989
URL: http://svnweb.freebsd.org/changeset/ports/367989
QAT: https://qat.redports.org/buildarchive/r367989/

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

Modified:
  head/www/wikindx/Makefile
  head/www/wikindx/pkg-plist

Modified: head/www/wikindx/Makefile
==============================================================================
--- head/www/wikindx/Makefile	Thu Sep 11 21:34:14 2014	(r367988)
+++ head/www/wikindx/Makefile	Thu Sep 11 21:53:51 2014	(r367989)
@@ -3,6 +3,7 @@
 
 PORTNAME=	wikindx
 PORTVERSION=	3.8.2
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}3_8_2
 DISTNAME=	${PORTNAME}${PORTVERSION:S/./_/g}
@@ -14,7 +15,7 @@ USE_PHP=	session mysql xml ctype
 
 NO_BUILD=	YES
 WRKSRC=		${WRKDIR}/wikindx3
-WWWDIR?=	www/wikindx
+PLIST_SUB=	WWWOWN="${WWWOWN}" WWWGRP="${WWWGRP}"
 ROOTFILES=	config.php index.php rss.php
 ROOTDIRS=	attachments core docs files languages modules \
 		papers styles templates update
@@ -23,15 +24,11 @@ DOCFILES=	CHANGELOG CUSTOMIZATION DISCLA
 
 OPTIONS_DEFINE=	DOCS
 
-pre-install:
-	@${ECHO} ${WWWDIR}
-
 do-install:
-	-${MKDIR} ${STAGEDIR}${PREFIX}/${WWWDIR}
-	(cd ${WRKSRC} && ${CP} ${ROOTFILES} ${STAGEDIR}${PREFIX}/${WWWDIR}/ )
-	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}${PREFIX}/${WWWDIR}
+	${MKDIR} ${STAGEDIR}${WWWDIR}
+	(cd ${WRKSRC} && ${CP} ${ROOTFILES} ${STAGEDIR}${WWWDIR}/ )
 .for i in ${ROOTDIRS}
-	@(cd ${WRKSRC} && ${COPYTREE_SHARE} ${i} ${STAGEDIR}${PREFIX}/${WWWDIR}/ )
+	@(cd ${WRKSRC} && ${COPYTREE_SHARE} ${i} ${STAGEDIR}${WWWDIR}/ )
 .endfor
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in ${DOCFILES}

Modified: head/www/wikindx/pkg-plist
==============================================================================
--- head/www/wikindx/pkg-plist	Thu Sep 11 21:34:14 2014	(r367988)
+++ head/www/wikindx/pkg-plist	Thu Sep 11 21:53:51 2014	(r367989)
@@ -7,6 +7,8 @@
 %%PORTDOCS%%%%DOCSDIR%%/README_CMS
 %%PORTDOCS%%%%DOCSDIR%%/README_RSS
 %%PORTDOCS%%%%DOCSDIR%%/UPGRADE
+ at owner %%WWWOWN%%
+ at group %%WWWGRP%%
 %%WWWDIR%%/attachments/ATTACHMENTS
 %%WWWDIR%%/config.php
 %%WWWDIR%%/core/admin/ADMIN.php
@@ -845,4 +847,6 @@
 @dirrm %%WWWDIR%%/core
 @dirrm %%WWWDIR%%/attachments
 @dirrm %%WWWDIR%%
+ at owner root
+ at group wheel
 @dirrm %%DOCSDIR%%