This is an initial port of newer versions of:

 - pwlib	->	1.9.2
 - openh323	->	1.17.3

The decission of porting the development releases instead of the stable
releases is based upon a discussion with the openh323 developers.

They serve as a start to be able to porting newer versions of e.g.
gnomemeeting et al.

Further tweaks/improvements to them may be required when other ports
start to use these versions.

Unlike the previous versions of those ports, they install a shared lib
now. So ports which depend upon them in the future should add a RUN_DEPENDS
upon them. Additionally the build time for those ports will decrease,
since they don't need to build pwlib/openh323 each time and grab them
from the build directory.

PR:			83396
Submitted by:		Steve Ames <steve@energistic.com>
In colaboration with:	Steve Ames <steve@energistic.com>

57 files changed, 776 insertions, 947 deletions

diff --git a/devel/pwlib/Makefile b/devel/pwlib/Makefile
index 6e70757bf17d..a49de807aa43 100644
--- a/devel/pwlib/Makefile
+++ b/devel/pwlib/Makefile
@@ -6,39 +6,64 @@
 #
 
 PORTNAME=	pwlib
-PORTVERSION=	1.5.2
-PORTREVISION=	1
+PORTVERSION=	1.9.2
 PORTEPOCH=	1
 CATEGORIES=	devel
-MASTER_SITES=	http://www.openh323.org/bin/ \
-		http://www.de.openh323.org/bin/ \
-		http://www.gnomemeeting.org/downloads/0.98.0/sources/
-DISTNAME=	${PORTNAME}_${PORTVERSION}
+MASTER_SITES=	http://www.voxgratia.org/releases/
+DISTFILES=	pwlib-v1_9_2-src-tar.gz
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A cross platform C++ library, used by OpenH323
 
 LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2
 
-WRKSRC=		${WRKDIR}/${PORTNAME}
+WRKSRC=	${WRKDIR}/pwlib_v1_9_2
 
 USE_BISON=	yes
 USE_GMAKE=	yes
-USE_OPENLDAP=	yes
-USE_AUTOTOOLS=	autoconf:253
-CONFIGURE_ENV=	OSRELEASE=${OSVERSION}
-ALL_TARGET=	optnoshared
-MAKE_ENV=	PWLIBDIR=${WRKDIR}/pwlib
-THE_MACHTYPE=	${ARCH:S/i386/x86/}
-MAKE_ARGS=	OSTYPE=${OPSYS} MACHTYPE=${THE_MACHTYPE} OSRELEASE=${OSVERSION} CPLUS=${CXX}
+USE_AUTOTOOLS=	autoconf:259
+WANT_SDL=	yes
+USE_OPENSSL=	yes
+NO_FILTER_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 502101
-ONLY_FOR_ARCHS=	i386
+# if explicitely asked for, depend upon it
+.if defined(WITH_SDL)
+USE_SDL+=	sdl
+.endif
+
+# if explicitely disabled, do not depend upon it
+.if defined(WITHOUT_SDL)
+CONFIGURE_ARGS+=	--disable-sdl
+.endif
+
+# if nobody cares, use it if it is installed already
+.if !defined(WITHOUT_SDL) && !defined(WITH_SDL)
+.if ${HAVE_SDL:Msdl}
+USE_SDL+=       sdl
+.else
+CONFIGURE_ARGS+=	--disable-sdl
+.endif
+.endif
+
+.if !defined(WITHOUT_PLUGINS)
+CONFIGURE_ARGS+=	--enable-plugins
+.endif
+
+#disable OpenLDAP support in PWLIB
+.if defined(WITHOUT_LDAP)
+CONFIGURE_ARGS+=	--disable-openldap
+.else
+USE_OPENLDAP=	yes
 .endif
 
