svn commit: r356285 - head/www/pebble

[Martin Wilke]

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
+ 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 || :