Add net/opal3, VoIP abstraction library v3.

PR:		138718
Feature safe:	yes

12 files changed, 563 insertions, 96 deletions

diff --git a/net/Makefile b/net/Makefile
index 10a5d29b896f..cc207a201916 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -436,6 +436,7 @@
     SUBDIR += onion-fec
     SUBDIR += online-desktop
     SUBDIR += opal
+    SUBDIR += opal3
     SUBDIR += openam
     SUBDIR += openbgpd
     SUBDIR += openh323
diff --git a/net/opal3/Makefile b/net/opal3/Makefile
index e18a7d037cce..aa51b81c16fe 100644
--- a/net/opal3/Makefile
+++ b/net/opal3/Makefile
@@ -1,54 +1,265 @@
-# New ports collection makefile for:	openh323
+# New ports collection makefile for:	opal3
 # Date created:		Thu Feb 17 15:00:48 GMT 2000
 # Whom:			Roger Hardiman <roger@freebsd.org>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	opal
-PORTVERSION=	2.2.11
-PORTREVISION=	1
+PORTNAME=	opal3
+PORTVERSION=	3.6.6
 CATEGORIES=	net
-MASTER_SITES=	GNOME
+MASTER_SITES=	SF/opalvoip/v3.6%20Lalande/Stable%205
+DISTNAME=	opal-${PORTVERSION}
 
-MAINTAINER=	mi@aldan.algebra.com
+MAINTAINER=	melifaro@ipfw.ru
 COMMENT=	VoIP abstraction library
 
-OPTIONS=	FFMPEG	"Support H263 audio/video codec"	on \
-		SPEEX	"Use speex installed by audio/speex"	on
+LIB_DEPENDS=	pt-2.6.[4-9]:${PORTSDIR}/devel/ptlib26
 
-LIB_DEPENDS=	pt_r:${PORTSDIR}/devel/pwlib
+WRKSRC=		${WRKDIR}/opal-${PORTVERSION}
 
-# In opal's Makefile the default make's target is optshared
-ALL_TARGET=	-j`${SYSCTL} -n hw.ncpu` optshared
+USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	autoconf:262
-USE_GNOME=	gnometarget
 GNU_CONFIGURE=	yes
+USE_SLD=	yes
 USE_LDCONFIG=	yes
-MAKE_ARGS=	-j`${SYSCTL} -n hw.ncpu`
+#MAKE_JOBS_SAFE=	yes
 
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -I${WRKSRC}/include" \
-		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
-PLIST_SUB=	PORTVERSION=${PORTVERSION}
+CXXFLAGS+=	-I${LOCALBASE}/include
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+
+OPTIONS=	ZRTP	"Enable ZRTP protocol support" on \
+		JAVA	"Enable Java JNI support" off \
+		CELT	"Use celt codec from ports" on \
+		ILBC	"USE iLBC codec from ports" off \
+		GSM	"Use GSM codec from ports" on \
+		SPEEX	"Use SPEEX codec from ports" on \
+		THEORA	"Enable theora  codec support" off \
+		FFMPEG	"Enable ffmpeg codec support" on \
+		X264	"Enable x.264 codec support" on \
+		SIP	"Enable SIP protocol support" on \
+		H323	"Enable H.323 protocol support" off \
+		IAX	"Enable IAX2 protocol support" off \
+		H224	"Enable H.224 control protocol" on \
+		H281	"Enable H.281 (Far End Camera Control)" on \
+		FAX	"Enable Fax T.38 support" on \
+		MSRP	"Enable MSRP protocol" on \
+		SIPIM	"Enable SIP-IM protocol" on \
+		RTPTEXT	"Enable RFC4103 Text RTP payload" on \
+		H450	"Enable H.450 H.323 subset" off \
+		H460	"Enable H.460 H.323 extension for NAT traversal" off \
+		H501	"Enable H.501 H323 mobility extensions" off \
+		LID	"Enable LID (Light-Weight Identity) support" on \
+		UVIDEO	"Enable RFC4175 uncompressed video RTP payload" off \
+		AEC	"Enable accoustic echo cancellation" on
 
 .include <bsd.port.pre.mk>
 
