Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 15 Aug 2014 03:38:10 +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: r364928 - head/graphics/deegree-wcs
Message-ID:  <201408150338.s7F3cAVM091708@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: vanilla
Date: Fri Aug 15 03:38:10 2014
New Revision: 364928
URL: http://svnweb.freebsd.org/changeset/ports/364928
QAT: https://qat.redports.org/buildarchive/r364928/

Log:
  Stagify.

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

Modified: head/graphics/deegree-wcs/Makefile
==============================================================================
--- head/graphics/deegree-wcs/Makefile	Fri Aug 15 03:27:55 2014	(r364927)
+++ head/graphics/deegree-wcs/Makefile	Fri Aug 15 03:38:10 2014	(r364928)
@@ -21,16 +21,13 @@ APPHOME=	${LOCALBASE}/${TOMCATVER}
 WEBAPPDIR=	${TOMCATDIR}/webapps
 PORTDOCS=	README.txt deegree_wcs_documentation_en.pdf
 DOCSDIR=	${PREFIX}/share/doc/deegree-wcs
-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>
@@ -55,13 +52,9 @@ post-extract:
 
 do-install:
 	cd ${WRKDIR} && \
-	${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-wcs/pkg-plist
==============================================================================
--- head/graphics/deegree-wcs/pkg-plist	Fri Aug 15 03:27:55 2014	(r364927)
+++ head/graphics/deegree-wcs/pkg-plist	Fri Aug 15 03:38:10 2014	(r364928)
@@ -1,3 +1,4 @@
+@exec chown %%WWWOWN%%:%%WWWGRP%% %D/%%TOMCATDIR%%/webapps/deegree-wcs
 %%TOMCATDIR%%/webapps/deegree-wcs/META-INF/MANIFEST.MF
 %%TOMCATDIR%%/webapps/deegree-wcs/WEB-INF/classes/log4j.properties
 %%TOMCATDIR%%/webapps/deegree-wcs/WEB-INF/conf/wcs/wcs_configuration.xml
@@ -2170,4 +2171,3 @@
 @dirrm %%TOMCATDIR%%/webapps/deegree-wcs/WEB-INF
 @dirrm %%TOMCATDIR%%/webapps/deegree-wcs/META-INF
 @dirrm %%TOMCATDIR%%/webapps/deegree-wcs
-@dirrm %%TOMCATDIR%%/webapps



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