From owner-svn-ports-all@FreeBSD.ORG  Thu Jun  5 21:22:30 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 03514802;
 Thu,  5 Jun 2014 21:22:30 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id E52072C10;
 Thu,  5 Jun 2014 21:22:29 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s55LMT9I092608;
 Thu, 5 Jun 2014 21:22:29 GMT (envelope-from antoine@svn.freebsd.org)
Received: (from antoine@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s55LMTi7092606;
 Thu, 5 Jun 2014 21:22:29 GMT (envelope-from antoine@svn.freebsd.org)
Message-Id: <201406052122.s55LMTi7092606@svn.freebsd.org>
From: Antoine Brodin <antoine@FreeBSD.org>
Date: Thu, 5 Jun 2014 21:22:29 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r356711 - head/www/dalbum
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 05 Jun 2014 21:22:30 -0000

Author: antoine
Date: Thu Jun  5 21:22:29 2014
New Revision: 356711
URL: http://svnweb.freebsd.org/changeset/ports/356711
QAT: https://qat.redports.org/buildarchive/r356711/

Log:
  - Do not copy ports cookies etc. to stagedir
  - Make packaging as a regular user work

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

Modified: head/www/dalbum/Makefile
==============================================================================
--- head/www/dalbum/Makefile	Thu Jun  5 21:21:11 2014	(r356710)
+++ head/www/dalbum/Makefile	Thu Jun  5 21:22:29 2014	(r356711)
@@ -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>

Modified: head/www/dalbum/pkg-plist
==============================================================================
--- head/www/dalbum/pkg-plist	Thu Jun  5 21:21:11 2014	(r356710)
+++ head/www/dalbum/pkg-plist	Thu Jun  5 21:22:29 2014	(r356711)
@@ -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