svn commit: r368084 - head/www/hastymail2

[Antoine Brodin]

Author: antoine
Date: Sat Sep 13 11:43:00 2014
New Revision: 368084
URL: http://svnweb.freebsd.org/changeset/ports/368084
QAT: https://qat.redports.org/buildarchive/r368084/

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

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

Modified: head/www/hastymail2/Makefile
==============================================================================
--- head/www/hastymail2/Makefile	Sat Sep 13 11:30:43 2014	(r368083)
+++ head/www/hastymail2/Makefile	Sat Sep 13 11:43:00 2014	(r368084)
@@ -3,7 +3,7 @@
 
 PORTNAME=	hastymail2
 PORTVERSION=	1.1
-PORTREVISION=	4
+PORTREVISION=	5
 PORTEPOCH=	1
 CATEGORIES=	www mail
 MASTER_SITES=	SF/hastymail/Hastymail2%20Stable%20Releases/Hastymail2%201.1/
@@ -26,6 +26,7 @@ WIKEDVERSION=	1_1
 WRKSRC=		${WRKDIR}/${PORTNAME}_${WIKEDVERSION}
 NO_BUILD=	yes
 FIND_SKIP_OPTS=	-not -name hastymail2.conf.example -not -name '*.orig'
+PLIST_SUB=	WWWOWN="${WWWOWN}" WWWGRP="${WWWGRP}"
 
 OPTIONS_DEFINE=	PGSQL MYSQL DB ICONV MBSTRING
 
@@ -69,7 +70,6 @@ do-install:
 	@${MKDIR} ${STAGEDIR}${WWWDIR}
 	@cd ${WRKSRC} && ${FIND} . ${FIND_SKIP_OPTS} \
 		| ${PAX} -rwd ${STAGEDIR}${WWWDIR}
-	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}${WWWDIR}
 	@${MKDIR} ${STAGEDIR}${ETCDIR}
 	@${INSTALL_DATA} ${WRKSRC}/hastymail2.conf.example \
 		${STAGEDIR}${ETCDIR}/hastymail2.conf.sample

Modified: head/www/hastymail2/pkg-plist
==============================================================================
--- head/www/hastymail2/pkg-plist	Sat Sep 13 11:30:43 2014	(r368083)
+++ head/www/hastymail2/pkg-plist	Sat Sep 13 11:43:00 2014	(r368084)
@@ -1,6 +1,6 @@
- at unexec if cmp -s %D/%%ETCDIR%%/hastymail2.conf.sample %D/%%ETCDIR%%/hastymail2.conf; then rm -f %D/%%ETCDIR%%/hastymail2.conf; fi
-%%ETCDIR%%/hastymail2.conf.sample
- at exec if [ ! -f %D/%%ETCDIR%%/hastymail2.conf ]; then cp -p %D/%F %B/hastymail2.conf; fi
+ at sample %%ETCDIR%%/hastymail2.conf.sample
+ at owner %%WWWOWN%%
+ at group %%WWWGRP%%
 %%WWWDIR%%/CHANGES
 %%WWWDIR%%/COPYING
 %%WWWDIR%%/INSTALL
@@ -1616,4 +1616,6 @@
 @dirrmtry %%WWWDIR%%/db
 @dirrmtry %%WWWDIR%%/contrib
 @dirrmtry %%WWWDIR%%
+ at owner root
+ at group wheel
 @dirrmtry %%ETCDIR%%