Index: head/graphics/deegree-csw/Makefile
===================================================================
--- head/graphics/deegree-csw/Makefile	(revision 429185)
+++ head/graphics/deegree-csw/Makefile	(revision 429186)
@@ -1,65 +1,65 @@
 # Created by: wenheping@gmail.com
 # $FreeBSD$
 
 PORTNAME=	csw
 PORTVERSION=	2.5
 PORTREVISION=	1
 CATEGORIES=	graphics java
 MASTER_SITES=	http://download.deegree.org/deegree${PORTVERSION}/
 PKGNAMEPREFIX=	deegree-
 DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Deegree Catalogue Service(CSW)
 
 LICENSE=	LGPL21+
 
 USES=		zip
 USE_JAVA=	yes
 
 NO_BUILD=	yes
 NO_ARCH=	yes
 TOMCATDIR=	${PREFIX}/${TOMCATVER}
 APPHOME=	${LOCALBASE}/${TOMCATVER}
 WEBAPPDIR=	${TOMCATDIR}/webapps
 PORTDOCS=	README.txt deegree_csw_2.0.2_documentation_en.pdf \
 		deegree_csw_documentation_de.pdf deegree_csw_documentation_en.pdf
 DOCSDIR=	${PREFIX}/share/doc/${DISTNAME}
 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
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MTOMCAT6}
 TOMCATVER=	apache-tomcat-6.0
 TCPORT=		8180
 BUILD_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:www/tomcat6
 RUN_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:www/tomcat6
 .endif
 
 .if ${PORT_OPTIONS:MTOMCAT7}
 TOMCATVER=	apache-tomcat-7.0
 TCPORT=		8080
 BUILD_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:www/tomcat7
 RUN_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:www/tomcat7
 .endif
 
 post-extract:
-	@${MKDIR} ${WRKDIR}/${PORTDIRNAME}
-	@${TAR} xf ${WRKDIR}/deegree-csw.war -C ${WRKDIR}/${PORTDIRNAME}
+	@${MKDIR} ${WRKDIR}/${PKGBASE}
+	@${TAR} xf ${WRKDIR}/deegree-csw.war -C ${WRKDIR}/${PKGBASE}
 
 do-install:
-	@${MKDIR} ${STAGEDIR}${WEBAPPDIR}/${PORTDIRNAME}
-	@cd ${WRKDIR}/${PORTDIRNAME} && ${COPYTREE_SHARE} \* ${STAGEDIR}${WEBAPPDIR}/${PORTDIRNAME}
+	@${MKDIR} ${STAGEDIR}${WEBAPPDIR}/${PKGBASE}
+	@cd ${WRKDIR}/${PKGBASE} && ${COPYTREE_SHARE} \* ${STAGEDIR}${WEBAPPDIR}/${PKGBASE}
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKDIR}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/graphics/deegree-igeoportal/Makefile
===================================================================
--- head/graphics/deegree-igeoportal/Makefile	(revision 429185)
+++ head/graphics/deegree-igeoportal/Makefile	(revision 429186)
@@ -1,63 +1,63 @@
 # Created by: wenheping@gmail.com
 # $FreeBSD$
 
 PORTNAME=	igeoportal
 PORTVERSION=	2.5
 PORTREVISION=	1
 CATEGORIES=	graphics java
 MASTER_SITES=	http://download.deegree.org/deegree${PORTVERSION}/
 PKGNAMEPREFIX=	deegree-
 DISTNAME=	${PORTNAME}-std_${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Browser based client handling WMS, WFS, and proxy service
 
 LICENSE=	LGPL21+
 
 USES=		zip
 USE_JAVA=	yes
 
 NO_BUILD=	yes
 TOMCATDIR=	${PREFIX}/${TOMCATVER}
 APPHOME=	${LOCALBASE}/${TOMCATVER}
 WEBAPPDIR=	${TOMCATDIR}/webapps
 PORTDOCS=	README.txt README_owswatch.txt deegree_igeoportal_documentation_en.pdf
 DOCSDIR=	${PREFIX}/share/doc/deegree-igeoportal
 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
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MTOMCAT6}
 TOMCATVER=	apache-tomcat-6.0
 TCPORT=		8180
 BUILD_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:www/tomcat6
 RUN_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:www/tomcat6
 .endif
 
 .if ${PORT_OPTIONS:MTOMCAT7}
 TOMCATVER=	apache-tomcat-7.0
 TCPORT=		8080
 BUILD_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:www/tomcat7
 RUN_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:www/tomcat7
 .endif
 
 post-extract:
-	@${MKDIR} ${WRKDIR}/${PORTDIRNAME}
-	@${TAR} xf ${WRKDIR}/igeoportal-std.war -C ${WRKDIR}/${PORTDIRNAME}
+	@${MKDIR} ${WRKDIR}/${PKGBASE}
+	@${TAR} xf ${WRKDIR}/igeoportal-std.war -C ${WRKDIR}/${PKGBASE}
 
 do-install:
-	@${MKDIR} ${STAGEDIR}${WEBAPPDIR}/${PORTDIRNAME}
-	@cd ${WRKDIR}/${PORTDIRNAME} && ${COPYTREE_SHARE} \* ${STAGEDIR}${WEBAPPDIR}/${PORTDIRNAME}
+	@${MKDIR} ${STAGEDIR}${WEBAPPDIR}/${PKGBASE}
+	@cd ${WRKDIR}/${PKGBASE} && ${COPYTREE_SHARE} \* ${STAGEDIR}${WEBAPPDIR}/${PKGBASE}
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKDIR}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/graphics/deegree-wcs/Makefile
===================================================================
--- head/graphics/deegree-wcs/Makefile	(revision 429185)
+++ head/graphics/deegree-wcs/Makefile	(revision 429186)
@@ -1,64 +1,64 @@
 # Created by: wenheping@gmail.com
 # $FreeBSD$
 
 PORTNAME=	wcs
 PORTVERSION=	2.5
 PORTREVISION=	1
 CATEGORIES=	graphics java
 MASTER_SITES=	http://download.deegree.org/deegree${PORTVERSION}/
 PKGNAMEPREFIX=	deegree-
 DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Deegree Web Coverage Service(WCS)
 
 LICENSE=	LGPL21+
 
 USES=		zip
 USE_JAVA=	yes
 
 NO_BUILD=	yes
 NO_ARCH=	yes
 TOMCATDIR=	${PREFIX}/${TOMCATVER}
 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}/||} WWWOWN="${WWWOWN}" WWWGRP="${WWWGRP}"
 SUB_FILES=	pkg-message
 SUB_LIST=	TCPORT=${TCPORT}
 
 OPTIONS_SINGLE=	AS
 OPTIONS_SINGLE_AS=	TOMCAT6 TOMCAT7
 OPTIONS_DEFAULT=	TOMCAT6
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MTOMCAT6}
 TOMCATVER=	apache-tomcat-6.0
 TCPORT=		8180
 BUILD_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:www/tomcat6
 RUN_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:www/tomcat6
 .endif
 
 .if ${PORT_OPTIONS:MTOMCAT7}
 TOMCATVER=	apache-tomcat-7.0
 TCPORT=		8080
 BUILD_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:www/tomcat7
 RUN_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:www/tomcat7
 .endif
 
 post-extract:
-	@${MKDIR} ${WRKDIR}/${PORTDIRNAME}
-	@${TAR} xf ${WRKDIR}/deegree-wcs.war -C ${WRKDIR}/${PORTDIRNAME}
+	@${MKDIR} ${WRKDIR}/${PKGBASE}
+	@${TAR} xf ${WRKDIR}/deegree-wcs.war -C ${WRKDIR}/${PKGBASE}
 
 do-install:
-	@${MKDIR} ${STAGEDIR}${WEBAPPDIR}/${PORTDIRNAME}
-	@cd ${WRKDIR}/${PORTDIRNAME} && ${COPYTREE_SHARE} \* ${STAGEDIR}${WEBAPPDIR}/${PORTDIRNAME}
+	@${MKDIR} ${STAGEDIR}${WEBAPPDIR}/${PKGBASE}
+	@cd ${WRKDIR}/${PKGBASE} && ${COPYTREE_SHARE} \* ${STAGEDIR}${WEBAPPDIR}/${PKGBASE}
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKDIR}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/graphics/deegree-wfs/Makefile
===================================================================
--- head/graphics/deegree-wfs/Makefile	(revision 429185)
+++ head/graphics/deegree-wfs/Makefile	(revision 429186)
@@ -1,62 +1,62 @@
 # Created by: wenheping@gmail.com
 # $FreeBSD$
 
 PORTNAME=	wfs
 PORTVERSION=	2.5
 PORTREVISION=	1
 CATEGORIES=	graphics java
 MASTER_SITES=	http://download.deegree.org/deegree${PORTVERSION}/
 PKGNAMEPREFIX=	deegree-
 DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Deegree Web Feature Service(WFS)
 
 LICENSE=	LGPL21+
 
 USES=		zip
 USE_JAVA=	yes
 
 NO_BUILD=	yes
 TOMCATDIR=	${PREFIX}/${TOMCATVER}
 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}/||} WWWOWN="${WWWOWN}" WWWGRP="${WWWGRP}"
 SUB_FILES=	pkg-message
 SUB_LIST=	TCPORT=${TCPORT}
 
 OPTIONS_SINGLE=	AS
 OPTIONS_SINGLE_AS=	TOMCAT6 TOMCAT7
 OPTIONS_DEFAULT=	TOMCAT6
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MTOMCAT6}
 TOMCATVER=	apache-tomcat-6.0
 TCPORT=		8180
 BUILD_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:www/tomcat6
 RUN_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:www/tomcat6
 .endif
 
 .if ${PORT_OPTIONS:MTOMCAT7}
 TOMCATVER=	apache-tomcat-7.0
 TCPORT=		8080
 BUILD_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:www/tomcat7
 RUN_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:www/tomcat7
 .endif
 
 post-extract:
-	@${MKDIR} ${WRKDIR}/${PORTDIRNAME}
-	@${TAR} xf ${WRKDIR}/deegree-wfs.war -C ${WRKDIR}/${PORTDIRNAME}
+	@${MKDIR} ${WRKDIR}/${PKGBASE}
+	@${TAR} xf ${WRKDIR}/deegree-wfs.war -C ${WRKDIR}/${PKGBASE}
 
 do-install:
-	cd ${WRKDIR}/${PORTDIRNAME} && ${COPYTREE_SHARE} \* ${STAGEDIR}${WEBAPPDIR}/${PORTDIRNAME}
+	cd ${WRKDIR}/${PKGBASE} && ${COPYTREE_SHARE} \* ${STAGEDIR}${WEBAPPDIR}/${PKGBASE}
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKDIR}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/graphics/deegree-wms/Makefile
===================================================================
--- head/graphics/deegree-wms/Makefile	(revision 429185)
+++ head/graphics/deegree-wms/Makefile	(revision 429186)
@@ -1,61 +1,61 @@
 # Created by: wenheping@gmail.com
 # $FreeBSD$
 
 PORTNAME=	wms
 PORTVERSION=	2.5
 PORTREVISION=	1
 CATEGORIES=	graphics java
 MASTER_SITES=	http://download.deegree.org/deegree${PORTVERSION}/
 PKGNAMEPREFIX=	deegree-
 DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Deegree Web Map Service(WMS)
 
 USES=		zip
 USE_JAVA=	yes
 
 NO_BUILD=	yes
 TOMCATDIR=	${PREFIX}/${TOMCATVER}
 APPHOME=	${LOCALBASE}/${TOMCATVER}
 WEBAPPDIR=	${TOMCATDIR}/webapps
 PORTDOCS=	README.txt deegree_charts_documentation_en.pdf deegree_wms_documentation_en.pdf
 DOCSDIR=	${PREFIX}/share/doc/deegree-wms
 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
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MTOMCAT6}
 TOMCATVER=	apache-tomcat-6.0
 TCPORT=		8180
 BUILD_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:www/tomcat6
 RUN_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:www/tomcat6
 .endif
 
 .if ${PORT_OPTIONS:MTOMCAT7}
 TOMCATVER=	apache-tomcat-7.0
 TCPORT=		8080
 BUILD_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:www/tomcat7
 RUN_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:www/tomcat7
 .endif
 
 post-extract:
-	@${MKDIR} ${WRKDIR}/${PORTDIRNAME}
-	@${TAR} xf ${WRKDIR}/deegree-wms.war -C ${WRKDIR}/${PORTDIRNAME}
+	@${MKDIR} ${WRKDIR}/${PKGBASE}
+	@${TAR} xf ${WRKDIR}/deegree-wms.war -C ${WRKDIR}/${PKGBASE}
 
 do-install:
-	@${MKDIR} ${STAGEDIR}${WEBAPPDIR}/${PORTDIRNAME}
-	@cd ${WRKDIR}/${PORTDIRNAME} && ${COPYTREE_SHARE} \* ${STAGEDIR}${WEBAPPDIR}/${PORTDIRNAME}
+	@${MKDIR} ${STAGEDIR}${WEBAPPDIR}/${PKGBASE}
+	@cd ${WRKDIR}/${PKGBASE} && ${COPYTREE_SHARE} \* ${STAGEDIR}${WEBAPPDIR}/${PKGBASE}
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKDIR}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/graphics/deegree-wps/Makefile
===================================================================
--- head/graphics/deegree-wps/Makefile	(revision 429185)
+++ head/graphics/deegree-wps/Makefile	(revision 429186)
@@ -1,61 +1,61 @@
 # Created by: wenheping@gmail.com
 # $FreeBSD$
 
 PORTNAME=	wps
 PORTVERSION=	2.5
 PORTREVISION=	1
 CATEGORIES=	graphics java
 MASTER_SITES=	http://download.deegree.org/deegree${PORTVERSION}/
 PKGNAMEPREFIX=	deegree-
 DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Deegree Web Processing Service(WPS)
 
 USES=		zip
 USE_JAVA=	yes
 
 NO_BUILD=	yes
 TOMCATDIR=	${PREFIX}/${TOMCATVER}
 APPHOME=	${LOCALBASE}/${TOMCATVER}
 WEBAPPDIR=	${TOMCATDIR}/webapps
 PORTDOCS=	README.txt deegree_wps_documentation_en.pdf
 DOCSDIR=	${PREFIX}/share/doc/deegree-wps
 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
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MTOMCAT6}
 TOMCATVER=	apache-tomcat-6.0
 TCPORT=		8180
 BUILD_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:www/tomcat6
 RUN_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:www/tomcat6
 .endif
 
 .if ${PORT_OPTIONS:MTOMCAT7}
 TOMCATVER=	apache-tomcat-7.0
 TCPORT=		8080
 BUILD_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:www/tomcat7
 RUN_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:www/tomcat7
 .endif
 
 post-extract:
