From owner-svn-ports-head@FreeBSD.ORG  Sat Sep 13 13:07:53 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@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 59DC4A87;
 Sat, 13 Sep 2014 13:07:53 +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 2B0517BA;
 Sat, 13 Sep 2014 13:07:53 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8DD7rB4009443;
 Sat, 13 Sep 2014 13:07:53 GMT (envelope-from antoine@FreeBSD.org)
Received: (from antoine@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8DD7qDR009441;
 Sat, 13 Sep 2014 13:07:52 GMT (envelope-from antoine@FreeBSD.org)
Message-Id: <201409131307.s8DD7qDR009441@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: antoine set sender to
 antoine@FreeBSD.org using -f
From: Antoine Brodin <antoine@FreeBSD.org>
Date: Sat, 13 Sep 2014 13:07:52 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r368093 - head/www/pebble
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 13 Sep 2014 13:07:53 -0000

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 @@
-@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