15 files changed, 315 insertions, 368 deletions

diff --git a/net/Makefile b/net/Makefile
index f5017e9e3ab9..f4f5662e7d4e 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -354,6 +354,7 @@
     SUBDIR += olsrd
     SUBDIR += onenetd
     SUBDIR += onion-fec
+    SUBDIR += opal
     SUBDIR += openam
     SUBDIR += openbgpd
     SUBDIR += openbgpd-devel
diff --git a/net/opal/Makefile b/net/opal/Makefile
index 205f557afca5..89e4771a470f 100644
--- a/net/opal/Makefile
+++ b/net/opal/Makefile
@@ -5,39 +5,26 @@
 # $FreeBSD$
 #
 
-PORTNAME=	openh323
-PORTVERSION=	1.17.3
-PORTREVISION=	2
+PORTNAME=	opal
+PORTVERSION=	2.2.1
 CATEGORIES=	net
 MASTER_SITES=	http://www.voxgratia.org/releases/
 DISTNAME=	${PORTNAME}-v${PORTVERSION:S/./_/g}-src-
 EXTRACT_SUFX=	tar.gz
 
-MAINTAINER=	steve@energistic.com
-COMMENT=	A H323 Video Conferencing library
+MAINTAINER=	jbq@caraldi.com
+COMMENT=	VoIP abstraction library
 
-LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2 \
-		pt_r.1:${PORTSDIR}/devel/pwlib
+LIB_DEPENDS=	pt_r.1:${PORTSDIR}/devel/pwlib
 
 WRKSRC=		${WRKDIR}/${PORTNAME}_v${PORTVERSION:S/./_/g}
 
-USE_BISON=	yes
 USE_GMAKE=	yes
-USE_OPENLDAP=	yes
 USE_AUTOTOOLS=	autoconf:259
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 
-ALL_TARGET=	optshared
 CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -I${WRKSRC}/include" \
-		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" BUILDTIME="YES"
-MAKE_ENV=	BUILDTIME="YES"
-NO_FILTER_SHLIBS=	yes
+		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
 
-.include <bsd.port.pre.mk>
-
-.if (${ARCH} == "amd64") || (${ARCH} == "ia64") || (${ARCH} == "sparc64")
-CFLAGS+=	-fPIC
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/opal/distinfo b/net/opal/distinfo
index 59d1d8ae9281..6b743bb33c55 100644
--- a/net/opal/distinfo
+++ b/net/opal/distinfo
@@ -1,3 +1,3 @@
-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
+MD5 (opal-v2_2_1-src-tar.gz) = a98f5e3b975215a2059582095d5c22d0
+SHA256 (opal-v2_2_1-src-tar.gz) = 4c35efa7cc3b8315cf4639629615de80f7aee709c5caf60064f92274e229eead
+SIZE (opal-v2_2_1-src-tar.gz) = 4091526
diff --git a/net/opal/files/patch-libspeex b/net/opal/files/patch-libspeex
new file mode 100644
index 000000000000..995ce4236118
--- /dev/null
+++ b/net/opal/files/patch-libspeex
@@ -0,0 +1,13 @@
+--- src/codec/speex/libspeex/kiss_fft.h.orig	Tue Apr  4 10:58:34 2006
++++ src/codec/speex/libspeex/kiss_fft.h	Tue Apr  4 10:58:57 2006
+@@ -6,10 +6,6 @@
+ #include <math.h>
+ #include <memory.h>
+ 
+-#ifndef P_MACOSX
+-#include <malloc.h>   // RMF
+-#endif
+-
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
diff --git a/net/opal/files/patch-makefile.in b/net/opal/files/patch-makefile.in
deleted file mode 100644
index 536bf181d711..000000000000
--- a/net/opal/files/patch-makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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
deleted file mode 100644
index e68b8c4420b9..000000000000
--- a/net/opal/files/patch-openh323u.mak.in
+++ /dev/null
@@ -1,47 +0,0 @@
---- openh323u.mak.in.orig	Tue Mar  7 15:45:47 2006
-+++ openh323u.mak.in	Tue Mar  7 15:50:52 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,12 +205,19 @@
- #OH323_SUPPRESS_H235	= 1
- 
- OH323_SRCDIR = $(OPENH323DIR)/src
-+
- ifdef PREFIX
- OH323_INCDIR = $(PREFIX)/include/openh323
-+OH323_LIBDIR = $(PREFIX)/lib
- else
- OH323_INCDIR = $(OPENH323DIR)/include
- endif # PREFIX
- 
-+ifdef BUILDTIME
-+OH323_INCDIR = ${OPENH323DIR}/include
-+OH323_LIBDIR = $(OPENH323DIR)/lib
-+endif #BUILDTIME
-+
- ifndef OH323_LIBDIR
- OH323_LIBDIR = $(OPENH323DIR)/lib
- endif # OH323_LIBDIR
-@@ -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/opal/pkg-descr b/net/opal/pkg-descr
index 5ea7add9f222..c232d9469719 100644
--- a/net/opal/pkg-descr
+++ b/net/opal/pkg-descr
@@ -1,13 +1,9 @@
-OpenH323 is a multi-platform H323 Video Conferencing library.
+OPAL is the "next generation" of OpenH323 that has a new architecture. Not only
+does it support H.323 and SIP, but new VoIP protocols or devices can be added
+very easily. It is being actively developed and is used by several projects
+such as Ekiga (http://www.ekiga.org)
 
-This is used to make H323 Video Conferencing applications
-like GnomeMeeting and ohphone. (both in the FreeBSD ports tree)
+BTW: OPAL is an acronym for Open Phone Abstraction Library, but that is not
+really important :)
 