-# Be sure to compile position-independent objects for the shared libraries
-CFLAGS+=	-fPIC
+.ifdef OPALDIR
+.error	OPALDIR is defined as an environment variable, or in the arguments \
+		to "make".  Please unset it and restart the build.
+.endif
+
+PLIST_SUB+=	PORTVERSION=${PORTVERSION} \
+		PVERSION_MAJOR=${PORTVERSION:C/.[0-9]+$//g}  \
+		PVERSION_MINOR=${PORTVERSION:C/^[0-9]+.[0-9]+.//}
+
+.if defined(WITH_ZRTP)
+LIB_DEPENDS+=	zrtpcpp.0:${PORTSDIR}/devel/libzrtpcpp
+CONFIGURE_ARGS+=	--enable-zrtp
+.else
+CONFIGURE_ARGS+=	--disable-zrtp
+.endif
+
+.if defined(WITH_GSM)
+LIB_DEPENDS+=	gsm.1:${PORTSDIR}/audio/gsm
+.else
+CONFIGURE_ARGS+=	--enable-localgsm
+.endif
+
+.if defined(WITH_SPEEX)
+LIB_DEPENDS+=	speex.1:${PORTSDIR}/audio/speex
+.else
+CONFIGURE_ARGS+=	--enable-localspeex
+.endif
+
+.if defined(WITH_JAVA)
+CONFIGURE_ARGS+=	--enable-java
+.else
+CONFIGURE_ARGS+=	--disable-java
+.endif
+
+.if defined(WITH_CELT)
+LIB_DEPENDS+=	celt.0:${PORTSDIR}/audio/celt
+CONFIGURE_ARGS+=	--enable-celt
+PLIST_SUB+=	CELT=""
+.else
+CONFIGURE_ARGS+=	--disable-celt
+PLIST_SUB+=	CELT="@comment "
+.endif
+
+.if defined(WITH_ILBC)
+LIB_DEPENDS+=	ilbc.0:${PORTSDIR}/net/ilbc
+.else
+CONFIGURE_ARGS+=	--enable-localilbc
+.endif
+
+.if defined(WITH_THEORA)
+LIB_DEPENDS+=	theora.0:${PORTSDIR}/multimedia/libtheora \
+		ogg.6:${PORTSDIR}/audio/libogg
+CONFIGURE_ARGS+=	--enable-theora
+PLIST_SUB+=	THEORA=""
+WITH_VIDEO=	yes
+.else
+CONFIGURE_ARGS+=	--disable-theora
+PLIST_SUB+=	THEORA="@comment "
+.endif
+
+.if defined(WITH_X264)
+LIB_DEPENDS+=	x264.6[0-9]:${PORTSDIR}/multimedia/x264
+CONFIGURE_ARGS+=	--enable-h264
+PLIST_SUB+=	X264=""
+WITH_VIDEO=	yes
+.else
+CONFIGURE_ARGS+=	--disable-h264
+PLIST_SUB+=	X264="@comment "
+.endif
+
+.if defined(WITH_FFMPEG)
+LIB_DEPENDS+=	avcodec.1:${PORTSDIR}/multimedia/ffmpeg
+CONFIGURE_ARGS+=	--enable-ffmpeg --enable-ffmpeg-h263
+PLIST_SUB+=	FFMPEG=""
+WITH_VIDEO=	yes
+.else
+CONFIGURE_ARGS+=	--disable-ffmpeg --disable-ffmpeg-h263
+PLIST_SUB+=	FFMPEG="@comment "
+.endif
+
+WITH_VIDEO=yes
+.if defined(WITH_VIDEO)
+CONFIGURE_ARGS+=	--enable-video
+PLIST_SUB+=	VIDEO=""
+.else
+CONFIGURE_ARGS+=	--disable-video
+PLIST_SUB+=	VIDEO="@comment "
+.endif
+
+.if defined(WITH_SIP)
+CONFIGURE_ARGS+=	--enable-sip
+.else
+CONFIGURE_ARGS+=	--disable-sip
+.endif
+
+.if defined(WITH_H323)
+CONFIGURE_ARGS+=	--enable-h323
+.else
+CONFIGURE_ARGS+=	--disable-h323
+.endif
 
-.if defined(WITHOUT_FFMPEG)
-CONFIGURE_ARGS+=--disable-h263avcodec
+.if defined(WITH_IAX)
+CONFIGURE_ARGS+=	--enable-iax
 .else
-LIB_DEPENDS+=	avcodec:${PORTSDIR}/multimedia/ffmpeg
-CONFIGURE_ARGS+=--enable-h263avcodec=${LOCALBASE}/include/ffmpeg
+CONFIGURE_ARGS+=	--disable-iax
 .endif
 
-.if defined(WITHOUT_SPEEX)
-CONFIGURE_ARGS+=--enable-localspeex=no
+.if defined(WITH_H224)
+CONFIGURE_ARGS+=	--enable-h224
 .else
-LIB_DEPENDS+=	speex:${PORTSDIR}/audio/speex
-CONFIGURE_ARGS+=--enable-localspeex=yes
+CONFIGURE_ARGS+=	--disable-h224
+.endif
+
+.if defined(WITH_H281)
+CONFIGURE_ARGS+=	--enable-h281
+.else
+CONFIGURE_ARGS+=	--disable-h281
+.endif
+
+.if defined(WITH_FAX)
+LIB_DEPENDS+=	spandsp.2:${PORTSDIR}/comms/spandsp-devel
+CONFIGURE_ARGS+=	--enable-fax --enable-t38
+PLIST_SUB+=	FAX=""
+.else
+CONFIGURE_ARGS+=	--disable-fax --disable-t38 --disable-spandsp
+PLIST_SUB+=	FAX="@comment "
+.endif
+
+.if defined(WITH_MSRP)
+CONFIGURE_ARGS+=	--enable-msrp
+##BROKEN=			Does not compile
+.else
+CONFIGURE_ARGS+=	--disable-msrp
+.endif
+
+.if defined(WITH_SIPIM)
+CONFIGURE_ARGS+=	--enable-sipim
+.else
+CONFIGURE_ARGS+=	--disable-sipim
+.endif
+
+.if defined(WITH_RTPTEXT)
+CONFIGURE_ARGS+=	--enable-rfc4103
+.else
+CONFIGURE_ARGS+=	--disable-rfc4103
+.endif
+
+.if defined(WITH_H450)
+CONFIGURE_ARGS+=	--enable-h450
+.else
+CONFIGURE_ARGS+=	--disable-h450
+.endif
+
+.if defined(WITH_H460)
+CONFIGURE_ARGS+=	--enable-h460
+.else
+CONFIGURE_ARGS+=	--disable-h460
+.endif
+
+.if defined(WITH_H501)
+CONFIGURE_ARGS+=	--enable-h501
+.else
+CONFIGURE_ARGS+=	--disable-h501
+.endif
+
+.if defined(WITH_LID)
+CONFIGURE_ARGS+=	--enable-lid --enable-ixj --enable-vpb
+PLIST_SUB+=	LID=""
+.else
+CONFIGURE_ARGS+=	--disable-lid --disable-ixj --disable-vpb
+PLIST_SUB+=	LID="@comment "
+.endif
+
+.if defined(WITH_UVIDEO)
+CONFIGURE_ARGS+=	--enable-rfc4175
+.else
+CONFIGURE_ARGS+=	--disable-rfc4175
+.endif
+
+.if defined(WITH_AEC)
+CONFIGURE_ARGS+=	--enable-aec
+.else
+CONFIGURE_ARGS+=	--disable-aec
+.endif
+
+.if defined(WITH_DEBUG)
+BROKEN=DEBUG: Not implemented
+.else
+CONFIGURE_ARGS+=	--disable-debug
+.endif
+
+post-patch:
+	@${REINPLACE_CMD} -e 's?-lopal?-lopal-${PORTVERSION:C/.[0-9]+$//g}?' ${WRKSRC}/opal.pc.in
+	@${REINPLACE_CMD} -e 's?^LIBS="-lilbc?LIBS="-lilbc -lm?' ${WRKSRC}/plugins/configure
+	@${REINPLACE_CMD} -e 's/^\(EXTRACCFLAGS.*\)/\1 -I\/usr\/local\/include/' ${WRKSRC}/plugins/*/*/Makefile.in
+	@${REINPLACE_CMD} -e 's?^EXTRALIBS = $(GSM_LIBS)?EXTRALIBS = $(GSM_LIBS) -L/usr/local/lib?' ${WRKSRC}/plugins/audio/GSM0610/Makefile.in
+	@${REINPLACE_CMD} -e 's?^EXTRALIBS = $(ILBC_LIBS)?EXTRALIBS = $(ILBC_LIBS) -L/usr/local/lib?' ${WRKSRC}/plugins/audio/iLBC/Makefile.in
+	@${REINPLACE_CMD} -e 's?ILBC_CFLAGS=""?ILBC_CFLAGS="-L/usr/local/lib"?' ${WRKSRC}/plugins/configure
+	@${REINPLACE_CMD} -e 's?^\(EXTRALIBS\)\(.*\)?\1\2 -L/usr/local/lib?' ${WRKSRC}/plugins/fax/fax_spandsp/Makefile.in
+	@${REINPLACE_CMD} -e 's?/pkgconfig?data/pkgconfig?g' ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e 's?@@SO_VER@@?'${PORTVERSION:C/.[0-9]+$//g}'.so.'${PORTVERSION:C/^[0-9]+.[0-9]+.//}'?g' ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e 's?@@SO_MAJ@@?'${PORTVERSION:C/.[0-9]+$//g}'.so?g' ${WRKSRC}/Makefile.in
+.if !defined(WITH_DEBUG)
+	@${REINPLACE_CMD} -e 's/^\(all:\).*/\1 optdepend opt/' ${WRKSRC}/Makefile.in
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/net/opal3/distinfo b/net/opal3/distinfo
index 7ba38f68e869..ac50a71ca72a 100644
--- a/net/opal3/distinfo
+++ b/net/opal3/distinfo
@@ -1,3 +1,3 @@
-MD5 (opal-2.2.11.tar.gz) = eb4a9c0c9ea93ec95c876aaeadf83936
-SHA256 (opal-2.2.11.tar.gz) = 0990ead39728f23a1ce39997f41a8484c59809ccec0e770b9bc4f795a85a29c4
-SIZE (opal-2.2.11.tar.gz) = 4165191
+MD5 (opal-3.6.6.tar.bz2) = 43b363c860780e7f1a0361cfee8f9f4a
+SHA256 (opal-3.6.6.tar.bz2) = 60c9d75703bedfeca7140cb76b23fae7179ce1f86e7e8b0026b72d66acd75c82
+SIZE (opal-3.6.6.tar.bz2) = 7062422
diff --git a/net/opal3/files/patch-Makefile.in b/net/opal3/files/patch-Makefile.in
index 43ac050eaf72..6082481257b3 100644
--- a/net/opal3/files/patch-Makefile.in
+++ b/net/opal3/files/patch-Makefile.in
@@ -1,13 +1,14 @@
---- Makefile.in.orig	Sat Apr 22 16:06:54 2006
-+++ Makefile.in	Thu Jun 22 09:39:04 2006
-@@ -427,10 +427,6 @@
- SOURCES += $(OPAL_SRCDIR)/lids/vpblid.cxx
- endif
+--- Makefile.in.orig	2009-09-11 02:47:07.000000000 +0400
++++ Makefile.in	2009-09-11 03:06:15.000000000 +0400
+@@ -541,8 +541,9 @@
+ install:
+ 	mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir)
+ 	$(INSTALL) -m 755 $(OPAL_LIBDIR)/$(LIB_FILENAME_STATIC) $(DESTDIR)$(libdir)
+-	$(INSTALL) -m 755 $(OPAL_LIBDIR)/$(LIB_FILENAME_SHARED_PAT) $(DESTDIR)$(libdir)
+-	ln -snf $(LIB_FILENAME_SHARED_PAT) $(DESTDIR)$(libdir)/$(LIB_FILENAME_SHARED)
++	$(INSTALL) -m 755 $(OPAL_LIBDIR)/$(LIB_FILENAME_SHARED_PAT) $(DESTDIR)$(libdir)/$(RELEASE_LIB_NAME)-@@SO_VER@@
++	ln -snf $(RELEASE_LIB_NAME)-@@SO_VER@@ $(DESTDIR)$(libdir)/$(RELEASE_LIB_NAME)-@@SO_MAJ@@
++	ln -snf $(RELEASE_LIB_NAME)-@@SO_VER@@ $(DESTDIR)$(libdir)/$(RELEASE_LIB_NAME).so
+ 	mkdir -p $(DESTDIR)$(libdir)/pkgconfig ; chmod 755 $(DESTDIR)$(libdir)/pkgconfig
+ 	$(INSTALL) -m 644 opal.pc $(DESTDIR)$(libdir)/pkgconfig
  
--ifdef HAS_SANGOMA
--SOURCES += $(OPAL_SRCDIR)/lids/sangomalid.cxx
--endif
--
- 
- ##################
- # Software codecs
diff --git a/net/opal3/files/patch-configure-spandsp b/net/opal3/files/patch-configure-spandsp
new file mode 100644
index 000000000000..88424a0b7e54
--- /dev/null
+++ b/net/opal3/files/patch-configure-spandsp
@@ -0,0 +1,56 @@
+--- plugins/configure.orig	2009-08-29 23:23:02.000000000 +0400
++++ plugins/configure	2009-08-29 23:23:29.000000000 +0400
+@@ -11549,9 +11549,9 @@
+ 
+           saved_LIBS="$LIBS"
+           LIBS="$LIBS -lspandsp"
+-          { echo "$as_me:$LINENO: checking for t38_indicator in -lspandsp" >&5
+-echo $ECHO_N "checking for t38_indicator in -lspandsp... $ECHO_C" >&6; }
+-if test "${ac_cv_lib_spandsp_t38_indicator+set}" = set; then
++          { echo "$as_me:$LINENO: checking for t38_core_init in -lspandsp" >&5
++echo $ECHO_N "checking for t38_core_init in -lspandsp... $ECHO_C" >&6; }
++if test "${ac_cv_lib_spandsp_t38_core_init+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -11569,11 +11569,11 @@
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-char t38_indicator ();
++char t38_core_init ();
+ int
+ main ()
+ {
+-return t38_indicator ();
++return t38_core_init ();
+   ;
+   return 0;
+ }
+@@ -11596,21 +11596,21 @@
+ 	 test ! -s conftest.err
+        } && test -s conftest$ac_exeext &&
+        $as_test_x conftest$ac_exeext; then
+-  ac_cv_lib_spandsp_t38_indicator=yes
++  ac_cv_lib_spandsp_t38_core_init=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-	ac_cv_lib_spandsp_t38_indicator=no
++	ac_cv_lib_spandsp_t38_core_init=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ echo "$as_me:$LINENO: result: $ac_cv_lib_spandsp_t38_indicator" >&5
+-echo "${ECHO_T}$ac_cv_lib_spandsp_t38_indicator" >&6; }
+-if test $ac_cv_lib_spandsp_t38_indicator = yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_spandsp_t38_core_init" >&5
++echo "${ECHO_T}$ac_cv_lib_spandsp_t38_core_init" >&6; }
++if test $ac_cv_lib_spandsp_t38_core_init = yes; then
+   opal_spandsp=yes
+ else
+   opal_spandsp=no
diff --git a/net/opal3/files/patch-includes_video_rfc2190.cxx b/net/opal3/files/patch-includes_video_rfc2190.cxx
new file mode 100644
index 000000000000..02b026280223
--- /dev/null
+++ b/net/opal3/files/patch-includes_video_rfc2190.cxx
@@ -0,0 +1,11 @@
+--- plugins/video/H.263-1998/rfc2190.cxx.orig	2009-08-30 02:08:09.000000000 +0400
++++ plugins/video/H.263-1998/rfc2190.cxx	2009-08-30 02:08:11.000000000 +0400
+@@ -21,7 +21,7 @@
+ 
+ #include <iostream>
+ #include <string.h>
+-#include <malloc.h>
++#include <stdlib.h>
+ using namespace std;
+ 
+ #include "rfc2190.h"
diff --git a/net/opal3/files/patch-libspeex b/net/opal3/files/patch-libspeex
deleted file mode 100644
index 5e452da8fc77..000000000000
--- a/net/opal3/files/patch-libspeex
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/codec/speex/libspeex/kiss_fft.h.orig	Thu Jun 22 09:56:34 2006
-+++ src/codec/speex/libspeex/kiss_fft.h	Thu Jun 22 09:56:53 2006
-@@ -6,10 +6,6 @@
- #include <math.h>
- #include <memory.h>
- 
--#if !(defined(P_MACOSX) || defined(P_FREEBSD))
--#include <malloc.h>   // RMF
--#endif
--
- #ifdef __cplusplus
- extern "C" {
- #endif
diff --git a/net/opal3/files/patch-opal_inc.mak.in b/net/opal3/files/patch-opal_inc.mak.in
deleted file mode 100644
index 1b879aae2153..000000000000
--- a/net/opal3/files/patch-opal_inc.mak.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- opal_inc.mak.in.orig	Fri Apr  7 08:12:16 2006
-+++ opal_inc.mak.in	Fri Apr  7 08:13:55 2006
-@@ -103,7 +103,7 @@
- endif
- 
- 
--OPAL_BASE  = opal_$(PLATFORM_TYPE)_$(OPAL_SUFFIX)
-+OPAL_BASE  = opal_$(OPAL_SUFFIX)
- OPAL_FILE  = lib$(OPAL_BASE)$(LIB_TYPE).$(LIB_SUFFIX)
- 
- LDFLAGS	    += -L$(OPAL_LIBDIR)
diff --git a/net/opal3/files/patch-plugins_configure b/net/opal3/files/patch-plugins_configure
new file mode 100644
index 000000000000..e81bd1893ba1
--- /dev/null
+++ b/net/opal3/files/patch-plugins_configure
@@ -0,0 +1,144 @@
+--- plugins/configure.ac.orig	2009-09-22 04:57:56.000000000 +0400
++++ plugins/configure.ac	2009-09-26 21:36:48.000000000 +0400
+@@ -219,6 +219,11 @@
+ dnl     ########################
+ dnl     libavcodec (ffmpeg)
+ dnl     ########################
++AC_ARG_ENABLE([ffmpeg],
++              [AC_HELP_STRING([--enable-ffmpeg],[enable libavcodec codec support])],
++              [HAVE_LIBAVCODEC=$enableval])
++
++if test "x${HAVE_LIBAVCODEC}" = "xyes" ; then
+ PKG_CHECK_MODULES([LIBAVCODEC],
+                   [libavcodec >= 52.20.0],
+                   [
+@@ -249,6 +254,8 @@
+                    HAVE_LIBAVCODEC=no
+                   ]
+                  )
++fi
++
+ AC_SUBST(HAVE_LIBAVCODEC)
+ 
+ OPAL_LIBAVCODEC_SOURCE()
+@@ -290,6 +297,11 @@
+ dnl     ########################
+ dnl     theora
+ dnl     ########################
++AC_ARG_ENABLE([theora],
++              [AC_HELP_STRING([--enable-theora],[enable theora codec support])],
++              [HAVE_THEORA=$enableval])
++
++if test "x${HAVE_THEORA}" = "xyes" ; then
+ PKG_CHECK_MODULES([THEORA],
+                   [theora],
+                   [
+@@ -301,11 +313,18 @@
+                   [
+                    HAVE_THEORA=no
+                   ])
++fi
++
+ AC_SUBST(HAVE_THEORA)
+ 
+ dnl     ########################
+ dnl     celt
+ dnl     ########################
++AC_ARG_ENABLE([celt],
++              [AC_HELP_STRING([--enable-celt],[enable CELT codec support])],
++              [HAVE_CELT=$enableval])
++
++if test "x${HAVE_CELT}" = "xyes" ; then
+ PKG_CHECK_MODULES([CELT],
+                   [celt],
+                   [
+@@ -321,6 +340,8 @@
+                   [
+                    HAVE_CELT=no
+                   ])
++fi
++
+ AC_SUBST(HAVE_CELT)
+ 
+ dnl     ########################
+--- plugins/configure.orig	2009-09-26 16:50:06.000000000 +0400
++++ plugins/configure	2009-09-26 21:44:26.000000000 +0400
+@@ -1340,11 +1340,14 @@
+   --enable-sbc            enable use of Bluetooth SBC for CD quality telephony
+   --enable-default-to-full-capabilties
+                           default to full capabilities at empty fmtp lines
++  --enable-ffmpeg         enable libavcodec codec support
+   --enable-libavcodec-stackalign-hack
+                           Stack alignment hack for libavcodec library
+   --enable-x264-link-static
+                           Statically link x264 to the plugin. Default for
+                           win32.
++  --enable-theora         enable theora codec support
++  --enable-celt           enable CELT codec support
+   --enable-h264           enable H.264 support
+   --enable-ixj            enable xJack cards
+   --enable-vpb            enable voicetronix vpb
+@@ -9543,6 +9546,13 @@
+           fi
+ 
+ 
++# Check whether --enable-ffmpeg was given.
++if test "${enable_ffmpeg+set}" = set; then
++  enableval=$enable_ffmpeg; HAVE_LIBAVCODEC=$enableval
++fi
++
++
++if test "x${HAVE_LIBAVCODEC}" = "xyes" ; then
+ 
+ pkg_failed=no
+ { echo "$as_me:$LINENO: checking for LIBAVCODEC" >&5
+@@ -10144,6 +10154,8 @@
+ 
+ 
+ fi
++fi
++
+ 
+ 
+ 
+@@ -10350,6 +10362,13 @@
+ 
+ 
+ 
++# Check whether --enable-theora was given.
++if test "${enable_theora+set}" = set; then
++  enableval=$enable_theora; HAVE_THEORA=$enableval
++fi
++
++
++if test "x${HAVE_THEORA}" = "xyes" ; then
+ 
+ pkg_failed=no
+ { echo "$as_me:$LINENO: checking for THEORA" >&5
+@@ -10430,8 +10449,17 @@
+                    HAVE_THEORA=yes
+ 
+ fi
++fi
++
+ 
+ 
++# Check whether --enable-celt was given.
++if test "${enable_celt+set}" = set; then
++  enableval=$enable_celt; HAVE_CELT=$enableval
++fi
++
++
++if test "x${HAVE_CELT}" = "xyes" ; then
+ 
+ pkg_failed=no
+ { echo "$as_me:$LINENO: checking for CELT" >&5
+@@ -10526,6 +10554,8 @@
+ fi
+ 
+ fi
++fi
++
+ 
+ 
+ 
diff --git a/net/opal3/files/patch-spandsp_if.h b/net/opal3/files/patch-spandsp_if.h
new file mode 100644
index 000000000000..70a10347440e
--- /dev/null
+++ b/net/opal3/files/patch-spandsp_if.h
@@ -0,0 +1,14 @@
+--- plugins/fax/fax_spandsp/spandsp_util/spandsp_if.h.orig	2009-08-30 02:52:53.000000000 +0400
++++ plugins/fax/fax_spandsp/spandsp_util/spandsp_if.h	2009-08-30 02:53:00.000000000 +0400
+@@ -24,6 +24,11 @@
+  */
+ 
+ extern "C" {
++#undef __cplusplus
++#undef _MACHINE__STDINT_H_
++#include <machine/_stdint.h>
++#define __cplusplus
++
+ #include "spandsp.h"
+ };
+ 
diff --git a/net/opal3/pkg-descr b/net/opal3/pkg-descr
index c232d9469719..b337a0341444 100644
--- a/net/opal3/pkg-descr
+++ b/net/opal3/pkg-descr
@@ -1,9 +1,18 @@
-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)
+Opal is a full-featured voip library that supports a variety of protocols and
+multi-media fornats. Features include:
+
+    * Low latency RTP stack designed specifically for real-time multimedia
+    * Full featured H.323, SIP and IAX2 protocol stacks
+    * Audio codecs including G.711, GSM06.10, Speex and iLBC.
+    * Video codecs including H.261 and H.263
+    * Run-time loadable codec interface for proprietary or codecs such as G.729,
+      H.263, H.264 and MPEG4
+    * Completely Open Source using the commercially friendly MPL 1.1 license
+
+Through the use of a platform isolation library called PTLIB, Opal can run on
+tiny embedded systems or multi-processor servers.
 
 BTW: OPAL is an acronym for Open Phone Abstraction Library, but that is not
 really important :)
 
-WWW: http://www.voxgratia.org/
+WWW: http://opalvoip.org/
diff --git a/net/opal3/pkg-plist b/net/opal3/pkg-plist
index 27baed23afbd..a0dd1570c433 100644
--- a/net/opal3/pkg-plist
+++ b/net/opal3/pkg-plist
@@ -1,6 +1,7 @@
 include/opal/asn/gcc.h
 include/opal/asn/h225.h
 include/opal/asn/h235.h
+include/opal/asn/h235_srtp.h
 include/opal/asn/h245.h
 include/opal/asn/h248.h
 include/opal/asn/h4501.h
@@ -18,21 +19,16 @@ 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/g711a1_plc.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/opalplugin.h
+include/opal/codec/opalpluginmgr.h
 include/opal/codec/opalwavfile.h
+include/opal/codec/ratectl.h
 include/opal/codec/rfc2833.h
+include/opal/codec/rfc4175.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
@@ -54,49 +50,70 @@ include/opal/h323/peclient.h
 include/opal/h323/q931.h
 include/opal/h323/svcctrl.h
 include/opal/h323/transaddr.h
+include/opal/h460/h460.h
+include/opal/h460/h4601.h
+include/opal/h460/h46018.h
+include/opal/h460/h46019.h
+include/opal/h460/h4609.h
+include/opal/h460/h460p.h
+include/opal/h460/h460pres.h
+include/opal/h460/h460tm.h
+include/opal/iax2/callprocessor.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/iax2jitter.h
 include/opal/iax2/iax2medstrm.h
 include/opal/iax2/iedata.h
 include/opal/iax2/ies.h
+include/opal/iax2/overview.h
 include/opal/iax2/processor.h
 include/opal/iax2/receiver.h
+include/opal/iax2/regprocessor.h
 include/opal/iax2/remote.h
 include/opal/iax2/safestrings.h
 include/opal/iax2/sound.h
+include/opal/iax2/specialprocessor.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/im/im.h
+include/opal/im/msrp.h
+include/opal/im/rfc4103.h
+include/opal/im/sipim.h
+include/opal/im/t140.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/lids/lidplugin.h
+include/opal/lids/lidpluginmgr.h
+include/opal/opal.h
+include/opal/opal/audiorecord.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/localep.h
 include/opal/opal/manager.h
 include/opal/opal/mediacmd.h
 include/opal/opal/mediafmt.h
 include/opal/opal/mediastrm.h
+include/opal/opal/mediatype.h
+include/opal/opal/opalmixer.h
 include/opal/opal/opalvxml.h
 include/opal/opal/patch.h
 include/opal/opal/pcss.h
+include/opal/opal/rtpconn.h
+include/opal/opal/rtpep.h
 include/opal/opal/transcoders.h
 include/opal/opal/transports.h
 include/opal/rtp/jitter.h
 include/opal/rtp/rtp.h
+include/opal/rtp/srtp.h
+include/opal/rtp/zrtpudp.h
+include/opal/sip/handlers.h
 include/opal/sip/sdp.h
 include/opal/sip/sip.h
 include/opal/sip/sipcon.h
@@ -106,21 +123,48 @@ include/opal/t120/h323t120.h
 include/opal/t120/t120proto.h
 include/opal/t120/x224.h
 include/opal/t38/h323t38.h
+include/opal/t38/sipt38.h
 include/opal/t38/t38proto.h
+include/opal/zrtp/opalzrtp.h
+include/opal/zrtp/zrtpeventproc.h
+lib/libopal-%%PVERSION_MAJOR%%.so
+lib/libopal-%%PVERSION_MAJOR%%.so.%%PVERSION_MINOR%%
 lib/libopal.so
-lib/libopal_r.so
-lib/libopal_r.so.2
-lib/libopal_r.so.2.2
-lib/libopal_r.so.%%PORTVERSION%%
-%%DATADIR%%/opal_inc.mak
-@dirrm %%DATADIR%%
+lib/libopal_s.a
+%%CELT%%lib/opal-%%PORTVERSION%%/codecs/audio/celtcodec_pwplugin.so
+lib/opal-%%PORTVERSION%%/codecs/audio/g722_audio_pwplugin.so
+lib/opal-%%PORTVERSION%%/codecs/audio/g726_audio_pwplugin.so
+lib/opal-%%PORTVERSION%%/codecs/audio/gsm0610_audio_pwplugin.so
+lib/opal-%%PORTVERSION%%/codecs/audio/gsmamrcodec_pwplugin.so
+lib/opal-%%PORTVERSION%%/codecs/audio/ilbc_audio_pwplugin.so
+lib/opal-%%PORTVERSION%%/codecs/audio/ima_adpcm_audio_pwplugin.so
+lib/opal-%%PORTVERSION%%/codecs/audio/lpc10_audio_pwplugin.so
+lib/opal-%%PORTVERSION%%/codecs/audio/speex_audio_pwplugin.so
+lib/opal-%%PORTVERSION%%/codecs/video/h261-vic_video_pwplugin.so
+%%FFMPEG%%lib/opal-%%PORTVERSION%%/codecs/video/h263-1998_video_pwplugin.so
+%%X264%%lib/opal-%%PORTVERSION%%/codecs/video/h264_video_pwplugin.so
+%%X264%%lib/opal-%%PORTVERSION%%/codecs/video/h264_video_pwplugin_helper
+%%FFMPEG%%lib/opal-%%PORTVERSION%%/codecs/video/mpeg4-ffmpeg_video_pwplugin.so
+%%THEORA%%lib/opal-%%PORTVERSION%%/codecs/video/theora_video_pwplugin.so
+%%FAX%%lib/opal-%%PORTVERSION%%/fax/spandsp_fax_pwplugin.so
+%%LID%%lib/opal-%%PORTVERSION%%/lid/vpb_lid_pwplugin.so
+libdata/pkgconfig/opal.pc
+%%LID%%@dirrm lib/opal-%%PORTVERSION%%/lid
+%%FAX%%@dirrm lib/opal-%%PORTVERSION%%/fax
+%%VIDEO%%@dirrm lib/opal-%%PORTVERSION%%/codecs/video
+@dirrm lib/opal-%%PORTVERSION%%/codecs/audio
+@dirrm lib/opal-%%PORTVERSION%%/codecs
+@dirrm lib/opal-%%PORTVERSION%%
+@dirrm include/opal/zrtp
 @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/im
 @dirrm include/opal/iax2
+@dirrm include/opal/h460
 @dirrm include/opal/h323
 @dirrm include/opal/codec
 @dirrm include/opal/asn