Revert previous delta, according to Porter's Handbook:

http://www.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/porting-wrkdirprefix.html

 "In particular, if you are referring to a WRKDIR of another port, note that
  the correct location is ${WRKDIRPREFIX}${PORTSDIR}/subdir/name/work"

Other ports that use ${.CURDIR} when reffering WRKDIR of another port should
be fixed along with bento scripts.

7 files changed, 14 insertions, 14 deletions

diff --git a/net/asterisk-bristuff/Makefile b/net/asterisk-bristuff/Makefile
index 3e2af1e1dc15..f6816dc37ab1 100644
--- a/net/asterisk-bristuff/Makefile
+++ b/net/asterisk-bristuff/Makefile
@@ -29,8 +29,8 @@ USE_OPENLDAP=	yes
 MAKE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}" \
 		MKDIR="${MKDIR}" \
-		PWLIBDIR=${WRKDIR}/../../../devel/pwlib/work/pwlib \
-		OPENH323DIR=${WRKDIR}/../../../net/openh323/work/openh323 \
+		PWLIBDIR=${WRKDIRPREFIX}${PORTSDIR}/devel/pwlib/work/pwlib \
+		OPENH323DIR=${WRKDIRPREFIX}${PORTSDIR}/net/openh323/work/openh323 \
 		OSVERSION=${OSVERSION} \
 		CXX="${CXX}"
 
diff --git a/net/asterisk-devel/Makefile b/net/asterisk-devel/Makefile
index 3e2af1e1dc15..f6816dc37ab1 100644
--- a/net/asterisk-devel/Makefile
+++ b/net/asterisk-devel/Makefile
@@ -29,8 +29,8 @@ USE_OPENLDAP=	yes
 MAKE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}" \
 		MKDIR="${MKDIR}" \
-		PWLIBDIR=${WRKDIR}/../../../devel/pwlib/work/pwlib \
-		OPENH323DIR=${WRKDIR}/../../../net/openh323/work/openh323 \
+		PWLIBDIR=${WRKDIRPREFIX}${PORTSDIR}/devel/pwlib/work/pwlib \
+		OPENH323DIR=${WRKDIRPREFIX}${PORTSDIR}/net/openh323/work/openh323 \
 		OSVERSION=${OSVERSION} \
 		CXX="${CXX}"
 
diff --git a/net/asterisk/Makefile b/net/asterisk/Makefile
index 3e2af1e1dc15..f6816dc37ab1 100644
--- a/net/asterisk/Makefile
+++ b/net/asterisk/Makefile
@@ -29,8 +29,8 @@ USE_OPENLDAP=	yes
 MAKE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}" \
 		MKDIR="${MKDIR}" \
-		PWLIBDIR=${WRKDIR}/../../../devel/pwlib/work/pwlib \
-		OPENH323DIR=${WRKDIR}/../../../net/openh323/work/openh323 \
+		PWLIBDIR=${WRKDIRPREFIX}${PORTSDIR}/devel/pwlib/work/pwlib \
+		OPENH323DIR=${WRKDIRPREFIX}${PORTSDIR}/net/openh323/work/openh323 \
 		OSVERSION=${OSVERSION} \
 		CXX="${CXX}"
 
diff --git a/net/asterisk10/Makefile b/net/asterisk10/Makefile
index 3e2af1e1dc15..f6816dc37ab1 100644
--- a/net/asterisk10/Makefile
+++ b/net/asterisk10/Makefile
@@ -29,8 +29,8 @@ USE_OPENLDAP=	yes
 MAKE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}" \
 		MKDIR="${MKDIR}" \
-		PWLIBDIR=${WRKDIR}/../../../devel/pwlib/work/pwlib \
-		OPENH323DIR=${WRKDIR}/../../../net/openh323/work/openh323 \
+		PWLIBDIR=${WRKDIRPREFIX}${PORTSDIR}/devel/pwlib/work/pwlib \
+		OPENH323DIR=${WRKDIRPREFIX}${PORTSDIR}/net/openh323/work/openh323 \
 		OSVERSION=${OSVERSION} \
 		CXX="${CXX}"
 
diff --git a/net/asterisk12/Makefile b/net/asterisk12/Makefile
index 3e2af1e1dc15..f6816dc37ab1 100644
--- a/net/asterisk12/Makefile
+++ b/net/asterisk12/Makefile
@@ -29,8 +29,8 @@ USE_OPENLDAP=	yes
 MAKE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}" \
 		MKDIR="${MKDIR}" \
-		PWLIBDIR=${WRKDIR}/../../../devel/pwlib/work/pwlib \
-		OPENH323DIR=${WRKDIR}/../../../net/openh323/work/openh323 \
+		PWLIBDIR=${WRKDIRPREFIX}${PORTSDIR}/devel/pwlib/work/pwlib \
+		OPENH323DIR=${WRKDIRPREFIX}${PORTSDIR}/net/openh323/work/openh323 \
 		OSVERSION=${OSVERSION} \
 		CXX="${CXX}"
 
diff --git a/net/asterisk14/Makefile b/net/asterisk14/Makefile
index 3e2af1e1dc15..f6816dc37ab1 100644
--- a/net/asterisk14/Makefile
+++ b/net/asterisk14/Makefile
@@ -29,8 +29,8 @@ USE_OPENLDAP=	yes
 MAKE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}" \
 		MKDIR="${MKDIR}" \
-		PWLIBDIR=${WRKDIR}/../../../devel/pwlib/work/pwlib \
-		OPENH323DIR=${WRKDIR}/../../../net/openh323/work/openh323 \
+		PWLIBDIR=${WRKDIRPREFIX}${PORTSDIR}/devel/pwlib/work/pwlib \
+		OPENH323DIR=${WRKDIRPREFIX}${PORTSDIR}/net/openh323/work/openh323 \
 		OSVERSION=${OSVERSION} \
 		CXX="${CXX}"
 
diff --git a/net/asterisk16/Makefile b/net/asterisk16/Makefile
index 3e2af1e1dc15..f6816dc37ab1 100644
--- a/net/asterisk16/Makefile
+++ b/net/asterisk16/Makefile
@@ -29,8 +29,8 @@ USE_OPENLDAP=	yes
 MAKE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}" \
 		MKDIR="${MKDIR}" \
-		PWLIBDIR=${WRKDIR}/../../../devel/pwlib/work/pwlib \
-		OPENH323DIR=${WRKDIR}/../../../net/openh323/work/openh323 \
+		PWLIBDIR=${WRKDIRPREFIX}${PORTSDIR}/devel/pwlib/work/pwlib \
+		OPENH323DIR=${WRKDIRPREFIX}${PORTSDIR}/net/openh323/work/openh323 \
 		OSVERSION=${OSVERSION} \
 		CXX="${CXX}"