-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.
-
-WWW: http://www.openh323.org/
+WWW: http://www.voxgratia.org/
diff --git a/net/opal/pkg-plist b/net/opal/pkg-plist
index 6eea50b90190..838eb1cf35a8 100644
--- a/net/opal/pkg-plist
+++ b/net/opal/pkg-plist
@@ -1,90 +1,127 @@
-lib/libh323_r.so
-lib/libh323_r.so.1
-lib/libh323_r.so.1.17
-lib/libh323_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
+include/opal/asn/gcc.h
+include/opal/asn/h225.h
+include/opal/asn/h235.h
+include/opal/asn/h245.h
+include/opal/asn/h248.h
+include/opal/asn/h4501.h
+include/opal/asn/h45010.h
+include/opal/asn/h45011.h
+include/opal/asn/h4502.h
+include/opal/asn/h4503.h
+include/opal/asn/h4504.h
+include/opal/asn/h4505.h
+include/opal/asn/h4506.h
+include/opal/asn/h4507.h
+include/opal/asn/h4508.h
+include/opal/asn/h4509.h
+include/opal/asn/h501.h
+include/opal/asn/mcs.h
+include/opal/asn/t38.h
+include/opal/asn/x880.h
+include/opal/codec/allcodecs.h
+include/opal/codec/echocancel.h
+include/opal/codec/g711codec.h
+include/opal/codec/g726codec.h
+include/opal/codec/g729codec.h
+include/opal/codec/gsmcodec.h
+include/opal/codec/h261codec.h
+include/opal/codec/h263codec.h
+include/opal/codec/ilbccodec.h
+include/opal/codec/lpc10codec.h
+include/opal/codec/mscodecs.h
+include/opal/codec/opalwavfile.h
+include/opal/codec/rfc2833.h
+include/opal/codec/silencedetect.h
+include/opal/codec/speexcodec.h
+include/opal/codec/vidcodec.h
+include/opal/h323/channels.h
+include/opal/h323/gkclient.h
+include/opal/h323/gkserver.h
+include/opal/h323/h225ras.h
+include/opal/h323/h235auth.h
+include/opal/h323/h323.h
+include/opal/h323/h323annexg.h
+include/opal/h323/h323caps.h
+include/opal/h323/h323con.h
+include/opal/h323/h323ep.h
+include/opal/h323/h323neg.h
+include/opal/h323/h323pdu.h
+include/opal/h323/h323rtp.h
+include/opal/h323/h323trans.h
+include/opal/h323/h450pdu.h
+include/opal/h323/h501pdu.h
+include/opal/h323/peclient.h
+include/opal/h323/q931.h
+include/opal/h323/svcctrl.h
+include/opal/h323/transaddr.h
+include/opal/iax2/causecode.h
+include/opal/iax2/frame.h
+include/opal/iax2/iax2.h
+include/opal/iax2/iax2con.h
+include/opal/iax2/iax2ep.h
+include/opal/iax2/iax2medstrm.h
+include/opal/iax2/iedata.h
+include/opal/iax2/ies.h
+include/opal/iax2/processor.h
+include/opal/iax2/receiver.h
+include/opal/iax2/remote.h
+include/opal/iax2/safestrings.h
+include/opal/iax2/sound.h
+include/opal/iax2/transmit.h
+include/opal/iax2/version.h
+include/opal/lids/QTIoctl.h
+include/opal/lids/alllids.h
+include/opal/lids/ixjDefs.h
+include/opal/lids/ixjidb.h
+include/opal/lids/ixjlid.h
+include/opal/lids/lid.h
+include/opal/lids/lidep.h
+include/opal/lids/sangomalid.h
+include/opal/lids/vblasterlid.h
+include/opal/lids/vpbapi.h
+include/opal/lids/vpblid.h
+include/opal/opal/buildopts.h
+include/opal/opal/call.h
+include/opal/opal/connection.h
+include/opal/opal/endpoint.h
+include/opal/opal/guid.h
+include/opal/opal/ivr.h
+include/opal/opal/manager.h
+include/opal/opal/mediacmd.h
+include/opal/opal/mediafmt.h
+include/opal/opal/mediastrm.h
+include/opal/opal/opalvxml.h
+include/opal/opal/patch.h
+include/opal/opal/pcss.h
+include/opal/opal/transcoders.h
+include/opal/opal/transports.h
+include/opal/rtp/jitter.h
+include/opal/rtp/rtp.h
+include/opal/sip/sdp.h
+include/opal/sip/sip.h
+include/opal/sip/sipcon.h
+include/opal/sip/sipep.h
+include/opal/sip/sippdu.h
+include/opal/t120/h323t120.h
+include/opal/t120/t120proto.h
+include/opal/t120/x224.h
+include/opal/t38/h323t38.h
+include/opal/t38/t38proto.h
+lib/libopal.so
+lib/libopal__r.so
+lib/libopal__r.so.2
+lib/libopal__r.so.2.2
+lib/libopal__r.so.2.2.1
+share/opal/opal_inc.mak
+@dirrm share/opal
+@dirrm include/opal/t38
+@dirrm include/opal/t120
+@dirrm include/opal/sip
+@dirrm include/opal/rtp
+@dirrm include/opal/opal
+@dirrm include/opal/lids
+@dirrm include/opal/iax2
+@dirrm include/opal/h323
+@dirrm include/opal/codec
+@dirrm include/opal/asn
+@dirrm include/opal
diff --git a/net/opal3/Makefile b/net/opal3/Makefile
index 205f557afca5..89e4771a470f 100644
--- a/net/opal3/Makefile
+++ b/net/opal3/Makefile
@@ -5,39 +5,26 @@
 # $FreeBSD$
 #
 
