From owner-svn-ports-head@FreeBSD.ORG  Tue Jun  3 05:05:51 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 9540ABAD;
 Tue,  3 Jun 2014 05:05:51 +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 6979D2B6A;
 Tue,  3 Jun 2014 05:05:51 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5355plD044978;
 Tue, 3 Jun 2014 05:05:51 GMT (envelope-from miwi@svn.freebsd.org)
Received: (from miwi@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5355p0E044973;
 Tue, 3 Jun 2014 05:05:51 GMT (envelope-from miwi@svn.freebsd.org)
Message-Id: <201406030505.s5355p0E044973@svn.freebsd.org>
From: Martin Wilke <miwi@FreeBSD.org>
Date: Tue, 3 Jun 2014 05:05:51 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r356285 - 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
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: Tue, 03 Jun 2014 05:05:51 -0000

Author: miwi
Date: Tue Jun  3 05:05:50 2014
New Revision: 356285
URL: http://svnweb.freebsd.org/changeset/ports/356285
QAT: https://qat.redports.org/buildarchive/r356285/

Log:
  - Stage support
  
  PR:		190313

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

Modified: head/www/pebble/Makefile
==============================================================================
--- head/www/pebble/Makefile	Tue Jun  3 05:04:48 2014	(r356284)
+++ head/www/pebble/Makefile	Tue Jun  3 05:05:50 2014	(r356285)
@@ -37,21 +37,20 @@ PORTDOCS=	configuration.html credits.htm
 PLIST_FILES=	${WEBAPP_SUBDIR}/${PORTNAME}.war
 PEBBLE_CONTEXT=	WEB-INF/applicationContext-pebble.xml
 
-NO_STAGE=	yes
 do-patch:
 	cd ${WRKSRC} && ${UNZIP_CMD} -o pebble.war "${PEBBLE_CONTEXT}"
 	${SED} -i.bak 's,/WEB-INF/pebble\.properties,file:${PEBBLE_PROPERTIES},' "${WRKSRC}/${PEBBLE_CONTEXT}"
 	cd ${WRKSRC} && ${LOCALBASE}/bin/zip -u pebble.war ${PEBBLE_CONTEXT}
 
 do-install:
-	${MKDIR} "${PEBBLE_HOME}"
-	${CHOWN} "www:www" "${PEBBLE_HOME}"
-	${INSTALL_DATA} ${WRKDIR}/pebble.properties ${PEBBLE_PROPERTIES}.sample
-	if [ ! -f ${PEBBLE_PROPERTIES} ]; then ${INSTALL_DATA} ${WRKDIR}/pebble.properties ${PEBBLE_PROPERTIES} ; fi
-	${INSTALL_DATA} ${WRKSRC}/pebble.war ${WEBAPP_DIR}/${PORTNAME}.war
+	${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
 .if !defined(NOPORTDOCS)
-	cd ${WRKSRC}/docs && ${FIND} ${PORTDOCS} -type d -exec ${MKDIR} ${DOCSDIR}/{} \;
-	cd ${WRKSRC}/docs && ${FIND} ${PORTDOCS} -type f -exec ${INSTALL_DATA} {} ${DOCSDIR}/{} \;
+	cd ${WRKSRC}/docs && ${FIND} ${PORTDOCS} -type d -exec ${MKDIR} ${STAGEDIR}${DOCSDIR}/{} \;
+	cd ${WRKSRC}/docs && ${FIND} ${PORTDOCS} -type f -exec ${INSTALL_DATA} {} ${STAGEDIR}${DOCSDIR}/{} \;
 .endif
 
 post-install:

Modified: head/www/pebble/pkg-plist
==============================================================================
--- head/www/pebble/pkg-plist	Tue Jun  3 05:04:48 2014	(r356284)
+++ head/www/pebble/pkg-plist	Tue Jun  3 05:05:50 2014	(r356285)
@@ -1,3 +1,6 @@
 @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 || :