Remove hardcoded WRKDIRPREFIX.

Proposed by:	des

11 files changed, 0 insertions, 11 deletions

diff --git a/www/jakarta-tomcat3/Makefile b/www/jakarta-tomcat3/Makefile
index 4b9d279dcef6..0c785338dc5a 100644
--- a/www/jakarta-tomcat3/Makefile
+++ b/www/jakarta-tomcat3/Makefile
@@ -51,7 +51,6 @@ REPLACE_FILES=	${PORTSDIR}/www/jakarta-tomcat4/files/daemonctl.c \
 		${PORTSDIR}/www/jakarta-tomcat4/files/startup.sh \
 		${WRKSRC}/conf/server.xml
 JAR_FILE=	lib/tomcat.jar
-WRKDIR?=	${WRKDIRPREFIX}${.CURDIR}/work
 CONF_EXT=	sample
 PLIST_SUB+=	CONF_EXT=${CONF_EXT}
 .include <bsd.port.pre.mk>
diff --git a/www/jakarta-tomcat4/Makefile b/www/jakarta-tomcat4/Makefile
index 786e87e7523c..f7816d4e703c 100644
--- a/www/jakarta-tomcat4/Makefile
+++ b/www/jakarta-tomcat4/Makefile
@@ -55,7 +55,6 @@ REPLACE_FILES=	${FILESDIR}/daemonctl.c \
 		${FILESDIR}/startup.sh \
 		${WRKSRC}/conf/server.xml
 JAR_FILE=	bin/bootstrap.jar
-WRKDIR?=	${WRKDIRPREFIX}${.CURDIR}/work
 CONF_EXT=	sample
 PLIST_SUB+=	CONF_EXT=${CONF_EXT}
 
diff --git a/www/jakarta-tomcat41/Makefile b/www/jakarta-tomcat41/Makefile
index 4193ddab65dc..3f7e5f3b6da6 100644
--- a/www/jakarta-tomcat41/Makefile
+++ b/www/jakarta-tomcat41/Makefile
@@ -54,7 +54,6 @@ REPLACE_FILES=	${PORTSDIR}/www/jakarta-tomcat4/files/daemonctl.c \
 		${PORTSDIR}/www/jakarta-tomcat4/files/startup.sh \
 		${WRKSRC}/conf/server.xml
 JAR_FILE=	bin/bootstrap.jar
-WRKDIR?=	${WRKDIRPREFIX}${.CURDIR}/work
 CONF_EXT=	sample
 PLIST_SUB+=	CONF_EXT=${CONF_EXT}
 
diff --git a/www/jakarta-tomcat5/Makefile b/www/jakarta-tomcat5/Makefile
index 558dbc72ac4c..a3c1ad8262cf 100644
--- a/www/jakarta-tomcat5/Makefile
+++ b/www/jakarta-tomcat5/Makefile
@@ -51,7 +51,6 @@ REPLACE_FILES=	${PORTSDIR}/www/jakarta-tomcat4/files/daemonctl.c \
 		${PORTSDIR}/www/jakarta-tomcat4/files/startup.sh \
 		${WRKSRC}/conf/server.xml
 JAR_FILE=	bin/bootstrap.jar