-PORTNAME=	openh323
-PORTVERSION=	1.17.3
-PORTREVISION=	2
+PORTNAME=	opal
+PORTVERSION=	2.2.1
 CATEGORIES=	net
 MASTER_SITES=	http://www.voxgratia.org/releases/
 DISTNAME=	${PORTNAME}-v${PORTVERSION:S/./_/g}-src-
 EXTRACT_SUFX=	tar.gz
 
-MAINTAINER=	steve@energistic.com
-COMMENT=	A H323 Video Conferencing library
+MAINTAINER=	jbq@caraldi.com
+COMMENT=	VoIP abstraction library
 
-LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2 \
-		pt_r.1:${PORTSDIR}/devel/pwlib
+LIB_DEPENDS=	pt_r.1:${PORTSDIR}/devel/pwlib
 
 WRKSRC=		${WRKDIR}/${PORTNAME}_v${PORTVERSION:S/./_/g}
 
-USE_BISON=	yes
 USE_GMAKE=	yes
-USE_OPENLDAP=	yes
 USE_AUTOTOOLS=	autoconf:259
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 
-ALL_TARGET=	optshared
 CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -I${WRKSRC}/include" \
-		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" BUILDTIME="YES"
-MAKE_ENV=	BUILDTIME="YES"
-NO_FILTER_SHLIBS=	yes
+		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
 
