- Update to 2.5

- Update tomcat dependency logic
- Drop TOMCATOWN/TOMCATGRP in favor of defaults WWWOWN/WWWGRP
- Drop war installation. Expand war and install as individual files to account for proper cleanup
- Application installs into its own directory now (safer) -- update pkg-message to reflect this

Approved by: wen (maintainer), crees (mentor)

4 files changed, 71 insertions, 10 deletions

diff --git a/graphics/deegree-wps/Makefile b/graphics/deegree-wps/Makefile
index 7b95f7fc2554..a0293854e493 100644
--- a/graphics/deegree-wps/Makefile
+++ b/graphics/deegree-wps/Makefile
@@ -6,16 +6,16 @@
 #
 
 PORTNAME=	wps
-PORTVERSION=	2.2
+PORTVERSION=	2.5
 CATEGORIES=	graphics java
 MASTER_SITES=	http://download.deegree.org/deegree${PORTVERSION}/
 PKGNAMEPREFIX=	deegree-
-DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}_v${PORTVERSION:S/./_/}
+DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	wenheping@gmail.com
 COMMENT=	Deegree Web Processing Service(WPS)
 
-RUN_DEPENDS=	${TOMCATDIR}:${PORTSDIR}/www/tomcat55
+RUN_DEPENDS=	${LOCALBASE}/${TOMCATVER}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat55
 
 USE_ZIP=	yes
 USE_JAVA=	1.5+
@@ -28,15 +28,19 @@ TOMCATGRP=	www
 WEBAPPDIR=	${TOMCATDIR}/webapps
 PORTDOCS=	*
 DOCSDIR=	${PREFIX}/share/doc/deegree-wps
-PLIST_FILES=	${TOMCATVER}/webapps/deegree-wps.war
+PLIST_SUB=	TOMCATDIR=${TOMCATDIR:S|^${PREFIX}/||}
+
+post-extract:
+	@${MKDIR} ${WRKDIR}/${PORTDIRNAME}
+	@${TAR} xf ${WRKDIR}/deegree-wps.war -C ${WRKDIR}/${PORTDIRNAME}
 
 do-install:
-	cd ${WRKDIR} && \
-		${INSTALL} -g ${TOMCATGRP} -o ${TOMCATOWN} -m 444 deegree-wps.war ${WEBAPPDIR};
+	${INSTALL} -d -o ${WWWOWN} -g ${WWWGRP} ${TOMCATDIR}/webapps/${PORTDIRNAME}
+	@cd ${WRKDIR}/${PORTDIRNAME} && ${COPYTREE_SHARE} \* ${WEBAPPDIR}/${PORTDIRNAME}
 
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKDIR}/README_WPS.txt ${DOCSDIR}
+	${INSTALL_DATA} ${WRKDIR}/README.txt ${DOCSDIR}
 	${INSTALL_DATA} ${WRKDIR}/deegree_wps_documentation_en.pdf ${DOCSDIR}
 .endif
 
diff --git a/graphics/deegree-wps/distinfo b/graphics/deegree-wps/distinfo
index bad49459ccc3..6297aa33ce97 100644
--- a/graphics/deegree-wps/distinfo
+++ b/graphics/deegree-wps/distinfo
@@ -1,2 +1,2 @@
-SHA256 (deegree-wps_v2_2.zip) = 835824925db50e7617683c84d08d1678b923731c116e69fa574443a8d299dbaf
-SIZE (deegree-wps_v2_2.zip) = 8132883
+SHA256 (deegree-wps_2.5.zip) = 5df734b337d9238d9675452320366bc9b441b9053aaeebf33d3fc63a7e334722
+SIZE (deegree-wps_2.5.zip) = 9355461
diff --git a/graphics/deegree-wps/pkg-message b/graphics/deegree-wps/pkg-message
index 13df82f03621..e29ccdf5df79 100644
--- a/graphics/deegree-wps/pkg-message
+++ b/graphics/deegree-wps/pkg-message
@@ -4,7 +4,7 @@ To start DeeGree correctly, please set the variable JAVA_OPTS with:
 setenv JAVA_OPTS "-server -Xms256m -Xmx512m"
 
 Now you should start your Tomcat server and browse with:
-   http://your-server:8180/deegree-wcs
+   http://your-server:8180/deegree-wps
 
 Enjoy it !
 ==========================================================================
