diff -ruN comms/pstngw/Makefile.orig comms/pstngw/Makefile
--- comms/pstngw/Makefile.orig	Mon May 16 02:45:08 2005
+++ comms/pstngw/Makefile	Fri Jul  1 11:06:15 2005
@@ -15,14 +15,14 @@
 MAINTAINER=	jacke@bofh.pl
 COMMENT=	Simple H.323-PSTN (POTS) gateway
 
-BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/net/openh323:build
+BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/net/openh323-112:build
 
 NOCLEANDEPENDS=	yes
 
 USE_GMAKE=	yes
 WRKSRC=		${WRKDIR}/pstngw
-MAKE_ENV+=	PWLIBDIR=${WRKDIRPREFIX}${.CURDIR}/../../devel/pwlib/work/pwlib \
-		OPENH323DIR=${WRKDIRPREFIX}${.CURDIR}/../../net/openh323/work/openh323
+MAKE_ENV+=	PWLIBDIR=${WRKDIRPREFIX}${.CURDIR}/../../devel/pwlib152/work/pwlib \
+		OPENH323DIR=${WRKDIRPREFIX}${.CURDIR}/../../net/openh323-112/work/openh323
 THE_MACHTYPE=	${ARCH:S/i386/x86/}
 
 PLIST_FILES=	bin/pstngw
diff -ruN net/asterisk/Makefile.orig net/asterisk/Makefile
--- net/asterisk/Makefile.orig	Sun Jun 19 12:50:39 2005
+++ net/asterisk/Makefile	Fri Jul  1 10:27:14 2005
@@ -37,8 +37,8 @@
 MAKE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}" \
 		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 \
 		OSVERSION=${OSVERSION} \
 		CXX="${CXX}"
 
@@ -55,8 +55,8 @@
 MAKE_ENV+=	WITHOUT_H323=1
 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=""
 .endif
 
diff -ruN net/asterisk-oh323/Makefile.orig net/asterisk-oh323/Makefile
--- net/asterisk-oh323/Makefile.orig	Sat Jun 18 20:19:37 2005
+++ net/asterisk-oh323/Makefile	Fri Jul  1 10:28:24 2005
@@ -14,8 +14,8 @@
 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
@@ -25,8 +25,8 @@
 PLIST_FILES+=	etc/asterisk/oh323.conf.sample
 
 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}"
 
 post-install:
diff -ruN net/callgen/Makefile.orig net/callgen/Makefile
--- net/callgen/Makefile.orig	Mon May 16 02:45:08 2005
+++ net/callgen/Makefile	Fri Jul  1 10:56:30 2005
@@ -14,13 +14,13 @@
 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 -ruN net/cphone/Makefile.orig net/cphone/Makefile
--- net/cphone/Makefile.orig	Mon May 16 02:45:08 2005
+++ net/cphone/Makefile	Fri Jul  1 11:05:28 2005
@@ -15,7 +15,7 @@
 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_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 -ruN net/gatekeeper/Makefile.orig net/gatekeeper/Makefile
--- net/gatekeeper/Makefile.orig	Thu Jun 30 18:11:28 2005
+++ net/gatekeeper/Makefile	Fri Jul  1 11:01:02 2005
@@ -16,7 +16,7 @@
 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 @@
 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 -ruN net/gnomemeeting/Makefile.orig net/gnomemeeting/Makefile
--- net/gnomemeeting/Makefile.orig	Mon May 16 02:45:09 2005
+++ net/gnomemeeting/Makefile	Fri Jul  1 11:02:54 2005
@@ -15,7 +15,7 @@
 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.
@@ -33,15 +33,15 @@
 GNU_CONFIGURE=	YES
 CONFIGURE_ENV=	OSTYPE=${OPSYS} \
 		LIBS="-L${PREFIX}/lib -L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
-		PTLIBDIR=${WRKDIRPREFIX}${.CURDIR}/../../devel/pwlib/work/pwlib \
-		OPENH323DIR=${WRKDIRPREFIX}${.CURDIR}/../openh323/work/openh323 \
+		PTLIBDIR=${WRKDIRPREFIX}${.CURDIR}/../../devel/pwlib152/work/pwlib \
+		OPENH323DIR=${WRKDIRPREFIX}${.CURDIR}/../openh323-112/work/openh323 \
 		SDL_CONFIG=${LOCALBASE}/bin/sdl11-config \
 		CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}"
 