-.include <bsd.port.pre.mk>
-
-.if (${ARCH} == "amd64") || (${ARCH} == "ia64") || (${ARCH} == "sparc64")
-CFLAGS+=	-fPIC
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/opal3/distinfo b/net/opal3/distinfo
index 59d1d8ae9281..6b743bb33c55 100644
--- a/net/opal3/distinfo
+++ b/net/opal3/distinfo
@@ -1,3 +1,3 @@
-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
+MD5 (opal-v2_2_1-src-tar.gz) = a98f5e3b975215a2059582095d5c22d0
+SHA256 (opal-v2_2_1-src-tar.gz) = 4c35efa7cc3b8315cf4639629615de80f7aee709c5caf60064f92274e229eead
+SIZE (opal-v2_2_1-src-tar.gz) = 4091526
diff --git a/net/opal3/files/patch-libspeex b/net/opal3/files/patch-libspeex
new file mode 100644
index 000000000000..995ce4236118
--- /dev/null
+++ b/net/opal3/files/patch-libspeex
@@ -0,0 +1,13 @@
+--- src/codec/speex/libspeex/kiss_fft.h.orig	Tue Apr  4 10:58:34 2006
++++ src/codec/speex/libspeex/kiss_fft.h	Tue Apr  4 10:58:57 2006
+@@ -6,10 +6,6 @@
+ #include <math.h>
+ #include <memory.h>
+ 
+-#ifndef P_MACOSX
+-#include <malloc.h>   // RMF
+-#endif
+-
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
diff --git a/net/opal3/files/patch-makefile.in b/net/opal3/files/patch-makefile.in
deleted file mode 100644
index 536bf181d711..000000000000
--- a/net/opal3/files/patch-makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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
deleted file mode 100644
index e68b8c4420b9..000000000000
--- a/net/opal3/files/patch-openh323u.mak.in
+++ /dev/null
@@ -1,47 +0,0 @@
---- openh323u.mak.in.orig	Tue Mar  7 15:45:47 2006
-+++ openh323u.mak.in	Tue Mar  7 15:50:52 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,12 +205,19 @@
- #OH323_SUPPRESS_H235	= 1
- 
- OH323_SRCDIR = $(OPENH323DIR)/src
-+
- ifdef PREFIX
- OH323_INCDIR = $(PREFIX)/include/openh323
-+OH323_LIBDIR = $(PREFIX)/lib
- else
- OH323_INCDIR = $(OPENH323DIR)/include
- endif # PREFIX
- 
-+ifdef BUILDTIME
-+OH323_INCDIR = ${OPENH323DIR}/include
-+OH323_LIBDIR = $(OPENH323DIR)/lib
-+endif #BUILDTIME
-+
- ifndef OH323_LIBDIR
- OH323_LIBDIR = $(OPENH323DIR)/lib
- endif # OH323_LIBDIR
-@@ -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/opal3/pkg-descr b/net/opal3/pkg-descr
index 5ea7add9f222..c232d9469719 100644
--- a/net/opal3/pkg-descr
+++ b/net/opal3/pkg-descr
@@ -1,13 +1,9 @@
-OpenH323 is a multi-platform H323 Video Conferencing library.
+OPAL is the "next generation" of OpenH323 that has a new architecture. Not only
+does it support H.323 and SIP, but new VoIP protocols or devices can be added
+very easily. It is being actively developed and is used by several projects
+such as Ekiga (http://www.ekiga.org)
 
-This is used to make H323 Video Conferencing applications
-like GnomeMeeting and ohphone. (both in the FreeBSD ports tree)
+BTW: OPAL is an acronym for Open Phone Abstraction Library, but that is not
+really important :)
 