diff --git a/graphics/deegree-wps/pkg-plist b/graphics/deegree-wps/pkg-plist
new file mode 100644
index 000000000000..b82a804667f3
--- /dev/null
+++ b/graphics/deegree-wps/pkg-plist
@@ -0,0 +1,57 @@
+%%TOMCATDIR%%/webapps/deegree-wps/META-INF/MANIFEST.MF
+%%TOMCATDIR%%/webapps/deegree-wps/WEB-INF/classes/log4j.properties
+%%TOMCATDIR%%/webapps/deegree-wps/WEB-INF/conf/wps/processConfigs/buffer_process_config.xml
+%%TOMCATDIR%%/webapps/deegree-wps/WEB-INF/conf/wps/wps_configuration.xml
+%%TOMCATDIR%%/webapps/deegree-wps/WEB-INF/lib/commons-codec-1.3.jar
+%%TOMCATDIR%%/webapps/deegree-wps/WEB-INF/lib/commons-httpclient-2.0.2-deegreeversion.jar
+%%TOMCATDIR%%/webapps/deegree-wps/WEB-INF/lib/commons-logging.jar
+%%TOMCATDIR%%/webapps/deegree-wps/WEB-INF/lib/deegree2.jar
+%%TOMCATDIR%%/webapps/deegree-wps/WEB-INF/lib/ehcache-1.2.0_03.jar
+%%TOMCATDIR%%/webapps/deegree-wps/WEB-INF/lib/jai_codec.jar
+%%TOMCATDIR%%/webapps/deegree-wps/WEB-INF/lib/jai_core.jar
+%%TOMCATDIR%%/webapps/deegree-wps/WEB-INF/lib/jaxen-1.1-beta-8.jar
+%%TOMCATDIR%%/webapps/deegree-wps/WEB-INF/lib/jts-1.8.jar
+%%TOMCATDIR%%/webapps/deegree-wps/WEB-INF/lib/log4j-1.2.13.jar
+%%TOMCATDIR%%/webapps/deegree-wps/WEB-INF/lib/mlibwrapper_jai.jar
+%%TOMCATDIR%%/webapps/deegree-wps/WEB-INF/lib/vecmath.jar
+%%TOMCATDIR%%/webapps/deegree-wps/WEB-INF/web.xml
+%%TOMCATDIR%%/webapps/deegree-wps/client/client.html
+%%TOMCATDIR%%/webapps/deegree-wps/client/client.jsp
+%%TOMCATDIR%%/webapps/deegree-wps/client/output.html
+%%TOMCATDIR%%/webapps/deegree-wps/client/requestHandler.jsp
+%%TOMCATDIR%%/webapps/deegree-wps/client/requests.jsp
+%%TOMCATDIR%%/webapps/deegree-wps/client/requests/wps/examples/Execute/xml/buffer.xml
+%%TOMCATDIR%%/webapps/deegree-wps/client/requests/wps/examples/Execute/xml/buffer_two_features.xml
+%%TOMCATDIR%%/webapps/deegree-wps/client/requests/wps/examples/Execute/xml/buffer_two_geometries.xml
+%%TOMCATDIR%%/webapps/deegree-wps/css/deegree.css
+%%TOMCATDIR%%/webapps/deegree-wps/deegree_header.jsp
+%%TOMCATDIR%%/webapps/deegree-wps/deegree_main.html
+%%TOMCATDIR%%/webapps/deegree-wps/deegree_navi.jsp
+%%TOMCATDIR%%/webapps/deegree-wps/error.jsp
+%%TOMCATDIR%%/webapps/deegree-wps/images/OSGeo_project.png
+%%TOMCATDIR%%/webapps/deegree-wps/images/logo-deegree.png
+%%TOMCATDIR%%/webapps/deegree-wps/images/logo-latlon.png
+%%TOMCATDIR%%/webapps/deegree-wps/images/logo-unibonn.png
+%%TOMCATDIR%%/webapps/deegree-wps/images/portal_saltlake.jpg
+%%TOMCATDIR%%/webapps/deegree-wps/index.jsp
+%%TOMCATDIR%%/webapps/deegree-wps/wps.jsp
+%%TOMCATDIR%%/webapps/deegree-wps/wps_basic.html
+%%TOMCATDIR%%/webapps/deegree-wps/wps_main.html
+%%TOMCATDIR%%/webapps/deegree-wps/wps_navi.jsp
+@dirrm %%TOMCATDIR%%/webapps/deegree-wps/images
+@dirrm %%TOMCATDIR%%/webapps/deegree-wps/css
+@dirrm %%TOMCATDIR%%/webapps/deegree-wps/client/requests/wps/examples/Execute/xml
+@dirrm %%TOMCATDIR%%/webapps/deegree-wps/client/requests/wps/examples/Execute
+@dirrm %%TOMCATDIR%%/webapps/deegree-wps/client/requests/wps/examples
+@dirrm %%TOMCATDIR%%/webapps/deegree-wps/client/requests/wps
+@dirrm %%TOMCATDIR%%/webapps/deegree-wps/client/requests
+@dirrm %%TOMCATDIR%%/webapps/deegree-wps/client
+@dirrm %%TOMCATDIR%%/webapps/deegree-wps/WEB-INF/lib
+@dirrm %%TOMCATDIR%%/webapps/deegree-wps/WEB-INF/conf/wps/processConfigs
+@dirrm %%TOMCATDIR%%/webapps/deegree-wps/WEB-INF/conf/wps
+@dirrm %%TOMCATDIR%%/webapps/deegree-wps/WEB-INF/conf
+@dirrm %%TOMCATDIR%%/webapps/deegree-wps/WEB-INF/classes
+@dirrm %%TOMCATDIR%%/webapps/deegree-wps/WEB-INF
+@dirrm %%TOMCATDIR%%/webapps/deegree-wps/META-INF
+@dirrm %%TOMCATDIR%%/webapps/deegree-wps
+@dirrm %%TOMCATDIR%%/webapps