Remove devel/pwlib, net/openh323 and net/ohphone. The OpenH323 project

was split into OpalVoip and H323Plus in 2007, both also available as ports.

Remove dependency on net/openh323 from net/asterisk13.  The chan_h323
module has been replaced with chan_ooh323 which no longer depends on
openh323.

23 files changed, 0 insertions, 546 deletions

diff --git a/net/Makefile b/net/Makefile
index c6fea083c125..4b55d6c756f7 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -498,7 +498,6 @@
     SUBDIR += nyancat
     SUBDIR += nylon
     SUBDIR += ocserv
-    SUBDIR += ohphone
     SUBDIR += olsrd
     SUBDIR += omnitty
     SUBDIR += onenetd
@@ -509,7 +508,6 @@
     SUBDIR += openbgpd
     SUBDIR += openbsc
     SUBDIR += openggsn
-    SUBDIR += openh323
     SUBDIR += openldap24-client
     SUBDIR += openldap24-sasl-client
     SUBDIR += openldap24-server
diff --git a/net/asterisk13/Makefile b/net/asterisk13/Makefile
index 9b61b2c760d7..728a1474d051 100644
--- a/net/asterisk13/Makefile
+++ b/net/asterisk13/Makefile
@@ -161,11 +161,6 @@ ODBC_CONFIGURE_ON=	--with-ltdl
 ODBC_LIB_DEPENDS=	libodbc.so:databases/unixODBC \
 			libltdl.so:devel/libltdl
 
-OOH323_CPPFLAGS=	-I${LOCALBASE}/include/openh323
-OOH323_LIB_DEPENDS=     libpt_r.so:devel/pwlib \
-			libh323_r.so:net/openh323
-OOH323_MAKE_ENV=	OPENH323DIR=${LOCALBASE}/share/openh323
-
 PGSQL_CONFIGURE_WITH=	postgres
 PGSQL_USES=		pgsql
 
diff --git a/net/asterisk13/files/patch-configure b/net/asterisk13/files/patch-configure
index cdf76d929870..af082d052990 100644
--- a/net/asterisk13/files/patch-configure
+++ b/net/asterisk13/files/patch-configure
@@ -30,15 +30,6 @@
   #include <ifaddrs.h>
  int
  main ()