-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.
-
-WWW: http://www.openh323.org/
+WWW: http://www.voxgratia.org/
diff --git a/net/opal3/pkg-plist b/net/opal3/pkg-plist
index 6eea50b90190..838eb1cf35a8 100644
--- a/net/opal3/pkg-plist
+++ b/net/opal3/pkg-plist
@@ -1,90 +1,127 @@
-lib/libh323_r.so
-lib/libh323_r.so.1
-lib/libh323_r.so.1.17
-lib/libh323_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
+include/opal/asn/gcc.h
+include/opal/asn/h225.h
+include/opal/asn/h235.h
+include/opal/asn/h245.h
+include/opal/asn/h248.h
+include/opal/asn/h4501.h
+include/opal/asn/h45010.h
+include/opal/asn/h45011.h
+include/opal/asn/h4502.h
+include/opal/asn/h4503.h
+include/opal/asn/h4504.h
+include/opal/asn/h4505.h
+include/opal/asn/h4506.h
+include/opal/asn/h4507.h
+include/opal/asn/h4508.h
+include/opal/asn/h4509.h
+include/opal/asn/h501.h
+include/opal/asn/mcs.h
+include/opal/asn/t38.h
+include/opal/asn/x880.h
+include/opal/codec/allcodecs.h
+include/opal/codec/echocancel.h
+include/opal/codec/g711codec.h
+include/opal/codec/g726codec.h
+include/opal/codec/g729codec.h
+include/opal/codec/gsmcodec.h
+include/opal/codec/h261codec.h
+include/opal/codec/h263codec.h
+include/opal/codec/ilbccodec.h
+include/opal/codec/lpc10codec.h
+include/opal/codec/mscodecs.h
+include/opal/codec/opalwavfile.h
+include/opal/codec/rfc2833.h
+include/opal/codec/silencedetect.h
+include/opal/codec/speexcodec.h
+include/opal/codec/vidcodec.h
+include/opal/h323/channels.h
+include/opal/h323/gkclient.h
+include/opal/h323/gkserver.h
+include/opal/h323/h225ras.h
+include/opal/h323/h235auth.h
+include/opal/h323/h323.h
+include/opal/h323/h323annexg.h
+include/opal/h323/h323caps.h
+include/opal/h323/h323con.h
+include/opal/h323/h323ep.h
+include/opal/h323/h323neg.h
+include/opal/h323/h323pdu.h
+include/opal/h323/h323rtp.h
+include/opal/h323/h323trans.h
+include/opal/h323/h450pdu.h
+include/opal/h323/h501pdu.h
+include/opal/h323/peclient.h
+include/opal/h323/q931.h
+include/opal/h323/svcctrl.h
+include/opal/h323/transaddr.h
+include/opal/iax2/causecode.h
+include/opal/iax2/frame.h
+include/opal/iax2/iax2.h
+include/opal/iax2/iax2con.h
+include/opal/iax2/iax2ep.h
+include/opal/iax2/iax2medstrm.h
+include/opal/iax2/iedata.h
+include/opal/iax2/ies.h
+include/opal/iax2/processor.h
+include/opal/iax2/receiver.h
+include/opal/iax2/remote.h
+include/opal/iax2/safestrings.h
+include/opal/iax2/sound.h
+include/opal/iax2/transmit.h
+include/opal/iax2/version.h
+include/opal/lids/QTIoctl.h
+include/opal/lids/alllids.h
+include/opal/lids/ixjDefs.h
+include/opal/lids/ixjidb.h
+include/opal/lids/ixjlid.h
+include/opal/lids/lid.h
+include/opal/lids/lidep.h
+include/opal/lids/sangomalid.h
+include/opal/lids/vblasterlid.h
+include/opal/lids/vpbapi.h
+include/opal/lids/vpblid.h
+include/opal/opal/buildopts.h
+include/opal/opal/call.h
+include/opal/opal/connection.h
+include/opal/opal/endpoint.h
+include/opal/opal/guid.h
+include/opal/opal/ivr.h
+include/opal/opal/manager.h
+include/opal/opal/mediacmd.h
+include/opal/opal/mediafmt.h
+include/opal/opal/mediastrm.h
+include/opal/opal/opalvxml.h
+include/opal/opal/patch.h
+include/opal/opal/pcss.h
+include/opal/opal/transcoders.h
+include/opal/opal/transports.h
+include/opal/rtp/jitter.h
+include/opal/rtp/rtp.h
+include/opal/sip/sdp.h
+include/opal/sip/sip.h
+include/opal/sip/sipcon.h
+include/opal/sip/sipep.h
+include/opal/sip/sippdu.h
+include/opal/t120/h323t120.h
+include/opal/t120/t120proto.h
+include/opal/t120/x224.h
+include/opal/t38/h323t38.h
+include/opal/t38/t38proto.h
+lib/libopal.so
+lib/libopal__r.so
+lib/libopal__r.so.2
+lib/libopal__r.so.2.2
+lib/libopal__r.so.2.2.1
+share/opal/opal_inc.mak
+@dirrm share/opal
+@dirrm include/opal/t38
+@dirrm include/opal/t120
+@dirrm include/opal/sip
+@dirrm include/opal/rtp
+@dirrm include/opal/opal
+@dirrm include/opal/lids
+@dirrm include/opal/iax2
+@dirrm include/opal/h323
+@dirrm include/opal/codec
+@dirrm include/opal/asn
+@dirrm include/opal