Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 5 Jun 2014 21:22:29 +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: r356711 - head/www/dalbum
Message-ID:  <201406052122.s55LMTi7092606@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



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