-do-install:
-#	${INSTALL_PROGRAM} ${WRKSRC}/samples/simple/obj_${OPSYS}_${THE_MACHTYPE}_r/simph323 ${PREFIX}/bin
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" SDLLIBDIR="${LOCALBASE}/lib"
+MAKE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" SDLLIBDIR="${LOCALBASE}/lib" STDCCFLAGS+="-I${LOCALBASE}"
+
+#.if ${OSVERSION} < 502101
+#ONLY_FOR_ARCHS=	i386
+#.endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/pwlib/distinfo b/devel/pwlib/distinfo
index de6a60038a6b..53ed50a2345d 100644
--- a/devel/pwlib/distinfo
+++ b/devel/pwlib/distinfo
@@ -1,3 +1,3 @@
-MD5 (pwlib_1.5.2.tar.gz) = 0fa33ba1b32b254abe0b731a52c0f2f9
-SHA256 (pwlib_1.5.2.tar.gz) = 62b254548ad7a9e71231a160275827d67ff39022ee8e2854a7c9d9fe9a688e65
-SIZE (pwlib_1.5.2.tar.gz) = 1085203
+MD5 (pwlib-v1_9_2-src-tar.gz) = 7135533e23747050bc218cac6edc764d
+SHA256 (pwlib-v1_9_2-src-tar.gz) = 03131bd6f40f59ec3d9e1675f5aa20714e30e0e1505804a224f9b6be78a8f896
+SIZE (pwlib-v1_9_2-src-tar.gz) = 2060667
diff --git a/devel/pwlib/files/patch-configureac b/devel/pwlib/files/patch-configureac
new file mode 100644
index 000000000000..d923f281db17
--- /dev/null
+++ b/devel/pwlib/files/patch-configureac
@@ -0,0 +1,154 @@
+--- configure.ac.orig	Wed Feb  1 14:52:36 2006
++++ configure.ac	Wed Feb  1 15:04:55 2006
+@@ -136,7 +136,7 @@
+    x86 | i686 | i586 | i486 | i386 ) MACHTYPE=x86
+                    ;;
+ 
+-   x86_64)	   MACHTYPE=x86_64 ;
++   x86_64|amd64)   MACHTYPE=x86_64 ;
+ 		   P_64BIT=1 ;
+                    LIB64=1 ;
+ 		   ;;
+@@ -276,7 +276,7 @@
+ 
+ AC_MSG_CHECKING(if linker accepts -Wreorder)
+ AC_LANG_CONFTEST([[int main(int ac,char **av) { return 0; }]])
+-$STDCXX $CXXFLAGS -Wreorder conftest.cc > /dev/null 2>&1
++$CXX $CXXFLAGS -Wreorder conftest.cc > /dev/null 2>&1
+ if test $? = 0 ; then
+   AC_MSG_RESULT(yes)
+   STDCXXFLAGS="$STDCXXFLAGS -Wreorder"
+@@ -289,7 +289,7 @@
+ # $CXX $CFLAGS -Woverloaded-virtual conftest.cc > /dev/null 2>&1
+ # if test $? = 0 ; then
+ #   AC_MSG_RESULT(yes)
+-#   STDCCFLAGS="$STDCCFLAGS -Woverloaded-virtual"
++#   STDCXXFLAGS="$STDCCFLAGS -Woverloaded-virtual"
+ # else
+ #   AC_MSG_RESULT(no)
+ # fi
+@@ -318,7 +318,7 @@
+   AC_MSG_RESULT(yes)
+ else
+   AC_MSG_RESULT(no)
+-  STDCXXFLAGS="$STDCCFLAGS -rtti"
++  STDCXXFLAGS="$STDCXXFLAGS -rtti"
+ fi
+ 
+ GCSECTIONS=0
+@@ -339,7 +339,7 @@
+   $CXX $CFLAGS -ffunction-sections -c conftest.cc > /dev/null 2>&1
+   if test $? = 0 ; then
+     AC_MSG_RESULT(yes)
+-    STDCCFLAGS="$STDCCFLAGS -ffunction-sections"
++    STDCXXFLAGS="$STDCXXFLAGS -ffunction-sections"
+     GCSECTIONS=1
+   else
+     AC_MSG_RESULT(no)
+@@ -355,7 +355,7 @@
+   dnl $CXX $CFLAGS -fdata-sections -c conftest.cc > /dev/null 2>&1
+   dnl if test $? = 0 ; then
+   dnl   AC_MSG_RESULT(yes)
+-  dnl   STDCCFLAGS="$STDCCFLAGS -fdata-sections"
++  dnl   STDCXXFLAGS="$STDCXXFLAGS -fdata-sections"
+   dnl   GCSECTIONS=1
+   dnl else
+   dnl   AC_MSG_RESULT(no)
+@@ -368,7 +368,7 @@
+   dnl $CXX $CFLAGS -fvtable-gc -c conftest.cc > /dev/null 2>&1
+   dnl if test $? = 0 ; then
+   dnl   AC_MSG_RESULT(yes)
+-  dnl   STDCCFLAGS="$STDCCFLAGS -fvtable-gc"
++  dnl   STDCXXFLAGS="$STDCXXFLAGS -fvtable-gc"
+   dnl   GCSECTIONS=1
+   dnl else
+   dnl   AC_MSG_RESULT(no)
+@@ -687,18 +687,18 @@
+ dnl MSWIN_DISPLAY semaphore,Semaphore Support
+ dnl MSWIN_DEFINE  semaphore,P_HAS_SEMAPHORES
+ 
+-dnl Linux, Mac OS X use libpthread and -lpthread
+-dnl FreeBSD uses the -pthread compiler option and uses libc_r
++dnl FreeBSD >= 5.x, Linux, Mac OS X use libpthread and -lpthread
++dnl FreeBSD < 5.x uses the -pthread compiler option and uses libc_r
+ 
+ AC_CHECK_LIB(pthread, pthread_create, HAS_PTHREADS=yes, HAS_PTHREADS=no)
+ if test ${HAS_PTHREADS} = yes ; then
+-  ENDLDLIBS="$ENDLDLIBS -lpthread"
+-  STDCCFLAGS="$STDCCFLAGS -D_REENTRANT"
++  ENDLDLIBS="$ENDLDLIBS ${PTHREAD_LIBS}"
++  STDCCFLAGS="$STDCCFLAGS -D_REENTRANT ${PTHREAD_LIBS}"
+ else
+   if test ${OSTYPE} = FreeBSD ; then
+     HAS_PTHREADS=yes
+-    ENDLDLIBS="$ENDLDLIBS -pthread"
+-    STDCCFLAGS="$STDCCFLAGS -D_REENTRANT -pthread"
++    ENDLDLIBS="$ENDLDLIBS ${PTHREAD_LIBS}"
++    STDCCFLAGS="$STDCCFLAGS -D_REENTRANT ${PTHREAD_LIBS}"
+   fi
+ fi
+ 
+@@ -1251,7 +1251,7 @@
+ else
+   AC_CHECK_HEADERS(expat.h, HAS_EXPAT=1)
+   if test "${HAS_EXPAT:-unset}" != "unset" ; then
+-    AC_CHECK_LIB(expat, XML_ParserCreate, HAS_EXPAT=1, HAS_EXPAT=)
++    AC_SEARCH_LIBS(XML_ParserCreate, expat, HAS_EXPAT=1, HAS_EXPAT=)
+   else
+     AC_CHECK_FILE(/usr/local/include/expat.h, HAS_EXPAT=1)
+     if test "${HAS_EXPAT:-unset}" != "unset" ; then
+@@ -1426,7 +1426,8 @@
+   if test $HAS_IPV6 = no ; then
+     AC_MSG_RESULT(no)
+   else
+-    AC_TRY_COMPILE([#include <sys/socket.h>
++    AC_TRY_COMPILE([#include <stddef.h>
++		     #include <sys/socket.h>
+                      #include <netdb.h>],
+                      [getnameinfo(NULL, 0, NULL, 0, NULL, 0, 0);], HAS_IPV6=yes, HAS_IPV6=no)
+     if test $HAS_IPV6 = no ; then
+@@ -1499,9 +1500,9 @@
+     AC_CHECK_LIB(SDL, SDL_CreateYUVOverlay, HAS_SDL=1, HAS_SDL=, -L${X11LIBDIR} -lpthread -lX11 -lXext -laa)
+   fi
+ 
+-  dnl freeBSD SDL check
++  dnl FreeBSD SDL check
+   if test "${HAS_SDL:-unset}" = "unset" ; then
+-    AC_CHECK_FILE(/usr/local/include/SDL11/SDL.h, HAS_SDL=1)
++    AC_CHECK_FILE(SDL11/SDL.h, HAS_SDL=1)
+     if test "${HAS_SDL:-unset}" != "unset" ; then
+       SDLLIB=SDL-1.1
+     fi
+@@ -1525,7 +1526,7 @@
+ dnl ########################################################################
+ dnl check for video capture support.
+ dnl videodev.h on linux
+-dnl machine/ioctl_meteor on FreeBSD
++dnl machine/ioctl_meteor or dev/bktr/ioctl_meteor.h on FreeBSD
+ dnl i386/ioctl_meteor on OpenBSD
+ dnl dev/ic/bt8xx on NetBSD
+ 
+@@ -1551,9 +1552,10 @@
+     HAS_VIDEO_CAPTURE=1
+   else
+     AC_CHECK_HEADER(linux/videodev.h, HAS_VIDEO_CAPTURE=1)
+-    dnl AC_CHECK_HEADER(machine/ioctl_meteor.h, HAS_VIDEO_CAPTURE=1)
+-    dnl AC_CHECK_HEADER(i386/ioctl_meteor.h, HAS_VIDEO_CAPTURE=1)
+-    dnl AC_CHECK_HEADER(dev/ic/bt8xx.h, HAS_VIDEO_CAPTURE=1)
++    AC_CHECK_HEADER(machine/ioctl_meteor.h, HAS_VIDEO_CAPTURE=1)
++    AC_CHECK_HEADER(dev/bktr/ioctl_meteor.h, HAS_VIDEO_CAPTURE=1)
++    AC_CHECK_HEADER(i386/ioctl_meteor.h, HAS_VIDEO_CAPTURE=1)
++    AC_CHECK_HEADER(dev/ic/bt8xx.h, HAS_VIDEO_CAPTURE=1)
+     if test "${HAS_VIDEO_CAPTURE}z" = "z" ; then
+       AC_MSG_NOTICE(No Video Capture support)
+       AC_DEFINE([NO_VIDEO_CAPTURE], [], [No video capture])
+@@ -2044,6 +2046,9 @@
+   AC_MSG_NOTICE(C++ exceptions enabled)
+   STDCCFLAGS="$STDCCFLAGS -fno-exceptions"
+ fi
++
++STDCCFLAGS="$CPPFLAGS $STDCCFLAGS"
++STDCXXFLAGS="$CPPFLAGS $STDCXXFLAGS"
+ 
+ dnl ########################################################################
+ dnl final declarations
diff --git a/devel/pwlib/files/patch-configurein b/devel/pwlib/files/patch-configurein
deleted file mode 100644
index 80c8ec813e73..000000000000
--- a/devel/pwlib/files/patch-configurein
+++ /dev/null
@@ -1,26 +0,0 @@
---- configure.in.orig	Thu May 22 05:19:16 2003
-+++ configure.in	Sun Feb 15 23:57:20 2004
-@@ -39,7 +39,7 @@
-                    STDCCFLAGS="-DP_LINUX=$OSRELEASE" ;;
- 
-   freebsd* )       OSTYPE=FreeBSD ;
--                   OSRELEASE=`sysctl -n kern.osreldate` ;
-+## use enviroment variable  OSRELEASE=`sysctl -n kern.osreldate` ;
-                    STDCCFLAGS="-DP_FREEBSD=$OSRELEASE" ;;
- 
-   openbsd* )       OSTYPE=OpenBSD ;
-@@ -452,12 +452,13 @@
- dnl ########################################################################
- dnl check for video capture support.
- dnl videodev.h on linux
--dnl machine/ioctl_meteor on FreeBSD
-+dnl dev/bktr/ioctl_meteor or machine/ioctl_meteor on FreeBSD
- dnl i386/ioctl_meteor on OpenBSD
- dnl dev/ic/bt8xx on NetBSD
- 
- HAS_VIDEO_CAPTURE=no
- AC_CHECK_HEADER(linux/videodev.h, HAS_VIDEO_CAPTURE=yes)
-+AC_CHECK_HEADER(dev/bktr/ioctl_meteor.h, HAS_VIDEO_CAPTURE=yes)
- AC_CHECK_HEADER(machine/ioctl_meteor.h, HAS_VIDEO_CAPTURE=yes)
- AC_CHECK_HEADER(i386/ioctl_meteor.h, HAS_VIDEO_CAPTURE=yes)
- AC_CHECK_HEADER(dev/ic/bt8xx.h, HAS_VIDEO_CAPTURE=yes)
diff --git a/devel/pwlib/files/patch-make-common.mak b/devel/pwlib/files/patch-make-common.mak
deleted file mode 100644
index 44f8b75a64d4..000000000000
--- a/devel/pwlib/files/patch-make-common.mak
+++ /dev/null
@@ -1,19 +0,0 @@
-*** make/common.mak.orig	Tue Jul 29 11:25:23 2003
---- make/common.mak	Wed Jun  8 16:50:19 2005
-***************
-*** 262,268 ****
-  endif
-  
-  ifneq ($(P_SHAREDLIB),1)
-! LDFLAGS += -static
-  endif
-  
-  #  clean whitespace out of source file list
---- 262,268 ----
-  endif
-  
-  ifneq ($(P_SHAREDLIB),1)
-! #LDFLAGS += -static
-  endif
-  
-  #  clean whitespace out of source file list
diff --git a/devel/pwlib/files/patch-makefile b/devel/pwlib/files/patch-makefile
deleted file mode 100644
index 1f7ea0dfcc56..000000000000
--- a/devel/pwlib/files/patch-makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-*** src/ptlib/unix/Makefile.orig	Tue Dec  2 11:15:55 2003
---- src/ptlib/unix/Makefile	Tue Dec  2 11:16:39 2003
-*************** VIDEO_CAPTURE_SOURCE = video4linux.cxx
-*** 422,428 ****
---- 422,430 ----
-  endif
-  
-  ifeq ($(OSTYPE),FreeBSD)
-+ ifneq (,$(wildcard $(SYSINCDIR)/dev/bktr/ioctl_meteor.h $(SYSINCDIR)/machine/ioctl_meteor.h))
-  VIDEO_CAPTURE_SOURCE = video4bsd.cxx
-+ endif
-  endif
-  
-  ifeq ($(OSTYPE),OpenBSD)
diff --git a/devel/pwlib/files/patch-src-ptclib-ansper.cxx b/devel/pwlib/files/patch-src-ptclib-ansper.cxx
deleted file mode 100644
index 27f09e7b8870..000000000000
--- a/devel/pwlib/files/patch-src-ptclib-ansper.cxx
+++ /dev/null
@@ -1,56 +0,0 @@
---- src/ptclib/asnper.cxx	Fri Aug  1 02:11:38 2003
-+++ src/ptclib/asnper.cxx	Fri Jun  3 14:32:55 2005
-@@ -1224,6 +1224,11 @@
-     return -1;
- 
-   value += lower;
-+
-+  // clamp value to upper limit
-+  if (value > upper)
-+    value = upper;
-+
-   return 0;
- }
- 
-@@ -1268,7 +1273,14 @@
-     unsigned base;
-     if (!MultiBitDecode(CountBits(upper - lower + 1), base))
-       return -1;
--    return lower + base;   // 10.9.4.1
-+    len = lower + base;   // 10.9.4.1
-+
-+    // clamp value to upper limit
-+    if (len > upper)
-+      len = upper;
-+
-+    return len;
-+
-   }
- 
-   if (upper < 65536)  // 10.9.3.3
-@@ -1279,13 +1291,20 @@
-   if (IsAtEnd())
-     return -1;
- 
--  if (SingleBitDecode() == 0)
--    return MultiBitDecode(7, len) ? 0 : -1;   // 10.9.3.6
-+  if (SingleBitDecode() == 0) {
-+    if (!MultiBitDecode(7, len))   // 10.9.3.6
-+      return -1;                // 10.9.3.8 unsupported
-+  }
-+  else if (SingleBitDecode() == 0) {
-+    if (!MultiBitDecode(14, len))    // 10.9.3.7
-+      return -1;  // 10.9.3.8 unsupported
-+  }
- 
--  if (SingleBitDecode() == 0)
--    return MultiBitDecode(14, len) ? 0 : -1;    // 10.9.3.7
-+  // clamp value to upper limit
-+  if (len > upper)
-+    len = upper;
- 
--  return -1;  // 10.9.3.8 unsupported
-+  return 0;
- }
- 
- 
diff --git a/devel/pwlib/files/patch-src_ptlib_common_getdate.y b/devel/pwlib/files/patch-src_ptlib_common_getdate.y
deleted file mode 100644
index b4cd1ac38b9b..000000000000
--- a/devel/pwlib/files/patch-src_ptlib_common_getdate.y
+++ /dev/null
@@ -1,7 +0,0 @@
---- src/ptlib/common/getdate.y.orig	Fri Jan 24 21:21:06 2003
-+++ src/ptlib/common/getdate.y	Sun May 15 14:41:11 2005
-@@ -1,3 +1,4 @@
-+%pure-parser
- %{
- /*
- **  Originally written by Steven M. Bellovin <smb@research.att.com> while
diff --git a/devel/pwlib/files/patch-unix b/devel/pwlib/files/patch-unix
deleted file mode 100644
index 945ad223fb83..000000000000
--- a/devel/pwlib/files/patch-unix
+++ /dev/null
@@ -1,70 +0,0 @@
-*** make/unix.mak.orig	Thu Jul 24 22:01:42 2003
---- make/unix.mak	Fri Jun  3 15:13:47 2005
-***************
-*** 358,368 ****
-  
-  ifeq ($(OSTYPE),FreeBSD)
-  
-! ifeq ($(MACHTYPE),x86)
-! ifdef CPUTYPE
-! STDCCFLAGS	+= -mcpu=$(CPUTYPE)
-! endif
-! endif
-  
-  ifndef OSRELEASE
-  OSRELEASE	:= $(shell sysctl -n kern.osreldate)
---- 358,368 ----
-  
-  ifeq ($(OSTYPE),FreeBSD)
-  
-! #ifeq ($(MACHTYPE),x86)
-! #ifdef CPUTYPE
-! #STDCCFLAGS	+= -mcpu=$(CPUTYPE)
-! #endif
-! #endif
-  
-  ifndef OSRELEASE
-  OSRELEASE	:= $(shell sysctl -n kern.osreldate)
-***************
-*** 891,901 ****
-  
-  # Directories
-  
-! ifdef PREFIX
-! UNIX_INC_DIR	= $(PREFIX)/include/ptlib/unix
-! else
-  UNIX_INC_DIR	= $(PWLIBDIR)/include/ptlib/unix
-! endif
-  
-  ifndef UNIX_SRC_DIR
-  UNIX_SRC_DIR	= $(PWLIBDIR)/src/ptlib/unix
---- 891,901 ----
-  
-  # Directories
-  
-! ##ifdef PREFIX
-! ##UNIX_INC_DIR	= $(PREFIX)/include/ptlib/unix
-! ##else
-  UNIX_INC_DIR	= $(PWLIBDIR)/include/ptlib/unix
-! ##endif
-  
-  ifndef UNIX_SRC_DIR
-  UNIX_SRC_DIR	= $(PWLIBDIR)/src/ptlib/unix
-***************
-*** 932,938 ****
-  else
-  
-  ifneq ($(OSTYPE),Darwin)
-!   OPTCCFLAGS	+= -Os -DNDEBUG
-  else
-    OPTCCFLAGS	+= -O2 -DNDEBUG
-  endif
---- 932,939 ----
-  else
-  
-  ifneq ($(OSTYPE),Darwin)
-! #  OPTCCFLAGS	+= -Os -DNDEBUG
-!   OPTCCFLAGS	+= -DNDEBUG
-  else
-    OPTCCFLAGS	+= -O2 -DNDEBUG
-  endif
diff --git a/devel/pwlib/files/patch-videoio b/devel/pwlib/files/patch-videoio
deleted file mode 100644
index 7e86b99f5bca..000000000000
--- a/devel/pwlib/files/patch-videoio
+++ /dev/null
@@ -1,26 +0,0 @@
---- include/ptlib/unix/ptlib/videoio.h.orig	Mon Jan  6 10:41:08 2003
-+++ include/ptlib/unix/ptlib/videoio.h	Sun Feb 15 23:42:39 2004
-@@ -106,9 +106,13 @@
- #include <linux/videodev.h>     /* change this to "videodev2.h" for v4l2 */
- #endif
- 
--#if defined(P_FREEBSD)
-+#if defined(P_FREEBSD) && !defined(NO_VIDEO_CAPTURE)
-+#if P_FREEBSD >= 502101
-+#include <dev/bktr/ioctl_meteor.h>
-+#else
- #include <machine/ioctl_meteor.h>
- #endif
-+#endif
- 
- #if defined(P_OPENBSD) || defined(P_NETBSD)
- #if P_OPENBSD >= 200105
-@@ -186,7 +190,7 @@
-     struct video_mmap frameBuffer[2];
- #endif
- 
--#if defined(P_FREEBSD) || defined(P_OPENBSD) || defined(P_NETBSD)
-+#if (defined(P_FREEBSD) || defined(P_OPENBSD) || defined(P_NETBSD)) && !defined(NO_VIDEO_CAPTURE)
-     struct video_capability
-     {
-         int channels;   /* Num channels */
diff --git a/devel/pwlib/pkg-descr b/devel/pwlib/pkg-descr
index df064540dc9a..c6a71d32ca39 100644
--- a/devel/pwlib/pkg-descr
+++ b/devel/pwlib/pkg-descr
@@ -4,9 +4,4 @@ and a few other Unix variants. It was developed by Equivalence Ltd Pty.
 
 It is used by the OpenH323 library.
 
-NOTE: This port does not install anything.
-The ports which use pwlib all look inside their local
-pwlib port directory for the library and header files
-and are compiled statically.
-
 WWW: http://www.openh323.org/
diff --git a/devel/pwlib/pkg-plist b/devel/pwlib/pkg-plist
index 549a621fec0c..9dc43c630b91 100644
--- a/devel/pwlib/pkg-plist
+++ b/devel/pwlib/pkg-plist
@@ -1 +1,180 @@
-@comment this plist intentionally left empty
+bin/ptlib-config
+include/ptbuildopts.h
+include/ptclib/asnber.h
+include/ptclib/asner.h
+include/ptclib/asnper.h
+include/ptclib/asnxer.h
+include/ptclib/cypher.h
+include/ptclib/delaychan.h
+include/ptclib/dtmf.h
+include/ptclib/enum.h
+include/ptclib/ftp.h
+include/ptclib/html.h
+include/ptclib/http.h
+include/ptclib/httpform.h
+include/ptclib/httpsvc.h
+include/ptclib/inetmail.h
+include/ptclib/inetprot.h
+include/ptclib/ipacl.h
+include/ptclib/memfile.h
+include/ptclib/mime.h
+include/ptclib/modem.h
+include/ptclib/pasn.h
+include/ptclib/pdns.h
+include/ptclib/pils.h
+include/ptclib/pldap.h
+include/ptclib/pnat.h
+include/ptclib/psasl.h
+include/ptclib/psnmp.h
+include/ptclib/psoap.h
+include/ptclib/pssl.h
+include/ptclib/pstun.h
+include/ptclib/ptts.h
+include/ptclib/pwavfile.h
+include/ptclib/pxml.h
+include/ptclib/pxmlrpc.h
+include/ptclib/pxmlrpcs.h
+include/ptclib/qchannel.h
+include/ptclib/random.h
+include/ptclib/shttpsvc.h
+include/ptclib/sockagg.h
+include/ptclib/socks.h
+include/ptclib/telnet.h
+include/ptclib/url.h
+include/ptclib/vsdl.h
+include/ptclib/vxml.h
+include/ptclib/xmpp.h
+include/ptclib/xmpp_c2s.h
+include/ptclib/xmpp_muc.h
+include/ptclib/xmpp_roster.h
+@dirrm include/ptclib
+include/ptlib.h
+include/ptlib/MacMainIf.h
+include/ptlib/args.h
+include/ptlib/array.h
+include/ptlib/channel.h
+include/ptlib/conchan.h
+include/ptlib/config.h
+include/ptlib/contain.h
+include/ptlib/contain.inl
+include/ptlib/critsec.h
+include/ptlib/dict.h
+include/ptlib/dynalink.h
+include/ptlib/ethsock.h
+include/ptlib/file.h
+include/ptlib/filepath.h
+include/ptlib/icmpsock.h
+include/ptlib/indchan.h
+include/ptlib/int64.h
+include/ptlib/ipdsock.h
+include/ptlib/ipsock.h
+include/ptlib/ipxsock.h
+include/ptlib/lists.h
+include/ptlib/mail.h
+include/ptlib/mutex.h
+include/ptlib/notifier.h
+include/ptlib/notifier_ext.h
+include/ptlib/object.h
+include/ptlib/osutil.inl
+include/ptlib/pdirect.h
+include/ptlib/pfactory.h
+include/ptlib/pipechan.h
+include/ptlib/plugin.h
+include/ptlib/pluginmgr.h
+include/ptlib/pprocess.h
+include/ptlib/psharedptr.h
+include/ptlib/pstring.h
+include/ptlib/psync.h
+include/ptlib/ptime.h
+include/ptlib/qos.h
+include/ptlib/remconn.h
+include/ptlib/safecoll.h
+include/ptlib/semaphor.h
+include/ptlib/serchan.h
+include/ptlib/sfile.h
+include/ptlib/smartptr.h
+include/ptlib/socket.h
+include/ptlib/sockets.h
+include/ptlib/sound.h
+include/ptlib/spxsock.h
+include/ptlib/svcproc.h
+include/ptlib/syncpoint.h
+include/ptlib/syncthrd.h
+include/ptlib/tcpsock.h
+include/ptlib/textfile.h
+include/ptlib/thread.h
+include/ptlib/timeint.h
+include/ptlib/timer.h
+include/ptlib/udpsock.h
+include/ptlib/unix/ptlib/beaudio.h
+include/ptlib/unix/ptlib/bevideo.h
+include/ptlib/unix/ptlib/channel.h
+include/ptlib/unix/ptlib/conchan.h
+include/ptlib/unix/ptlib/config.h
+include/ptlib/unix/ptlib/contain.h
+include/ptlib/unix/ptlib/critsec.h
+include/ptlib/unix/ptlib/dynalink.h
+include/ptlib/unix/ptlib/ethsock.h
+include/ptlib/unix/ptlib/file.h
+include/ptlib/unix/ptlib/filepath.h
+include/ptlib/unix/ptlib/icmpsock.h
+include/ptlib/unix/ptlib/ipdsock.h
+include/ptlib/unix/ptlib/ipsock.h
+include/ptlib/unix/ptlib/maccoreaudio.h
+include/ptlib/unix/ptlib/mutex.h
+include/ptlib/unix/ptlib/pdirect.h
+include/ptlib/unix/ptlib/pipechan.h
+include/ptlib/unix/ptlib/pmachdep.h
+include/ptlib/unix/ptlib/pprocess.h
+include/ptlib/unix/ptlib/ptime.h
+include/ptlib/unix/ptlib/ptlib.inl
+include/ptlib/unix/ptlib/remconn.h
+include/ptlib/unix/ptlib/resampler.h
+include/ptlib/unix/ptlib/semaphor.h
+include/ptlib/unix/ptlib/serchan.h
+include/ptlib/unix/ptlib/sfile.h
+include/ptlib/unix/ptlib/socket.h
+include/ptlib/unix/ptlib/sound.h
+include/ptlib/unix/ptlib/svcproc.h
+include/ptlib/unix/ptlib/syncpoint.h
+include/ptlib/unix/ptlib/tcpsock.h
+include/ptlib/unix/ptlib/textfile.h
+include/ptlib/unix/ptlib/thread.h
+include/ptlib/unix/ptlib/timeint.h
+include/ptlib/unix/ptlib/timer.h
+include/ptlib/unix/ptlib/udpsock.h
+include/ptlib/unix/ptlib/video.h
+include/ptlib/unix/ptlib/videoio.h
+@dirrm include/ptlib/unix/ptlib
+@dirrm include/ptlib/unix
+include/ptlib/vconvert.h
+include/ptlib/video.h
+include/ptlib/videoio.h
+include/ptlib/videoio1394dc.h
+@dirrm include/ptlib
+lib/libpt.so
+lib/libpt_FreeBSD_x86_r.so
+lib/libpt_FreeBSD_x86_r.so.1
+lib/libpt_FreeBSD_x86_r.so.1.9
+lib/libpt_FreeBSD_x86_r.so.1.9.2
+lib/pwlib/devices/sound/oss_pwplugin.so
+lib/pwlib/devices/videoinput/bsdvideo_pwplugin.so
+@dirrm lib/pwlib/devices/sound
+@dirrm lib/pwlib/devices/videoinput
+@dirrm lib/pwlib/devices
+@dirrm lib/pwlib
+%%DATADIR%%/make/common.mak
+%%DATADIR%%/make/defaultgui.mak
+%%DATADIR%%/make/gui.mak
+%%DATADIR%%/make/lib.mak
+%%DATADIR%%/make/motif.mak
+%%DATADIR%%/make/plugins.mak
+%%DATADIR%%/make/ptbuildopts.mak
+%%DATADIR%%/make/ptlib-config
+%%DATADIR%%/make/ptlib.mak
+%%DATADIR%%/make/pwlib.mak
+%%DATADIR%%/make/qt.mak
+%%DATADIR%%/make/unix.mak
+%%DATADIR%%/make/xlib.mak
+@dirrm %%DATADIR%%/make
+@dirrm %%DATADIR%%
diff --git a/net/opal/Makefile b/net/opal/Makefile
index 5dbdfe458cfa..e0500c9efd6b 100644
--- a/net/opal/Makefile
+++ b/net/opal/Makefile
@@ -6,61 +6,29 @@
 #
 
 PORTNAME=	openh323
-PORTVERSION=	1.12.2
-PORTREVISION=	1
+PORTVERSION=	1.17.3
 CATEGORIES=	net
-MASTER_SITES=	http://www.openh323.org/bin/ \
-		http://www.de.openh323.org/bin/ \
-		http://www.gnomemeeting.org/downloads/0.98.0/sources/
-DISTNAME=	${PORTNAME}_${PORTVERSION}
+MASTER_SITES=	http://www.voxgratia.org/releases/
+DISTFILES=	openh323-v1_17_3-src-tar.gz
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A H323 Video Conferencing library
 
-BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/devel/pwlib:build
-LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2 \
+		pt_FreeBSD_x86_r.1:${PORTSDIR}/devel/pwlib
 
-.include <bsd.port.pre.mk>
-.if ${OSVERSION} < 500000
-# Check for telephony.h in the two places the source is hard coded to check
-# /usr/include/sys and /usr/local/include/sys
-# If it is not present, extract it from the comms/ixj port
-.if !exists(/usr/include/sys/telephony.h)
-.if !exists(/usr/local/include/sys/telephony.h)
-PATCH_DEPENDS+=	${NONEXISTENT}:${PORTSDIR}/comms/ixj:patch
-.endif
-.endif
-.endif
+WRKSRC=	${WRKDIR}/openh323_v1_17_3
 
-WRKSRC=		${WRKDIR}/${PORTNAME}
-
-PLIST_FILES=	bin/simph323
 USE_BISON=	yes
-
 USE_GMAKE=	yes
 USE_OPENLDAP=	yes
-USE_AUTOTOOLS=	autoconf:259 autoconf:253:env
+USE_AUTOTOOLS=	autoconf:259
 GNU_CONFIGURE=	yes
-PWLIBDIR!=	cd ${PORTSDIR}/devel/pwlib && make -V WRKSRC
-CONFIGURE_ENV=	PWLIBDIR=${PWLIBDIR} OPENH323DIR=${WRKSRC}
-ALL_TARGET=	optnoshared
-MAKE_ENV=	PWLIBDIR=${PWLIBDIR} OPENH323DIR=${WRKSRC}
-THE_MACHTYPE=	${ARCH:S/i386/x86/}
-MAKE_ARGS=	OSTYPE=${OPSYS} MACHTYPE=${THE_MACHTYPE} OSRELEASE=${OSVERSION} CPLUS=${CXX}
-
-post-patch:
-.if ${OSVERSION} < 500000
-.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
-.endif
-.endif
-.endif
+INSTALLS_SHLIB=	yes
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/samples/simple/obj_${OPSYS}_${THE_MACHTYPE}_r/simph323 ${PREFIX}/bin
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -I${WRKSRC}/include" LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" BUILDTIME="YES"
+NO_FILTER_SHLIBS=	yes
+ALL_TARGET=	optshared
+MAKE_ENV=	BUILDTIME="YES"
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/opal/distinfo b/net/opal/distinfo
index e42058e4b966..59d1d8ae9281 100644
--- a/net/opal/distinfo
+++ b/net/opal/distinfo
@@ -1,3 +1,3 @@
-MD5 (openh323_1.12.2.tar.gz) = 15f0b12b60769d03eca9e498050776f3
-SHA256 (openh323_1.12.2.tar.gz) = 683efdae1d501c4294521d6c457b7152f20cfa5faf8c9b46e2899e1caa4aa305
-SIZE (openh323_1.12.2.tar.gz) = 2343354
+MD5 (openh323-v1_17_3-src-tar.gz) = 6797f1c04aaeb3b6a43aebd70b5e8b5d
+SHA256 (openh323-v1_17_3-src-tar.gz) = 625bb7b6ba19638a037e7f231523bdeff0eccc4ae71abaed7700b3bc8dd47e67
+SIZE (openh323-v1_17_3-src-tar.gz) = 3745141
diff --git a/net/opal/files/patch-configurein b/net/opal/files/patch-configurein
deleted file mode 100644
index 28578a9c1175..000000000000
--- a/net/opal/files/patch-configurein
+++ /dev/null
@@ -1,19 +0,0 @@
-*** configure.in.orig	Mon Jun  6 14:34:14 2005
---- configure.in	Mon Jun  6 14:41:03 2005
-***************
-*** 109,115 ****
-  if test "${H323_AVCODEC:-unset}" != "unset" ; then
-    AC_SUBST(H323_AVCODEC, 1)
-    AC_DEFINE(H323_AVCODEC, 1, "ffmpeg based avodec found")
-!   AVCODECINCLUDEDIR=/usr/local/include/ffmpeg
-    AVCODECLIBDIR=/usr/local/lib
-    STDCCFLAGS="$STDCCFLAGS -I${AVCODECINCLUDEDIR}"
-  
---- 109,115 ----
-  if test "${H323_AVCODEC:-unset}" != "unset" ; then
-    AC_SUBST(H323_AVCODEC, 1)
-    AC_DEFINE(H323_AVCODEC, 1, "ffmpeg based avodec found")
-!   AVCODECINCLUDEDIR=/usr/local/include
-    AVCODECLIBDIR=/usr/local/lib
-    STDCCFLAGS="$STDCCFLAGS -I${AVCODECINCLUDEDIR}"
-  
diff --git a/net/opal/files/patch-include-ffh263codec.h b/net/opal/files/patch-include-ffh263codec.h
deleted file mode 100644
index 4329c3f7ef76..000000000000
--- a/net/opal/files/patch-include-ffh263codec.h
+++ /dev/null
@@ -1,12 +0,0 @@
-*** include/ffh263codec.h.orig	Mon Aug  4 00:03:16 2003
---- include/ffh263codec.h	Mon Jun  6 14:54:31 2005
-***************
-*** 96,101 ****
---- 96,102 ----
-  struct AVCodec;
-  struct AVCodecContext;
-  struct AVFrame;
-+ struct AVCodecParserContext;
-   
-  ///////////////////////////////////////////////////////////////////////////////
-  
diff --git a/net/opal/files/patch-include-h263codec.h b/net/opal/files/patch-include-h263codec.h
deleted file mode 100644
index de0bf299f3bd..000000000000
--- a/net/opal/files/patch-include-h263codec.h
+++ /dev/null
@@ -1,19 +0,0 @@
-*** include/h263codec.h.orig	Mon Aug  4 00:03:22 2003
---- include/h263codec.h	Mon Jun  6 14:57:16 2005
-***************
-*** 426,432 ****
-         send. Note that for every encode thread, this 1 method is called. Consequently, 
-         code is required to separate out packets from different encode threads.
-      */
-!     static void RtpCallback(void *data, int size, int packetNumber);
-  
-    protected:
-      BOOL Resize(int width, int height);
---- 426,432 ----
-         send. Note that for every encode thread, this 1 method is called. Consequently, 
-         code is required to separate out packets from different encode threads.
-      */
-!     static void RtpCallback(AVCodecContext *s, void *data, int size, int packet Number);
-  
-    protected:
-      BOOL Resize(int width, int height);
diff --git a/net/opal/files/patch-include::gkserver.h b/net/opal/files/patch-include::gkserver.h
deleted file mode 100644
index cdc0ba88ce08..000000000000
--- a/net/opal/files/patch-include::gkserver.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- include/gkserver.h	2004/08/28 17:16:13	1.1
-+++ include/gkserver.h	2004/08/28 17:16:24
-@@ -404,7 +404,6 @@
-     H225_RegistrationConfirm & rcf;
-     H225_RegistrationReject  & rrj;
- 
--  protected:
-     virtual Response OnHandlePDU();
- };
- 
diff --git a/net/opal/files/patch-ixjlid b/net/opal/files/patch-ixjlid
deleted file mode 100644
index faec5f30ea6b..000000000000
--- a/net/opal/files/patch-ixjlid
+++ /dev/null
@@ -1,21 +0,0 @@
-*** include/ixjlid.h.orig	Tue Sep  2 17:32:20 2003
---- include/ixjlid.h	Tue Sep  2 17:32:37 2003
-***************
-*** 253,260 ****
-  #include <linux/ixjuser.h>
-  #endif
-  #ifdef P_FREEBSD
-! #include <sys/telephony.h>
-! #include <sys/ixjuser.h>
-  #endif
-  #endif
-  
---- 253,260 ----
-  #include <linux/ixjuser.h>
-  #endif
-  #ifdef P_FREEBSD
-! #include "sys/telephony.h"
-! #include "sys/ixjuser.h"
-  #endif
-  #endif
-  
diff --git a/net/opal/files/patch-makefile.in b/net/opal/files/patch-makefile.in
new file mode 100644
index 000000000000..536bf181d711
--- /dev/null
+++ b/net/opal/files/patch-makefile.in
@@ -0,0 +1,13 @@
+--- Makefile.in.orig	Thu Feb  2 13:29:46 2006
++++ Makefile.in	Thu Feb  2 13:33:57 2006
+@@ -351,8 +351,8 @@
+ 		ln -sf $(OH323_FILE).@MAJOR_VERSION@.@MINOR_VERSION@.@BUILD_NUMBER@ $(OH323_FILE) \
+ 	)
+ 	(cd $(DESTDIR)$(LIBDIR); \
+-		rm -f  libopenh323.@SHAREDLIBEXT@ ; \
+-		ln -sf $(OH323_FILE) libopenh323.@SHAREDLIBEXT@ \
++		rm -f  libopenh323.so ; \
++		ln -sf $(OH323_FILE) libopenh323.so \
+ 	)
+ 	( for dir in $(DESTDIR)$(LIBDIR) \
+ 		     $(DESTDIR)$(PREFIX)/include/openh323 \
diff --git a/net/opal/files/patch-openh323u.mak.in b/net/opal/files/patch-openh323u.mak.in
new file mode 100644
index 000000000000..5be056ca337c
--- /dev/null
+++ b/net/opal/files/patch-openh323u.mak.in
@@ -0,0 +1,13 @@
+--- openh323u.mak.in.orig	Thu Feb  2 12:39:34 2006
++++ openh323u.mak.in	Thu Feb  2 12:39:51 2006
+@@ -203,6 +203,10 @@
+ OH323_INCDIR = $(OPENH323DIR)/include
+ endif # PREFIX
+ 
++ifdef BUILDTIME
++OH323_INCDIR = ${OPENH323DIR}/include
++endif #BUILDTIME
++
+ ifndef OH323_LIBDIR
+ OH323_LIBDIR = $(OPENH323DIR)/lib
+ endif # OH323_LIBDIR
diff --git a/net/opal/files/patch-openh323uin b/net/opal/files/patch-openh323uin
deleted file mode 100644
index 4613a12f810e..000000000000
--- a/net/opal/files/patch-openh323uin
+++ /dev/null
@@ -1,53 +0,0 @@
-*** openh323u.mak.in.orig	Wed May 14 20:52:44 2003
---- openh323u.mak.in	Sun Aug 31 21:26:51 2003
-*************** LIBDIRS += $(OPENH323DIR)
-*** 142,152 ****
-  
-  
-  OH323_SRCDIR = $(OPENH323DIR)/src
-! ifdef PREFIX
-! OH323_INCDIR = $(PREFIX)/include/openh323
-! else
-  OH323_INCDIR = $(OPENH323DIR)/include
-! endif
-  OH323_LIBDIR = $(OPENH323DIR)/lib
-  
-  
---- 142,152 ----
-  
-  
-  OH323_SRCDIR = $(OPENH323DIR)/src
-! #ifdef PREFIX
-! #OH323_INCDIR = $(PREFIX)/include/openh323
-! #else
-  OH323_INCDIR = $(OPENH323DIR)/include
-! #endif
-  OH323_LIBDIR = $(OPENH323DIR)/lib
-  
-  
-*************** ifdef	OH323_SUPPRESS_H235
-*** 184,189 ****
---- 184,190 ----
-  STDCCFLAGS  += -DOH323_SUPPRESS_H235
-  endif
-  
-+ # Check for the ixj/telephony header files on the system.
-  ifneq (,$(wildcard $(SYSINCDIR)/linux/telephony.h))
-  HAS_IXJ	    = 1
-  STDCCFLAGS += -DHAS_IXJ
-*************** endif
-*** 197,202 ****
---- 198,210 ----
-  ifneq (,$(wildcard /usr/local/include/sys/telephony.h))
-  HAS_IXJ	    = 1
-  STDCCFLAGS += -DHAS_IXJ -I/usr/local/include
-+ endif
-+ 
-+ # In the FreeBSD port, we make a local copy of the ixj header files from
-+ # the ixj driver in openh323/include/sys
-+ ifneq (,$(wildcard $(OPENH323DIR)/include/sys/telephony.h))
-+ HAS_IXJ	    = 1
-+ STDCCFLAGS += -DHAS_IXJ
-  endif
-  
-  #Check if we have an OSS soundcard.h
diff --git a/net/opal/files/patch-src+OpenH323.dtf b/net/opal/files/patch-src+OpenH323.dtf
deleted file mode 100644
index fe407773f4ef..000000000000
--- a/net/opal/files/patch-src+OpenH323.dtf
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/OpenH323.dtf.orig	Sat Feb 19 11:23:59 2005
-+++ src/OpenH323.dtf	Sat Feb 19 11:25:00 2005
-@@ -23073,7 +23073,7 @@
-     ?RingLine@OpalLineInterfaceDevice@@UAEHIK@Z @12182 NONAME ;public: virtual int __thiscall OpalLineInterfaceDevice::RingLine(unsigned int,unsigned long)
-     ?RingLine@OpalVoipBlasterDevice@@UAEHIK@Z @20048 NONAME ;public: virtual int __thiscall OpalVoipBlasterDevice::RingLine(unsigned int,unsigned long)
-     ?ROWZAG@@3QBEB @12183 NONAME ;unsigned char const * const  ROWZAG
--    ?RtpCallback@H323_H263Codec@@SAXPAXHH@Z @26507 NONAME ;public: static void __cdecl H323_H263Codec::RtpCallback(void *,int,int)
-+    ?RtpCallback@H323_H263Codec@@SAXPAXHH@Z @26507 NONAME ;public: static void __cdecl H323_H263Codec::RtpCallback(AVCodecContext *,void *,int,int)
-     ?saveblks@Pre_Vid_Coder@@IAEXPAE@Z @12184 NONAME ;protected: void __thiscall Pre_Vid_Coder::saveblks(unsigned char *)
-     ?SelectDefaultLogicalChannel@H323Connection@@UAEXI@Z @12185 NONAME ;public: virtual void __thiscall H323Connection::SelectDefaultLogicalChannel(unsigned int)
-     ?SelectFastStartChannels@H323Connection@@UAEXIHH@Z @12791 NONAME ;public: virtual void __thiscall H323Connection::SelectFastStartChannels(unsigned int,int,int)
diff --git a/net/opal/files/patch-src+OpenH323d.dtf b/net/opal/files/patch-src+OpenH323d.dtf
deleted file mode 100644
index 4979aea3f4e1..000000000000
--- a/net/opal/files/patch-src+OpenH323d.dtf
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/OpenH323d.dtf.orig	Sat Feb 19 11:25:40 2005
-+++ src/OpenH323d.dtf	Sat Feb 19 11:26:27 2005
-@@ -29709,7 +29709,7 @@
-     ?RingLine@OpalLineInterfaceDevice@@UAEHIK@Z @16774 NONAME ;public: virtual int __thiscall OpalLineInterfaceDevice::RingLine(unsigned int,unsigned long)
-     ?RingLine@OpalVoipBlasterDevice@@UAEHIK@Z @29808 NONAME ;public: virtual int __thiscall OpalVoipBlasterDevice::RingLine(unsigned int,unsigned long)
-     ?ROWZAG@@3QBEB @16775 NONAME ;unsigned char const * const  ROWZAG
--    ?RtpCallback@H323_H263Codec@@SAXPAXHH@Z @38109 NONAME ;public: static void __cdecl H323_H263Codec::RtpCallback(void *,int,int)
-+    ?RtpCallback@H323_H263Codec@@SAXPAXHH@Z @38109 NONAME ;public: static void __cdecl H323_H263Codec::RtpCallback(AVCodecContext *,void *,int,int)
-     ?SameSize@Encoder@@IAEHPBVVideoFrame@@@Z @16776 NONAME ;protected: int __thiscall Encoder::SameSize(class VideoFrame const *)
-     ?save@Pre_Vid_Coder@@IAEXPAE0H@Z @16777 NONAME ;protected: void __thiscall Pre_Vid_Coder::save(unsigned char *,unsigned char *,int)
-     ?saveblks@Pre_Vid_Coder@@IAEXPAE@Z @16778 NONAME ;protected: void __thiscall Pre_Vid_Coder::saveblks(unsigned char *)
diff --git a/net/opal/files/patch-src+OpenH323n.dtf b/net/opal/files/patch-src+OpenH323n.dtf
deleted file mode 100644
index fa2bdab7f14a..000000000000
--- a/net/opal/files/patch-src+OpenH323n.dtf
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/OpenH323n.dtf.orig	Sat Feb 19 11:25:47 2005
-+++ src/OpenH323n.dtf	Sat Feb 19 11:26:53 2005
-@@ -15904,7 +15904,7 @@
-     ?RingLine@OpalLineInterfaceDevice@@UAEHIK@Z @8723 NONAME ;public: virtual int __thiscall OpalLineInterfaceDevice::RingLine(unsigned int,unsigned long)
-     ?RingLine@OpalVoipBlasterDevice@@UAEHIK@Z @13722 NONAME ;public: virtual int __thiscall OpalVoipBlasterDevice::RingLine(unsigned int,unsigned long)
-     ?ROWZAG@@3QBEB @8724 NONAME ;unsigned char const * const  ROWZAG
--    ?RtpCallback@H323_H263Codec@@SAXPAXHH@Z @18805 NONAME ;public: static void __cdecl H323_H263Codec::RtpCallback(void *,int,int)
-+    ?RtpCallback@H323_H263Codec@@SAXPAXHH@Z @18805 NONAME ;public: static void __cdecl H323_H263Codec::RtpCallback(AVCodecContext *,void *,int,int)
-     ?saveblks@Pre_Vid_Coder@@IAEXPAE@Z @8725 NONAME ;protected: void __thiscall Pre_Vid_Coder::saveblks(unsigned char *)
-     ?SelectDefaultLogicalChannel@H323Connection@@UAEXI@Z @8726 NONAME ;public: virtual void __thiscall H323Connection::SelectDefaultLogicalChannel(unsigned int)
-     ?SelectFastStartChannels@H323Connection@@UAEXIHH@Z @9303 NONAME ;public: virtual void __thiscall H323Connection::SelectFastStartChannels(unsigned int,int,int)
diff --git a/net/opal/files/patch-src-ffh263codec.cxx b/net/opal/files/patch-src-ffh263codec.cxx
deleted file mode 100644
index 3669cbe8779d..000000000000
--- a/net/opal/files/patch-src-ffh263codec.cxx
+++ /dev/null
@@ -1,19 +0,0 @@
-*** src/ffh263codec.cxx.orig	Fri Aug  8 01:52:14 2003
---- src/ffh263codec.cxx	Mon Jun  6 15:28:05 2005
-***************
-*** 140,146 ****
-  #define  MSVC_OPENH323 1
-  
-  extern "C" {
-! #include <avcodec.h>
-  };
-  
-  
---- 140,146 ----
-  #define  MSVC_OPENH323 1
-  
-  extern "C" {
-! #include <ffmpeg/avcodec.h>
-  };
-  
-  
diff --git a/net/opal/pkg-plist b/net/opal/pkg-plist
new file mode 100644
index 000000000000..4f7b6ae08e4f
--- /dev/null
+++ b/net/opal/pkg-plist
@@ -0,0 +1,90 @@
+lib/libh323_FreeBSD_x86_r.so
+lib/libh323_FreeBSD_x86_r.so.1
+lib/libh323_FreeBSD_x86_r.so.1.17
+lib/libh323_FreeBSD_x86_r.so.1.17.3
+lib/libopenh323.so
+include/openh323/QTIoctl.h
+include/openh323/channels.h
+include/openh323/codecs.h
+include/openh323/cu30codec.h
+include/openh323/dynacodec.h
+include/openh323/ffh263codec.h
+include/openh323/gccpdu.h
+include/openh323/gkclient.h
+include/openh323/gkserver.h
+include/openh323/guid.h
+include/openh323/h225.h
+include/openh323/h225ras.h
+include/openh323/h235.h
+include/openh323/h235auth.h
+include/openh323/h245.h
+include/openh323/h248.h
+include/openh323/h261codec.h
+include/openh323/h263codec.h
+include/openh323/h323.h
+include/openh323/h323annexg.h
+include/openh323/h323caps.h
+include/openh323/h323con.h
+include/openh323/h323ep.h
+include/openh323/h323neg.h
+include/openh323/h323pdu.h
+include/openh323/h323pluginmgr.h
+include/openh323/h323rtp.h
+include/openh323/h323t120.h
+include/openh323/h323t38.h
+include/openh323/h323trans.h
+include/openh323/h4501.h
+include/openh323/h45010.h
+include/openh323/h45011.h
+include/openh323/h4502.h
+include/openh323/h4503.h
+include/openh323/h4504.h
+include/openh323/h4505.h
+include/openh323/h4506.h
+include/openh323/h4507.h
+include/openh323/h4508.h
+include/openh323/h4509.h
+include/openh323/h450pdu.h
+include/openh323/h460.h
+include/openh323/h501.h
+include/openh323/h501pdu.h
+include/openh323/hid.h
+include/openh323/ixjDefs.h
+include/openh323/ixjidb.h
+include/openh323/ixjlid.h
+include/openh323/jitter.h
+include/openh323/lid.h
+include/openh323/mcspdu.h
+include/openh323/mediafmt.h
+include/openh323/opalosp.h
+include/openh323/opalplugin.h
+include/openh323/opalusbdevice.h
+include/openh323/opalvxml.h
+include/openh323/opalwavfile.h
+include/openh323/openh323buildopts.h
+include/openh323/peclient.h
+include/openh323/q931.h
+include/openh323/rfc2190avcodec.h
+include/openh323/rfc2833.h
+include/openh323/rtp.h
+include/openh323/rtp2wav.h
+include/openh323/svcctrl.h
+include/openh323/t120proto.h
+include/openh323/t38.h
+include/openh323/t38proto.h
+include/openh323/transports.h
+include/openh323/vblasterlid.h
+include/openh323/vpblid.h
+include/openh323/x224.h
+include/openh323/x880.h
+@dirrm include/openh323
+%%DATADIR%%/openh323u.mak
+@dirrm %%DATADIR%%
+lib/pwlib/codecs/audio/g726_audio_pwplugin.so
+lib/pwlib/codecs/audio/gsm0610_audio_pwplugin.so
+lib/pwlib/codecs/audio/ilbc_audio_pwplugin.so
+lib/pwlib/codecs/audio/ima_adpcm_audio_pwplugin.so
+lib/pwlib/codecs/audio/lpc10_audio_pwplugin.so
+lib/pwlib/codecs/audio/speex_audio_pwplugin.so
+@dirrm lib/pwlib/codecs/audio
+@dirrm lib/pwlib/codecs
diff --git a/net/opal3/Makefile b/net/opal3/Makefile
index 5dbdfe458cfa..e0500c9efd6b 100644
--- a/net/opal3/Makefile
+++ b/net/opal3/Makefile
@@ -6,61 +6,29 @@
 #
 
 PORTNAME=	openh323
-PORTVERSION=	1.12.2
-PORTREVISION=	1
+PORTVERSION=	1.17.3
 CATEGORIES=	net
-MASTER_SITES=	http://www.openh323.org/bin/ \
-		http://www.de.openh323.org/bin/ \
-		http://www.gnomemeeting.org/downloads/0.98.0/sources/
-DISTNAME=	${PORTNAME}_${PORTVERSION}
+MASTER_SITES=	http://www.voxgratia.org/releases/
+DISTFILES=	openh323-v1_17_3-src-tar.gz
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A H323 Video Conferencing library
 
-BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/devel/pwlib:build
-LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2 \
+		pt_FreeBSD_x86_r.1:${PORTSDIR}/devel/pwlib
 
-.include <bsd.port.pre.mk>
-.if ${OSVERSION} < 500000
-# Check for telephony.h in the two places the source is hard coded to check
-# /usr/include/sys and /usr/local/include/sys
-# If it is not present, extract it from the comms/ixj port
-.if !exists(/usr/include/sys/telephony.h)
-.if !exists(/usr/local/include/sys/telephony.h)
-PATCH_DEPENDS+=	${NONEXISTENT}:${PORTSDIR}/comms/ixj:patch
-.endif
-.endif
-.endif
+WRKSRC=	${WRKDIR}/openh323_v1_17_3
 
-WRKSRC=		${WRKDIR}/${PORTNAME}
-
-PLIST_FILES=	bin/simph323
 USE_BISON=	yes
-
 USE_GMAKE=	yes
 USE_OPENLDAP=	yes
-USE_AUTOTOOLS=	autoconf:259 autoconf:253:env
+USE_AUTOTOOLS=	autoconf:259
 GNU_CONFIGURE=	yes
-PWLIBDIR!=	cd ${PORTSDIR}/devel/pwlib && make -V WRKSRC
-CONFIGURE_ENV=	PWLIBDIR=${PWLIBDIR} OPENH323DIR=${WRKSRC}
-ALL_TARGET=	optnoshared
-MAKE_ENV=	PWLIBDIR=${PWLIBDIR} OPENH323DIR=${WRKSRC}
-THE_MACHTYPE=	${ARCH:S/i386/x86/}
-MAKE_ARGS=	OSTYPE=${OPSYS} MACHTYPE=${THE_MACHTYPE} OSRELEASE=${OSVERSION} CPLUS=${CXX}
-
-post-patch:
-.if ${OSVERSION} < 500000
-.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
-.endif
-.endif
-.endif
+INSTALLS_SHLIB=	yes
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/samples/simple/obj_${OPSYS}_${THE_MACHTYPE}_r/simph323 ${PREFIX}/bin
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -I${WRKSRC}/include" LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" BUILDTIME="YES"
+NO_FILTER_SHLIBS=	yes
+ALL_TARGET=	optshared
+MAKE_ENV=	BUILDTIME="YES"
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/opal3/distinfo b/net/opal3/distinfo
index e42058e4b966..59d1d8ae9281 100644
--- a/net/opal3/distinfo
+++ b/net/opal3/distinfo
@@ -1,3 +1,3 @@
-MD5 (openh323_1.12.2.tar.gz) = 15f0b12b60769d03eca9e498050776f3
-SHA256 (openh323_1.12.2.tar.gz) = 683efdae1d501c4294521d6c457b7152f20cfa5faf8c9b46e2899e1caa4aa305
-SIZE (openh323_1.12.2.tar.gz) = 2343354
+MD5 (openh323-v1_17_3-src-tar.gz) = 6797f1c04aaeb3b6a43aebd70b5e8b5d
+SHA256 (openh323-v1_17_3-src-tar.gz) = 625bb7b6ba19638a037e7f231523bdeff0eccc4ae71abaed7700b3bc8dd47e67
+SIZE (openh323-v1_17_3-src-tar.gz) = 3745141
diff --git a/net/opal3/files/patch-configurein b/net/opal3/files/patch-configurein
deleted file mode 100644
index 28578a9c1175..000000000000
--- a/net/opal3/files/patch-configurein
+++ /dev/null
@@ -1,19 +0,0 @@
-*** configure.in.orig	Mon Jun  6 14:34:14 2005
---- configure.in	Mon Jun  6 14:41:03 2005
-***************
-*** 109,115 ****
-  if test "${H323_AVCODEC:-unset}" != "unset" ; then
-    AC_SUBST(H323_AVCODEC, 1)
-    AC_DEFINE(H323_AVCODEC, 1, "ffmpeg based avodec found")
-!   AVCODECINCLUDEDIR=/usr/local/include/ffmpeg
-    AVCODECLIBDIR=/usr/local/lib
-    STDCCFLAGS="$STDCCFLAGS -I${AVCODECINCLUDEDIR}"
-  
---- 109,115 ----
-  if test "${H323_AVCODEC:-unset}" != "unset" ; then
-    AC_SUBST(H323_AVCODEC, 1)
-    AC_DEFINE(H323_AVCODEC, 1, "ffmpeg based avodec found")
-!   AVCODECINCLUDEDIR=/usr/local/include
-    AVCODECLIBDIR=/usr/local/lib
-    STDCCFLAGS="$STDCCFLAGS -I${AVCODECINCLUDEDIR}"
-  
diff --git a/net/opal3/files/patch-include-ffh263codec.h b/net/opal3/files/patch-include-ffh263codec.h
deleted file mode 100644
index 4329c3f7ef76..000000000000
--- a/net/opal3/files/patch-include-ffh263codec.h
+++ /dev/null
@@ -1,12 +0,0 @@
-*** include/ffh263codec.h.orig	Mon Aug  4 00:03:16 2003
---- include/ffh263codec.h	Mon Jun  6 14:54:31 2005
-***************
-*** 96,101 ****
---- 96,102 ----
-  struct AVCodec;
-  struct AVCodecContext;
-  struct AVFrame;
-+ struct AVCodecParserContext;
-   
-  ///////////////////////////////////////////////////////////////////////////////
-  
diff --git a/net/opal3/files/patch-include-h263codec.h b/net/opal3/files/patch-include-h263codec.h
deleted file mode 100644
index de0bf299f3bd..000000000000
--- a/net/opal3/files/patch-include-h263codec.h
+++ /dev/null
@@ -1,19 +0,0 @@
-*** include/h263codec.h.orig	Mon Aug  4 00:03:22 2003
---- include/h263codec.h	Mon Jun  6 14:57:16 2005
-***************
-*** 426,432 ****
-         send. Note that for every encode thread, this 1 method is called. Consequently, 
-         code is required to separate out packets from different encode threads.
-      */
-!     static void RtpCallback(void *data, int size, int packetNumber);
-  
-    protected:
-      BOOL Resize(int width, int height);
---- 426,432 ----
-         send. Note that for every encode thread, this 1 method is called. Consequently, 
-         code is required to separate out packets from different encode threads.
-      */
-!     static void RtpCallback(AVCodecContext *s, void *data, int size, int packet Number);
-  
-    protected:
-      BOOL Resize(int width, int height);
diff --git a/net/opal3/files/patch-include::gkserver.h b/net/opal3/files/patch-include::gkserver.h
deleted file mode 100644
index cdc0ba88ce08..000000000000
--- a/net/opal3/files/patch-include::gkserver.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- include/gkserver.h	2004/08/28 17:16:13	1.1
-+++ include/gkserver.h	2004/08/28 17:16:24
-@@ -404,7 +404,6 @@
-     H225_RegistrationConfirm & rcf;
-     H225_RegistrationReject  & rrj;
- 
--  protected:
-     virtual Response OnHandlePDU();
- };
- 
diff --git a/net/opal3/files/patch-ixjlid b/net/opal3/files/patch-ixjlid
deleted file mode 100644
index faec5f30ea6b..000000000000
--- a/net/opal3/files/patch-ixjlid
+++ /dev/null
@@ -1,21 +0,0 @@
-*** include/ixjlid.h.orig	Tue Sep  2 17:32:20 2003
---- include/ixjlid.h	Tue Sep  2 17:32:37 2003
-***************
-*** 253,260 ****
-  #include <linux/ixjuser.h>
-  #endif
-  #ifdef P_FREEBSD
-! #include <sys/telephony.h>
-! #include <sys/ixjuser.h>
-  #endif
-  #endif
-  
---- 253,260 ----
-  #include <linux/ixjuser.h>
-  #endif
-  #ifdef P_FREEBSD
-! #include "sys/telephony.h"
-! #include "sys/ixjuser.h"
-  #endif
-  #endif
-  
diff --git a/net/opal3/files/patch-makefile.in b/net/opal3/files/patch-makefile.in
new file mode 100644
index 000000000000..536bf181d711
--- /dev/null
+++ b/net/opal3/files/patch-makefile.in
@@ -0,0 +1,13 @@
+--- Makefile.in.orig	Thu Feb  2 13:29:46 2006
++++ Makefile.in	Thu Feb  2 13:33:57 2006
+@@ -351,8 +351,8 @@
+ 		ln -sf $(OH323_FILE).@MAJOR_VERSION@.@MINOR_VERSION@.@BUILD_NUMBER@ $(OH323_FILE) \
+ 	)
+ 	(cd $(DESTDIR)$(LIBDIR); \
+-		rm -f  libopenh323.@SHAREDLIBEXT@ ; \
+-		ln -sf $(OH323_FILE) libopenh323.@SHAREDLIBEXT@ \
++		rm -f  libopenh323.so ; \
++		ln -sf $(OH323_FILE) libopenh323.so \
+ 	)
+ 	( for dir in $(DESTDIR)$(LIBDIR) \
+ 		     $(DESTDIR)$(PREFIX)/include/openh323 \
diff --git a/net/opal3/files/patch-openh323u.mak.in b/net/opal3/files/patch-openh323u.mak.in
new file mode 100644
index 000000000000..5be056ca337c
--- /dev/null
+++ b/net/opal3/files/patch-openh323u.mak.in
@@ -0,0 +1,13 @@
+--- openh323u.mak.in.orig	Thu Feb  2 12:39:34 2006
++++ openh323u.mak.in	Thu Feb  2 12:39:51 2006
+@@ -203,6 +203,10 @@
+ OH323_INCDIR = $(OPENH323DIR)/include
+ endif # PREFIX
+ 
++ifdef BUILDTIME
++OH323_INCDIR = ${OPENH323DIR}/include
++endif #BUILDTIME
++
+ ifndef OH323_LIBDIR
+ OH323_LIBDIR = $(OPENH323DIR)/lib
+ endif # OH323_LIBDIR
diff --git a/net/opal3/files/patch-openh323uin b/net/opal3/files/patch-openh323uin
deleted file mode 100644
index 4613a12f810e..000000000000
--- a/net/opal3/files/patch-openh323uin
+++ /dev/null
@@ -1,53 +0,0 @@
-*** openh323u.mak.in.orig	Wed May 14 20:52:44 2003
---- openh323u.mak.in	Sun Aug 31 21:26:51 2003
-*************** LIBDIRS += $(OPENH323DIR)
-*** 142,152 ****
-  
-  
-  OH323_SRCDIR = $(OPENH323DIR)/src
-! ifdef PREFIX
-! OH323_INCDIR = $(PREFIX)/include/openh323
-! else
-  OH323_INCDIR = $(OPENH323DIR)/include
-! endif
-  OH323_LIBDIR = $(OPENH323DIR)/lib
-  
-  
---- 142,152 ----
-  
-  
-  OH323_SRCDIR = $(OPENH323DIR)/src
-! #ifdef PREFIX
-! #OH323_INCDIR = $(PREFIX)/include/openh323
-! #else
-  OH323_INCDIR = $(OPENH323DIR)/include
-! #endif
-  OH323_LIBDIR = $(OPENH323DIR)/lib
-  
-  
-*************** ifdef	OH323_SUPPRESS_H235
-*** 184,189 ****
---- 184,190 ----
-  STDCCFLAGS  += -DOH323_SUPPRESS_H235
-  endif
-  
-+ # Check for the ixj/telephony header files on the system.
-  ifneq (,$(wildcard $(SYSINCDIR)/linux/telephony.h))
-  HAS_IXJ	    = 1
-  STDCCFLAGS += -DHAS_IXJ
-*************** endif
-*** 197,202 ****
---- 198,210 ----
-  ifneq (,$(wildcard /usr/local/include/sys/telephony.h))
-  HAS_IXJ	    = 1
-  STDCCFLAGS += -DHAS_IXJ -I/usr/local/include
-+ endif
-+ 
-+ # In the FreeBSD port, we make a local copy of the ixj header files from
-+ # the ixj driver in openh323/include/sys
-+ ifneq (,$(wildcard $(OPENH323DIR)/include/sys/telephony.h))
-+ HAS_IXJ	    = 1
-+ STDCCFLAGS += -DHAS_IXJ
-  endif
-  
-  #Check if we have an OSS soundcard.h
diff --git a/net/opal3/files/patch-src+OpenH323.dtf b/net/opal3/files/patch-src+OpenH323.dtf
deleted file mode 100644
index fe407773f4ef..000000000000
--- a/net/opal3/files/patch-src+OpenH323.dtf
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/OpenH323.dtf.orig	Sat Feb 19 11:23:59 2005
-+++ src/OpenH323.dtf	Sat Feb 19 11:25:00 2005
-@@ -23073,7 +23073,7 @@
-     ?RingLine@OpalLineInterfaceDevice@@UAEHIK@Z @12182 NONAME ;public: virtual int __thiscall OpalLineInterfaceDevice::RingLine(unsigned int,unsigned long)
-     ?RingLine@OpalVoipBlasterDevice@@UAEHIK@Z @20048 NONAME ;public: virtual int __thiscall OpalVoipBlasterDevice::RingLine(unsigned int,unsigned long)
-     ?ROWZAG@@3QBEB @12183 NONAME ;unsigned char const * const  ROWZAG
--    ?RtpCallback@H323_H263Codec@@SAXPAXHH@Z @26507 NONAME ;public: static void __cdecl H323_H263Codec::RtpCallback(void *,int,int)
-+    ?RtpCallback@H323_H263Codec@@SAXPAXHH@Z @26507 NONAME ;public: static void __cdecl H323_H263Codec::RtpCallback(AVCodecContext *,void *,int,int)
-     ?saveblks@Pre_Vid_Coder@@IAEXPAE@Z @12184 NONAME ;protected: void __thiscall Pre_Vid_Coder::saveblks(unsigned char *)
-     ?SelectDefaultLogicalChannel@H323Connection@@UAEXI@Z @12185 NONAME ;public: virtual void __thiscall H323Connection::SelectDefaultLogicalChannel(unsigned int)
-     ?SelectFastStartChannels@H323Connection@@UAEXIHH@Z @12791 NONAME ;public: virtual void __thiscall H323Connection::SelectFastStartChannels(unsigned int,int,int)
diff --git a/net/opal3/files/patch-src+OpenH323d.dtf b/net/opal3/files/patch-src+OpenH323d.dtf
deleted file mode 100644
index 4979aea3f4e1..000000000000
--- a/net/opal3/files/patch-src+OpenH323d.dtf
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/OpenH323d.dtf.orig	Sat Feb 19 11:25:40 2005
-+++ src/OpenH323d.dtf	Sat Feb 19 11:26:27 2005
-@@ -29709,7 +29709,7 @@
-     ?RingLine@OpalLineInterfaceDevice@@UAEHIK@Z @16774 NONAME ;public: virtual int __thiscall OpalLineInterfaceDevice::RingLine(unsigned int,unsigned long)
-     ?RingLine@OpalVoipBlasterDevice@@UAEHIK@Z @29808 NONAME ;public: virtual int __thiscall OpalVoipBlasterDevice::RingLine(unsigned int,unsigned long)
-     ?ROWZAG@@3QBEB @16775 NONAME ;unsigned char const * const  ROWZAG
--    ?RtpCallback@H323_H263Codec@@SAXPAXHH@Z @38109 NONAME ;public: static void __cdecl H323_H263Codec::RtpCallback(void *,int,int)
-+    ?RtpCallback@H323_H263Codec@@SAXPAXHH@Z @38109 NONAME ;public: static void __cdecl H323_H263Codec::RtpCallback(AVCodecContext *,void *,int,int)
-     ?SameSize@Encoder@@IAEHPBVVideoFrame@@@Z @16776 NONAME ;protected: int __thiscall Encoder::SameSize(class VideoFrame const *)
-     ?save@Pre_Vid_Coder@@IAEXPAE0H@Z @16777 NONAME ;protected: void __thiscall Pre_Vid_Coder::save(unsigned char *,unsigned char *,int)
-     ?saveblks@Pre_Vid_Coder@@IAEXPAE@Z @16778 NONAME ;protected: void __thiscall Pre_Vid_Coder::saveblks(unsigned char *)
diff --git a/net/opal3/files/patch-src+OpenH323n.dtf b/net/opal3/files/patch-src+OpenH323n.dtf
deleted file mode 100644
index fa2bdab7f14a..000000000000
--- a/net/opal3/files/patch-src+OpenH323n.dtf
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/OpenH323n.dtf.orig	Sat Feb 19 11:25:47 2005
-+++ src/OpenH323n.dtf	Sat Feb 19 11:26:53 2005
-@@ -15904,7 +15904,7 @@
-     ?RingLine@OpalLineInterfaceDevice@@UAEHIK@Z @8723 NONAME ;public: virtual int __thiscall OpalLineInterfaceDevice::RingLine(unsigned int,unsigned long)
-     ?RingLine@OpalVoipBlasterDevice@@UAEHIK@Z @13722 NONAME ;public: virtual int __thiscall OpalVoipBlasterDevice::RingLine(unsigned int,unsigned long)
-     ?ROWZAG@@3QBEB @8724 NONAME ;unsigned char const * const  ROWZAG
--    ?RtpCallback@H323_H263Codec@@SAXPAXHH@Z @18805 NONAME ;public: static void __cdecl H323_H263Codec::RtpCallback(void *,int,int)
-+    ?RtpCallback@H323_H263Codec@@SAXPAXHH@Z @18805 NONAME ;public: static void __cdecl H323_H263Codec::RtpCallback(AVCodecContext *,void *,int,int)
-     ?saveblks@Pre_Vid_Coder@@IAEXPAE@Z @8725 NONAME ;protected: void __thiscall Pre_Vid_Coder::saveblks(unsigned char *)
-     ?SelectDefaultLogicalChannel@H323Connection@@UAEXI@Z @8726 NONAME ;public: virtual void __thiscall H323Connection::SelectDefaultLogicalChannel(unsigned int)
-     ?SelectFastStartChannels@H323Connection@@UAEXIHH@Z @9303 NONAME ;public: virtual void __thiscall H323Connection::SelectFastStartChannels(unsigned int,int,int)
diff --git a/net/opal3/files/patch-src-ffh263codec.cxx b/net/opal3/files/patch-src-ffh263codec.cxx
deleted file mode 100644
index 3669cbe8779d..000000000000
--- a/net/opal3/files/patch-src-ffh263codec.cxx
+++ /dev/null
@@ -1,19 +0,0 @@
-*** src/ffh263codec.cxx.orig	Fri Aug  8 01:52:14 2003
---- src/ffh263codec.cxx	Mon Jun  6 15:28:05 2005
-***************
-*** 140,146 ****
-  #define  MSVC_OPENH323 1
-  
-  extern "C" {
-! #include <avcodec.h>
-  };
-  
-  
---- 140,146 ----
-  #define  MSVC_OPENH323 1
-  
-  extern "C" {
-! #include <ffmpeg/avcodec.h>
-  };
-  
-  
diff --git a/net/opal3/pkg-plist b/net/opal3/pkg-plist
new file mode 100644
index 000000000000..4f7b6ae08e4f
--- /dev/null
+++ b/net/opal3/pkg-plist
@@ -0,0 +1,90 @@
+lib/libh323_FreeBSD_x86_r.so
+lib/libh323_FreeBSD_x86_r.so.1
+lib/libh323_FreeBSD_x86_r.so.1.17
+lib/libh323_FreeBSD_x86_r.so.1.17.3
+lib/libopenh323.so
+include/openh323/QTIoctl.h
+include/openh323/channels.h
+include/openh323/codecs.h
+include/openh323/cu30codec.h
+include/openh323/dynacodec.h
+include/openh323/ffh263codec.h
+include/openh323/gccpdu.h
+include/openh323/gkclient.h
+include/openh323/gkserver.h
+include/openh323/guid.h
+include/openh323/h225.h
+include/openh323/h225ras.h
+include/openh323/h235.h
+include/openh323/h235auth.h
+include/openh323/h245.h
+include/openh323/h248.h
+include/openh323/h261codec.h
+include/openh323/h263codec.h
+include/openh323/h323.h
+include/openh323/h323annexg.h
+include/openh323/h323caps.h
+include/openh323/h323con.h
+include/openh323/h323ep.h
+include/openh323/h323neg.h
+include/openh323/h323pdu.h
+include/openh323/h323pluginmgr.h
+include/openh323/h323rtp.h
+include/openh323/h323t120.h
+include/openh323/h323t38.h
+include/openh323/h323trans.h
+include/openh323/h4501.h
+include/openh323/h45010.h
+include/openh323/h45011.h
+include/openh323/h4502.h
+include/openh323/h4503.h
+include/openh323/h4504.h
+include/openh323/h4505.h
+include/openh323/h4506.h
+include/openh323/h4507.h
+include/openh323/h4508.h
+include/openh323/h4509.h
+include/openh323/h450pdu.h
+include/openh323/h460.h
+include/openh323/h501.h
+include/openh323/h501pdu.h
+include/openh323/hid.h
+include/openh323/ixjDefs.h
+include/openh323/ixjidb.h
+include/openh323/ixjlid.h
+include/openh323/jitter.h
+include/openh323/lid.h
+include/openh323/mcspdu.h
+include/openh323/mediafmt.h
+include/openh323/opalosp.h
+include/openh323/opalplugin.h
+include/openh323/opalusbdevice.h
+include/openh323/opalvxml.h
+include/openh323/opalwavfile.h
+include/openh323/openh323buildopts.h
+include/openh323/peclient.h
+include/openh323/q931.h
+include/openh323/rfc2190avcodec.h
+include/openh323/rfc2833.h
+include/openh323/rtp.h
+include/openh323/rtp2wav.h
+include/openh323/svcctrl.h
+include/openh323/t120proto.h
+include/openh323/t38.h
+include/openh323/t38proto.h
+include/openh323/transports.h
+include/openh323/vblasterlid.h
+include/openh323/vpblid.h
+include/openh323/x224.h
+include/openh323/x880.h
+@dirrm include/openh323
+%%DATADIR%%/openh323u.mak
+@dirrm %%DATADIR%%
+lib/pwlib/codecs/audio/g726_audio_pwplugin.so
+lib/pwlib/codecs/audio/gsm0610_audio_pwplugin.so
+lib/pwlib/codecs/audio/ilbc_audio_pwplugin.so
+lib/pwlib/codecs/audio/ima_adpcm_audio_pwplugin.so
+lib/pwlib/codecs/audio/lpc10_audio_pwplugin.so
+lib/pwlib/codecs/audio/speex_audio_pwplugin.so
+@dirrm lib/pwlib/codecs/audio
+@dirrm lib/pwlib/codecs
diff --git a/net/openh323/Makefile b/net/openh323/Makefile
index 5dbdfe458cfa..e0500c9efd6b 100644
--- a/net/openh323/Makefile
+++ b/net/openh323/Makefile
@@ -6,61 +6,29 @@
 #
 
 PORTNAME=	openh323
-PORTVERSION=	1.12.2
-PORTREVISION=	1
+PORTVERSION=	1.17.3
 CATEGORIES=	net
-MASTER_SITES=	http://www.openh323.org/bin/ \
-		http://www.de.openh323.org/bin/ \
-		http://www.gnomemeeting.org/downloads/0.98.0/sources/
-DISTNAME=	${PORTNAME}_${PORTVERSION}
+MASTER_SITES=	http://www.voxgratia.org/releases/
+DISTFILES=	openh323-v1_17_3-src-tar.gz
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A H323 Video Conferencing library
 
-BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/devel/pwlib:build
-LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2 \
+		pt_FreeBSD_x86_r.1:${PORTSDIR}/devel/pwlib
 
-.include <bsd.port.pre.mk>
-.if ${OSVERSION} < 500000
-# Check for telephony.h in the two places the source is hard coded to check
-# /usr/include/sys and /usr/local/include/sys
-# If it is not present, extract it from the comms/ixj port
-.if !exists(/usr/include/sys/telephony.h)
-.if !exists(/usr/local/include/sys/telephony.h)
-PATCH_DEPENDS+=	${NONEXISTENT}:${PORTSDIR}/comms/ixj:patch
-.endif
-.endif
-.endif
+WRKSRC=	${WRKDIR}/openh323_v1_17_3
 
-WRKSRC=		${WRKDIR}/${PORTNAME}
-
-PLIST_FILES=	bin/simph323
 USE_BISON=	yes
-
 USE_GMAKE=	yes
 USE_OPENLDAP=	yes
-USE_AUTOTOOLS=	autoconf:259 autoconf:253:env
+USE_AUTOTOOLS=	autoconf:259
 GNU_CONFIGURE=	yes
-PWLIBDIR!=	cd ${PORTSDIR}/devel/pwlib && make -V WRKSRC
-CONFIGURE_ENV=	PWLIBDIR=${PWLIBDIR} OPENH323DIR=${WRKSRC}
-ALL_TARGET=	optnoshared
-MAKE_ENV=	PWLIBDIR=${PWLIBDIR} OPENH323DIR=${WRKSRC}
-THE_MACHTYPE=	${ARCH:S/i386/x86/}
-MAKE_ARGS=	OSTYPE=${OPSYS} MACHTYPE=${THE_MACHTYPE} OSRELEASE=${OSVERSION} CPLUS=${CXX}
-
-post-patch:
-.if ${OSVERSION} < 500000
-.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
-.endif
-.endif
-.endif
+INSTALLS_SHLIB=	yes
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/samples/simple/obj_${OPSYS}_${THE_MACHTYPE}_r/simph323 ${PREFIX}/bin
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -I${WRKSRC}/include" LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" BUILDTIME="YES"
+NO_FILTER_SHLIBS=	yes
+ALL_TARGET=	optshared
+MAKE_ENV=	BUILDTIME="YES"
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/openh323/distinfo b/net/openh323/distinfo
index e42058e4b966..59d1d8ae9281 100644
--- a/net/openh323/distinfo
+++ b/net/openh323/distinfo
@@ -1,3 +1,3 @@
-MD5 (openh323_1.12.2.tar.gz) = 15f0b12b60769d03eca9e498050776f3
-SHA256 (openh323_1.12.2.tar.gz) = 683efdae1d501c4294521d6c457b7152f20cfa5faf8c9b46e2899e1caa4aa305
-SIZE (openh323_1.12.2.tar.gz) = 2343354
+MD5 (openh323-v1_17_3-src-tar.gz) = 6797f1c04aaeb3b6a43aebd70b5e8b5d
+SHA256 (openh323-v1_17_3-src-tar.gz) = 625bb7b6ba19638a037e7f231523bdeff0eccc4ae71abaed7700b3bc8dd47e67
+SIZE (openh323-v1_17_3-src-tar.gz) = 3745141
diff --git a/net/openh323/files/patch-configurein b/net/openh323/files/patch-configurein
deleted file mode 100644
index 28578a9c1175..000000000000
--- a/net/openh323/files/patch-configurein
+++ /dev/null
@@ -1,19 +0,0 @@
-*** configure.in.orig	Mon Jun  6 14:34:14 2005
---- configure.in	Mon Jun  6 14:41:03 2005
-***************
-*** 109,115 ****
-  if test "${H323_AVCODEC:-unset}" != "unset" ; then
-    AC_SUBST(H323_AVCODEC, 1)
-    AC_DEFINE(H323_AVCODEC, 1, "ffmpeg based avodec found")
-!   AVCODECINCLUDEDIR=/usr/local/include/ffmpeg
-    AVCODECLIBDIR=/usr/local/lib
-    STDCCFLAGS="$STDCCFLAGS -I${AVCODECINCLUDEDIR}"
-  
---- 109,115 ----
-  if test "${H323_AVCODEC:-unset}" != "unset" ; then
-    AC_SUBST(H323_AVCODEC, 1)
-    AC_DEFINE(H323_AVCODEC, 1, "ffmpeg based avodec found")
-!   AVCODECINCLUDEDIR=/usr/local/include
-    AVCODECLIBDIR=/usr/local/lib
-    STDCCFLAGS="$STDCCFLAGS -I${AVCODECINCLUDEDIR}"
-  
diff --git a/net/openh323/files/patch-include-ffh263codec.h b/net/openh323/files/patch-include-ffh263codec.h
deleted file mode 100644
index 4329c3f7ef76..000000000000
--- a/net/openh323/files/patch-include-ffh263codec.h
+++ /dev/null
@@ -1,12 +0,0 @@
-*** include/ffh263codec.h.orig	Mon Aug  4 00:03:16 2003
---- include/ffh263codec.h	Mon Jun  6 14:54:31 2005
-***************
-*** 96,101 ****
---- 96,102 ----
-  struct AVCodec;
-  struct AVCodecContext;
-  struct AVFrame;
-+ struct AVCodecParserContext;
-   
-  ///////////////////////////////////////////////////////////////////////////////
-  
diff --git a/net/openh323/files/patch-include-h263codec.h b/net/openh323/files/patch-include-h263codec.h
deleted file mode 100644
index de0bf299f3bd..000000000000
--- a/net/openh323/files/patch-include-h263codec.h
+++ /dev/null
@@ -1,19 +0,0 @@
-*** include/h263codec.h.orig	Mon Aug  4 00:03:22 2003
---- include/h263codec.h	Mon Jun  6 14:57:16 2005
-***************
-*** 426,432 ****
-         send. Note that for every encode thread, this 1 method is called. Consequently, 
-         code is required to separate out packets from different encode threads.
-      */
-!     static void RtpCallback(void *data, int size, int packetNumber);
-  
-    protected:
-      BOOL Resize(int width, int height);
---- 426,432 ----
-         send. Note that for every encode thread, this 1 method is called. Consequently, 
-         code is required to separate out packets from different encode threads.
-      */
-!     static void RtpCallback(AVCodecContext *s, void *data, int size, int packet Number);
-  
-    protected:
-      BOOL Resize(int width, int height);
diff --git a/net/openh323/files/patch-include::gkserver.h b/net/openh323/files/patch-include::gkserver.h
deleted file mode 100644
index cdc0ba88ce08..000000000000
--- a/net/openh323/files/patch-include::gkserver.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- include/gkserver.h	2004/08/28 17:16:13	1.1
-+++ include/gkserver.h	2004/08/28 17:16:24
-@@ -404,7 +404,6 @@
-     H225_RegistrationConfirm & rcf;
-     H225_RegistrationReject  & rrj;
- 
--  protected:
-     virtual Response OnHandlePDU();
- };
- 
diff --git a/net/openh323/files/patch-ixjlid b/net/openh323/files/patch-ixjlid
deleted file mode 100644
index faec5f30ea6b..000000000000
--- a/net/openh323/files/patch-ixjlid
+++ /dev/null
@@ -1,21 +0,0 @@
-*** include/ixjlid.h.orig	Tue Sep  2 17:32:20 2003
---- include/ixjlid.h	Tue Sep  2 17:32:37 2003
-***************
-*** 253,260 ****
-  #include <linux/ixjuser.h>
-  #endif
-  #ifdef P_FREEBSD
-! #include <sys/telephony.h>
-! #include <sys/ixjuser.h>
-  #endif
-  #endif
-  
---- 253,260 ----
-  #include <linux/ixjuser.h>
-  #endif
-  #ifdef P_FREEBSD
-! #include "sys/telephony.h"
-! #include "sys/ixjuser.h"
-  #endif
-  #endif
-  
diff --git a/net/openh323/files/patch-makefile.in b/net/openh323/files/patch-makefile.in
new file mode 100644
index 000000000000..536bf181d711
--- /dev/null
+++ b/net/openh323/files/patch-makefile.in
@@ -0,0 +1,13 @@
+--- Makefile.in.orig	Thu Feb  2 13:29:46 2006
++++ Makefile.in	Thu Feb  2 13:33:57 2006
+@@ -351,8 +351,8 @@
+ 		ln -sf $(OH323_FILE).@MAJOR_VERSION@.@MINOR_VERSION@.@BUILD_NUMBER@ $(OH323_FILE) \
+ 	)
+ 	(cd $(DESTDIR)$(LIBDIR); \
+-		rm -f  libopenh323.@SHAREDLIBEXT@ ; \
+-		ln -sf $(OH323_FILE) libopenh323.@SHAREDLIBEXT@ \
++		rm -f  libopenh323.so ; \
++		ln -sf $(OH323_FILE) libopenh323.so \
+ 	)
+ 	( for dir in $(DESTDIR)$(LIBDIR) \
+ 		     $(DESTDIR)$(PREFIX)/include/openh323 \
diff --git a/net/openh323/files/patch-openh323u.mak.in b/net/openh323/files/patch-openh323u.mak.in
new file mode 100644
index 000000000000..5be056ca337c
--- /dev/null
+++ b/net/openh323/files/patch-openh323u.mak.in
@@ -0,0 +1,13 @@
+--- openh323u.mak.in.orig	Thu Feb  2 12:39:34 2006
++++ openh323u.mak.in	Thu Feb  2 12:39:51 2006
+@@ -203,6 +203,10 @@
+ OH323_INCDIR = $(OPENH323DIR)/include
+ endif # PREFIX
+ 
++ifdef BUILDTIME
++OH323_INCDIR = ${OPENH323DIR}/include
++endif #BUILDTIME
++
+ ifndef OH323_LIBDIR
+ OH323_LIBDIR = $(OPENH323DIR)/lib
+ endif # OH323_LIBDIR
diff --git a/net/openh323/files/patch-openh323uin b/net/openh323/files/patch-openh323uin
deleted file mode 100644
index 4613a12f810e..000000000000
--- a/net/openh323/files/patch-openh323uin
+++ /dev/null
@@ -1,53 +0,0 @@
-*** openh323u.mak.in.orig	Wed May 14 20:52:44 2003
---- openh323u.mak.in	Sun Aug 31 21:26:51 2003
-*************** LIBDIRS += $(OPENH323DIR)
-*** 142,152 ****
-  
-  
-  OH323_SRCDIR = $(OPENH323DIR)/src
-! ifdef PREFIX
-! OH323_INCDIR = $(PREFIX)/include/openh323
-! else
-  OH323_INCDIR = $(OPENH323DIR)/include
-! endif
-  OH323_LIBDIR = $(OPENH323DIR)/lib
-  
-  
---- 142,152 ----
-  
-  
-  OH323_SRCDIR = $(OPENH323DIR)/src
-! #ifdef PREFIX
-! #OH323_INCDIR = $(PREFIX)/include/openh323
-! #else
-  OH323_INCDIR = $(OPENH323DIR)/include
-! #endif
-  OH323_LIBDIR = $(OPENH323DIR)/lib
-  
-  
-*************** ifdef	OH323_SUPPRESS_H235
-*** 184,189 ****
---- 184,190 ----
-  STDCCFLAGS  += -DOH323_SUPPRESS_H235
-  endif
-  
-+ # Check for the ixj/telephony header files on the system.
-  ifneq (,$(wildcard $(SYSINCDIR)/linux/telephony.h))
-  HAS_IXJ	    = 1
-  STDCCFLAGS += -DHAS_IXJ
-*************** endif
-*** 197,202 ****
---- 198,210 ----
-  ifneq (,$(wildcard /usr/local/include/sys/telephony.h))
-  HAS_IXJ	    = 1
-  STDCCFLAGS += -DHAS_IXJ -I/usr/local/include
-+ endif
-+ 
-+ # In the FreeBSD port, we make a local copy of the ixj header files from
-+ # the ixj driver in openh323/include/sys
-+ ifneq (,$(wildcard $(OPENH323DIR)/include/sys/telephony.h))
-+ HAS_IXJ	    = 1
-+ STDCCFLAGS += -DHAS_IXJ
-  endif
-  
-  #Check if we have an OSS soundcard.h
diff --git a/net/openh323/files/patch-src+OpenH323.dtf b/net/openh323/files/patch-src+OpenH323.dtf
deleted file mode 100644
index fe407773f4ef..000000000000
--- a/net/openh323/files/patch-src+OpenH323.dtf
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/OpenH323.dtf.orig	Sat Feb 19 11:23:59 2005
-+++ src/OpenH323.dtf	Sat Feb 19 11:25:00 2005
-@@ -23073,7 +23073,7 @@
-     ?RingLine@OpalLineInterfaceDevice@@UAEHIK@Z @12182 NONAME ;public: virtual int __thiscall OpalLineInterfaceDevice::RingLine(unsigned int,unsigned long)
-     ?RingLine@OpalVoipBlasterDevice@@UAEHIK@Z @20048 NONAME ;public: virtual int __thiscall OpalVoipBlasterDevice::RingLine(unsigned int,unsigned long)
-     ?ROWZAG@@3QBEB @12183 NONAME ;unsigned char const * const  ROWZAG
--    ?RtpCallback@H323_H263Codec@@SAXPAXHH@Z @26507 NONAME ;public: static void __cdecl H323_H263Codec::RtpCallback(void *,int,int)
-+    ?RtpCallback@H323_H263Codec@@SAXPAXHH@Z @26507 NONAME ;public: static void __cdecl H323_H263Codec::RtpCallback(AVCodecContext *,void *,int,int)
-     ?saveblks@Pre_Vid_Coder@@IAEXPAE@Z @12184 NONAME ;protected: void __thiscall Pre_Vid_Coder::saveblks(unsigned char *)
-     ?SelectDefaultLogicalChannel@H323Connection@@UAEXI@Z @12185 NONAME ;public: virtual void __thiscall H323Connection::SelectDefaultLogicalChannel(unsigned int)
-     ?SelectFastStartChannels@H323Connection@@UAEXIHH@Z @12791 NONAME ;public: virtual void __thiscall H323Connection::SelectFastStartChannels(unsigned int,int,int)
diff --git a/net/openh323/files/patch-src+OpenH323d.dtf b/net/openh323/files/patch-src+OpenH323d.dtf
deleted file mode 100644
index 4979aea3f4e1..000000000000
--- a/net/openh323/files/patch-src+OpenH323d.dtf
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/OpenH323d.dtf.orig	Sat Feb 19 11:25:40 2005
-+++ src/OpenH323d.dtf	Sat Feb 19 11:26:27 2005
-@@ -29709,7 +29709,7 @@
-     ?RingLine@OpalLineInterfaceDevice@@UAEHIK@Z @16774 NONAME ;public: virtual int __thiscall OpalLineInterfaceDevice::RingLine(unsigned int,unsigned long)
-     ?RingLine@OpalVoipBlasterDevice@@UAEHIK@Z @29808 NONAME ;public: virtual int __thiscall OpalVoipBlasterDevice::RingLine(unsigned int,unsigned long)
-     ?ROWZAG@@3QBEB @16775 NONAME ;unsigned char const * const  ROWZAG
--    ?RtpCallback@H323_H263Codec@@SAXPAXHH@Z @38109 NONAME ;public: static void __cdecl H323_H263Codec::RtpCallback(void *,int,int)
-+    ?RtpCallback@H323_H263Codec@@SAXPAXHH@Z @38109 NONAME ;public: static void __cdecl H323_H263Codec::RtpCallback(AVCodecContext *,void *,int,int)
-     ?SameSize@Encoder@@IAEHPBVVideoFrame@@@Z @16776 NONAME ;protected: int __thiscall Encoder::SameSize(class VideoFrame const *)
-     ?save@Pre_Vid_Coder@@IAEXPAE0H@Z @16777 NONAME ;protected: void __thiscall Pre_Vid_Coder::save(unsigned char *,unsigned char *,int)
-     ?saveblks@Pre_Vid_Coder@@IAEXPAE@Z @16778 NONAME ;protected: void __thiscall Pre_Vid_Coder::saveblks(unsigned char *)
diff --git a/net/openh323/files/patch-src+OpenH323n.dtf b/net/openh323/files/patch-src+OpenH323n.dtf
deleted file mode 100644
index fa2bdab7f14a..000000000000
--- a/net/openh323/files/patch-src+OpenH323n.dtf
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/OpenH323n.dtf.orig	Sat Feb 19 11:25:47 2005
-+++ src/OpenH323n.dtf	Sat Feb 19 11:26:53 2005
-@@ -15904,7 +15904,7 @@
-     ?RingLine@OpalLineInterfaceDevice@@UAEHIK@Z @8723 NONAME ;public: virtual int __thiscall OpalLineInterfaceDevice::RingLine(unsigned int,unsigned long)
-     ?RingLine@OpalVoipBlasterDevice@@UAEHIK@Z @13722 NONAME ;public: virtual int __thiscall OpalVoipBlasterDevice::RingLine(unsigned int,unsigned long)
-     ?ROWZAG@@3QBEB @8724 NONAME ;unsigned char const * const  ROWZAG
--    ?RtpCallback@H323_H263Codec@@SAXPAXHH@Z @18805 NONAME ;public: static void __cdecl H323_H263Codec::RtpCallback(void *,int,int)
-+    ?RtpCallback@H323_H263Codec@@SAXPAXHH@Z @18805 NONAME ;public: static void __cdecl H323_H263Codec::RtpCallback(AVCodecContext *,void *,int,int)
-     ?saveblks@Pre_Vid_Coder@@IAEXPAE@Z @8725 NONAME ;protected: void __thiscall Pre_Vid_Coder::saveblks(unsigned char *)
-     ?SelectDefaultLogicalChannel@H323Connection@@UAEXI@Z @8726 NONAME ;public: virtual void __thiscall H323Connection::SelectDefaultLogicalChannel(unsigned int)
-     ?SelectFastStartChannels@H323Connection@@UAEXIHH@Z @9303 NONAME ;public: virtual void __thiscall H323Connection::SelectFastStartChannels(unsigned int,int,int)
diff --git a/net/openh323/files/patch-src-ffh263codec.cxx b/net/openh323/files/patch-src-ffh263codec.cxx
deleted file mode 100644
index 3669cbe8779d..000000000000
--- a/net/openh323/files/patch-src-ffh263codec.cxx
+++ /dev/null
@@ -1,19 +0,0 @@
-*** src/ffh263codec.cxx.orig	Fri Aug  8 01:52:14 2003
---- src/ffh263codec.cxx	Mon Jun  6 15:28:05 2005
-***************
-*** 140,146 ****
-  #define  MSVC_OPENH323 1
-  
-  extern "C" {
-! #include <avcodec.h>
-  };
-  
-  
---- 140,146 ----
-  #define  MSVC_OPENH323 1
-  
-  extern "C" {
-! #include <ffmpeg/avcodec.h>
-  };
-  
-  
diff --git a/net/openh323/pkg-plist b/net/openh323/pkg-plist
new file mode 100644
index 000000000000..4f7b6ae08e4f
--- /dev/null
+++ b/net/openh323/pkg-plist
@@ -0,0 +1,90 @@
+lib/libh323_FreeBSD_x86_r.so
+lib/libh323_FreeBSD_x86_r.so.1
+lib/libh323_FreeBSD_x86_r.so.1.17
+lib/libh323_FreeBSD_x86_r.so.1.17.3
+lib/libopenh323.so
+include/openh323/QTIoctl.h
+include/openh323/channels.h
+include/openh323/codecs.h
+include/openh323/cu30codec.h
+include/openh323/dynacodec.h
+include/openh323/ffh263codec.h
+include/openh323/gccpdu.h
+include/openh323/gkclient.h
+include/openh323/gkserver.h
+include/openh323/guid.h
+include/openh323/h225.h
+include/openh323/h225ras.h
+include/openh323/h235.h
+include/openh323/h235auth.h
+include/openh323/h245.h
+include/openh323/h248.h
+include/openh323/h261codec.h
+include/openh323/h263codec.h
+include/openh323/h323.h
+include/openh323/h323annexg.h
+include/openh323/h323caps.h
+include/openh323/h323con.h
+include/openh323/h323ep.h
+include/openh323/h323neg.h
+include/openh323/h323pdu.h
+include/openh323/h323pluginmgr.h
+include/openh323/h323rtp.h
+include/openh323/h323t120.h
+include/openh323/h323t38.h
+include/openh323/h323trans.h
+include/openh323/h4501.h
+include/openh323/h45010.h
+include/openh323/h45011.h
+include/openh323/h4502.h
+include/openh323/h4503.h
+include/openh323/h4504.h
+include/openh323/h4505.h
+include/openh323/h4506.h
+include/openh323/h4507.h
+include/openh323/h4508.h
+include/openh323/h4509.h
+include/openh323/h450pdu.h
+include/openh323/h460.h
+include/openh323/h501.h
+include/openh323/h501pdu.h
+include/openh323/hid.h
+include/openh323/ixjDefs.h
+include/openh323/ixjidb.h
+include/openh323/ixjlid.h
+include/openh323/jitter.h
+include/openh323/lid.h
+include/openh323/mcspdu.h
+include/openh323/mediafmt.h
+include/openh323/opalosp.h
+include/openh323/opalplugin.h
+include/openh323/opalusbdevice.h
+include/openh323/opalvxml.h
+include/openh323/opalwavfile.h
+include/openh323/openh323buildopts.h
+include/openh323/peclient.h
+include/openh323/q931.h
+include/openh323/rfc2190avcodec.h
+include/openh323/rfc2833.h
+include/openh323/rtp.h
+include/openh323/rtp2wav.h
+include/openh323/svcctrl.h
+include/openh323/t120proto.h
+include/openh323/t38.h
+include/openh323/t38proto.h
+include/openh323/transports.h
+include/openh323/vblasterlid.h
+include/openh323/vpblid.h
+include/openh323/x224.h
+include/openh323/x880.h
+@dirrm include/openh323
+%%DATADIR%%/openh323u.mak
+@dirrm %%DATADIR%%
+lib/pwlib/codecs/audio/g726_audio_pwplugin.so
+lib/pwlib/codecs/audio/gsm0610_audio_pwplugin.so
+lib/pwlib/codecs/audio/ilbc_audio_pwplugin.so
+lib/pwlib/codecs/audio/ima_adpcm_audio_pwplugin.so
+lib/pwlib/codecs/audio/lpc10_audio_pwplugin.so
+lib/pwlib/codecs/audio/speex_audio_pwplugin.so
+@dirrm lib/pwlib/codecs/audio
+@dirrm lib/pwlib/codecs