-CONFIGURE_ARGS=	--with-ptlib-includes=${WRKDIRPREFIX}${.CURDIR}/../../devel/pwlib/work/pwlib/include/ptlib \
-		--with-ptlib-libs=${WRKDIRPREFIX}${.CURDIR}/../../devel/pwlib/work/pwlib/lib \
-		--with-openh323-includes=${WRKDIRPREFIX}${.CURDIR}/../openh323/work/openh323/include \
-		--with-openh323-libs=${WRKDIRPREFIX}${.CURDIR}/../openh323/work/openh323/lib \
+CONFIGURE_ARGS=	--with-ptlib-includes=${WRKDIRPREFIX}${.CURDIR}/../../devel/pwlib152/work/pwlib/include/ptlib \
+		--with-ptlib-libs=${WRKDIRPREFIX}${.CURDIR}/../../devel/pwlib152/work/pwlib/lib \
+		--with-openh323-includes=${WRKDIRPREFIX}${.CURDIR}/../openh323-112/work/openh323/include \
+		--with-openh323-libs=${WRKDIRPREFIX}${.CURDIR}/../openh323-112/work/openh323/lib \
 		--with-ldap-includes=${LOCALBASE}/include \
 		--with-openldap-libs=${LOCALBASE}/lib
 GCONF_SCHEMAS=	gnomemeeting.schemas
diff -ruN net/ohphone/Makefile.orig net/ohphone/Makefile
--- net/ohphone/Makefile.orig	Mon May 16 02:45:09 2005
+++ net/ohphone/Makefile	Fri Jul  1 10:57:24 2005
@@ -17,7 +17,7 @@
 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_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 -ruN net/openam/Makefile.orig net/openam/Makefile
--- net/openam/Makefile.orig	Mon May 16 02:45:09 2005
+++ net/openam/Makefile	Fri Jul  1 11:04:40 2005
@@ -17,7 +17,7 @@
 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 @@
 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 -ruN net/opengk/Makefile.orig net/opengk/Makefile
--- net/opengk/Makefile.orig	Mon May 16 02:45:09 2005
+++ net/opengk/Makefile	Fri Jul  1 10:59:29 2005
@@ -17,7 +17,7 @@
 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 @@
 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 -ruN net/openh323-112/Makefile.orig net/openh323-112/Makefile
--- net/openh323-112/Makefile.orig	Fri Jun 10 21:30:34 2005
+++ net/openh323-112/Makefile	Fri Jul  1 10:24:54 2005
@@ -16,7 +16,7 @@
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A H323 Video Conferencing library
 
-BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/devel/pwlib:build
+BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/devel/pwlib152:build
 LIB_DEPENDS=	expat.5:${PORTSDIR}/textproc/expat2
 
 .include <bsd.port.pre.mk>
@@ -40,7 +40,7 @@
 USE_OPENLDAP=	yes
 USE_AUTOCONF_VER=	259
 GNU_CONFIGURE=	yes
-PWLIBDIR!=	cd ${PORTSDIR}/devel/pwlib && make -V WRKSRC
+PWLIBDIR!=	cd ${PORTSDIR}/devel/pwlib152 && make -V WRKSRC
 CONFIGURE_ENV=	PWLIBDIR=${PWLIBDIR} OPENH323DIR=${WRKSRC}
 ALL_TARGET=	optnoshared
 MAKE_ENV=	PWLIBDIR=${PWLIBDIR} OPENH323DIR=${WRKSRC}
@@ -52,9 +52,9 @@
 .if !exists(/usr/include/sys/telephony.h)
 .if !exists(/usr/local/include/sys/telephony.h)
 	# Copy ixj driver include files into OpenH323 include directory
-	${MKDIR} ${WRKDIR}/openh323/include/sys
-	${CP} ${WRKDIRPREFIX}${.CURDIR}/../../comms/ixj/work/ixj_freebsd/telephony.h ${WRKDIR}/openh323/include/sys
-	${CP} ${WRKDIRPREFIX}${.CURDIR}/../../comms/ixj/work/ixj_freebsd/ixjuser.h ${WRKDIR}/openh323/include/sys
+	${MKDIR} ${WRKDIR}/openh323-112/include/sys
+	${CP} ${WRKDIRPREFIX}${.CURDIR}/../../comms/ixj/work/ixj_freebsd/telephony.h ${WRKDIR}/openh323-112/include/sys
+	${CP} ${WRKDIRPREFIX}${.CURDIR}/../../comms/ixj/work/ixj_freebsd/ixjuser.h ${WRKDIR}/openh323-112/include/sys
 .endif
 .endif
 .endif
diff -ruN net/openmcu/Makefile.orig net/openmcu/Makefile
--- net/openmcu/Makefile.orig	Mon May 16 02:45:10 2005
+++ net/openmcu/Makefile	Fri Jul  1 11:00:21 2005
@@ -17,7 +17,7 @@
 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 @@
 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}