Depend upon the repocopied pwlib152 and and openh323-112 ports, to ease the

transition to newer versions of pwlib and openh323 without breaking ports
which depend upon them.

PR:			83396
Submitted by:		Steve Ames <steve@energistic.com>
In colaboration with:	Steve Ames <steve@energistic.com>
Approved by:		linimon ("no weeping changes ATM"-Heads-Up)

18 files changed, 61 insertions, 61 deletions

diff --git a/net/asterisk-bristuff/Makefile b/net/asterisk-bristuff/Makefile
index da0285533efc..7aa2b1e1f92f 100644
--- a/net/asterisk-bristuff/Makefile
+++ b/net/asterisk-bristuff/Makefile
@@ -45,8 +45,8 @@ MAN8=		asterisk.8 astgenkey.8 autosupport.8 safe_asterisk.8
 
 .include <bsd.port.pre.mk>
 
-PWLIBDIR!=	cd ${PORTSDIR}/devel/pwlib; make -V WRKSRC
-OPENH323DIR!=	cd ${PORTSDIR}/net/openh323; make -V WRKSRC
+PWLIBDIR!=	cd ${PORTSDIR}/devel/pwlib152; make -V WRKSRC
+OPENH323DIR!=	cd ${PORTSDIR}/net/openh323-112; make -V WRKSRC
 
 .if ${ARCH} != "i386"
 WITHOUT_H323=	1
@@ -56,8 +56,8 @@ WITHOUT_ZAPTEL=	1
 .if defined(WITHOUT_H323)
 PLIST_SUB+=	WITH_H323="@comment "
 .else
-BUILD_DEPENDS+=	${NONEXISTENT}:${PORTSDIR}/devel/pwlib:build \
-		${NONEXISTENT}:${PORTSDIR}/net/openh323:build
+BUILD_DEPENDS+=	${NONEXISTENT}:${PORTSDIR}/devel/pwlib152:build \
+		${NONEXISTENT}:${PORTSDIR}/net/openh323-112:build
 PLIST_SUB+=	WITH_H323=""
 MAKE_ENV+=	WITH_H323=1
 .endif
diff --git a/net/asterisk-current/Makefile b/net/asterisk-current/Makefile
index 37ca4e564132..14dd3d1599fd 100644
--- a/net/asterisk-current/Makefile
+++ b/net/asterisk-current/Makefile
@@ -14,7 +14,7 @@ DISTFILES=	# none
 MAINTAINER=	luigi@FreeBSD.org
 COMMENT=	An Open Source PBX and telephony toolkit - head branch
 
-# --- BUIKD OPTIONS ---
+# --- BUILD OPTIONS ---
 # If you run "make -DPLAIN" you will only run the svn distribution
 # without any local change. Otherwise, you will use whatever
 # patch-* and src*.tgz that is in the files directory.
@@ -120,8 +120,8 @@ do-extract:
 
 .if defined(WITH_H323)
 # put in the prerequisites
-BUILD_DEPENDS+=	${NONEXISTENT}:${PORTSDIR}/devel/pwlib:build \
-		${NONEXISTENT}:${PORTSDIR}/net/openh323:build
+BUILD_DEPENDS+=	${NONEXISTENT}:${PORTSDIR}/devel/pwlib152:build \
+		${NONEXISTENT}:${PORTSDIR}/net/openh323-112:build
 .endif
 
 .if defined(WITH_ZAPTEL)
diff --git a/net/asterisk-oh323/Makefile b/net/asterisk-oh323/Makefile
index aae75de157bd..6075b3a2bd89 100644
--- a/net/asterisk-oh323/Makefile
+++ b/net/asterisk-oh323/Makefile
@@ -14,14 +14,14 @@ MASTER_SITES=	http://www.inaccessnetworks.com/projects/asterisk-oh323/download/
 MAINTAINER=	bamby@portaone.com
 COMMENT=	A H.323 support module for the Asterisk soft PBX
 
-BUILD_DEPENDS= 	${NONEXISTENT}:${PORTSDIR}/devel/pwlib:build \
-	    	${NONEXISTENT}:${PORTSDIR}/net/openh323:build \
+BUILD_DEPENDS= 	${NONEXISTENT}:${PORTSDIR}/devel/pwlib152:build \
+	    	${NONEXISTENT}:${PORTSDIR}/net/openh323-112:build \
 	    	${LOCALBASE}/sbin/asterisk:${PORTSDIR}/net/asterisk
 
 USE_GMAKE=	yes
 MAKE_ENV=	MKDIR="${MKDIR}" \
