From 30056fc4bc9c407417cca0410c7889296ab76ae5 Mon Sep 17 00:00:00 2001
From: antoine <antoine@FreeBSD.org>
Date: Thu, 11 Sep 2014 19:08:46 +0000
Subject: [PATCH] - Allow staging as a regular user - Bump portrevision as
 files were not packaged with intended ownership

---
 deskutils/phpicalendar/Makefile  | 6 ++----
 deskutils/phpicalendar/pkg-plist | 4 ++++
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/deskutils/phpicalendar/Makefile b/deskutils/phpicalendar/Makefile
index 893c005d1f268..852c0d957276e 100644
--- a/deskutils/phpicalendar/Makefile
+++ b/deskutils/phpicalendar/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	phpicalendar
 PORTVERSION=	2.24
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils www
 MASTER_SITES=	SF/${PORTNAME}/OldFiles
 
@@ -13,6 +13,7 @@ COMMENT=	Webbased calendar with iCal support
 USES=		tar:tgz
 NO_BUILD=	yes
 USE_PHP=	session pcre
+PLIST_SUB=	WWWOWN="${WWWOWN}" WWWGRP="${WWWGRP}"
 SUB_FILES=	pkg-message
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/${PORTNAME}
 
@@ -24,13 +25,10 @@ do-install:
 	${MKDIR} ${STAGEDIR}${WWWDIR}
 .for dir in admin calendars functions images includes languages rss templates
 	@${CP} -Rv ${WRKSRC}/${dir} ${STAGEDIR}${WWWDIR}
-	${CHOWN} -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}${WWWDIR}/${dir}
 .endfor
 .for f in index.php TIMEZONES error.php day.php preferences.php print.php search.php week.php month.php year.php README COPYING AUTHORS
 	@${CP} -v ${WRKSRC}/${f} ${STAGEDIR}${WWWDIR}
-	${CHOWN} ${WWWOWN}:${WWWGRP} ${STAGEDIR}${WWWDIR}/${f}
 .endfor
 	@${CP} -v ${WRKSRC}/config.inc-dist.php ${STAGEDIR}${WWWDIR}/config.inc.php.sample
-	${CHOWN} ${WWWOWN}:${WWWGRP} ${STAGEDIR}${WWWDIR}/config.inc.php.sample
 
 .include <bsd.port.mk>
diff --git a/deskutils/phpicalendar/pkg-plist b/deskutils/phpicalendar/pkg-plist
index cca0b86be90c0..ed48576f0882a 100644
--- a/deskutils/phpicalendar/pkg-plist
+++ b/deskutils/phpicalendar/pkg-plist
@@ -1,3 +1,5 @@
+@owner %%WWWOWN%%
+@group %%WWWGRP%%
 %%WWWDIR%%/AUTHORS
 %%WWWDIR%%/COPYING
 %%WWWDIR%%/README
@@ -393,3 +395,5 @@
 @dirrm %%WWWDIR%%/calendars
 @dirrm %%WWWDIR%%/admin
 @dirrmtry %%WWWDIR%%
+@owner root
+@group wheel