svn commit: r368093 - head/www/pebble

[Antoine Brodin]

Author: antoine
Date: Sat Sep 13 13:07:52 2014
New Revision: 368093
URL: http://svnweb.freebsd.org/changeset/ports/368093
QAT: https://qat.redports.org/buildarchive/r368093/

Log:
  - Allow staging as a regular user
  - Bump portrevision as a directory was not packaged with intended owner

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

Modified: head/www/pebble/Makefile
==============================================================================
--- head/www/pebble/Makefile	Sat Sep 13 12:56:20 2014	(r368092)
+++ head/www/pebble/Makefile	Sat Sep 13 13:07:52 2014	(r368093)
@@ -3,7 +3,7 @@
 
 PORTNAME=	pebble
 PORTVERSION=	2.3.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www java
 MASTER_SITES=	SF
 
@@ -35,6 +35,7 @@ PORTDOCS=	configuration.html credits.htm
 		screenshots.html security.html upgrading1x.html \
 		upgrading2x.html
 PLIST_FILES=	${WEBAPP_SUBDIR}/${PORTNAME}.war
+PLIST_SUB=	WWWOWN="${WWWOWN}" WWWGRP="${WWWGRP}"
 PEBBLE_CONTEXT=	WEB-INF/applicationContext-pebble.xml
 
 do-patch:
@@ -44,7 +45,6 @@ do-patch:
 
 do-install:
 	@${MKDIR} "${STAGEDIR}${PEBBLE_HOME}"
-	${CHOWN} "www:www" "${STAGEDIR}${PEBBLE_HOME}"
 	${INSTALL_DATA} ${WRKDIR}/pebble.properties ${STAGEDIR}${PEBBLE_PROPERTIES}.sample
 	@${MKDIR} ${STAGEDIR}${WEBAPP_DIR}
 	${INSTALL_DATA} ${WRKSRC}/pebble.war ${STAGEDIR}${WEBAPP_DIR}/${PORTNAME}.war

Modified: head/www/pebble/pkg-plist
==============================================================================
--- head/www/pebble/pkg-plist	Sat Sep 13 12:56:20 2014	(r368092)
+++ head/www/pebble/pkg-plist	Sat Sep 13 13:07:52 2014	(r368093)
@@ -1,6 +1,3 @@
- at exec mkdir -p %%PEBBLE_HOME%%
- at unexec if cmp -s %D/etc/pebble.properties.sample %D/etc/pebble.properties; then rm -f %D/etc/pebble.properties; fi
-etc/pebble.properties.sample
- at exec cp -n %D/%F %B/pebble.properties
- at unexec rmdir "/var/lib/pebble" >/dev/null 2>&1 || :
- at unexec rmdir "/var/lib" >/dev/null 2>&1 || :
+ at sample etc/pebble.properties.sample
+ at dirrmtry(%%WWWOWN%%,%%WWWGRP%%,) /var/lib/pebble
+ at dirrmtry /var/lib