-		PWLIBDIR=${WRKDIRPREFIX}${PORTSDIR}/devel/pwlib/work/pwlib \
-		OPENH323DIR=${WRKDIRPREFIX}${PORTSDIR}/net/openh323/work/openh323 \
+		PWLIBDIR=${WRKDIRPREFIX}${PORTSDIR}/devel/pwlib152/work/pwlib \
+		OPENH323DIR=${WRKDIRPREFIX}${PORTSDIR}/net/openh323-112/work/openh323 \
 		CPP="${CXX}" \
 		USE_OLD_CAPABILITIES_API="yes"
 
diff --git a/net/asterisk/Makefile b/net/asterisk/Makefile
index da0285533efc..7aa2b1e1f92f 100644
--- a/net/asterisk/Makefile
+++ b/net/asterisk/Makefile
@@ -45,8 +45,8 @@ MAN8=		asterisk.8 astgenkey.8 autosupport.8 safe_asterisk.8
 
 .include <bsd.port.pre.mk>
 
-PWLIBDIR!=	cd ${PORTSDIR}/devel/pwlib; make -V WRKSRC
-OPENH323DIR!=	cd ${PORTSDIR}/net/openh323; make -V WRKSRC
+PWLIBDIR!=	cd ${PORTSDIR}/devel/pwlib152; make -V WRKSRC
+OPENH323DIR!=	cd ${PORTSDIR}/net/openh323-112; make -V WRKSRC
 
 .if ${ARCH} != "i386"
 WITHOUT_H323=	1
@@ -56,8 +56,8 @@ WITHOUT_ZAPTEL=	1
 .if defined(WITHOUT_H323)
 PLIST_SUB+=	WITH_H323="@comment "
 .else
-BUILD_DEPENDS+=	${NONEXISTENT}:${PORTSDIR}/devel/pwlib:build \
-		${NONEXISTENT}:${PORTSDIR}/net/openh323:build
+BUILD_DEPENDS+=	${NONEXISTENT}:${PORTSDIR}/devel/pwlib152:build \
+		${NONEXISTENT}:${PORTSDIR}/net/openh323-112:build
 PLIST_SUB+=	WITH_H323=""
 MAKE_ENV+=	WITH_H323=1
 .endif
diff --git a/net/asterisk10/Makefile b/net/asterisk10/Makefile
index da0285533efc..7aa2b1e1f92f 100644
--- a/net/asterisk10/Makefile
+++ b/net/asterisk10/Makefile
@@ -45,8 +45,8 @@ MAN8=		asterisk.8 astgenkey.8 autosupport.8 safe_asterisk.8
 
 .include <bsd.port.pre.mk>
 
-PWLIBDIR!=	cd ${PORTSDIR}/devel/pwlib; make -V WRKSRC
-OPENH323DIR!=	cd ${PORTSDIR}/net/openh323; make -V WRKSRC
+PWLIBDIR!=	cd ${PORTSDIR}/devel/pwlib152; make -V WRKSRC
+OPENH323DIR!=	cd ${PORTSDIR}/net/openh323-112; make -V WRKSRC
 
 .if ${ARCH} != "i386"
 WITHOUT_H323=	1
@@ -56,8 +56,8 @@ WITHOUT_ZAPTEL=	1
 .if defined(WITHOUT_H323)
 PLIST_SUB+=	WITH_H323="@comment "
 .else
-BUILD_DEPENDS+=	${NONEXISTENT}:${PORTSDIR}/devel/pwlib:build \
-		${NONEXISTENT}:${PORTSDIR}/net/openh323:build
+BUILD_DEPENDS+=	${NONEXISTENT}:${PORTSDIR}/devel/pwlib152:build \
+		${NONEXISTENT}:${PORTSDIR}/net/openh323-112:build
 PLIST_SUB+=	WITH_H323=""
 MAKE_ENV+=	WITH_H323=1
 .endif
diff --git a/net/asterisk12/Makefile b/net/asterisk12/Makefile
index da0285533efc..7aa2b1e1f92f 100644
--- a/net/asterisk12/Makefile
+++ b/net/asterisk12/Makefile
@@ -45,8 +45,8 @@ MAN8=		asterisk.8 astgenkey.8 autosupport.8 safe_asterisk.8
 
 .include <bsd.port.pre.mk>
 