-	@${MKDIR} ${WRKDIR}/${PORTDIRNAME}
-	@${TAR} xf ${WRKDIR}/deegree-wps.war -C ${WRKDIR}/${PORTDIRNAME}
+	@${MKDIR} ${WRKDIR}/${PKGBASE}
+	@${TAR} xf ${WRKDIR}/deegree-wps.war -C ${WRKDIR}/${PKGBASE}
 
 do-install:
-	@${MKDIR} ${STAGEDIR}${WEBAPPDIR}/${PORTDIRNAME}
-	@cd ${WRKDIR}/${PORTDIRNAME} && ${COPYTREE_SHARE} \* ${STAGEDIR}${WEBAPPDIR}/${PORTDIRNAME}
+	@${MKDIR} ${STAGEDIR}${WEBAPPDIR}/${PKGBASE}
+	@cd ${WRKDIR}/${PKGBASE} && ${COPYTREE_SHARE} \* ${STAGEDIR}${WEBAPPDIR}/${PKGBASE}
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKDIR}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/graphics/deegree-wpvs/Makefile
===================================================================
--- head/graphics/deegree-wpvs/Makefile	(revision 429185)
+++ head/graphics/deegree-wpvs/Makefile	(revision 429186)
@@ -1,64 +1,64 @@
 # Created by: wenheping@gmail.com
 # $FreeBSD$
 
 PORTNAME=	wpvs
 PORTVERSION=	2.5
 PORTREVISION=	1
 CATEGORIES=	graphics java
 MASTER_SITES=	http://download.deegree.org/deegree${PORTVERSION}/
 PKGNAMEPREFIX=	deegree-
 DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Deegree Web Terrain Service(WTS)/Web Perspective View Service(WPVS)
 
 LICENSE=	LGPL21+
 
 USES=		zip
 USE_JAVA=	yes
 
 NO_BUILD=	yes
 NO_ARCH=	yes
 TOMCATDIR=	${PREFIX}/${TOMCATVER}
 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}/||} WWWOWN="${WWWOWN}" WWWGRP="${WWWGRP}"
 SUB_FILES=	pkg-message
 SUB_LIST=	TCPORT=${TCPORT}
 
 OPTIONS_SINGLE=	AS
 OPTIONS_SINGLE_AS=	TOMCAT6 TOMCAT7
 OPTIONS_DEFAULT=	TOMCAT6
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MTOMCAT6}
 TOMCATVER=	apache-tomcat-6.0
 TCPORT=		8180
 BUILD_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:www/tomcat6
 RUN_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:www/tomcat6
 .endif
 
 .if ${PORT_OPTIONS:MTOMCAT7}
 TOMCATVER=	apache-tomcat-7.0
 TCPORT=		8080
 BUILD_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:www/tomcat7
 RUN_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:www/tomcat7
 .endif
 
 post-extract:
-	@${MKDIR} ${WRKDIR}/${PORTDIRNAME}
-	@${TAR} xf ${WRKDIR}/deegree-wpvs.war -C ${WRKDIR}/${PORTDIRNAME}
+	@${MKDIR} ${WRKDIR}/${PKGBASE}
+	@${TAR} xf ${WRKDIR}/deegree-wpvs.war -C ${WRKDIR}/${PKGBASE}
 
 do-install:
-	@${MKDIR} ${STAGEDIR}${WEBAPPDIR}/${PORTDIRNAME}
-	@cd ${WRKDIR}/${PORTDIRNAME} && ${COPYTREE_SHARE} \* ${STAGEDIR}${WEBAPPDIR}/${PORTDIRNAME}
+	@${MKDIR} ${STAGEDIR}${WEBAPPDIR}/${PKGBASE}
+	@cd ${WRKDIR}/${PKGBASE} && ${COPYTREE_SHARE} \* ${STAGEDIR}${WEBAPPDIR}/${PKGBASE}
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKDIR}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>