-WRKDIR?=	${WRKDIRPREFIX}${.CURDIR}/work
 PLIST_SUB+=	T=${APP_HOME:S/^${PREFIX}\///} WWWOWN=${USER} WWWGRP=${GROUP}
 LATEST_LINK=	${APP_SHORTNAME}
 CONF_EXT=	sample
diff --git a/www/jakarta-tomcat55/Makefile b/www/jakarta-tomcat55/Makefile
index 558dbc72ac4c..a3c1ad8262cf 100644
--- a/www/jakarta-tomcat55/Makefile
+++ b/www/jakarta-tomcat55/Makefile
@@ -51,7 +51,6 @@ REPLACE_FILES=	${PORTSDIR}/www/jakarta-tomcat4/files/daemonctl.c \
 		${PORTSDIR}/www/jakarta-tomcat4/files/startup.sh \
 		${WRKSRC}/conf/server.xml
 JAR_FILE=	bin/bootstrap.jar
-WRKDIR?=	${WRKDIRPREFIX}${.CURDIR}/work
 PLIST_SUB+=	T=${APP_HOME:S/^${PREFIX}\///} WWWOWN=${USER} WWWGRP=${GROUP}
 LATEST_LINK=	${APP_SHORTNAME}
 CONF_EXT=	sample
diff --git a/www/resin2/Makefile b/www/resin2/Makefile
index 95c6296fb7d9..92018a02ea84 100644
--- a/www/resin2/Makefile
+++ b/www/resin2/Makefile
@@ -43,7 +43,6 @@ PKGDEINSTALL=		${WRKDIR}/pkg-deinstall
 PKGMESSAGE=		${WRKDIR}/pkg-message
 # We need WRKSRC and WRKDIR right now so define them "manually"
 WRKSRC=			${WRKDIR}/${PORTNAME}-${PORTVERSION}
-WRKDIR?=		${WRKDIRPREFIX}${.CURDIR}/work
 REINPLACE_FILES=	${WRKSRC}/src/c/plugin/apache/Makefile.in \
 			${WRKSRC}/src/c/plugin/apache2/Makefile.in
 REPLACE_FILES=		${FILESDIR}/pkg-install \
diff --git a/www/resin3/Makefile b/www/resin3/Makefile
index d74e02c0db77..5e2cad5ad2b1 100644
--- a/www/resin3/Makefile
+++ b/www/resin3/Makefile
@@ -43,7 +43,6 @@ PKGDEINSTALL=		${WRKDIR}/pkg-deinstall
 PKGMESSAGE=		${WRKDIR}/pkg-message
 # We need WRKSRC and WRKDIR right now so define them "manually"
 WRKSRC=			${WRKDIR}/${PORTNAME}-${PORTVERSION}
-WRKDIR?=		${WRKDIRPREFIX}${.CURDIR}/work
 REINPLACE_FILES=	${WRKSRC}/src/c/apache1/Makefile.in \
 			${WRKSRC}/src/c/apache2/Makefile.in
 REPLACE_FILES=		${FILESDIR}/pkg-install \
diff --git a/www/tomcat41/Makefile b/www/tomcat41/Makefile
index 4193ddab65dc..3f7e5f3b6da6 100644
--- a/www/tomcat41/Makefile
+++ b/www/tomcat41/Makefile
@@ -54,7 +54,6 @@ REPLACE_FILES=	${PORTSDIR}/www/jakarta-tomcat4/files/daemonctl.c \
 		${PORTSDIR}/www/jakarta-tomcat4/files/startup.sh \
 		${WRKSRC}/conf/server.xml
 JAR_FILE=	bin/bootstrap.jar
-WRKDIR?=	${WRKDIRPREFIX}${.CURDIR}/work
 CONF_EXT=	sample
 PLIST_SUB+=	CONF_EXT=${CONF_EXT}
 
diff --git a/www/tomcat55/Makefile b/www/tomcat55/Makefile
index 558dbc72ac4c..a3c1ad8262cf 100644
--- a/www/tomcat55/Makefile
+++ b/www/tomcat55/Makefile
@@ -51,7 +51,6 @@ REPLACE_FILES=	${PORTSDIR}/www/jakarta-tomcat4/files/daemonctl.c \
 		${PORTSDIR}/www/jakarta-tomcat4/files/startup.sh \
 		${WRKSRC}/conf/server.xml
 JAR_FILE=	bin/bootstrap.jar
-WRKDIR?=	${WRKDIRPREFIX}${.CURDIR}/work
 PLIST_SUB+=	T=${APP_HOME:S/^${PREFIX}\///} WWWOWN=${USER} WWWGRP=${GROUP}
 LATEST_LINK=	${APP_SHORTNAME}
 CONF_EXT=	sample
diff --git a/www/tomcat6/Makefile b/www/tomcat6/Makefile
index 558dbc72ac4c..a3c1ad8262cf 100644
--- a/www/tomcat6/Makefile
+++ b/www/tomcat6/Makefile
@@ -51,7 +51,6 @@ REPLACE_FILES=	${PORTSDIR}/www/jakarta-tomcat4/files/daemonctl.c \
 		${PORTSDIR}/www/jakarta-tomcat4/files/startup.sh \
 		${WRKSRC}/conf/server.xml
 JAR_FILE=	bin/bootstrap.jar
-WRKDIR?=	${WRKDIRPREFIX}${.CURDIR}/work
 PLIST_SUB+=	T=${APP_HOME:S/^${PREFIX}\///} WWWOWN=${USER} WWWGRP=${GROUP}
 LATEST_LINK=	${APP_SHORTNAME}
 CONF_EXT=	sample
diff --git a/www/tomcat7/Makefile b/www/tomcat7/Makefile
index 558dbc72ac4c..a3c1ad8262cf 100644
--- a/www/tomcat7/Makefile
+++ b/www/tomcat7/Makefile
@@ -51,7 +51,6 @@ REPLACE_FILES=	${PORTSDIR}/www/jakarta-tomcat4/files/daemonctl.c \
 		${PORTSDIR}/www/jakarta-tomcat4/files/startup.sh \
 		${WRKSRC}/conf/server.xml
 JAR_FILE=	bin/bootstrap.jar
-WRKDIR?=	${WRKDIRPREFIX}${.CURDIR}/work
 PLIST_SUB+=	T=${APP_HOME:S/^${PREFIX}\///} WWWOWN=${USER} WWWGRP=${GROUP}
 LATEST_LINK=	${APP_SHORTNAME}
 CONF_EXT=	sample