-PWLIBDIR!=	cd ${PORTSDIR}/devel/pwlib; make -V WRKSRC
-OPENH323DIR!=	cd ${PORTSDIR}/net/openh323; make -V WRKSRC
+PWLIBDIR!=	cd ${PORTSDIR}/devel/pwlib152; make -V WRKSRC
+OPENH323DIR!=	cd ${PORTSDIR}/net/openh323-112; make -V WRKSRC
 
 .if ${ARCH} != "i386"
 WITHOUT_H323=	1
@@ -56,8 +56,8 @@ WITHOUT_ZAPTEL=	1
 .if defined(WITHOUT_H323)
 PLIST_SUB+=	WITH_H323="@comment "
 .else
-BUILD_DEPENDS+=	${NONEXISTENT}:${PORTSDIR}/devel/pwlib:build \
-		${NONEXISTENT}:${PORTSDIR}/net/openh323:build
+BUILD_DEPENDS+=	${NONEXISTENT}:${PORTSDIR}/devel/pwlib152:build \
+		${NONEXISTENT}:${PORTSDIR}/net/openh323-112:build
 PLIST_SUB+=	WITH_H323=""
 MAKE_ENV+=	WITH_H323=1
 .endif
diff --git a/net/asterisk14/Makefile b/net/asterisk14/Makefile
index da0285533efc..7aa2b1e1f92f 100644
--- a/net/asterisk14/Makefile
+++ b/net/asterisk14/Makefile
@@ -45,8 +45,8 @@ MAN8=		asterisk.8 astgenkey.8 autosupport.8 safe_asterisk.8
 
 .include <bsd.port.pre.mk>
 
-PWLIBDIR!=	cd ${PORTSDIR}/devel/pwlib; make -V WRKSRC
-OPENH323DIR!=	cd ${PORTSDIR}/net/openh323; make -V WRKSRC
+PWLIBDIR!=	cd ${PORTSDIR}/devel/pwlib152; make -V WRKSRC
+OPENH323DIR!=	cd ${PORTSDIR}/net/openh323-112; make -V WRKSRC
 
 .if ${ARCH} != "i386"
 WITHOUT_H323=	1
@@ -56,8 +56,8 @@ WITHOUT_ZAPTEL=	1
 .if defined(WITHOUT_H323)
 PLIST_SUB+=	WITH_H323="@comment "
 .else
-BUILD_DEPENDS+=	${NONEXISTENT}:${PORTSDIR}/devel/pwlib:build \
-		${NONEXISTENT}:${PORTSDIR}/net/openh323:build
+BUILD_DEPENDS+=	${NONEXISTENT}:${PORTSDIR}/devel/pwlib152:build \
+		${NONEXISTENT}:${PORTSDIR}/net/openh323-112:build
 PLIST_SUB+=	WITH_H323=""
 MAKE_ENV+=	WITH_H323=1
 .endif
diff --git a/net/asterisk16/Makefile b/net/asterisk16/Makefile
index da0285533efc..7aa2b1e1f92f 100644
--- a/net/asterisk16/Makefile
+++ b/net/asterisk16/Makefile
@@ -45,8 +45,8 @@ MAN8=		asterisk.8 astgenkey.8 autosupport.8 safe_asterisk.8
 
 .include <bsd.port.pre.mk>
 
-PWLIBDIR!=	cd ${PORTSDIR}/devel/pwlib; make -V WRKSRC
-OPENH323DIR!=	cd ${PORTSDIR}/net/openh323; make -V WRKSRC
+PWLIBDIR!=	cd ${PORTSDIR}/devel/pwlib152; make -V WRKSRC
+OPENH323DIR!=	cd ${PORTSDIR}/net/openh323-112; make -V WRKSRC
 
 .if ${ARCH} != "i386"
 WITHOUT_H323=	1
@@ -56,8 +56,8 @@ WITHOUT_ZAPTEL=	1
 .if defined(WITHOUT_H323)
 PLIST_SUB+=	WITH_H323="@comment "
 .else
-BUILD_DEPENDS+=	${NONEXISTENT}:${PORTSDIR}/devel/pwlib:build \
-		${NONEXISTENT}:${PORTSDIR}/net/openh323:build
+BUILD_DEPENDS+=	${NONEXISTENT}:${PORTSDIR}/devel/pwlib152:build \
+		${NONEXISTENT}:${PORTSDIR}/net/openh323-112:build
 PLIST_SUB+=	WITH_H323=""
 MAKE_ENV+=	WITH_H323=1
 .endif
