- Allow staging as a regular user

- Bump portrevision as a directory was not packaged with intended owner

2 files changed, 5 insertions, 8 deletions

diff --git a/www/pebble/Makefile b/www/pebble/Makefile
index 830cdf5735e4..617860460f92 100644
--- a/www/pebble/Makefile
+++ b/www/pebble/Makefile
@@ -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.html images index.html \
 		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
diff --git a/www/pebble/pkg-plist b/www/pebble/pkg-plist
index b57a142f7a2e..c5d3ef7b20e5 100644
--- a/www/pebble/pkg-plist
+++ b/www/pebble/pkg-plist
@@ -1,6 +1,3 @@
-@exec mkdir -p %%PEBBLE_HOME%%
-@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
-@exec cp -n %D/%F %B/pebble.properties
-@unexec rmdir "/var/lib/pebble" >/dev/null 2>&1 || :
-@unexec rmdir "/var/lib" >/dev/null 2>&1 || :
+@sample etc/pebble.properties.sample
+@dirrmtry(%%WWWOWN%%,%%WWWGRP%%,) /var/lib/pebble
+@dirrmtry /var/lib