Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 15 Aug 2014 06:37:17 +0000 (UTC)
From:      "Vanilla I. Shu" <vanilla@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r364937 - head/graphics/deegree-wpvs
Message-ID:  <201408150637.s7F6bHDs072739@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: vanilla
Date: Fri Aug 15 06:37:17 2014
New Revision: 364937
URL: http://svnweb.freebsd.org/changeset/ports/364937
QAT: https://qat.redports.org/buildarchive/r364937/

Log:
  Stagify.

Modified:
  head/graphics/deegree-wpvs/Makefile
  head/graphics/deegree-wpvs/pkg-plist

Modified: head/graphics/deegree-wpvs/Makefile
==============================================================================
--- head/graphics/deegree-wpvs/Makefile	Fri Aug 15 06:12:18 2014	(r364936)
+++ head/graphics/deegree-wpvs/Makefile	Fri Aug 15 06:37:17 2014	(r364937)
@@ -21,16 +21,13 @@ APPHOME=	${LOCALBASE}/${TOMCATVER}
 WEBAPPDIR=	${TOMCATDIR}/webapps
 PORTDOCS=	README.txt deegree_wpvs_documentation_en.pdf
 DOCSDIR=	${PREFIX}/share/doc/deegree-wpvs
-PLIST_SUB=	TOMCATDIR=${TOMCATDIR:S|^${PREFIX}/||}
+PLIST_SUB=	TOMCATDIR=${TOMCATDIR:S|^${PREFIX}/||} WWWOWN="${WWWOWN}" WWWGRP="${WWWGRP}"
 SUB_FILES=	pkg-message
 SUB_LIST=	TCPORT=${TCPORT}
 
 OPTIONS_SINGLE=	AS
 OPTIONS_SINGLE_AS=	TOMCAT6 TOMCAT7
 OPTIONS_DEFAULT=	TOMCAT6
-
-NO_STAGE=	yes
-
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.options.mk>
@@ -54,13 +51,9 @@ post-extract:
 	@${TAR} xf ${WRKDIR}/deegree-wpvs.war -C ${WRKDIR}/${PORTDIRNAME}
 
 do-install:
-	${INSTALL} -d -o ${WWWOWN} -g ${WWWGRP} ${TOMCATDIR}/webapps/${PORTDIRNAME}
-	@cd ${WRKDIR}/${PORTDIRNAME} && ${COPYTREE_SHARE} \* ${WEBAPPDIR}/${PORTDIRNAME}
-
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKDIR}/|} ${DOCSDIR}
-.endif
-	@${CAT} ${PKGMESSAGE}
+	${INSTALL} -d ${STAGEDIR}${WEBAPPDIR}/${PORTDIRNAME}
+	@cd ${WRKDIR}/${PORTDIRNAME} && ${COPYTREE_SHARE} \* ${STAGEDIR}${WEBAPPDIR}/${PORTDIRNAME}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKDIR}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

Modified: head/graphics/deegree-wpvs/pkg-plist
==============================================================================
--- head/graphics/deegree-wpvs/pkg-plist	Fri Aug 15 06:12:18 2014	(r364936)
+++ head/graphics/deegree-wpvs/pkg-plist	Fri Aug 15 06:37:17 2014	(r364937)
@@ -1,3 +1,4 @@
+@exec chown %%WWWOWN%%:%%WWWGRP%% %D/%%TOMCATDIR%%/webapps/deegree-wpvs
 %%TOMCATDIR%%/webapps/deegree-wpvs/META-INF/MANIFEST.MF
 %%TOMCATDIR%%/webapps/deegree-wpvs/WEB-INF/classes/log4j.properties
 %%TOMCATDIR%%/webapps/deegree-wpvs/WEB-INF/classes/wpvsclient.properties
@@ -2216,4 +2217,3 @@
 @dirrm %%TOMCATDIR%%/webapps/deegree-wpvs/WEB-INF
 @dirrm %%TOMCATDIR%%/webapps/deegree-wpvs/META-INF
 @dirrm %%TOMCATDIR%%/webapps/deegree-wpvs
-@dirrm %%TOMCATDIR%%/webapps



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201408150637.s7F6bHDs072739>