diff --git a/net/callgen/Makefile b/net/callgen/Makefile
index 8d308ace6fb6..a41cc54adccf 100644
--- a/net/callgen/Makefile
+++ b/net/callgen/Makefile
@@ -14,13 +14,13 @@ DISTNAME=	callgen323_${PORTVERSION}
 MAINTAINER=	jacke@bofh.pl
 COMMENT=	H.323 Call Generator
 
-BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/net/openh323:configure
+BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/net/openh323-112:configure
 
 NOCLEANDEPENDS=	yes
 USE_GMAKE=	yes
 WRKSRC=		${WRKDIR}/callgen323
-MAKE_ENV=	PWLIBDIR=${WRKDIRPREFIX}${.CURDIR}/../../devel/pwlib/work/pwlib \
-		OPENH323DIR=${WRKDIRPREFIX}${.CURDIR}/../openh323/work/openh323
+MAKE_ENV=	PWLIBDIR=${WRKDIRPREFIX}${.CURDIR}/../../devel/pwlib152/work/pwlib \
+		OPENH323DIR=${WRKDIRPREFIX}${.CURDIR}/../openh323-112/work/openh323
 THE_MACHTYPE=	${ARCH:S/i386/x86/}
 
 PLIST_FILES=	bin/callgen323
diff --git a/net/callgen323/Makefile b/net/callgen323/Makefile
index 8d308ace6fb6..a41cc54adccf 100644
--- a/net/callgen323/Makefile
+++ b/net/callgen323/Makefile
@@ -14,13 +14,13 @@ DISTNAME=	callgen323_${PORTVERSION}
 MAINTAINER=	jacke@bofh.pl
 COMMENT=	H.323 Call Generator
 
-BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/net/openh323:configure
+BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/net/openh323-112:configure
 
 NOCLEANDEPENDS=	yes
 USE_GMAKE=	yes
 WRKSRC=		${WRKDIR}/callgen323
-MAKE_ENV=	PWLIBDIR=${WRKDIRPREFIX}${.CURDIR}/../../devel/pwlib/work/pwlib \
-		OPENH323DIR=${WRKDIRPREFIX}${.CURDIR}/../openh323/work/openh323
+MAKE_ENV=	PWLIBDIR=${WRKDIRPREFIX}${.CURDIR}/../../devel/pwlib152/work/pwlib \
+		OPENH323DIR=${WRKDIRPREFIX}${.CURDIR}/../openh323-112/work/openh323
 THE_MACHTYPE=	${ARCH:S/i386/x86/}
 
 PLIST_FILES=	bin/callgen323
diff --git a/net/cphone/Makefile b/net/cphone/Makefile
index 47da4ab1ffaa..814c42f83780 100644
--- a/net/cphone/Makefile
+++ b/net/cphone/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	H323 Video Conferencing Program which uses QT
 
-BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/net/openh323:build \
+BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/net/openh323-112:build \
 		qmake:${PORTSDIR}/devel/qmake
 
 NOCLEANDEPENDS=	yes
@@ -27,8 +27,8 @@ USE_QT_VER=	3
 USE_GMAKE=	yes
 ALL_TARGET=	optnoshared
 MAKE_ENV=	QTDIR=${X11BASE} \
-		PWLIBDIR=${WRKDIRPREFIX}${.CURDIR}/../../devel/pwlib/work/pwlib \
-		OPENH323DIR=${WRKDIRPREFIX}${.CURDIR}/../openh323/work/openh323
+		PWLIBDIR=${WRKDIRPREFIX}${.CURDIR}/../../devel/pwlib152/work/pwlib \
+		OPENH323DIR=${WRKDIRPREFIX}${.CURDIR}/../openh323-112/work/openh323
 THE_MACHTYPE=	${ARCH:S/i386/x86/}
 MAKE_ARGS=	OSTYPE=${OPSYS} MACHTYPE=${THE_MACHTYPE} OSRELEASE=${OSVERSION} CPLUS=${CXX}
 
diff --git a/net/ekiga/Makefile b/net/ekiga/Makefile
index 8caed373d57b..0a2387ae1b74 100644
--- a/net/ekiga/Makefile
+++ b/net/ekiga/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.98
 MAINTAINER=	kwm@FreeBSD.org
 COMMENT=	GNOME H323 Video Conferencing program, similar to NetMeeting
 
-BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/net/openh323:build
+BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/net/openh323-112:build
 
 # note, we do not want to clean openh323, otherwise it has to build
 # it all over again which can take several hours.
@@ -50,8 +50,8 @@ MAN1=		gnomemeeting.1
 
 .include <bsd.port.pre.mk>
 
