diff options
| -rw-r--r-- | graphics/deegree-wfs/Makefile | 18 | ||||
| -rw-r--r-- | graphics/deegree-wfs/pkg-plist | 2 |
2 files changed, 6 insertions, 14 deletions
diff --git a/graphics/deegree-wfs/Makefile b/graphics/deegree-wfs/Makefile index a10d1f64a761..1ed56eab92be 100644 --- a/graphics/deegree-wfs/Makefile +++ b/graphics/deegree-wfs/Makefile @@ -21,16 +21,13 @@ APPHOME= ${LOCALBASE}/${TOMCATVER} WEBAPPDIR= ${TOMCATDIR}/webapps PORTDOCS= README.txt deegree_wfs_documentation_en.pdf DOCSDIR= ${PREFIX}/share/doc/deegree-wfs -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,14 +51,9 @@ post-extract: @${TAR} xf ${WRKDIR}/deegree-wfs.war -C ${WRKDIR}/${PORTDIRNAME} 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> diff --git a/graphics/deegree-wfs/pkg-plist b/graphics/deegree-wfs/pkg-plist index ae4df2b796f1..be875806b148 100644 --- a/graphics/deegree-wfs/pkg-plist +++ b/graphics/deegree-wfs/pkg-plist @@ -1,3 +1,4 @@ +@exec chown %%WWWOWN%%:%%WWWGRP%% %D/%%TOMCATDIR%%/webapps/deegree-wfs %%TOMCATDIR%%/webapps/deegree-wfs/META-INF/MANIFEST.MF %%TOMCATDIR%%/webapps/deegree-wfs/WEB-INF/classes/log4j.properties %%TOMCATDIR%%/webapps/deegree-wfs/WEB-INF/classes/wfsrequestmapping.properties @@ -255,4 +256,3 @@ @dirrm %%TOMCATDIR%%/webapps/deegree-wfs/WEB-INF @dirrm %%TOMCATDIR%%/webapps/deegree-wfs/META-INF @dirrm %%TOMCATDIR%%/webapps/deegree-wfs -@dirrm %%TOMCATDIR%%/webapps |