-@@ -30490,7 +30490,7 @@ $as_echo "${OPENH323_BUILD}" >&6; }
- 
- 	fi
- 
--	PLATFORM_OPENH323="h323_${PWLIB_PLATFORM}_${OPENH323_SUFFIX}"
-+	PLATFORM_OPENH323="h323_${OPENH323_SUFFIX}"
- 
- 	if test "${HAS_OPENH323:-unset}" != "unset"; then
- 	   { $as_echo "$as_me:${as_lineno-$LINENO}: checking OpenH323 installation validity" >&5
 @@ -30588,13 +30588,13 @@ if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no";
        ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
        CFLAGS="${CFLAGS} "
diff --git a/net/ohphone/Makefile b/net/ohphone/Makefile
deleted file mode 100644
index a5bba515c861..000000000000
--- a/net/ohphone/Makefile
+++ /dev/null
@@ -1,51 +0,0 @@
-# Created by: Roger Hardiman <roger@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME=	ohphone
-PORTVERSION=	1.4.5
-PORTREVISION=	12
-CATEGORIES=	net
-MASTER_SITES=	ftp://ftp.frm2.tum.de/pub/jpulz/FreeBSD/distfiles/
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	H323 Video Conferencing Program, compatible with NetMeeting
-
-LICENSE=	MPL10
-
-LIB_DEPENDS=	libh323_r.so:net/openh323
-
-USES=		bison gmake
-ALL_TARGET=	optshared
-MAKE_ENV=	PWLIBDIR=${LOCALBASE}/share/pwlib \
-		OPENH323DIR=${LOCALBASE}/share/openh323 \
-		SYSLIBDIR=${LOCALBASE}/lib
-MAKE_ARGS=	OSTYPE=${OPSYS} MACHTYPE=${ARCH:S/i386/x86/} \
-		OSRELEASE=${OSVERSION} CPLUS=${CXX}
-USE_GCC=	any
-
-PLIST_SUB=	PORTNAME=${PORTNAME}
-DOCSDIR=	${PREFIX}/share/doc/openh323
-EXAMPLESDIR=	${PREFIX}/share/examples/openh323
-
-PLIST_FILES=	bin/${PORTNAME} \
-		man/man1/${PORTNAME}.1.gz
-PORTDOCS=	*
-PORTEXAMPLES=	*
-
-OPTIONS_DEFINE=	DOCS EXAMPLES
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/obj_r/ohphone ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/ohphone.1 ${STAGEDIR}${PREFIX}/man/man1
-
-do-install-DOCS-on:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}/${PORTNAME}
-	${INSTALL_DATA} ${WRKSRC}/ReadMe.txt ${STAGEDIR}${DOCSDIR}/${PORTNAME}
-
-do-install-EXAMPLES-on:
-	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/${PORTNAME}
-	${INSTALL_DATA} ${WRKSRC}/check_listen.awk ${STAGEDIR}${EXAMPLESDIR}/${PORTNAME}
-	${INSTALL_DATA} ${WRKSRC}/regtest ${STAGEDIR}${EXAMPLESDIR}/${PORTNAME}
-	${INSTALL_DATA} ${WRKSRC}/stresstest ${STAGEDIR}${EXAMPLESDIR}/${PORTNAME}
-
-.include <bsd.port.mk>
diff --git a/net/ohphone/distinfo b/net/ohphone/distinfo
deleted file mode 100644
index b1a355f2ea53..000000000000
--- a/net/ohphone/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (ohphone-1.4.5.tar.gz) = 62e3038341d940700d186f68fff9a4b38c891d7afc6562e5afa9c31789b96d3d
-SIZE (ohphone-1.4.5.tar.gz) = 75743
diff --git a/net/ohphone/files/patch-main.cxx b/net/ohphone/files/patch-main.cxx
deleted file mode 100644
index b23cb1f33c6b..000000000000
--- a/net/ohphone/files/patch-main.cxx
+++ /dev/null
@@ -1,47 +0,0 @@
---- main.cxx.orig	2006-04-06 18:21:49 UTC
-+++ main.cxx
-@@ -184,6 +184,8 @@
-  */
- 
- #include <ptlib.h>
-+#include <ptlib/sound.h>
-+#include <ptlib/video.h>
- #include <ptclib/random.h>
- 
- #include "main.h"
-@@ -224,7 +226,7 @@
- #include "xlibvid.h"
- #endif
- 
--#ifdef P_SDL
-+#if P_SDL
- #include <ptclib/vsdl.h>
- #endif
- 
-@@ -554,7 +556,7 @@ void OhPhone::Main()
-             "                          :      svga256  256 colour VGA (Linux only)\n"
-             "                          :      svga     full colour VGA (Linux only)\n"
- #endif
--#ifdef P_SDL
-+#if P_SDL
-             "                          :      sdl      Use Simple DirectMedia Library\n"
- #endif
- #ifdef HAS_X11
-@@ -855,7 +857,7 @@ BOOL MyH323EndPoint::Initialise(PConfigA
-         && !(videoReceiveDevice *= "svga")
-         && !(videoReceiveDevice *= "svga256")
- #endif
--#ifdef P_SDL
-+#if P_SDL
-         && !(videoReceiveDevice *= "sdl")
- #endif
- #ifdef HAS_X11
-@@ -2065,7 +2067,7 @@ BOOL MyH323EndPoint::OpenVideoChannel(H3
-   if ((!isEncoding) || videoLocal)
-     PAssert(!videoReceiveDevice.IsEmpty(), "video display created without device type");
- 
--#ifdef P_SDL
-+#if P_SDL
-      // Dump received video to SDL 
-     if (videoReceiveDevice *= "sdl") 
-       display = new PSDLVideoDevice();
diff --git a/net/ohphone/files/patch-xlibvid.cxx b/net/ohphone/files/patch-xlibvid.cxx
deleted file mode 100644
index 0b62edc69f9c..000000000000
--- a/net/ohphone/files/patch-xlibvid.cxx
+++ /dev/null
@@ -1,10 +0,0 @@
---- xlibvid.cxx.orig	2006-04-06 18:21:49 UTC
-+++ xlibvid.cxx
-@@ -88,6 +88,7 @@
- #include <sys/time.h>
- #include <unistd.h>
- #include <ptlib.h>
-+#include <ptlib/video.h>
- #include <string.h>
- #include "xlibvid.h"
- 
diff --git a/net/ohphone/pkg-descr b/net/ohphone/pkg-descr
deleted file mode 100644
index 9b46b3c1bfb4..000000000000
--- a/net/ohphone/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
-OhPhone is a H323 Video Conferencing Program compatible with other
-H323 video conferencing programs including Microsoft NetMeeting.
-
-OhPhone supports full duplex audio and bi-directional video.
-It requires a full duplex sound card for audio support
-and a Bt848/878 based video card (using the bktr driver) for video capture.
-
-It uses the OpenH323 and PWLib libraries, developed by Equivalence Pty.
diff --git a/net/openh323/Makefile b/net/openh323/Makefile
deleted file mode 100644
index 1b06e0fa7914..000000000000
--- a/net/openh323/Makefile
+++ /dev/null
@@ -1,57 +0,0 @@
-# Created by: Roger Hardiman <roger@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME=	openh323
-PORTVERSION=	1.19.0.1
-PORTREVISION=	13
-CATEGORIES=	net
-MASTER_SITES=	SF
-DISTNAME=	${PORTNAME}-v${PORTVERSION:S/./_/g}-src
-EXTRACT_SUFX=	-tar.gz
-DIST_SUBDIR=	openh323
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	H323 Video Conferencing library
-
-LIB_DEPENDS=	libpt_r.so:devel/pwlib
-
-BROKEN_powerpc64=	Does not build: call to H261Encoder::~H261Encoder() lacks nop, can't restore toc
-
-CONFLICTS=	h323plus-1.*
-
-WRKSRC=		${WRKDIR}/${PORTNAME}_v${PORTVERSION:S/./_/g}
-
-USES=		bison gmake
-USE_GCC=	yes
-USE_AUTOTOOLS=	autoconf
-GNU_CONFIGURE=	yes
-USE_LDCONFIG=	yes
-
-CFLAGS_amd64=	-fPIC
-CFLAGS_powerpc=	-fPIC
-CFLAGS_sparc64=	-fPIC
-
-ALL_TARGET=	optshared
-CONFIGURE_ENV+=	BUILDTIME="YES"
-CPPFLAGS+=	-I${LOCALBASE}/include -I${WRKSRC}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-MAKE_ENV=	BUILDTIME="YES"
-
-OPTIONS_DEFINE=		FFMPEG SPEEX
-FFMPEG_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg
-FFMPEG_CONFIGURE_ON=	--enable-rfc2190avcodec=${LOCALBASE}/include/ffmpeg
-
-SPEEX_LIB_DEPENDS=	libspeex.so:audio/speex
-SPEEX_CONFIGURE_ON=	--enable-localspeex=no
-SPEEX_CONFIGURE_OFF=	--enable-localspeex=yes
-
-.include <bsd.port.pre.mk>
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
-		${WRKSRC}/configure.ac
-
-post-install:
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/pwlib/codecs/audio/*.so
-
-.include <bsd.port.post.mk>
diff --git a/net/openh323/distinfo b/net/openh323/distinfo
deleted file mode 100644
index 1f155338ee7f..000000000000
--- a/net/openh323/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (openh323/openh323-v1_19_0_1-src-tar.gz) = a4909d8d26a50eec42d3bfb6b88ff53ef0a714e6c6b6cf381b783050a09d31ea
-SIZE (openh323/openh323-v1_19_0_1-src-tar.gz) = 3959271
diff --git a/net/openh323/files/patch-include-h4601.h b/net/openh323/files/patch-include-h4601.h
deleted file mode 100644
index 8022ba51565b..000000000000
--- a/net/openh323/files/patch-include-h4601.h
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN include/h4601.h.orig include/h4601.h
---- include/h4601.h.orig    2006-06-08 09:26:16.000000000 -0400
-+++ include/h4601.h        2007-12-31 15:10:41.000000000 -0500
-@@ -61,6 +61,7 @@
-
- #include "h225.h"
- #include "transports.h"
-+#include <ptlib/pluginmgr.h>
- #include <ptclib/url.h>
-
-
-
diff --git a/net/openh323/files/patch-include-mediafmt.h b/net/openh323/files/patch-include-mediafmt.h
deleted file mode 100644
index 641449b9142a..000000000000
--- a/net/openh323/files/patch-include-mediafmt.h
+++ /dev/null
@@ -1,19 +0,0 @@
---- ../openh323.orig/work/openh323_v1_18_0/include/mediafmt.h	2005-11-30 08:05:01.000000000 -0500
-+++ include/mediafmt.h	2008-01-05 23:12:39.000000000 -0500
-@@ -163,9 +163,13 @@
-     RTP_DataFrame::PayloadTypes GetPayloadType() const { return rtpPayloadType; }
- 
-     enum {
--      DefaultAudioSessionID = 1,
--      DefaultVideoSessionID = 2,
--      DefaultDataSessionID  = 3
-+      FirstSessionID            = 1,
-+      DefaultAudioSessionID     = 1,
-+      DefaultVideoSessionID     = 2,
-+      DefaultDataSessionID      = 3,
-+      DefaultH224SessionID      = 4,
-+      DefaultExtVideoSessionID  = 5,
-+      LastSessionID             = 5
-     };
- 
-     /**Get the default session ID for media format.
diff --git a/net/openh323/files/patch-makefile.in b/net/openh323/files/patch-makefile.in
deleted file mode 100644
index 15d9a24d22f8..000000000000
--- a/net/openh323/files/patch-makefile.in
+++ /dev/null
@@ -1,37 +0,0 @@
---- Makefile.in.orig	2005-08-04 19:31:59 UTC
-+++ Makefile.in
-@@ -337,22 +337,14 @@
- install:
- 	mkdir -p $(DESTDIR)$(LIBDIR)
- 	rm -f $(DESTDIR)$(LIBDIR)/libh323_*_r.so*
--	$(INSTALL) -m 444 lib/$(OH323_FILE).@MAJOR_VERSION@.@MINOR_VERSION@.@BUILD_NUMBER@ $(DESTDIR)$(LIBDIR)
--	(cd $(DESTDIR)$(LIBDIR) ; \
--		rm -f  $(OH323_FILE).@MAJOR_VERSION@.@MINOR_VERSION@ ; \
--		ln -sf $(OH323_FILE).@MAJOR_VERSION@.@MINOR_VERSION@.@BUILD_NUMBER@ $(OH323_FILE).@MAJOR_VERSION@.@MINOR_VERSION@ \
--	)
--	(cd $(DESTDIR)$(LIBDIR) ; \
--		rm -f  $(OH323_FILE).@MAJOR_VERSION@ ; \
--		ln -sf $(OH323_FILE).@MAJOR_VERSION@.@MINOR_VERSION@.@BUILD_NUMBER@ $(OH323_FILE).@MAJOR_VERSION@ \
--	)
-+	$(BSD_INSTALL_LIB) lib/$(OH323_FILE).@MAJOR_VERSION@ $(DESTDIR)$(LIBDIR)
- 	(cd $(DESTDIR)$(LIBDIR) ; \
- 		rm -f  $(OH323_FILE) ; \
--		ln -sf $(OH323_FILE).@MAJOR_VERSION@.@MINOR_VERSION@.@BUILD_NUMBER@ $(OH323_FILE) \
-+		ln -sf $(OH323_FILE).@MAJOR_VERSION@ $(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 \
-@@ -362,6 +354,7 @@
- 	( for fn in include/*.h ; do \
- 		$(INSTALL) -m 444 $$fn $(DESTDIR)$(PREFIX)/include/openh323 ; \
- 	done)
-+	$(INSTALL) -m 444 version.h $(DESTDIR)$(PREFIX)/share/openh323
- 	$(INSTALL) -m 444 openh323u.mak $(DESTDIR)$(PREFIX)/share/openh323
- 	(cd plugins; $(MAKE) install)
- 
diff --git a/net/openh323/files/patch-openh323u.mak.in b/net/openh323/files/patch-openh323u.mak.in
deleted file mode 100644
index 8fc762274799..000000000000
--- a/net/openh323/files/patch-openh323u.mak.in
+++ /dev/null
@@ -1,49 +0,0 @@
---- openh323u.mak.in.orig	Mon Jan  3 12:25:51 2005
-+++ openh323u.mak.in	Wed Apr 26 11:37:40 2006
-@@ -163,7 +163,15 @@
- #
- 
- PWLIBDIR	= @PWLIBDIR@
-+
-+ifdef BUILDTIME
- OPENH323DIR	= @OPENH323DIR@
-+endif
-+
-+ifndef OPENH323DIR
-+OPENH323DIR	= /usr/local/share/openh323
-+endif
-+
- STDCCFLAGS	+= @STDCCFLAGS@
- LDFLAGS		+= @LDFLAGS@
- LDLIBS		+= @LDLIBS@
-@@ -197,11 +205,18 @@
- #OH323_SUPPRESS_H235	= 1
- 
- OH323_SRCDIR = $(OPENH323DIR)/src
--ifdef PREFIX
--OH323_INCDIR = $(PREFIX)/include/openh323
-+
-+ifdef LOCALBASE
-+OH323_INCDIR = $(LOCALBASE)/include/openh323
-+OH323_LIBDIR = $(LOCALBASE)/lib
- else
- OH323_INCDIR = $(OPENH323DIR)/include
--endif # PREFIX
-+endif # LOCALBASE
-+
-+ifdef BUILDTIME
-+OH323_INCDIR = ${OPENH323DIR}/include
-+OH323_LIBDIR = $(OPENH323DIR)/lib
-+endif #BUILDTIME
- 
- ifndef OH323_LIBDIR
- OH323_LIBDIR = $(OPENH323DIR)/lib
-@@ -216,7 +231,7 @@
- OH323_SUFFIX = $(OBJ_SUFFIX)
- endif # NOTRACE
- 
--OH323_BASE  = h323_$(PLATFORM_TYPE)_$(OH323_SUFFIX)$(LIB_TYPE)
-+OH323_BASE  = h323_$(OH323_SUFFIX)$(LIB_TYPE)
- OH323_FILE  = lib$(OH323_BASE).$(LIB_SUFFIX)
- 
- LDFLAGS	    += -L$(OH323_LIBDIR)
diff --git a/net/openh323/files/patch-plugins-audio-GSM0610-Makefile.in b/net/openh323/files/patch-plugins-audio-GSM0610-Makefile.in
deleted file mode 100644
index fb006b9e937c..000000000000
--- a/net/openh323/files/patch-plugins-audio-GSM0610-Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
---- plugins/audio/GSM0610/Makefile.in.orig	2011-04-04 21:11:06.526890734 +0200
-+++ plugins/audio/GSM0610/Makefile.in	2011-04-04 21:12:20.656887701 +0200
-@@ -74,4 +74,5 @@
- CXX=@CXX@
- LDSO=@LDSO@
-+LDFLAGS=@LDFLAGS@
- 
- ifndef PREFIX
-@@ -139,5 +140,5 @@
- 
- $(PLUGIN): $(OBJECTS)
--	$(CC) $(LDSO)$(SONAME) -o $@ $^ $(EXTRALIBS)
-+	$(CC) $(LDSO)$(SONAME) -o $@ $^ $(LDFLAGS) $(EXTRALIBS)
- 
- endif
diff --git a/net/openh323/files/patch-plugins-audio-Speex-Makefile.in b/net/openh323/files/patch-plugins-audio-Speex-Makefile.in
deleted file mode 100644
index f634b0f5d68c..000000000000
--- a/net/openh323/files/patch-plugins-audio-Speex-Makefile.in
+++ /dev/null
@@ -1,19 +0,0 @@
---- plugins/audio/Speex/Makefile.in.orig	Wed Apr  5 23:40:27 2006
-+++ plugins/audio/Speex/Makefile.in	Wed Apr  5 23:41:12 2006
-@@ -59,6 +59,7 @@
- CC=@CC@
- CXX=@CXX@
- LDSO=@LDSO@
-+LDFLAGS=@LDFLAGS@
- 
- ifndef PREFIX
- PREFIX=/usr/local
-@@ -101,7 +102,7 @@
- OBJECTS	= $(addprefix $(OBJDIR)/,$(patsubst %.cxx,%.o,$(patsubst %.c,%.o,$(notdir $(SRCS)))))
- 
- $(PLUGIN): $(OBJECTS)
--	$(CC) $(LDSO)$(SONAME) -o $@ $^ $(EXTRALIBS)
-+	$(CC) $(LDSO)$(SONAME) -o $@ $^ $(LDFLAGS) $(EXTRALIBS)
- 
- install:
- 	mkdir -p $(DESTDIR)$(LIBDIR)/pwlib/codecs/audio/
diff --git a/net/openh323/files/patch-src-h261codec-cxx b/net/openh323/files/patch-src-h261codec-cxx
deleted file mode 100644
index ff426c9fde64..000000000000
--- a/net/openh323/files/patch-src-h261codec-cxx
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ruN src/h261codec.cxx.orig src/h261codec.cxx
---- src/h261codec.cxx  2006-06-06 04:05:40.000000000 -0400
-+++ src/h261codec.cxx      2007-12-31 15:17:29.000000000 -0500
-@@ -279,6 +279,7 @@
- #include "h245.h"
- #include "rtp.h"
-
-+#include <ptlib/video.h>
- #include "vic/p64.h"
- #include "vic/p64encoder.h"
-
diff --git a/net/openh323/files/patch-src-h323caps.cxx b/net/openh323/files/patch-src-h323caps.cxx
deleted file mode 100644
index 164315e4c9e6..000000000000
--- a/net/openh323/files/patch-src-h323caps.cxx
+++ /dev/null
@@ -1,58 +0,0 @@
---- src/h323caps.cxx.orig	2006-05-16 07:36:01.000000000 -0400
-+++ src/h323caps.cxx	2007-12-31 15:28:02.000000000 -0500
-@@ -2076,7 +2076,7 @@
-                                             PINDEX simultaneous,
-                                             const PString & name)
- {
--  PINDEX reply = descriptorNum == P_MAX_INDEX ? P_MAX_INDEX : simultaneous;
-+/*  PINDEX reply = descriptorNum == P_MAX_INDEX ? P_MAX_INDEX : simultaneous;
- 
-   PStringArray wildcard = name.Tokenise('*', FALSE);
- 
-@@ -2109,6 +2109,46 @@
-   }
- 
-   return reply;
-+*/
-+
-+
-+
-+
-+  PINDEX reply = descriptorNum == P_MAX_INDEX ? P_MAX_INDEX : simultaneous;
-+
-+  PStringArray wildcard = name.Tokenise('*', FALSE);
-+
-+  H323CapabilityFactory::KeyList_T stdCaps = H323CapabilityFactory::GetKeyList();
-+
-+  for (unsigned session = OpalMediaFormat::FirstSessionID; session <= OpalMediaFormat::LastSessionID; session++) {
-+    for (H323CapabilityFactory::KeyList_T::const_iterator r = stdCaps.begin(); r != stdCaps.end(); ++r) {
-+      PString capName(*r);
-+      if (MatchWildcard(capName, wildcard) && (FindCapability(capName) == NULL)) {
-+        OpalMediaFormat mediaFormat(capName);
-+        if (!mediaFormat.IsValid() && (capName.Right(4) == "{sw}") && capName.GetLength() > 4)
-+          mediaFormat = OpalMediaFormat(capName.Left(capName.GetLength()-4));
-+        if (mediaFormat.IsValid() && mediaFormat.GetDefaultSessionID() == session) {
-+          // add the capability
-+          H323Capability * capability = H323Capability::Create(capName);
-+          PINDEX num = SetCapability(descriptorNum, simultaneous, capability);
-+          if (descriptorNum == P_MAX_INDEX) {
-+            reply = num;
-+            descriptorNum = num;
-+            simultaneous = P_MAX_INDEX;
-+          }
-+          else if (simultaneous == P_MAX_INDEX) {
-+            if (reply == P_MAX_INDEX)
-+              reply = num;
-+            simultaneous = num;
-+          }
-+        }
-+      }
-+    }
-+    simultaneous = P_MAX_INDEX;
-+  }
-+
-+  return reply;
-+
- }
- 
- 
diff --git a/net/openh323/files/patch-src-h323ep-cxx b/net/openh323/files/patch-src-h323ep-cxx
deleted file mode 100644
index 29e80a67bd5f..000000000000
--- a/net/openh323/files/patch-src-h323ep-cxx
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ruN src/h323ep.cxx.orig src/h323ep.cxx
---- src/h323ep.cxx.orig     2006-06-09 02:30:12.000000000 -0400
-+++ src/h323ep.cxx 2007-12-31 13:11:13.000000000 -0500
-@@ -793,6 +793,7 @@
- #include <ptclib/url.h>
- #include <ptclib/pils.h>
- #include <ptclib/enum.h>
-+#include <ptlib/sound.h>
-
- #if defined(H323_RTP_AGGREGATE) || defined(H323_SIGNAL_AGGREGATE)
- #include <ptclib/sockagg.h>
diff --git a/net/openh323/files/patch-src-h323pluginmgr-cxx b/net/openh323/files/patch-src-h323pluginmgr-cxx
deleted file mode 100644
index e3546d1dbe2c..000000000000
--- a/net/openh323/files/patch-src-h323pluginmgr-cxx
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ruN src/h323pluginmgr.cxx.orig src/h323pluginmgr.
-cxx
---- src/h323pluginmgr.cxx.orig      2005-08-05 13:11:03.000000000 -0400
-+++ src/h323pluginmgr.cxx  2007-12-31 15:04:53.000000000 -0500
-@@ -1305,7 +1305,7 @@
-         PTRACE(4, "H323PLUGIN\tCannot instantiate static codec plugin " << *r);
-       } else {
-         PTRACE(4, "H323PLUGIN\tLoading static codec plugin " << *r);
--        RegisterStaticCodec(*r, instance->Get_GetAPIFn(), instance->Get_GetCodecFn());
-+        RegisterStaticCodec(r->c_str(), instance->Get_GetAPIFn(), instance->Get_GetCodecFn());
-       }
-     }
-   }
diff --git a/net/openh323/files/patch-src-mediafmt.cxx b/net/openh323/files/patch-src-mediafmt.cxx
deleted file mode 100644
index 084c50685c93..000000000000
--- a/net/openh323/files/patch-src-mediafmt.cxx
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN src/mediafmt.cxx.orig src/mediafmt.cxx
---- src/mediafmt.cxx.orig   2005-01-11 02:12:13.000000000 -0500
-+++ src/mediafmt.cxx       2007-12-31 14:48:26.000000000 -0500
-@@ -395,7 +395,7 @@
-     OpalMediaFormatFactory::KeyMap_T & keyMap = OpalMediaFormatFactory::GetKeyMap();
-     OpalMediaFormatFactory::KeyMap_T::const_iterator r;
-     for (r = keyMap.begin(); r != keyMap.end(); ++r) {
--      if (r->first.Find(search) != P_MAX_INDEX) {
-+      if (r->first.find(search) != P_MAX_INDEX) {
-         *this = *OpalMediaFormatFactory::CreateInstance(r->first);
-         break;
-       }
diff --git a/net/openh323/pkg-descr b/net/openh323/pkg-descr
deleted file mode 100644
index 41ce54a1e678..000000000000
--- a/net/openh323/pkg-descr
+++ /dev/null
@@ -1,11 +0,0 @@
-OpenH323 is a multi-platform H323 Video Conferencing library.
-
-This is used to make H323 Video Conferencing applications
-like GnomeMeeting and ohphone. (both in the FreeBSD ports tree)
-
-The library includes a sample program called simph323.
-
-The OpenH323 library makes use of PWLib. http://www.equival.com
-PWLib is a multi-platform code library that can be used to write
-applications that will compile and run on the BSD Unixes, Windows, Linux
-and a few other Unix variants. It was developed by Equivalence Ltd Pty.
diff --git a/net/openh323/pkg-plist b/net/openh323/pkg-plist
deleted file mode 100644
index e7b226b3faeb..000000000000
--- a/net/openh323/pkg-plist
+++ /dev/null
@@ -1,86 +0,0 @@
-lib/libh323_r.so
-lib/libh323_r.so.1
-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/h4601.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
-%%DATADIR%%/openh323u.mak
-%%DATADIR%%/version.h
-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