-PWLIBDIR!=	cd ${PORTSDIR}/devel/pwlib && make -V WRKSRC
-OPENH323DIR!=	cd ${PORTSDIR}/net/openh323 && make -V WRKSRC
+PWLIBDIR!=	cd ${PORTSDIR}/devel/pwlib152 && make -V WRKSRC
+OPENH323DIR!=	cd ${PORTSDIR}/net/openh323-112 && make -V WRKSRC
 
 .if ${ARCH} != "i386"
 BROKEN=		"Configure fails on !i386"
diff --git a/net/gatekeeper/Makefile b/net/gatekeeper/Makefile
index ea99215e83e7..a28fe8097e83 100644
--- a/net/gatekeeper/Makefile
+++ b/net/gatekeeper/Makefile
@@ -16,7 +16,7 @@ DISTNAME=	gnugk-${PORTVERSION}
 MAINTAINER=	Joerg.Pulz@frm2.tum.de
 COMMENT=	GnuGK is GPL Gate Keeper for OhPhone, GnomeMeeting, NetMeeting and H323
 
-BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/net/openh323:build
+BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/net/openh323-112:build
 
 USE_RC_SUBR=	yes
 RC_DIR=		${PREFIX}/etc/rc.d
@@ -29,8 +29,8 @@ NOCLEANDEPENDS=	yes
 USE_BISON=	yes
 USE_GMAKE=	yes
 ALL_TARGET=	optnoshared addpasswd
-MAKE_ENV=	PWLIBDIR=${WRKDIRPREFIX}${.CURDIR}/../../devel/pwlib/work/pwlib \
-		OPENH323DIR=${WRKDIRPREFIX}${.CURDIR}/../openh323/work/openh323
+MAKE_ENV=	PWLIBDIR=${WRKDIRPREFIX}${.CURDIR}/../../devel/pwlib152/work/pwlib \
+		OPENH323DIR=${WRKDIRPREFIX}${.CURDIR}/../openh323-112/work/openh323
 THE_MACHTYPE=	${ARCH:S/i386/x86/}
 MAKE_ARGS=	OSTYPE=${OPSYS} MACHTYPE=${THE_MACHTYPE} OSRELEASE=${OSVERSION} CPLUS=${CXX} HAS_RADACCT=1
 
diff --git a/net/gnomemeeting/Makefile b/net/gnomemeeting/Makefile
index 8caed373d57b..0a2387ae1b74 100644
--- a/net/gnomemeeting/Makefile
+++ b/net/gnomemeeting/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.98
 MAINTAINER=	kwm@FreeBSD.org
 COMMENT=	GNOME H323 Video Conferencing program, similar to NetMeeting
 
-BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/net/openh323:build
+BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/net/openh323-112:build
 
 # note, we do not want to clean openh323, otherwise it has to build
 # it all over again which can take several hours.
@@ -50,8 +50,8 @@ MAN1=		gnomemeeting.1
 
 .include <bsd.port.pre.mk>
 
-PWLIBDIR!=	cd ${PORTSDIR}/devel/pwlib && make -V WRKSRC
-OPENH323DIR!=	cd ${PORTSDIR}/net/openh323 && make -V WRKSRC
+PWLIBDIR!=	cd ${PORTSDIR}/devel/pwlib152 && make -V WRKSRC
+OPENH323DIR!=	cd ${PORTSDIR}/net/openh323-112 && make -V WRKSRC
 
 .if ${ARCH} != "i386"
 BROKEN=		"Configure fails on !i386"
diff --git a/net/ohphone/Makefile b/net/ohphone/Makefile
index 01ed09f00318..301b843d5eb4 100644
--- a/net/ohphone/Makefile
+++ b/net/ohphone/Makefile
@@ -17,7 +17,7 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	H323 Video Conferencing Program, compatible with NetMeeting
 
-BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/net/openh323:build
+BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/net/openh323-112:build
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
@@ -27,8 +27,8 @@ USE_BISON=	yes
 USE_XLIB=	yes
 USE_GMAKE=	yes
 ALL_TARGET=	optnoshared
-MAKE_ENV=	PWLIBDIR=${WRKDIRPREFIX}${.CURDIR}/../../devel/pwlib/work/pwlib \
-		OPENH323DIR=${WRKDIRPREFIX}${.CURDIR}/../openh323/work/openh323
+MAKE_ENV=	PWLIBDIR=${WRKDIRPREFIX}${.CURDIR}/../../devel/pwlib152/work/pwlib \
+		OPENH323DIR=${WRKDIRPREFIX}${.CURDIR}/../openh323-112/work/openh323
 THE_MACHTYPE=	${ARCH:S/i386/x86/}
 MAKE_ARGS=	OSTYPE=${OPSYS} MACHTYPE=${THE_MACHTYPE} OSRELEASE=${OSVERSION} CPLUS=${CXX}
 MAN1=		ohphone.1
