From 7f288c0d6a0ec759b049337a9ef7d5f18c0503c9 Mon Sep 17 00:00:00 2001
From: Antoine Brodin <antoine@FreeBSD.org>
Date: Thu, 5 Jun 2014 21:22:29 +0000
Subject: [PATCH] - Do not copy ports cookies etc. to stagedir - Make packaging
 as a regular user work

---
 www/dalbum/Makefile  | 6 +++---
 www/dalbum/pkg-plist | 4 ++++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/www/dalbum/Makefile b/www/dalbum/Makefile
index afaa761a10ac..3d6df3e791a2 100644
--- a/www/dalbum/Makefile
+++ b/www/dalbum/Makefile
@@ -19,7 +19,7 @@ NO_BUILD=	yes
 DALBUM_DIR?=	www/photo
 NO_WRKSUBDIR=	yes
 
-PLIST_SUB+=	DALBUM_DIR=${DALBUM_DIR}
+PLIST_SUB+=	DALBUM_DIR=${DALBUM_DIR} WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
 SUB_LIST+=	DALBUM_DIR=${DALBUM_DIR}
 SUB_FILES=	pkg-message
 
@@ -29,8 +29,8 @@ post-patch:
 
 do-install:
 	@${MKDIR} -m 0775 ${STAGEDIR}${PREFIX}/${DALBUM_DIR}
-	@cd ${WRKSRC} && ${FIND} . -print | \
-		${CPIO} --quiet -pdum -R ${WWWOWN}:${WWWGRP} \
+	@cd ${WRKSRC} && ${FIND} .htaccess .private config images include pictures *.css *.js *.php *.txt -print | \
+		${CPIO} --quiet -pdum \
 		${STAGEDIR}${PREFIX}/${DALBUM_DIR}
 
 .include <bsd.port.mk>
diff --git a/www/dalbum/pkg-plist b/www/dalbum/pkg-plist
index d4b433b99246..273d969b1bc7 100644
--- a/www/dalbum/pkg-plist
+++ b/www/dalbum/pkg-plist
@@ -1,3 +1,5 @@
+@owner %%WWWOWN%%
+@group %%WWWGRP%%
 %%DALBUM_DIR%%/.htaccess
 %%DALBUM_DIR%%/.private/.htaccess
 %%DALBUM_DIR%%/.private/.htpasswd
@@ -90,3 +92,5 @@
 @dirrm %%DALBUM_DIR%%/config
 @dirrmtry %%DALBUM_DIR%%/.private
 @dirrm %%DALBUM_DIR%%
+@owner root
+@group wheel