diff --git a/net/openam/Makefile b/net/openam/Makefile
index 1ad6658dec2e..509d18895582 100644
--- a/net/openam/Makefile
+++ b/net/openam/Makefile
@@ -17,7 +17,7 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	H323 Answer Machine
 
-BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/net/openh323:build
+BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/net/openh323-112:build
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
@@ -26,8 +26,8 @@ NOCLEANDEPENDS=	yes
 USE_BISON=	yes
 USE_GMAKE=	yes
 ALL_TARGET=	optnoshared
-MAKE_ENV=	PWLIBDIR=${WRKDIRPREFIX}${.CURDIR}/../../devl/pwlib/work/pwlib \
-		OPENH323DIR=${WRKDIRPREFIX}${.CURDIR}/../openh323/work/openh323
+MAKE_ENV=	PWLIBDIR=${WRKDIRPREFIX}${.CURDIR}/../../devel/pwlib152/work/pwlib \
+		OPENH323DIR=${WRKDIRPREFIX}${.CURDIR}/../openh323-112/work/openh323
 THE_MACHTYPE=	${ARCH:S/i386/x86/}
 MAKE_ARGS=	OSTYPE=${OPSYS} MACHTYPE=${THE_MACHTYPE} OSRELEASE=${OSVERSION} CPLUS=${CXX}
 
diff --git a/net/opengk/Makefile b/net/opengk/Makefile
index 2316e4fad696..bd4cce3ebb30 100644
--- a/net/opengk/Makefile
+++ b/net/opengk/Makefile
@@ -17,7 +17,7 @@ DISTNAME=	opengk_${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Equivalence's H323 GateKeeper for OpenH323 OhPhone and NetMeeting
 
-BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/net/openh323:build
+BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/net/openh323-112:build
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
@@ -26,8 +26,8 @@ NOCLEANDEPENDS=	yes
 PLIST_FILES=	bin/opengk
 USE_GMAKE=	yes
 ALL_TARGET=	optnoshared
-MAKE_ENV=	PWLIBDIR=${WRKDIRPREFIX}${.CURDIR}/../openh323/work/pwlib \
-		OPENH323DIR=${WRKDIRPREFIX}${.CURDIR}/../openh323/work/openh323
+MAKE_ENV=	PWLIBDIR=${WRKDIRPREFIX}${.CURDIR}/../../devel/pwlib152/work/pwlib \
+		OPENH323DIR=${WRKDIRPREFIX}${.CURDIR}/../openh323-112/work/openh323
 THE_MACHTYPE=	${ARCH:S/i386/x86/}
 MAKE_ARGS=	OSTYPE=${OPSYS} MACHTYPE=${THE_MACHTYPE} OSRELEASE=${OSVERSION} CPLUS=${CXX}
 
diff --git a/net/openmcu/Makefile b/net/openmcu/Makefile
index 35c97871112a..3d0963df4565 100644
--- a/net/openmcu/Makefile
+++ b/net/openmcu/Makefile
@@ -17,7 +17,7 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	OpenMCU hosts a conference call for H323 Video Conferencing users
 
-BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/net/openh323:build
+BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/net/openh323-112:build
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
@@ -26,8 +26,8 @@ NOCLEANDEPENDS=	yes
 USE_BISON=	yes
 USE_GMAKE=	yes
 ALL_TARGET=	optnoshared
-MAKE_ENV=	PWLIBDIR=${WRKDIRPREFIX}${.CURDIR}/../../devel/pwlib/work/pwlib \
-		OPENH323DIR=${WRKDIRPREFIX}${.CURDIR}/../openh323/work/openh323
+MAKE_ENV=	PWLIBDIR=${WRKDIRPREFIX}${.CURDIR}/../../devel/pwlib152/work/pwlib \
+		OPENH323DIR=${WRKDIRPREFIX}${.CURDIR}/../openh323-112/work/openh323
 THE_MACHTYPE=	${ARCH:S/i386/x86/}
 MAKE_ARGS=	OSTYPE=${OPSYS} MACHTYPE=${THE_MACHTYPE} OSRELEASE=${OSVERSION} CPLUS=${CXX}