Move ptlib26, opal3 and ekiga3 to unversioned ports and update to:

ptlib to 2.10.10 opal to 3.10.10 ekiga to 4.0.1
author: kwm <kwm@FreeBSD.org> 2013-09-21 05:50:39 +0800
committer: kwm <kwm@FreeBSD.org> 2013-09-21 05:50:39 +0800
commit: 7886f477be92414f643a2d7504d632aef3cf9501 (patch)
tree: c62b4e58e684a810c47846f1e9a173a16b0d27d1
parent: a9210df4691ddad7f7398bd6dc25d23ecd6d1b69 (diff)
download: freebsd-ports-gnome-7886f477be92414f643a2d7504d632aef3cf9501.tar.gz
freebsd-ports-gnome-7886f477be92414f643a2d7504d632aef3cf9501.tar.zst
freebsd-ports-gnome-7886f477be92414f643a2d7504d632aef3cf9501.zip
54 files changed, 1297 insertions, 2113 deletions
diff --git a/MOVED b/MOVED
index ef159ed42283..e137c7a2870a 100644
--- a/MOVED
+++ b/MOVED
@@ -4943,3 +4943,7 @@ irc/xchat1|irc/xchat|2013-09-16|Unsupported upstream, consider using irc/xchat
 japanese/xchat|irc/xchat|2013-09-16|Unsupported upstream, consider using irc/xchat
 www/autoindex|www/autoindex2|2013-09-16|Does not work with any of the supported PHP versions
 textproc/rotix||2013-09-20|Has expired: no longer maintained upstream
+devel/ptlib26|devel/ptlib|2013-09-20|Removed old version, update to new version and moved port
+net/opal3|net/opal|2013-09-20|Removed old version, update to new version and moved port
+net/ekiga|net-im/ekiga|2013-09-20|Removed old version, update to new version and moved port
+net/ekiga3|net-im/ekiga|2013-09-20|Removed old version, update to new version and moved port
diff --git a/devel/Makefile b/devel/Makefile
index 4b8db80fdd5f..1fe13014bd14 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -3366,7 +3366,6 @@
     SUBDIR += pth-hard
     SUBDIR += pthsem
     SUBDIR += ptlib
-    SUBDIR += ptlib26
     SUBDIR += ptmalloc
     SUBDIR += ptmalloc2
     SUBDIR += pty
diff --git a/devel/ptlib/Makefile b/devel/ptlib/Makefile
new file mode 100644
index 000000000000..e1701ed78912
--- /dev/null
+++ b/devel/ptlib/Makefile
@@ -0,0 +1,176 @@
+# Created by: Roger Hardiman <roger@freebsd.org>
+# $FreeBSD$
+
+PORTNAME=	ptlib
+PORTVERSION=	2.10.10
+CATEGORIES=	devel
+MASTER_SITES=	GNOME
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	Cross platform C++ library, used by OPAL
+
+LICENSE=	MPL
+
+LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
+
+CONFLICTS=	pwlib-1.*
+
+USE_XZ=		yes
+USES=		bison gmake pkgconfig
+USE_AUTOTOOLS=	autoconf:env automake:env
+GNU_CONFIGURE=	yes
+USE_OPENSSL=	yes
+USE_LDCONFIG=	yes
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+
+CONFIGURE_ARGS+=--enable-audio \
+		--enable-ipv6 \
+		--enable-exceptions \
+		--enable-oss \
+		--enable-plugins
+
+CONFIGURE_ARGS+=--disable-lua \
+		--disable-sasl
+
+# --with-expat-dir="${LOCALBASE}"
+CONFIGURE_ENV+=	OPENSSL_CFLAGS="-I${OPENSSLINC}" \
+		OPENSSL_LIBS="-L${OPENSSLLIB} -lssl"
+
+OPTIONS_DEFINE=	BSDVIDEO DEBUG ODBC ALSA JABBER V4L SDL LDAP PULSEAUDIO
+OPTIONS_DEFAULT=BSDVIDEO SDL V4L JABBER
+
+BSDVIDEO_DESC=	BSD video support
+DEBUG_DESC=	Install debug library
+
+NO_STAGE=	yes
+.include <bsd.port.options.mk>
+
+PLIST_SUB+=	PORTVERSION=${PORTVERSION} \
+		PVERSION_MAJOR=${PVERSION_MAJOR} \
+		PVERSION_MINOR=${PVERSION_MINOR}
+
+PVERSION_MAJOR=	${PORTVERSION:C/.[0-9]+.[0-9]+.//}
+PVERSION_MINOR=	${PORTVERSION:C/.[0-9]+$//g}
+
+.if ${PORT_OPTIONS:MDEBUG}
+ALL_TARGET=	optshared debugshared
+PLIST_SUB+=	DEBUG=""
+.else
+ALL_TARGET=	optshared
+PLIST_SUB+=	DEBUG="@comment "
+.endif
+
+.if ${PORT_OPTIONS:MPULSEAUDIO}
+LIB_DEPENDS+=	libpulse.so:${PORTSDIR}/audio/pulseaudio
+CONFIGURE_ARGS+=--enable-pulse
+.else
+CONFIGURE_ARGS+=--disable-pulse
+.endif
+
+.if ${PORT_OPTIONS:MJABBER}
+CONFIGURE_ARGS+=--enable-jabber
+PLLIB_VIDEO=1
+.endif
+
+.if ${PORT_OPTIONS:MODBC}
+LIB_DEPENDS+=	libodbc.so:${PORTSDIR}/databases/unixODBC
+CONFIGURE_ARGS+=--enable-odbc
+.else
+CONFIGURE_ARGS+=--disable-odbc
+.endif
+
+.if ${PORT_OPTIONS:MALSA}
+LIB_DEPENDS+=	libasound.so:${PORTSDIR}/audio/alsa-lib
+CONFIGURE_ARGS+=--enable-alsa
+PLIST_SUB+=	ALSA=""
+.else
+CONFIGURE_ARGS+=--disable-alsa
+PLIST_SUB+=	ALSA="@comment "
+.endif
+
+.if ${PORT_OPTIONS:MBSDVIDEO}
+CONFIGURE_ARGS+=--enable-bsdvideo
+PLIST_SUB+=	BSDVIDEO=""
+PTLIB_VIDEO=1
+.else
+CONFIGURE_ARGS+=--disable-bsdvideo
+PLIST_SUB+=	BSDVIDEO="@comment "
+.endif
+
+.if ${PORT_OPTIONS:MV4L}
+BUILD_DEPENDS+=	v4l_compat>=0:${PORTSDIR}/multimedia/v4l_compat
+LIB_DEPENDS+=	libv4l2.so:${PORTSDIR}/multimedia/libv4l
+CONFIGURE_ARGS+=--enable-v4l --enable-v4l2
+PLIST_SUB+=	V4L=""
+PTLIB_VIDEO=1
+.else
+CONFIGURE_ARGS+=--disable-v4l --disable-v4l2
+PLIST_SUB+=	V4L="@comment "
+.endif
+
+.if defined(PTLIB_VIDEO)
+CONFIGURE_ARGS+=--enable-video --enable-vidfile
+PLIST_SUB+=	VIDEODIR=""
+.else
+CONFIGURE_ARGS+=--disable-video --disable-vidfile
+PLIST_SUB+=	VIDEODIR="@comment "
+.endif
+
+.if ${PORT_OPTIONS:MSDL}
+USE_SDL+=	sdl
+CONFIGURE_ARGS+=--enable-sdl
+.else
+CONFIGURE_ARGS+=--disable-sdl
+.endif
+
+.if ${PORT_OPTIONS:MLDAP}
+USE_OPENLDAP=	yes
+CONFIGURE_ARGS+=--enable-openldap
+.else
+CONFIGURE_ARGS+=--disable-openldap
+.endif
+
+# ONLY FOR THE BRAVE!
+# If someone owns a firewire(4) video device and wants to use it for
+# video-conferencing purposes, please download the files:
+# libraw1394.shar.gz, libavc1394.shar.gz and libdc1394.shar.gz from
+# ftp://ftp.frm2.tum.de/pub/jpulz/FreeBSD/ports/
+# Extract the files in ${PORTSDIR}/devel and uncomment the following lines.
+#
+##enable libavc1394
+#.if defined(WITH_AVC1394)
+#LIB_DEPENDS+=	avc1394.2:${PORTSDIR}/devel/libavc1394 \
+#		dv.4:${PORTSDIR}/multimedia/libdv
+#CONFIGURE_ARGS+=	--enable-avc
+#PLIST_SUB+=	AVC1394=""
+#.else
+CONFIGURE_ARGS+=	--disable-avc
+PLIST_SUB+=	AVC1394="@comment "
+#.endif
+#
+##enable libdc1394
+#.if defined(WITH_DC1394)
+#LIB_DEPENDS+=	dc1394.2[0-9]:${PORTSDIR}/multimedia/libdc1394
+#CONFIGURE_ARGS+=	--enable-dc
+#PLIST_SUB+=	DC1394=""
+#.else
+CONFIGURE_ARGS+=	--disable-dc
+#PLIST_SUB+=	DC1394="@comment "
+#.endif
+
+post-patch:
+	@${REINPLACE_CMD} -e 's/RTF_WASCLONED/0x20000/' ${WRKSRC}/src/ptlib/unix/socket.cxx
+
+pre-configure:
+	cd ${WRKSRC}/plugins/ && autoreconf -fi
+
+post-install:
+	${LN} -sf libpt.so.${PORTVERSION} ${PREFIX}/lib/libpt.so.${PVERSION_MAJOR}
+	${LN} -sf libpt.so.${PORTVERSION} ${PREFIX}/lib/libpt.so.${PVERSION_MINOR}
+.if ${PORT_OPTIONS:MDEBUG}
+	${LN} -sf libpt_d.so.${PORTVERSION} ${PREFIX}/lib/libpt_d.so.${PVERSION_MAJOR}
+	${LN} -sf libpt_d.so.${PORTVERSION} ${PREFIX}/lib/libpt_d.so.${PVERSION_MINOR}
+.endif
+
+.include <bsd.port.mk>
diff --git a/devel/ptlib/distinfo b/devel/ptlib/distinfo
new file mode 100644
index 000000000000..1504b7395f06
--- /dev/null
+++ b/devel/ptlib/distinfo
@@ -0,0 +1,2 @@
+SHA256 (ptlib-2.10.10.tar.xz) = 7fcaabe194cbd3bc0b370b951dffd19cfe7ea0298bfff6aecee948e97f3207e4
+SIZE (ptlib-2.10.10.tar.xz) = 2520444
diff --git a/devel/ptlib/files/patch-Makefile.in b/devel/ptlib/files/patch-Makefile.in
new file mode 100644
index 000000000000..72d2e4b5e541
--- /dev/null
+++ b/devel/ptlib/files/patch-Makefile.in
@@ -0,0 +1,35 @@
+--- Makefile.in.orig	2013-02-20 03:12:27.000000000 +0100
++++ Makefile.in	2013-07-11 10:16:26.000000000 +0200
+@@ -111,9 +111,7 @@
+ 		do mkdir -p $$dir ; chmod 755 $$dir ; \
+ 	done )
+ 	( for lib in  $(PT_LIBDIR)/$(LIB_SONAME) \
+-	              $(PT_LIBDIR)/$(DEBUG_SONAME) \
+-	              $(PT_LIBDIR)/lib$(PTLIB_BASE)_s.a \
+-	              $(PT_LIBDIR)/lib$(PTLIB_BASE)_d_s.a ; \
++	              $(PT_LIBDIR)/$(DEBUG_SONAME) ; \
+           do \
+ 	  ( if test -e $$lib ; then \
+ 		$(INSTALL) -m 444 $$lib $(DESTDIR)$(LIBDIR); \
+@@ -160,9 +158,9 @@
+ 	$(INSTALL) -m 755 make/ptlib-config $(DESTDIR)$(PREFIX)/share/ptlib/make/
+ 	(cd $(DESTDIR)$(PREFIX)/bin; rm -f ptlib-config ; ln -snf ../share/ptlib/make/ptlib-config ptlib-config)
+ 
+-	mkdir -p $(DESTDIR)$(LIBDIR)/pkgconfig
+-	chmod 755 $(DESTDIR)$(LIBDIR)/pkgconfig
+-	$(INSTALL) -m 644 ptlib.pc $(DESTDIR)$(LIBDIR)/pkgconfig/
++	mkdir -p $(DESTDIR)$(PREFIX)/libdata/pkgconfig
++	chmod 755 $(DESTDIR)$(PREFIX)/libdata/pkgconfig
++	$(INSTALL) -m 644 ptlib.pc $(DESTDIR)$(PREFIX)/libdata/pkgconfig/
+ 
+ uninstall:
+ 	rm -rf $(DESTDIR)$(PREFIX)/include/ptlib \
+@@ -171,7 +169,7 @@
+ 	       $(DESTDIR)$(PREFIX)/include/ptbuildopts.h \
+ 	       $(DESTDIR)$(PREFIX)/share/ptlib \
+ 	       $(DESTDIR)$(LIBDIR)/$(DEV_PLUGIN_DIR) \
+-	       $(DESTDIR)$(LIBDIR)/pkgconfig/ptlib.pc
++	       $(DESTDIR)$(PREFIX)/libdata/pkgconfig/ptlib.pc
+ 	rm -f $(DESTDIR)$(LIBDIR)/lib$(PTLIB_BASE)_s.a \
+ 	      $(DESTDIR)$(LIBDIR)/$(PTLIB_FILE) \
+ 	      $(DESTDIR)$(LIBDIR)/$(LIB_SONAME)
diff --git a/devel/ptlib/files/patch-include_ptlib_object.h b/devel/ptlib/files/patch-include_ptlib_object.h
new file mode 100644
index 000000000000..f2198cb5bf94
--- /dev/null
+++ b/devel/ptlib/files/patch-include_ptlib_object.h
@@ -0,0 +1,11 @@
+--- include/ptlib/object.h.orig	2013-09-16 12:18:01.000000000 +0200
++++ include/ptlib/object.h	2013-09-16 12:19:59.000000000 +0200
+@@ -1011,7 +1011,7 @@
+                    + __GNUC_PATCHLEVEL__)
+ 
+ // Memory pooling allocators
+-#if defined(__GNUC__) && (GCC_VERSION > 40000) && !defined(P_MINGW) && !defined(P_MACOSX) 
++#if defined(__GNUC__) && (GCC_VERSION > 40000) && !defined(P_MINGW) && !defined(P_MACOSX) && !defined(_LIBCPP_VERSION)
+ #include <ext/mt_allocator.h>
+ template <class Type> struct PFixedPoolAllocator    : public PAllocatorTemplate<__gnu_cxx::__mt_alloc<Type>, Type> { };
+ template <class Type> struct PVariablePoolAllocator : public PAllocatorTemplate<__gnu_cxx::__mt_alloc<Type>, Type> { };
diff --git a/devel/ptlib/files/patch-plugins_configure.in b/devel/ptlib/files/patch-plugins_configure.in
new file mode 100644
index 000000000000..2a7f2fac0636
--- /dev/null
+++ b/devel/ptlib/files/patch-plugins_configure.in
@@ -0,0 +1,10 @@
+--- plugins/configure.in.orig	2013-07-08 22:41:36.000000000 +0200
++++ plugins/configure.in	2013-07-08 22:44:52.000000000 +0200
+@@ -250,6 +250,7 @@
+ AC_ARG_ENABLE(bsdvideo, [  --enable-bsdvideo       enable BSD video support],,enable_bsdvideo=yes)
+ 
+ if test "${enable_bsdvideo}z" = "yesz" ; then
++  AC_CHECK_HEADER(dev/bktr/ioctl_meteor.h, BSDVIDEOHDR=1)
+   AC_CHECK_HEADER(machine/ioctl_meteor.h, BSDVIDEOHDR=1)
+   AC_CHECK_HEADER(i386/ioctl_meteor.h, BSDVIDEOHDR=1)
+   AC_CHECK_HEADER(dev/ic/bt8xx.h, BSDVIDEOHDR=1)
diff --git a/devel/ptlib/files/patch-src_ptlib_unix_svcproc.cxx b/devel/ptlib/files/patch-src_ptlib_unix_svcproc.cxx
new file mode 100644
index 000000000000..7bc74281fd79
--- /dev/null
+++ b/devel/ptlib/files/patch-src_ptlib_unix_svcproc.cxx
@@ -0,0 +1,29 @@
+--- src/ptlib/unix/svcproc.cxx.orig	2013-09-20 14:46:03.000000000 +0200
++++ src/ptlib/unix/svcproc.cxx	2013-09-20 14:46:46.000000000 +0200
+@@ -217,7 +217,7 @@
+     pid_t pid;
+ 
+     {
+-      ifstream pidfile(pidfilename);
++      ifstream pidfile((const char*)pidfilename);
+       if (!pidfile.is_open()) {
+         cout << "Could not open pid file: \"" << pidfilename << "\""
+                 " - " << strerror(errno) << endl;
+@@ -384,7 +384,7 @@
+   // Run as a daemon, ie fork
+ 
+   if (!pidfilename) {
+-    ifstream pidfile(pidfilename);
++    ifstream pidfile((const char*)pidfilename);
+     if (pidfile.is_open()) {
+       pid_t pid;
+       pidfile >> pid;
+@@ -412,7 +412,7 @@
+       cout << "Daemon started with pid " << pid << endl;
+       if (!pidfilename) {
+         // Write out the child pid to magic file in /var/run (at least for linux)
+-        ofstream pidfile(pidfilename);
++        ofstream pidfile((const char*)pidfilename);
+         if (pidfile.is_open())
+           pidfile << pid;
+         else
diff --git a/devel/ptlib26/pkg-descr b/devel/ptlib/pkg-descr
index ab38421b0f13..ab38421b0f13 100644
--- a/devel/ptlib26/pkg-descr
+++ b/devel/ptlib/pkg-descr
diff --git a/devel/ptlib26/pkg-plist b/devel/ptlib/pkg-plist
index 5725f26c9000..30824ab97664 100644
--- a/devel/ptlib26/pkg-plist
+++ b/devel/ptlib/pkg-plist
@@ -4,6 +4,7 @@ include/ptclib/asnber.h
 include/ptclib/asner.h
 include/ptclib/asnper.h
 include/ptclib/asnxer.h
+include/ptclib/cli.h
 include/ptclib/cypher.h
 include/ptclib/delaychan.h
 include/ptclib/dtmf.h
@@ -17,6 +18,7 @@ include/ptclib/httpsvc.h
 include/ptclib/inetmail.h
 include/ptclib/inetprot.h
 include/ptclib/ipacl.h
+include/ptclib/lua.h
 include/ptclib/memfile.h
 include/ptclib/mime.h
 include/ptclib/modem.h
@@ -51,6 +53,7 @@ include/ptclib/socks.h
 include/ptclib/telnet.h
 include/ptclib/threadpool.h
 include/ptclib/url.h
+include/ptclib/vcard.h
 include/ptclib/vsdl.h
 include/ptclib/vxml.h
 include/ptclib/xmpp.h
@@ -107,6 +110,7 @@ include/ptlib/sound.h
 include/ptlib/svcproc.h
 include/ptlib/syncpoint.h
 include/ptlib/syncthrd.h
+include/ptlib/syslog.h
 include/ptlib/tcpsock.h
 include/ptlib/textfile.h
 include/ptlib/thread.h
@@ -128,6 +132,7 @@ 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/mail.h
 include/ptlib/unix/ptlib/mutex.h
 include/ptlib/unix/ptlib/pdirect.h
 include/ptlib/unix/ptlib/pipechan.h
@@ -156,26 +161,30 @@ include/ptlib/vconvert.h
 include/ptlib/video.h
 include/ptlib/videoio.h
 include/ptlib/videoio1394dc.h
-lib/libpt-%%PVERSION_MAJOR%%.so
-lib/libpt-%%PVERSION_MAJOR%%.so.%%PVERSION_MINOR%%
+include/ptlib/wxstring.h
 lib/libpt.so
-lib/libpt_s.a
-%%ALSA%%lib/ptlib-%%PORTVERSION%%/devices/sound/alsa_pwplugin.so
+lib/libpt.so.%%PVERSION_MINOR%%
+lib/libpt.so.%%PVERSION_MAJOR%%
+lib/libpt.so.%%PORTVERSION%%
+%%DEBUG%%lib/libpt_d.so
+%%DEBUG%%lib/libpt_d.so.%%PVERSION_MINOR%%
+%%DEBUG%%lib/libpt_d.so.%%PVERSION_MAJOR%%
+%%DEBUG%%lib/libpt_d.so.%%PORTVERSION%%
 lib/ptlib-%%PORTVERSION%%/devices/sound/oss_pwplugin.so
 %%BSDVIDEO%%lib/ptlib-%%PORTVERSION%%/devices/videoinput/bsdvideo_pwplugin.so
 %%V4L%%lib/ptlib-%%PORTVERSION%%/devices/videoinput/v4l_pwplugin.so
 %%V4L%%lib/ptlib-%%PORTVERSION%%/devices/videoinput/v4l2_pwplugin.so
 libdata/pkgconfig/ptlib.pc
-%%DATADIR%%/make/common.mak
-%%DATADIR%%/make/lib.mak
-%%DATADIR%%/make/plugins.mak
-%%DATADIR%%/make/ptbuildopts.mak
-%%DATADIR%%/make/ptlib-config
-%%DATADIR%%/make/ptlib.mak
-%%DATADIR%%/make/unix.mak
-@dirrm %%DATADIR%%/make
-@dirrm %%DATADIR%%
-%%VIDEODIR%%@dirrm lib/ptlib-%%PORTVERSION%%/devices/videoinput
+share/ptlib/make/common.mak
+share/ptlib/make/lib.mak
+share/ptlib/make/plugins.mak
+share/ptlib/make/ptbuildopts.mak
+share/ptlib/make/ptlib-config
+share/ptlib/make/ptlib.mak
+share/ptlib/make/unix.mak
+@dirrm share/ptlib/make
+@dirrm share/ptlib
+%%V4L%%@dirrm lib/ptlib-%%PORTVERSION%%/devices/videoinput
 @dirrm lib/ptlib-%%PORTVERSION%%/devices/sound
 @dirrm lib/ptlib-%%PORTVERSION%%/devices
 @dirrm lib/ptlib-%%PORTVERSION%%
diff --git a/devel/ptlib26/Makefile b/devel/ptlib26/Makefile
deleted file mode 100644
index 63da5394d6a3..000000000000
--- a/devel/ptlib26/Makefile
+++ /dev/null
@@ -1,148 +0,0 @@
-# Created by: Roger Hardiman <roger@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME=	ptlib
-PORTVERSION=	2.6.7
-PORTREVISION=	2
-CATEGORIES=	devel
-MASTER_SITES=	SF/opalvoip/v3.6%20Lalande/Final/
-DISTNAME=	ptlib-${PORTVERSION}
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	A cross platform C++ library, used by OPAL
-
-LICENSE=MPL
-
-LIB_DEPENDS=	expat:${PORTSDIR}/textproc/expat2
-
-CONFLICTS=	pwlib-1.* ptlib-2.4.* ptlib-2.8.*
-
-USE_BZIP2=	yes
-USES=		bison gmake pkgconfig
-GNU_CONFIGURE=	yes
-WANT_GNOME=	yes
-USE_OPENSSL=	yes
-USE_LDCONFIG=	yes
-
-CFLAGS+=	-I${LOCALBASE}/include
-CONFIGURE_ARGS+=	--enable-oss --enable-plugins --with-expat-dir="${LOCALBASE}"
-CONFIGURE_ENV+=		OPENSSL_CFLAGS="-I${OPENSSLINC}" OPENSSL_LIBS="-L${OPENSSLLIB} -lssl"
-
-OPTIONS_DEFINE=	ODBC ALSA V4L BSDVIDEO SDL LDAP
-OPTIONS_DEFAULT=BSDVIDEO SDL
-BSDVIDEO_DESC=	BSD video support
-
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
-PLIST_SUB+=	PORTVERSION=${PORTVERSION} \
-		PVERSION_MAJOR=${PORTVERSION:C/.[0-9]+$//g}  \
-		PVERSION_MINOR=${PORTVERSION:C/^[0-9]+.[0-9]+.//}
-
-.if ${PORT_OPTIONS:MDEBUG}
-ALL_TARGET=	optshared debugshared
-BROKEN=		debug libs install broken
-.else
-ALL_TARGET=	optshared
-.endif
-
-.if ${PORT_OPTIONS:MODBC}
-CONFIGURE_ARGS+=	--enable-odbc
-LIB_DEPENDS+=		odbc:${PORTSDIR}/databases/unixODBC
-.else
-CONFIGURE_ARGS+=	--disable-odbc
-.endif
-
-.if ${PORT_OPTIONS:MALSA}
-CONFIGURE_ARGS+=	--enable-alsa
-PLIST_SUB+=	ALSA=""
-LIB_DEPENDS+=		asound:${PORTSDIR}/audio/alsa-lib
-.else
-CONFIGURE_ARGS+=	--disable-alsa
-PLIST_SUB+=	ALSA="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MBSDVIDEO}
-CONFIGURE_ARGS+=--enable-bsdvideo
-PLIST_SUB+=	BSDVIDEO=""
-WITH_VIDEO=1
-.else
-CONFIGURE_ARGS+=--disable-bsdvideo
-PLIST_SUB+=	BSDVIDEO="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MV4L}
-CONFIGURE_ARGS+=--enable-v4l --enable-v4l2
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-PLIST_SUB+=	V4L=""
-BUILD_DEPENDS+=	${LOCALBASE}/include/linux/videodev.h:${PORTSDIR}/multimedia/v4l_compat
-LIB_DEPENDS+=	v4l1.0:${PORTSDIR}/multimedia/libv4l
-WITH_VIDEO=1
-.else
-CONFIGURE_ARGS+=--disable-v4l
-PLIST_SUB+=	V4L="@comment "
-.endif
-
-.if defined(WITH_VIDEO)
-CONFIGURE_ARGS+=	--enable-video
-PLIST_SUB+=	VIDEODIR=""
-.else
-CONFIGURE_ARGS+=	--disable-video
-PLIST_SUB+=	VIDEODIR="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MSDL}
-USE_SDL+=	sdl
-.else
-CONFIGURE_ARGS+=	--disable-sdl
-.endif
-
-.if ${PORT_OPTIONS:MLDAP}
-USE_OPENLDAP=	yes
-CONFIGURE_ARGS+=	--enable-openldap --with-ldap-dir="${LOCALBASE}"
-.else
-CONFIGURE_ARGS+=	--disable-openldap
-.endif
-
-# ONLY FOR THE BRAVE!
-# If someone owns a firewire(4) video device and wants to use it for
-# video-conferencing purposes, please download the files:
-# libraw1394.shar.gz, libavc1394.shar.gz and libdc1394.shar.gz from
-# ftp://ftp.frm2.tum.de/pub/jpulz/FreeBSD/ports/
-# Extract the files in ${PORTSDIR}/devel and uncomment the following lines.
-#
-##enable libavc1394
-#.if defined(WITH_AVC1394)
-#LIB_DEPENDS+=	avc1394.2:${PORTSDIR}/devel/libavc1394 \
-#		dv.4:${PORTSDIR}/multimedia/libdv
-#CONFIGURE_ARGS+=	--enable-avc
-#PLIST_SUB+=	AVC1394=""
-#.else
-CONFIGURE_ARGS+=	--disable-avc
-PLIST_SUB+=	AVC1394="@comment "
-#.endif
-#
-##enable libdc1394
-#.if defined(WITH_DC1394)
-#LIB_DEPENDS+=	dc1394.2[0-9]:${PORTSDIR}/multimedia/libdc1394
-#CONFIGURE_ARGS+=	--enable-dc
-#PLIST_SUB+=	DC1394=""
-#.else
-CONFIGURE_ARGS+=	--disable-dc
-#PLIST_SUB+=	DC1394="@comment "
-#.endif
-
-.include <bsd.port.pre.mk>
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|-lpt|-lpt-${PORTVERSION:C/.[0-9]+$//g}|' ${WRKSRC}/ptlib.pc.in
-	@${REINPLACE_CMD} -e 's|-lasound|-lasound -L${LOCALBASE}/lib|' ${WRKSRC}/plugins/sound_alsa/Makefile
-.if ${ARCH} == sparc64 && ${OSVERSION} <= 700003
-	@${REINPLACE_CMD} -e 's|P_PTHREADS_XPG6|0|' ${WRKSRC}/src/ptlib/unix/tlibthrd.cxx
-.endif
-.if ${OSVERSION} >= 800059
-	@${REINPLACE_CMD} -e 's/RTF_WASCLONED/0x20000/' ${WRKSRC}/src/ptlib/unix/socket.cxx
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/devel/ptlib26/distinfo b/devel/ptlib26/distinfo
deleted file mode 100644
index a00f9e376d93..000000000000
--- a/devel/ptlib26/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (ptlib-2.6.7.tar.bz2) = 7dd28225fedd21154d34899b21ee4b6d27c88eb1a9f9931c8e6ced28e8f3b97f
-SIZE (ptlib-2.6.7.tar.bz2) = 3275152
diff --git a/devel/ptlib26/files/patch-Makefile.in b/devel/ptlib26/files/patch-Makefile.in
deleted file mode 100644
index d87720598716..000000000000
--- a/devel/ptlib26/files/patch-Makefile.in
+++ /dev/null
@@ -1,39 +0,0 @@
---- Makefile.in.orig	2009-10-03 19:15:36.000000000 +0400
-+++ Makefile.in	2009-10-03 21:23:44.000000000 +0400
-@@ -92,11 +92,12 @@
-                      $(DESTDIR)$(PREFIX)/share/ptlib/make ; \
- 		do mkdir -p $$dir ; chmod 755 $$dir ; \
- 	done )
--	$(INSTALL) -m 444 $(PT_LIBDIR)/$(LIB_SONAME) $(DESTDIR)$(LIBDIR)
-+	$(INSTALL) -m 444 $(PT_LIBDIR)/$(LIB_SONAME) $(DESTDIR)$(LIBDIR)/lib$(PTLIB_BASE)-@MAJOR_VERSION@.@MINOR_VERSION@$(OBJ_SUFFIX).so@BUILD_TYPE@@BUILD_NUMBER@
- 	$(INSTALL) -m 444 $(PT_LIBDIR)/lib$(PTLIB_BASE)_s.a $(DESTDIR)$(LIBDIR)
- 	(cd $(DESTDIR)$(LIBDIR) ; \
- 		rm -f  $(PTLIB_FILE) ; \
--		ln -sf $(LIB_SONAME) $(PTLIB_FILE) \
-+		ln -sf lib$(PTLIB_BASE)-@MAJOR_VERSION@.@MINOR_VERSION@$(OBJ_SUFFIX).so@BUILD_TYPE@@BUILD_NUMBER@ $(PTLIB_FILE) ; \
-+		ln -sf lib$(PTLIB_BASE)-@MAJOR_VERSION@.@MINOR_VERSION@$(OBJ_SUFFIX).so@BUILD_TYPE@@BUILD_NUMBER@ lib$(PTLIB_BASE)-@MAJOR_VERSION@.@MINOR_VERSION@$(OBJ_SUFFIX).so \
- 	)
- ifeq (1, $(HAS_PLUGINS))
- 	if test -e $(PT_LIBDIR)/device/; then \
-@@ -127,9 +128,9 @@
- 	$(INSTALL) -m 755 make/ptlib-config $(DESTDIR)$(PREFIX)/share/ptlib/make/
- 	(cd $(DESTDIR)$(PREFIX)/bin; rm -f ptlib-config ; ln -snf ../share/ptlib/make/ptlib-config ptlib-config)
- 
--	mkdir -p $(DESTDIR)$(LIBDIR)/pkgconfig
--	chmod 755 $(DESTDIR)$(LIBDIR)/pkgconfig
--	$(INSTALL) -m 644 ptlib.pc $(DESTDIR)$(LIBDIR)/pkgconfig/
-+	mkdir -p $(DESTDIR)$(PREFIX)/libdata/pkgconfig
-+	chmod 755 $(DESTDIR)$(PREFIX)/libdata/pkgconfig
-+	$(INSTALL) -m 644 ptlib.pc $(DESTDIR)$(PREFIX)/libdata/pkgconfig/
- uninstall:
- 	rm -rf $(DESTDIR)$(PREFIX)/include/ptlib \
- 	       $(DESTDIR)$(PREFIX)/include/ptclib \
-@@ -137,7 +138,7 @@
- 	       $(DESTDIR)$(PREFIX)/include/ptbuildopts.h \
- 	       $(DESTDIR)$(PREFIX)/share/ptlib \
- 	       $(DESTDIR)$(LIBDIR)/$(DEV_PLUGIN_DIR) \
--	       $(DESTDIR)$(LIBDIR)/pkgconfig/ptlib.pc
-+	       $(DESTDIR)$(PREFIX)/libdata/pkgconfig/ptlib.pc
- 	rm -f $(DESTDIR)$(LIBDIR)/lib$(PTLIB_BASE)_s.a \
- 	      $(DESTDIR)$(LIBDIR)/$(PTLIB_FILE) \
- 	      $(DESTDIR)$(LIBDIR)/$(LIB_SONAME)
diff --git a/devel/ptlib26/files/patch-include_ptlib_array.h b/devel/ptlib26/files/patch-include_ptlib_array.h
deleted file mode 100644
index 29d620a71360..000000000000
--- a/devel/ptlib26/files/patch-include_ptlib_array.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/ptlib/array.h.orig	2012-09-03 22:42:13.000000000 +0200
-+++ include/ptlib/array.h	2012-09-03 22:42:49.000000000 +0200
-@@ -523,7 +523,7 @@
-       T t;
-       stream >> t;
-       if (!stream.fail())
--        SetAt(index, t);
-+        this->SetAt(index, t);
-     }
- };
- 
diff --git a/devel/ptlib26/files/patch-make__lib.mak b/devel/ptlib26/files/patch-make__lib.mak
deleted file mode 100644
index d0fe1cdccd3f..000000000000
--- a/devel/ptlib26/files/patch-make__lib.mak
+++ /dev/null
@@ -1,17 +0,0 @@
---- make/lib.mak.orig	2009-11-13 21:10:07.000000000 +0800
-+++ make/lib.mak	2009-11-13 21:16:47.000000000 +0800
-@@ -97,8 +97,12 @@
-     ifeq ($(OSTYPE),mingw)
-       LDSOOPTS += -Wl,--kill-at
-     else
--      ifneq ($(OSTYPE),Darwin)
--        LDSOOPTS += -Wl,-soname,$(LIB_SONAME)
-+      ifeq ($(OSTYPE),FreeBSD)
-+        LDSOOPTS += -Wl,-soname,$(subst .$(LIB_SUFFIX),,$(LIB_FILENAME))-$(MAJOR_VERSION).$(MINOR_VERSION).$(LIB_SUFFIX).$(BUILD_NUMBER)
-+      else
-+        ifneq ($(OSTYPE),Darwin)
-+          LDSOOPTS += -Wl,-soname,$(LIB_SONAME)
-+        endif
-       endif
-     endif
-   endif
diff --git a/devel/ptlib26/files/patch-plugins_configure b/devel/ptlib26/files/patch-plugins_configure
deleted file mode 100644
index ad461d9cba53..000000000000
--- a/devel/ptlib26/files/patch-plugins_configure
+++ /dev/null
@@ -1,404 +0,0 @@
---- plugins/configure.orig	2009-09-20 20:25:31.000000000 -0400
-+++ plugins/configure	2010-01-27 16:45:51.000000000 -0500
-@@ -4994,6 +4994,268 @@
- 
- 
- if test "${enable_bsdvideo}z" = "yesz" ; then
-+  if test "${ac_cv_header_ioctl_meteor_h+set}" = set; then
-+  { echo "$as_me:$LINENO: checking for dev/bktr/ioctl_meteor.h" >&5
-+echo $ECHO_N "checking for dev/bktr/ioctl_meteor.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_ioctl_meteor_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_ioctl_meteor_h" >&5
-+echo "${ECHO_T}$ac_cv_header_ioctl_meteor_h" >&6; }
-+else
-+  # Is the header compilable?
-+{ echo "$as_me:$LINENO: checking dev/bktr/ioctl_meteor.h usability" >&5
-+echo $ECHO_N "checking dev/bktr/ioctl_meteor.h usability... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+#include <dev/bktr/ioctl_meteor.h>
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-+  ac_header_compiler=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_header_compiler=no
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
-+
-+# Is the header present?
-+{ echo "$as_me:$LINENO: checking dev/bktr/ioctl_meteor.h presence" >&5
-+echo $ECHO_N "checking dev/bktr/ioctl_meteor.h presence... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <dev/bktr/ioctl_meteor.h>
-+_ACEOF
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } >/dev/null && {
-+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       }; then
-+  ac_header_preproc=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+  ac_header_preproc=no
-+fi
-+
-+rm -f conftest.err conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
-+
-+# So?  What about this header?
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+  yes:no: )
-+    { echo "$as_me:$LINENO: WARNING: dev/bktr/ioctl_meteor.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: dev/bktr/ioctl_meteor.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: dev/bktr/ioctl_meteor.h: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: dev/bktr/ioctl_meteor.h: proceeding with the compiler's result" >&2;}
-+    ac_header_preproc=yes
-+    ;;
-+  no:yes:* )
-+    { echo "$as_me:$LINENO: WARNING: dev/bktr/ioctl_meteor.h: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: dev/bktr/ioctl_meteor.h: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: dev/bktr/ioctl_meteor.h:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: dev/bktr/ioctl_meteor.h:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: dev/bktr/ioctl_meteor.h: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: dev/bktr/ioctl_meteor.h: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: dev/bktr/ioctl_meteor.h:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: dev/bktr/ioctl_meteor.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: dev/bktr/ioctl_meteor.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: dev/bktr/ioctl_meteor.h: proceeding with the preprocessor's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: dev/bktr/ioctl_meteor.h: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: dev/bktr/ioctl_meteor.h: in the future, the compiler will take precedence" >&2;}
-+
-+    ;;
-+esac
-+{ echo "$as_me:$LINENO: checking for dev/bktr/ioctl_meteor.h" >&5
-+echo $ECHO_N "checking for dev/bktr/ioctl_meteor.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_ioctl_meteor_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_cv_header_ioctl_meteor_h=$ac_header_preproc
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_ioctl_meteor_h" >&5
-+echo "${ECHO_T}$ac_cv_header_ioctl_meteor_h" >&6; }
-+
-+fi
-+if test $ac_cv_header_ioctl_meteor_h = yes; then
-+  BSDVIDEOHDR=1
-+fi
-+
-+
-+  if test "${ac_cv_header_ioctl_bt848_h+set}" = set; then
-+  { echo "$as_me:$LINENO: checking for dev/bktr/ioctl_bt848.h" >&5
-+echo $ECHO_N "checking for dev/bktr/ioctl_bt848.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_ioctl_bt848_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_ioctl_bt848_h" >&5
-+echo "${ECHO_T}$ac_cv_header_ioctl_bt848_h" >&6; }
-+else
-+  # Is the header compilable?
-+{ echo "$as_me:$LINENO: checking dev/bktr/ioctl_bt848.h usability" >&5
-+echo $ECHO_N "checking dev/bktr/ioctl_bt848.h usability... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+#include <dev/bktr/ioctl_bt848.h>
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-+  ac_header_compiler=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_header_compiler=no
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
-+
-+# Is the header present?
-+{ echo "$as_me:$LINENO: checking dev/bktr/ioctl_bt848.h presence" >&5
-+echo $ECHO_N "checking dev/bktr/ioctl_bt848.h presence... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <dev/bktr/ioctl_bt848.h>
-+_ACEOF
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } >/dev/null && {
-+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       }; then
-+  ac_header_preproc=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+  ac_header_preproc=no
-+fi
-+
-+rm -f conftest.err conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
-+
-+# So?  What about this header?
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+  yes:no: )
-+    { echo "$as_me:$LINENO: WARNING: dev/bktr/ioctl_bt848.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: dev/bktr/ioctl_bt848.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: dev/bktr/ioctl_bt848.h: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: dev/bktr/ioctl_bt848.h: proceeding with the compiler's result" >&2;}
-+    ac_header_preproc=yes
-+    ;;
-+  no:yes:* )
-+    { echo "$as_me:$LINENO: WARNING: dev/bktr/ioctl_bt848.h: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: dev/bktr/ioctl_bt848.h: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: dev/bktr/ioctl_bt848.h:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: dev/bktr/ioctl_bt848.h:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: dev/bktr/ioctl_bt848.h: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: dev/bktr/ioctl_bt848.h: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: dev/bktr/ioctl_bt848.h:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: dev/bktr/ioctl_bt848.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: dev/bktr/ioctl_bt848.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: dev/bktr/ioctl_bt848.h: proceeding with the preprocessor's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: dev/bktr/ioctl_bt848.h: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: dev/bktr/ioctl_bt848.h: in the future, the compiler will take precedence" >&2;}
-+
-+    ;;
-+esac
-+{ echo "$as_me:$LINENO: checking for dev/bktr/ioctl_bt848.h" >&5
-+echo $ECHO_N "checking for dev/bktr/ioctl_bt848.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_ioctl_bt848_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_cv_header_ioctl_bt848_h=$ac_header_preproc
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_ioctl_bt848_h" >&5
-+echo "${ECHO_T}$ac_cv_header_ioctl_bt848_h" >&6; }
-+
-+fi
-+if test $ac_cv_header_ioctl_bt848_h = yes; then
-+  BSDVIDEOHDR=1
-+fi
-+
-+
-+# old path
-+if test "$ac_cv_header_ioctl_bt848_h" != yes -a "$ac_cv_header_ioctl_meteor_h" != yes; then
-   if test "${ac_cv_header_machine_ioctl_meteor_h+set}" = set; then
-   { echo "$as_me:$LINENO: checking for machine/ioctl_meteor.h" >&5
- echo $ECHO_N "checking for machine/ioctl_meteor.h... $ECHO_C" >&6; }
-@@ -5124,18 +5386,18 @@
- fi
- 
- 
--  if test "${ac_cv_header_i386_ioctl_meteor_h+set}" = set; then
--  { echo "$as_me:$LINENO: checking for i386/ioctl_meteor.h" >&5
--echo $ECHO_N "checking for i386/ioctl_meteor.h... $ECHO_C" >&6; }
--if test "${ac_cv_header_i386_ioctl_meteor_h+set}" = set; then
-+  if test "${ac_cv_header_machine_ioctl_bt848_h+set}" = set; then
-+  { echo "$as_me:$LINENO: checking for machine/ioctl_bt848.h" >&5
-+echo $ECHO_N "checking for machine/ioctl_bt848.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_machine_ioctl_bt848_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_header_i386_ioctl_meteor_h" >&5
--echo "${ECHO_T}$ac_cv_header_i386_ioctl_meteor_h" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_machine_ioctl_bt848_h" >&5
-+echo "${ECHO_T}$ac_cv_header_machine_ioctl_bt848_h" >&6; }
- else
-   # Is the header compilable?
--{ echo "$as_me:$LINENO: checking i386/ioctl_meteor.h usability" >&5
--echo $ECHO_N "checking i386/ioctl_meteor.h usability... $ECHO_C" >&6; }
-+{ echo "$as_me:$LINENO: checking machine/ioctl_bt848.h usability" >&5
-+echo $ECHO_N "checking machine/ioctl_bt848.h usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -5143,7 +5405,7 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--#include <i386/ioctl_meteor.h>
-+#include <machine/ioctl_bt848.h>
- _ACEOF
- rm -f conftest.$ac_objext
- if { (ac_try="$ac_compile"
-@@ -5175,15 +5437,15 @@
- echo "${ECHO_T}$ac_header_compiler" >&6; }
- 
- # Is the header present?
--{ echo "$as_me:$LINENO: checking i386/ioctl_meteor.h presence" >&5
--echo $ECHO_N "checking i386/ioctl_meteor.h presence... $ECHO_C" >&6; }
-+{ echo "$as_me:$LINENO: checking machine/ioctl_bt848.h presence" >&5
-+echo $ECHO_N "checking machine/ioctl_bt848.h presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
--#include <i386/ioctl_meteor.h>
-+#include <machine/ioctl_bt848.h>
- _ACEOF
- if { (ac_try="$ac_cpp conftest.$ac_ext"
- case "(($ac_try" in
-@@ -5216,43 +5478,44 @@
- # So?  What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-   yes:no: )
--    { echo "$as_me:$LINENO: WARNING: i386/ioctl_meteor.h: accepted by the compiler, rejected by the preprocessor!" >&5
--echo "$as_me: WARNING: i386/ioctl_meteor.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
--    { echo "$as_me:$LINENO: WARNING: i386/ioctl_meteor.h: proceeding with the compiler's result" >&5
--echo "$as_me: WARNING: i386/ioctl_meteor.h: proceeding with the compiler's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: machine/ioctl_bt848.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: machine/ioctl_bt848.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: machine/ioctl_bt848.h: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: machine/ioctl_bt848.h: proceeding with the compiler's result" >&2;}
-     ac_header_preproc=yes
-     ;;
-   no:yes:* )
--    { echo "$as_me:$LINENO: WARNING: i386/ioctl_meteor.h: present but cannot be compiled" >&5
--echo "$as_me: WARNING: i386/ioctl_meteor.h: present but cannot be compiled" >&2;}
--    { echo "$as_me:$LINENO: WARNING: i386/ioctl_meteor.h:     check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: i386/ioctl_meteor.h:     check for missing prerequisite headers?" >&2;}
--    { echo "$as_me:$LINENO: WARNING: i386/ioctl_meteor.h: see the Autoconf documentation" >&5
--echo "$as_me: WARNING: i386/ioctl_meteor.h: see the Autoconf documentation" >&2;}
--    { echo "$as_me:$LINENO: WARNING: i386/ioctl_meteor.h:     section \"Present But Cannot Be Compiled\"" >&5
--echo "$as_me: WARNING: i386/ioctl_meteor.h:     section \"Present But Cannot Be Compiled\"" >&2;}
--    { echo "$as_me:$LINENO: WARNING: i386/ioctl_meteor.h: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: i386/ioctl_meteor.h: proceeding with the preprocessor's result" >&2;}
--    { echo "$as_me:$LINENO: WARNING: i386/ioctl_meteor.h: in the future, the compiler will take precedence" >&5
--echo "$as_me: WARNING: i386/ioctl_meteor.h: in the future, the compiler will take precedence" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: machine/ioctl_bt848.h: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: machine/ioctl_bt848.h: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: machine/ioctl_bt848.h:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: machine/ioctl_bt848.h:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: machine/ioctl_bt848.h: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: machine/ioctl_bt848.h: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: machine/ioctl_bt848.h:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: machine/ioctl_bt848.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: machine/ioctl_bt848.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: machine/ioctl_bt848.h: proceeding with the preprocessor's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: machine/ioctl_bt848.h: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: machine/ioctl_bt848.h: in the future, the compiler will take precedence" >&2;}
- 
-     ;;
- esac
--{ echo "$as_me:$LINENO: checking for i386/ioctl_meteor.h" >&5
--echo $ECHO_N "checking for i386/ioctl_meteor.h... $ECHO_C" >&6; }
--if test "${ac_cv_header_i386_ioctl_meteor_h+set}" = set; then
-+{ echo "$as_me:$LINENO: checking for machine/ioctl_bt848.h" >&5
-+echo $ECHO_N "checking for machine/ioctl_bt848.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_machine_ioctl_bt848_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  ac_cv_header_i386_ioctl_meteor_h=$ac_header_preproc
-+  ac_cv_header_machine_ioctl_bt848_h=$ac_header_preproc
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_header_i386_ioctl_meteor_h" >&5
--echo "${ECHO_T}$ac_cv_header_i386_ioctl_meteor_h" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_machine_ioctl_bt848_h" >&5
-+echo "${ECHO_T}$ac_cv_header_machine_ioctl_bt848_h" >&6; }
- 
- fi
--if test $ac_cv_header_i386_ioctl_meteor_h = yes; then
-+if test $ac_cv_header_machine_ioctl_bt848_h = yes; then
-   BSDVIDEOHDR=1
- fi
--
-+fi
-+# old path - end
- 
-   if test "${ac_cv_header_dev_ic_bt8xx_h+set}" = set; then
-   { echo "$as_me:$LINENO: checking for dev/ic/bt8xx.h" >&5
-@@ -6161,6 +6424,8 @@
- 
- ac_config_files="$ac_config_files Makefile"
- 
-+ac_config_files="$ac_config_files vidinput_v4l/Makefile"
-+
- ac_config_files="$ac_config_files vidinput_v4l2/Makefile"
- 
- ac_config_files="$ac_config_files vidinput_dc/Makefile"
diff --git a/devel/ptlib26/files/patch-plugins_sound_oss_sound_oss.cxx b/devel/ptlib26/files/patch-plugins_sound_oss_sound_oss.cxx
deleted file mode 100644
index 0321a9dfe5c4..000000000000
--- a/devel/ptlib26/files/patch-plugins_sound_oss_sound_oss.cxx
+++ /dev/null
@@ -1,17 +0,0 @@
---- plugins/sound_oss/sound_oss.cxx.orig	2009-09-20 20:25:31.000000000 -0400
-+++ plugins/sound_oss/sound_oss.cxx	2010-01-27 16:15:09.000000000 -0500
-@@ -175,11 +175,11 @@
-             if (dsp.GetAt(cardnum+1) == NULL) {
- #if defined (P_FREEBSD)
-               // in FreeBSD the file name should be used via the devfs(5) and
--              // is just "/dev/dsp0" and devfs(5) takes care of virtual channels,
--              // like /dev/dsp0.0 /dev/dsp0.1 ...
-+              // is just "/dev/dspN" and devfs(5) takes care of virtual channels,
-+              // like /dev/dspN.0 /dev/dspN.1 ...
-               // everything else would conflict with other KDE apps using the
-               // audio
--              devname = devdir + "dsp0";
-+              devname = devdir + "dsp" + PString(cardnum);
-               PTRACE(1, "OSS\tCollectSoundDevices FreeBSD devname set to devfs(5) name:" << devname );
- #endif /* defined (P_FREEBSD) */
-               dsp.SetAt(cardnum+1, devname);
diff --git a/devel/ptlib26/files/patch-plugins_vidinput_v4l2_vidinput_v4l2.cxx b/devel/ptlib26/files/patch-plugins_vidinput_v4l2_vidinput_v4l2.cxx
deleted file mode 100644
index e74096fdb1ca..000000000000
--- a/devel/ptlib26/files/patch-plugins_vidinput_v4l2_vidinput_v4l2.cxx
+++ /dev/null
@@ -1,122 +0,0 @@
---- plugins/vidinput_v4l2/vidinput_v4l2.cxx.orig	2009-09-20 20:25:31.000000000 -0400
-+++ plugins/vidinput_v4l2/vidinput_v4l2.cxx	2010-01-27 14:28:45.000000000 -0500
-@@ -48,6 +48,7 @@
- #include <libv4l2.h>
- #else
- #define v4l2_fd_open(fd, flags) (fd)
-+#define v4l2_open open
- #define v4l2_close close
- #define v4l2_ioctl ioctl
- #define v4l2_read read
-@@ -161,7 +162,7 @@
-   PString name = GetNames().GetDeviceName(devName);
-   PTRACE(1,"PVidInDev\tOpen()\tdevName:" << name << "  videoFd:" << videoFd);
-   
--  videoFd = ::open((const char *)name, O_RDWR);
-+  videoFd = ::v4l2_open((const char *)name, O_RDWR);
-   if (videoFd < 0) {
-     PTRACE(1,"PVidInDev\topen failed : " << ::strerror(errno));
-     return PFalse;
-@@ -977,6 +978,32 @@
- V4L2Names::Update()
- {
-   PTRACE(1,"Detecting V4L2 devices");
-+  PWaitAndSignal m(mutex);
-+  inputDeviceNames.RemoveAll (); // flush the previous run
-+#if defined(P_FREEBSD)
-+  for (int i = 0; i < 10; i++) {
-+    PString thisDevice = PString("/dev/video") + PString(i);
-+    int videoFd=::v4l2_open((const char *)thisDevice, O_RDONLY | O_NONBLOCK);
-+    if ((videoFd > 0) || (errno == EBUSY)) {
-+      PBoolean valid = PFalse;
-+      struct v4l2_capability videoCaps;
-+      memset(&videoCaps,0,sizeof(videoCaps));
-+      if ((errno == EBUSY) ||
-+          (v4l2_ioctl(videoFd, VIDIOC_QUERYCAP, &videoCaps) >= 0 &&
-+          (videoCaps.capabilities & V4L2_CAP_VIDEO_CAPTURE))) {
-+        PTRACE(1,"PV4L2Plugin\tdetected capture device " << videoCaps.card);
-+        valid = PTrue;
-+      }
-+      else {
-+        PTRACE(1,"PV4L2Plugin\t" << thisDevice << "is not deemed valid");
-+      }
-+      if (videoFd>0)
-+        ::v4l2_close(videoFd);
-+      if(valid)
-+        inputDeviceNames += thisDevice;
-+    }
-+  }
-+#else
-   PDirectory   procvideo2_4("/proc/video/dev");
-   PDirectory   procvideo2_6("/sys/class/video4linux");
-   PDirectory * procvideo;
-@@ -996,8 +1023,6 @@
-     kernelVersion=KUNKNOWN;
-     procvideo=0;
-   }
--  PWaitAndSignal m(mutex);
--  inputDeviceNames.RemoveAll (); // flush the previous run
-   if (procvideo) {
-     PTRACE(2,"PV4L2Plugin\tdetected device metadata at "<<*procvideo);
-     if (((kernelVersion==K2_6 && procvideo->Open(PFileInfo::SubDirectory)) || 
-@@ -1006,7 +1031,7 @@
-         entry = procvideo->GetEntryName();
-         if ((entry.Left(5) == "video")) {
-           PString thisDevice = "/dev/" + entry;
--          int videoFd=::open((const char *)thisDevice, O_RDONLY | O_NONBLOCK);
-+          int videoFd=::v4l2_open((const char *)thisDevice, O_RDONLY | O_NONBLOCK);
-           if ((videoFd > 0) || (errno == EBUSY)) {
-             PBoolean valid = PFalse;
-             struct v4l2_capability videoCaps;
-@@ -1021,7 +1046,7 @@
-               PTRACE(1,"PV4L2Plugin\t" << thisDevice << "is not deemed valid");
-             }
-             if (videoFd>0)
--              ::close(videoFd);
-+              ::v4l2_close(videoFd);
-             if(valid)
-               inputDeviceNames += thisDevice;
-           }
-@@ -1035,16 +1060,17 @@
-   else {
-     PTRACE(1,"Unable to detect v4l2 directory");
-   }
-+#endif
-   if (inputDeviceNames.GetSize() == 0) {
-     POrdinalToString vid;
-     ReadDeviceDirectory("/dev/", vid);
- 
-     for (PINDEX i = 0; i < vid.GetSize(); i++) {
-       PINDEX cardnum = vid.GetKeyAt(i);
--      int fd = ::open(vid[cardnum], O_RDONLY | O_NONBLOCK);
-+      int fd = ::v4l2_open(vid[cardnum], O_RDONLY | O_NONBLOCK);
-       if ((fd >= 0) || (errno == EBUSY)) {
-         if (fd >= 0)
--          ::close(fd);
-+          ::v4l2_close(fd);
-         inputDeviceNames += vid[cardnum];
-       }
-     }
-@@ -1056,7 +1082,7 @@
- {
-   PString Result;
- 
--  int fd = ::open((const char *)devname, O_RDONLY);
-+  int fd = ::v4l2_open((const char *)devname, O_RDONLY);
-   if(fd < 0) {
-     return devname;
-   }
-@@ -1064,11 +1090,11 @@
-   struct v4l2_capability videocap;
-   memset(&videocap,0,sizeof(videocap));
-   if (v4l2_ioctl(fd, VIDIOC_QUERYCAP, &videocap) < 0)  {
--      ::close(fd);
-+      ::v4l2_close(fd);
-       return devname;
-     }
-   
--  ::close(fd);
-+  ::v4l2_close(fd);
-   PString ufname((const char*)videocap.card);
- 
-   return ufname;
diff --git a/devel/ptlib26/files/patch-plugins_vidinput_v4l_Makefile.in b/devel/ptlib26/files/patch-plugins_vidinput_v4l_Makefile.in
deleted file mode 100644
index 51e8a117f4ab..000000000000
--- a/devel/ptlib26/files/patch-plugins_vidinput_v4l_Makefile.in
+++ /dev/null
@@ -1,16 +0,0 @@
---- plugins/vidinput_v4l/Makefile.in.orig	2010-01-27 16:48:07.000000000 -0500
-+++ plugins/vidinput_v4l/Makefile.in	2010-01-27 17:00:56.000000000 -0500
-@@ -0,0 +1,13 @@
-+HAS_LIBV4L = @HAS_LIBV4L@
-+
-+PLUGIN_NAME	= v4l
-+PLUGIN_FAMILY	= device/videoinput
-+PLUGIN_LIBS	=
-+PLUGIN_SOURCES	= vidinput_v4l.cxx
-+
-+ifeq (1,$(HAS_LIBV4L))
-+PLUGIN_LIBS	= $(LDFLAGS) -lv4l1
-+STDCCFLAGS	+= -DHAS_LIBV4L
-+endif
-+
-+include ../../make/plugins.mak
diff --git a/devel/ptlib26/files/patch-plugins_vidinput_v4l_vidinput_v4l.cxx b/devel/ptlib26/files/patch-plugins_vidinput_v4l_vidinput_v4l.cxx
deleted file mode 100644
index 6d37b797323b..000000000000
--- a/devel/ptlib26/files/patch-plugins_vidinput_v4l_vidinput_v4l.cxx
+++ /dev/null
@@ -1,494 +0,0 @@
---- plugins/vidinput_v4l/vidinput_v4l.cxx.orig	2009-09-20 20:25:31.000000000 -0400
-+++ plugins/vidinput_v4l/vidinput_v4l.cxx	2010-01-27 14:11:25.000000000 -0500
-@@ -38,6 +38,17 @@
- 
- PCREATE_VIDINPUT_PLUGIN(V4L);
- 
-+#ifdef HAS_LIBV4L
-+#include <libv4l1.h>
-+#else
-+#define v4l1_open open
-+#define v4l1_close close
-+#define v4l1_ioctl ioctl
-+#define v4l1_read read
-+#define v4l1_mmap mmap
-+#define v4l1_munmap munmap
-+#endif  
-+
- ///////////////////////////////////////////////////////////////////////////////
- // Linux Video4Linux Driver Hints Tables.
- //
-@@ -261,27 +272,46 @@
- void
- V4LNames::Update()
- {
--  PDirectory   procvideo("/proc/video/dev");
--  PString      entry;
--  PStringList  devlist;
-   
-   PWaitAndSignal m(mutex);
-   inputDeviceNames.RemoveAll (); // flush the previous run
-+
-+#if defined(P_FREEBSD)
-+  for (int i = 0; i < 10; i++) {
-+    PString thisDevice = PString("/dev/video") + PString(i);
-+    int videoFd = ::v4l1_open((const char *)thisDevice, O_RDONLY | O_NONBLOCK);
-+
-+    if ((videoFd > 0) || (errno == EBUSY)){
-+      PBoolean valid = PFalse;
-+      struct video_capability  videoCaps;
-+      if (v4l1_ioctl(videoFd, VIDIOCGCAP, &videoCaps) >= 0 && (videoCaps.type & VID_TYPE_CAPTURE) != 0)
-+        valid = PTrue;
-+      if (videoFd >= 0)
-+        v4l1_close(videoFd); 
-+      if (valid)
-+        inputDeviceNames += thisDevice;
-+    }
-+  }
-+#else
-+  PDirectory   procvideo("/proc/video/dev");
-+  PString      entry;
-+  PStringList  devlist;
-+
-   if (procvideo.Exists()) {
-     if (procvideo.Open(PFileInfo::RegularFile)) {
-       do {
-         entry = procvideo.GetEntryName();
-         if ((entry.Left(5) == "video") || (entry.Left(7) == "capture")) {
-           PString thisDevice = "/dev/video" + entry.Right(1);
--          int videoFd = ::open((const char *)thisDevice, O_RDONLY | O_NONBLOCK);
-+          int videoFd = ::v4l1_open((const char *)thisDevice, O_RDONLY | O_NONBLOCK);
- 
-           if ((videoFd > 0) || (errno == EBUSY)){
-             PBoolean valid = PFalse;
-             struct video_capability  videoCaps;
--            if (ioctl(videoFd, VIDIOCGCAP, &videoCaps) >= 0 && (videoCaps.type & VID_TYPE_CAPTURE) != 0)
-+            if (v4l1_ioctl(videoFd, VIDIOCGCAP, &videoCaps) >= 0 && (videoCaps.type & VID_TYPE_CAPTURE) != 0)
-               valid = PTrue;
-             if (videoFd >= 0)
--              close(videoFd); 
-+              v4l1_close(videoFd); 
-             if (valid)
-               inputDeviceNames += thisDevice;
-           }
-@@ -289,16 +319,17 @@
-       } while (procvideo.Next());
-     }   
-   } 
-+#endif
-   if (inputDeviceNames.GetSize() == 0) {
-     POrdinalToString vid;
-     ReadDeviceDirectory("/dev/", vid);
- 
-     for (PINDEX i = 0; i < vid.GetSize(); i++) {
-       PINDEX cardnum = vid.GetKeyAt(i);
--      int fd = ::open(vid[cardnum], O_RDONLY | O_NONBLOCK);
-+      int fd = ::v4l1_open(vid[cardnum], O_RDONLY | O_NONBLOCK);
-       if ((fd >= 0) || (errno == EBUSY)) {
-         if (fd >= 0)
--          ::close(fd);
-+          ::v4l1_close(fd);
-         inputDeviceNames += vid[cardnum];
-       }
-     }
-@@ -411,18 +442,18 @@
- {
-   PString Result;
- 
--  int fd = ::open((const char *)devname, O_RDONLY);
-+  int fd = ::v4l1_open((const char *)devname, O_RDONLY);
-   if(fd < 0) {
-     return devname;
-   }
- 
-   struct video_capability videocap;
--  if (::ioctl(fd, VIDIOCGCAP, &videocap) < 0)  {
--      ::close(fd);
-+  if (::v4l1_ioctl(fd, VIDIOCGCAP, &videocap) < 0)  {
-+      ::v4l1_close(fd);
-       return devname;
-     }
-   
--  ::close(fd);
-+  ::v4l1_close(fd);
-   PString ufname(videocap.name);  
- 
-   return ufname;
-@@ -515,7 +546,7 @@
-   // check if it is a userfriendly name, and if so, get the real device name
- 
-   PString deviceName = GetNames().GetDeviceName(devName);
--  videoFd = ::open((const char *)deviceName, O_RDWR);
-+  videoFd = ::v4l1_open((const char *)deviceName, O_RDWR);
-   if (videoFd < 0) {
-     PTRACE(1,"PVideoInputDevice_V4L::Open failed : "<< ::strerror(errno));
-     return PFalse;
-@@ -523,14 +554,14 @@
-   
-   // get the device capabilities
-   if (!RefreshCapabilities()) {
--    ::close (videoFd);
-+    ::v4l1_close (videoFd);
-     videoFd = -1;
-     return PFalse;
-   }
-   
-   if ((videoCapability.type & VID_TYPE_CAPTURE) == 0) {
-     PTRACE(1,"PVideoInputDevice_V4L:: device capablilities reports cannot capture");
--    ::close (videoFd);
-+    ::v4l1_close (videoFd);
-     videoFd = -1;
-     return PFalse;
-   }
-@@ -579,7 +610,7 @@
-   if (hint_index >= PARRAYSIZE(driver_hints)-1) {
-      struct video_channel channel;
-      memset(&channel, 0, sizeof(struct video_channel));
--     if (::ioctl(videoFd, VIDIOCGCHAN, &channel) == 0) {
-+     if (::v4l1_ioctl(videoFd, VIDIOCGCHAN, &channel) == 0) {
- 	/* Only check if the called doesn't return an error */
- 	for (tbl = 0; tbl < PARRAYSIZE(bridges_with_640x480_fixed_width); tbl ++) {
- 	   if (strcmp(bridges_with_640x480_fixed_width[tbl], channel.name) == 0) {
-@@ -609,7 +640,7 @@
- #define VIDIOCQCSCOMPATIBLE     _IOWR('v',QC_IOCTLBASE+10,int)  /* Set enable workaround for bugs, bitfield */
- 
-     int reg = 2; /* enable double buffering */
--    ::ioctl (videoFd, VIDIOCQCSCOMPATIBLE, &reg);
-+    ::v4l1_ioctl (videoFd, VIDIOCQCSCOMPATIBLE, &reg);
-   }
- 
-     
-@@ -620,11 +651,11 @@
- 
-   // Init audio
-   struct video_audio videoAudio;
--  if (::ioctl(videoFd, VIDIOCGAUDIO, &videoAudio) >= 0 &&
-+  if (::v4l1_ioctl(videoFd, VIDIOCGAUDIO, &videoAudio) >= 0 &&
-                       (videoAudio.flags & VIDEO_AUDIO_MUTABLE) != 0) {
-     videoAudio.flags &= ~VIDEO_AUDIO_MUTE;
-     videoAudio.mode = VIDEO_SOUND_MONO;
--    ::ioctl(videoFd, VIDIOCSAUDIO, &videoAudio);
-+    ::v4l1_ioctl(videoFd, VIDIOCSAUDIO, &videoAudio);
-     } 
- 
-   return PTrue;
-@@ -645,14 +676,14 @@
- 
-   // Mute audio
-   struct video_audio videoAudio;
--  if (::ioctl(videoFd, VIDIOCGAUDIO, &videoAudio) >= 0 &&
-+  if (::v4l1_ioctl(videoFd, VIDIOCGAUDIO, &videoAudio) >= 0 &&
-                       (videoAudio.flags & VIDEO_AUDIO_MUTABLE) != 0) {
-     videoAudio.flags |= VIDEO_AUDIO_MUTE;
--    ::ioctl(videoFd, VIDIOCSAUDIO, &videoAudio);
-+    ::v4l1_ioctl(videoFd, VIDIOCSAUDIO, &videoAudio);
-   }
- 
-   ClearMapping();
--  ::close(videoFd);
-+  ::v4l1_close(videoFd);
- 
-   videoFd = -1;
-   canMap  = -1;
-@@ -703,7 +734,7 @@
- 
-   struct video_channel channel;
-   channel.channel = channelNumber;
--  if (::ioctl(videoFd, VIDIOCGCHAN, &channel) < 0) {
-+  if (::v4l1_ioctl(videoFd, VIDIOCGCHAN, &channel) < 0) {
-     PTRACE(1,"VideoInputDevice Get Channel info failed : "<< ::strerror(errno));    
-     return PFalse;
-   }
-@@ -714,7 +745,7 @@
-   channel.norm = fmt[newFormat];
- 
-   // set the information
--  if (::ioctl(videoFd, VIDIOCSCHAN, &channel) >= 0) {
-+  if (::v4l1_ioctl(videoFd, VIDIOCSCHAN, &channel) >= 0) {
-     // format change might affect frame size limits; grab them again
-     RefreshCapabilities();
-     return PTrue;
-@@ -754,7 +785,7 @@
-   // get channel information (to check if channel is valid)
-   struct video_channel channel;
-   channel.channel = channelNumber;
--  if (::ioctl(videoFd, VIDIOCGCHAN, &channel) < 0) {
-+  if (::v4l1_ioctl(videoFd, VIDIOCGCHAN, &channel) < 0) {
-     PTRACE(1,"VideoInputDevice:: Get info on channel " << channelNumber << " failed : "<< ::strerror(errno));    
-     return PFalse;
-   }
-@@ -763,7 +794,7 @@
-   channel.channel = channelNumber;
- 
-   // set the information
--  if (::ioctl(videoFd, VIDIOCSCHAN, &channel) < 0) {
-+  if (::v4l1_ioctl(videoFd, VIDIOCSCHAN, &channel) < 0) {
-     PTRACE(1,"VideoInputDevice:: Set info on channel " << channelNumber << " failed : "<< ::strerror(errno));    
-     return PFalse;
-   }
-@@ -792,7 +823,7 @@
-   // get channel information (to check if channel is valid)
-   struct video_channel channel;
-   channel.channel = channelNumber;
--  if (::ioctl(videoFd, VIDIOCGCHAN, &channel) < 0) {
-+  if (::v4l1_ioctl(videoFd, VIDIOCGCHAN, &channel) < 0) {
-     PTRACE(1,"VideoInputDevice Get Channel info failed : "<< ::strerror(errno));    
- 
-     return PFalse;
-@@ -803,7 +834,7 @@
-   channel.channel = channelNumber;
- 
-   // set the information
--  if (::ioctl(videoFd, VIDIOCSCHAN, &channel) < 0) {
-+  if (::v4l1_ioctl(videoFd, VIDIOCSCHAN, &channel) < 0) {
-     PTRACE(1,"VideoInputDevice SetChannel failed : "<< ::strerror(errno));  
- 
-     return PFalse;
-@@ -830,7 +861,7 @@
- 
-   // get current picture information
-   struct video_picture pictureInfo;
--  if (::ioctl(videoFd, VIDIOCGPICT, &pictureInfo) < 0) {
-+  if (::v4l1_ioctl(videoFd, VIDIOCGPICT, &pictureInfo) < 0) {
-     PTRACE(1,"PVideoInputDevice_V4L::Get pict info failed : "<< ::strerror(errno));
-     return PFalse;
-   }
-@@ -842,7 +873,7 @@
-     pictureInfo.depth = 16;
- 
-   // set the information
--  if (::ioctl(videoFd, VIDIOCSPICT, &pictureInfo) < 0) {
-+  if (::v4l1_ioctl(videoFd, VIDIOCSPICT, &pictureInfo) < 0) {
-     PTRACE(1,"PVideoInputDevice_V4L::Set pict info failed : "<< ::strerror(errno));
-     PTRACE(1,"PVideoInputDevice_V4L:: used code of "<<colourFormatCode);
-     PTRACE(1,"PVideoInputDevice_V4L:: palette: "<<colourFormatTab[colourFormatIndex].colourFormat);
-@@ -871,7 +902,7 @@
- 
-   // Some V4L drivers can't use CGPICT to check for errors.
-   if (!HINT(HINT_CGPICT_DOESNT_SET_PALETTE)) {
--    if (::ioctl(videoFd, VIDIOCGPICT, &pictureInfo) < 0) {
-+    if (::v4l1_ioctl(videoFd, VIDIOCGPICT, &pictureInfo) < 0) {
-       PTRACE(1,"PVideoInputDevice_V4L::Get pict info failed : "<< ::strerror(errno));
-       return PFalse;
-     }
-@@ -959,12 +990,12 @@
- {
-   if (canMap < 0) {
-     //When canMap is < 0, it is the first use of GetFrameData. Check for memory mapping.
--    if (::ioctl(videoFd, VIDIOCGMBUF, &frame) < 0) {
-+    if (::v4l1_ioctl(videoFd, VIDIOCGMBUF, &frame) < 0) {
-       canMap=0;
-       PTRACE(3, "VideoGrabber " << deviceName << " cannot do memory mapping - GMBUF failed.");
-       //This video device cannot do memory mapping.
-     } else {
--      videoBuffer = (BYTE *)::mmap(0, frame.size, PROT_READ|PROT_WRITE, MAP_SHARED, videoFd, 0);
-+      videoBuffer = (BYTE *)::v4l1_mmap(0, frame.size, PROT_READ|PROT_WRITE, MAP_SHARED, videoFd, 0);
-      
-       if (videoBuffer < 0) {
-         canMap = 0;
-@@ -985,7 +1016,7 @@
- 
-         currentFrame = 0;
-         int ret;
--        ret = ::ioctl(videoFd, VIDIOCMCAPTURE, &frameBuffer[currentFrame]);
-+        ret = ::v4l1_ioctl(videoFd, VIDIOCMCAPTURE, &frameBuffer[currentFrame]);
-         if (ret < 0) {
-           PTRACE(1,"PVideoInputDevice_V4L::GetFrameData mcapture1 failed : " << ::strerror(errno));
-           ClearMapping();  
-@@ -1029,7 +1060,7 @@
-   // fallback to read() on errors.
-   int ret = -1;
-   
--  ret = ::ioctl(videoFd, VIDIOCMCAPTURE, &frameBuffer[ 1 - currentFrame ]);
-+  ret = ::v4l1_ioctl(videoFd, VIDIOCMCAPTURE, &frameBuffer[ 1 - currentFrame ]);
-   if ( ret < 0 ) {
-     PTRACE(1,"PVideoInputDevice_V4L::GetFrameData mcapture2 failed : " << ::strerror(errno));
-     ClearMapping();
-@@ -1042,7 +1073,7 @@
-   // device does support memory mapping, get data
- 
-   // wait for the frame to load. 
--  ret = ::ioctl(videoFd, VIDIOCSYNC, &currentFrame);
-+  ret = ::v4l1_ioctl(videoFd, VIDIOCSYNC, &currentFrame);
-   pendingSync[currentFrame] = PFalse;    
-   if (ret < 0) {
-     PTRACE(1,"PVideoInputDevice_V4L::GetFrameData csync failed : " << ::strerror(errno));
-@@ -1077,7 +1108,7 @@
-    ret = -1;
-    while (ret < 0) {
- 
--     ret = ::read(videoFd, resultBuffer, frameBytes);
-+     ret = ::v4l1_read(videoFd, resultBuffer, frameBytes);
-      if ((ret < 0) && (errno == EINTR))
-        continue;
-     
-@@ -1108,12 +1139,12 @@
-   if ((canMap == 1) && (videoBuffer != NULL)) {
-     for (int i=0; i<2; i++) {
-       if (pendingSync[i]) {
--        int res = ::ioctl(videoFd, VIDIOCSYNC, &i);
-+        int res = ::v4l1_ioctl(videoFd, VIDIOCSYNC, &i);
-         if (res < 0) 
-           PTRACE(1,"PVideoInputDevice_V4L::GetFrameData csync failed : " << ::strerror(errno));
-           pendingSync[i] = PFalse;    
-         }
--        ::munmap(videoBuffer, frame.size);
-+        ::v4l1_munmap(videoBuffer, frame.size);
-     }
-   }
-   
-@@ -1154,7 +1185,7 @@
-   }
-   
-   // Request current hardware frame size
--  if (::ioctl(videoFd, VIDIOCGWIN, &vwin) < 0) {
-+  if (::v4l1_ioctl(videoFd, VIDIOCGWIN, &vwin) < 0) {
-     PTRACE(3,"PVideoInputDevice_V4L\t VerifyHardwareFrameSize VIDIOCGWIN1 error::" << ::strerror(errno));
-     return PFalse;
-   }
-@@ -1172,10 +1203,10 @@
-     vwin.flags = 0;
-   }
-   
--  ::ioctl(videoFd, VIDIOCSWIN, &vwin);
-+  ::v4l1_ioctl(videoFd, VIDIOCSWIN, &vwin);
-   
-   // Read back settings to be careful about existing (broken) V4L drivers
--  if (::ioctl(videoFd, VIDIOCGWIN, &vwin) < 0) {
-+  if (::v4l1_ioctl(videoFd, VIDIOCGWIN, &vwin) < 0) {
-     PTRACE(3,"PVideoInputDevice_V4L\t VerifyHardwareFrameSize VIDIOCGWIN2 error::" << ::strerror(errno));
-     return PFalse;
-   }
-@@ -1195,7 +1226,7 @@
- 
-   struct video_picture vp;
- 
--  if (::ioctl(videoFd, VIDIOCGPICT, &vp) < 0)
-+  if (::v4l1_ioctl(videoFd, VIDIOCGPICT, &vp) < 0)
-     return -1;
-   frameBrightness = vp.brightness;
- 
-@@ -1210,7 +1241,7 @@
- 
-   struct video_picture vp;
- 
--  if (::ioctl(videoFd, VIDIOCGPICT, &vp) < 0)
-+  if (::v4l1_ioctl(videoFd, VIDIOCGPICT, &vp) < 0)
-     return -1;
-   frameWhiteness = vp.whiteness;
- 
-@@ -1224,7 +1255,7 @@
- 
-   struct video_picture vp;
- 
--  if (::ioctl(videoFd, VIDIOCGPICT, &vp) < 0)
-+  if (::v4l1_ioctl(videoFd, VIDIOCGPICT, &vp) < 0)
-     return -1;
-   frameColour = vp.colour;
- 
-@@ -1240,7 +1271,7 @@
- 
-   struct video_picture vp;
- 
--  if (::ioctl(videoFd, VIDIOCGPICT, &vp) < 0)
-+  if (::v4l1_ioctl(videoFd, VIDIOCGPICT, &vp) < 0)
-     return -1;
-   frameContrast = vp.contrast;
- 
-@@ -1254,7 +1285,7 @@
- 
-   struct video_picture vp;
- 
--  if (::ioctl(videoFd, VIDIOCGPICT, &vp) < 0)
-+  if (::v4l1_ioctl(videoFd, VIDIOCGPICT, &vp) < 0)
-     return -1;
-   frameHue = vp.hue;
- 
-@@ -1268,11 +1299,11 @@
- 
-   struct video_picture vp;
- 
--  if (::ioctl(videoFd, VIDIOCGPICT, &vp) < 0)
-+  if (::v4l1_ioctl(videoFd, VIDIOCGPICT, &vp) < 0)
-     return PFalse;
- 
-   vp.brightness = newBrightness;
--  if (::ioctl(videoFd, VIDIOCSPICT, &vp) < 0)
-+  if (::v4l1_ioctl(videoFd, VIDIOCSPICT, &vp) < 0)
-     return PFalse;
- 
-   frameBrightness=newBrightness;
-@@ -1285,11 +1316,11 @@
- 
-   struct video_picture vp;
- 
--  if (::ioctl(videoFd, VIDIOCGPICT, &vp) < 0)
-+  if (::v4l1_ioctl(videoFd, VIDIOCGPICT, &vp) < 0)
-     return PFalse;
- 
-   vp.whiteness = newWhiteness;
--  if (::ioctl(videoFd, VIDIOCSPICT, &vp) < 0)
-+  if (::v4l1_ioctl(videoFd, VIDIOCSPICT, &vp) < 0)
-     return PFalse;
- 
-   frameWhiteness = newWhiteness;
-@@ -1303,11 +1334,11 @@
- 
-   struct video_picture vp;
- 
--  if (::ioctl(videoFd, VIDIOCGPICT, &vp) < 0)
-+  if (::v4l1_ioctl(videoFd, VIDIOCGPICT, &vp) < 0)
-     return PFalse;
- 
-   vp.colour = newColour;
--  if (::ioctl(videoFd, VIDIOCSPICT, &vp) < 0)
-+  if (::v4l1_ioctl(videoFd, VIDIOCSPICT, &vp) < 0)
-     return PFalse;
- 
-   frameColour = newColour;
-@@ -1320,11 +1351,11 @@
- 
-   struct video_picture vp;
- 
--  if (::ioctl(videoFd, VIDIOCGPICT, &vp) < 0)
-+  if (::v4l1_ioctl(videoFd, VIDIOCGPICT, &vp) < 0)
-     return PFalse;
- 
-   vp.contrast = newContrast;
--  if (::ioctl(videoFd, VIDIOCSPICT, &vp) < 0)
-+  if (::v4l1_ioctl(videoFd, VIDIOCSPICT, &vp) < 0)
-     return PFalse;
- 
-   frameContrast = newContrast;
-@@ -1338,11 +1369,11 @@
- 
-   struct video_picture vp;
- 
--  if (::ioctl(videoFd, VIDIOCGPICT, &vp) < 0)
-+  if (::v4l1_ioctl(videoFd, VIDIOCGPICT, &vp) < 0)
-     return PFalse;
- 
-   vp.hue = newHue;
--  if (::ioctl(videoFd, VIDIOCSPICT, &vp) < 0)
-+  if (::v4l1_ioctl(videoFd, VIDIOCSPICT, &vp) < 0)
-     return PFalse;
- 
-    frameHue=newHue; 
-@@ -1357,7 +1388,7 @@
- 
-   struct video_picture vp;
- 
--  if (::ioctl(videoFd, VIDIOCGPICT, &vp) < 0)
-+  if (::v4l1_ioctl(videoFd, VIDIOCGPICT, &vp) < 0)
-     {
-       PTRACE(3, "GetParams bombs out!");
-       return PFalse;
-@@ -1385,7 +1416,7 @@
- 
- PBoolean PVideoInputDevice_V4L::RefreshCapabilities()
- {
--  if (::ioctl(videoFd, VIDIOCGCAP, &videoCapability) < 0)  {
-+  if (::v4l1_ioctl(videoFd, VIDIOCGCAP, &videoCapability) < 0)  {
-     PTRACE(1,"PVideoInputV4lDevice:: get device capablilities failed : "<< ::strerror(errno));
-     return PFalse;
-   }
diff --git a/net-im/Makefile b/net-im/Makefile
index 8e94be93d034..ee01b2643c9a 100644
--- a/net-im/Makefile
+++ b/net-im/Makefile
@@ -19,6 +19,7 @@
     SUBDIR += decibel
     SUBDIR += echat
     SUBDIR += ejabberd
+    SUBDIR += ekiga
     SUBDIR += emesene
     SUBDIR += empathy
     SUBDIR += farsight2
diff --git a/net-im/ekiga/Makefile b/net-im/ekiga/Makefile
new file mode 100644
index 000000000000..594bf39906c8
--- /dev/null
+++ b/net-im/ekiga/Makefile
@@ -0,0 +1,171 @@
+# Created by: Charlie & <root@ws.ipfw.ru>
+# $FreeBSD$
+
+PORTNAME=	ekiga
+PORTVERSION=	4.0.1
+CATEGORIES=	net
+MASTER_SITES=	GNOME
+#MASTER_SITES=	http://www.ekiga.org/admin/downloads/latest/sources/ekiga_${PORTVERSION}/
+#DISTNAME=	ekiga-${PORTVERSION}
+DIST_SUBDIR=	gnome3
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	VoIP and video conferencing application
+
+BUILD_DEPENDS=	v4l_compat>=0:${PORTSDIR}/multimedia/v4l_compat \
+		gnome-icon-theme>=3.0.0:${PORTSDIR}/misc/gnome-icon-theme
+LIB_DEPENDS=	libboost_signals.so:${PORTSDIR}/devel/boost-libs \
+		libopal.so:${PORTSDIR}/net/opal \
+		libv4l2.so:${PORTSDIR}/multimedia/libv4l
+RUN_DEPENDS=	gnome-icon-theme>=3.0.0:${PORTSDIR}/misc/gnome-icon-theme
+
+USE_XZ=		yes
+GNU_CONFIGURE=	yes
+USES=		gettext gmake pathfix perl5 pkgconfig
+USE_XORG=	xv
+USE_GNOME=	gtk20 intltool libxml2
+INSTALLS_OMF=	yes
+INSTALLS_ICONS=	yes
+
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-I${LOCALBASE}/lib
+
+MAN1=		ekiga.1
+
+OPTIONS_DEFINE=	LDAP NOTIFY EVOLUTION GCONF DBUS AVAHI GNOMEHELP
+OPTIONS_DEFAULT=NOTIFY DBUS GCONF AVAHI
+
+EVOLUTION_DESC=	Evolution data server support
+GNOMEHELP_DESC=	Build Ekiga help files
+
+#OPTIONS_GROUP=	EXP
+#OPTIONS_GROUP_EXP=	KDE KAB GSTREAMER XCAP LOUDMOUTH
+EXP_DESC=	Experimental features
+KDE_DESC=	KDE 4 support
+KAB_DESC=	KAddressBook support (implies KDE option)
+GSTREAMER_DESC=	Gstreamer support
+XCAP_DESC=	Remote contact storage via HTTP in xml format
+LOUDMOUTH_DESC=	XMPP (jabber) support
+
+# Note that h.323 support is enabled when opal is build with it.
+
+NO_STAGE=	yes
+.include <bsd.port.options.mk>
+
+PLIST_SUB+=	VERSION=${PORTVERSION}
+
+.if ${PORT_OPTIONS:MKDE} || ${PORT_OPTIONS:MKAB}
+USE_KDE4=	kdehier kdelibs
+USE_QT4=	corelib
+CONFIGURE_ARGS+=--enable-kde
+#CONFIGURE_ENV+=KDE_CFLAGS="-I${KDE4_PREFIX}/include -I${QT_INCDIR} \
+#	-I${LOCALBASE}/include" KDE_LIBS="-L${KDE4_PREFIX}/lib"
+CPPFLAGS+=	-I${KDE4_PREFIX}/include
+LDFLAGS+=	-L${KDE4_PREFIX}/lib
+.else
+CONFIGURE_ARGS+=--disable-kde
+.endif
+
+.if ${PORT_OPTIONS:MKAB}
+CONFIGURE_ARGS+=--enable-kab
+USE_KDE4+=	pimlibs
+.else
+CONFIGURE_ARGS+=--disable-kab
+.endif
+
+.if ${PORT_OPTIONS:MGSTREAMER}
+CONFIGURE_ARGS+=--enable-gstreamer
+USE_GSTREAMER=	yes
+.else
+CONFIGURE_ARGS+=--disable-gstreamer
+.endif
+
+.if ${PORT_OPTIONS:MXCAP}
+CONFIGURE_ARGS+=--enable-xcap
+LIB_DEPENDS+=	libsoup-2.4.so:${PORTSDIR}/devel/libsoup
+.else
+CONFIGURE_ARGS+=--disable-xcap
+.endif
+
+.if ${PORT_OPTIONS:MLOUDMOUTH}
+CONFIGURE_ARGS+=--enable-loudmouth
+LIB_DEPENDS+=	libloudmouth-1.so:${PORTSDIR}/net-im/loudmouth
+.else
+CONFIGURE_ARGS+=--disable-loudmouth
+.endif
+
+.if ${PORT_OPTIONS:MLDAP}
+USE_OPENLDAP=	yes
+LIB_DEPENDS+=	libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
+CONFIGURE_ARGS+=--enable-ldap --with-ldap-dir="${LOCALBASE}" --with-libsasl2-dir="${LOCALBASE}"
+PLIST_SUB+=	LDAP=""
+WITH_PLUGINS=	1
+.else
+CONFIGURE_ARGS+=--disable-ldap
+PLIST_SUB+=	LDAP="@comment "
+.endif
+
+.if defined(WITH_PLUGINS)
+PLIST_SUB+=	PLUGINS=""
+.else
+PLIST_SUB+=	PLUGINS="@comment "
+.endif
+
+.if ${PORT_OPTIONS:MNOTIFY}
+LIB_DEPENDS+=	libnotify.so:${PORTSDIR}/devel/libnotify
+CONFIGURE_ARGS+=--enable-notify
+PLIST_SUB+=	NOTIFY=""
+WITH_PLUGINS=	1
+.else
+CONFIGURE_ARGS+=--disable-notify
+PLIST_SUB+=	NOTIFY="@comment "
+.endif
+
+.if ${PORT_OPTIONS:MDBUS}
+LIB_DEPENDS+=	libdbus-1.so:${PORTSDIR}/devel/dbus
+CONFIGURE_ARGS+=--enable-dbus --enable-dbus-service
+PLIST_SUB+=	DBUS=""
+.else
+CONFIGURE_ARGS+=--disable-dbus --disable-dbus-service
+PLIST_SUB+=	DBUS="@comment "
+.endif
+
+.if ${PORT_OPTIONS:MGCONF}
+USE_GNOME+=	gconf2
+CONFIGURE_ARGS+=--enable-gconf
+GCONF_SCHEMAS=	ekiga.schemas
+PLIST_SUB+=	GCONF="@comment "
+.else
+CONFIGURE_ARGS+=--disable-gconf
+PLIST_SUB+=	GCONF=""
+.endif
+
+.if ${PORT_OPTIONS:MEVOLUTION}
+USE_GNOME+=	evolutiondataserver
+CONFIGURE_ARGS+=--enable-eds
+PLIST_SUB+=	EVOLUTION=""
+WITH_PLUGINS=	1
+.else
+CONFIGURE_ARGS+=--disable-eds
+PLIST_SUB+=	EVOLUTION="@comment "
+.endif
+
+.if ${PORT_OPTIONS:MAVAHI}
+CONFIGURE_ARGS+=--enable-avahi
+LIB_DEPENDS+=	libavahi-client.so:${PORTSDIR}/net/avahi-app
+PLIST_SUB+=	AVAHI=""
+WITH_PLUGINS=	1
+.else
+CONFIGURE_ARGS+=--disable-avahi
+PLIST_SUB+=	AVAHI="@comment "
+.endif
+
+.if ${PORT_OPTIONS:MGNOMEHELP}
+PLIST_SUB+=	GNOMEHELP=""
+USE_GNOME+=	gnomedocutils
+.else
+CONFIGURE_ARGS+=--disable-gdu
+PLIST_SUB+=	GNOMEHELP="@comment "
+.endif
+
+.include <bsd.port.mk>
diff --git a/net-im/ekiga/distinfo b/net-im/ekiga/distinfo
new file mode 100644
index 000000000000..9d7b66ff8c16
--- /dev/null
+++ b/net-im/ekiga/distinfo
@@ -0,0 +1,2 @@
+SHA256 (gnome3/ekiga-4.0.1.tar.xz) = 5f4f491c9496cf65ba057a9345d6bb0278f4eca07bcda5baeecf50bfcd9a4a3b
+SIZE (gnome3/ekiga-4.0.1.tar.xz) = 8339364
diff --git a/net-im/ekiga/files/patch-configure b/net-im/ekiga/files/patch-configure
new file mode 100644
index 000000000000..dbba96488363
--- /dev/null
+++ b/net-im/ekiga/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig	2013-07-11 12:30:00.000000000 +0200
++++ configure	2013-07-11 12:31:26.000000000 +0200
+@@ -18351,7 +18351,7 @@
+   # Check whether --enable-gconf was given.
+ if test "${enable_gconf+set}" = set; then :
+   enableval=$enable_gconf; if test "x$enableval" = "xyes"; then
+-  enable_gconf = yes
++  enable_gconf=yes
+ fi
+ else
+   enable_gconf=yes
diff --git a/net/ekiga3/pkg-descr b/net-im/ekiga/pkg-descr
index 7ff17aa4df8b..9aaa052bd378 100644
--- a/net/ekiga3/pkg-descr
+++ b/net-im/ekiga/pkg-descr
@@ -2,4 +2,4 @@ Ekiga (formely known as GnomeMeeting) is an open source
 VoIP and video conferencing application for GNOME/KDE.
 Ekiga uses both the H.323 and SIP protocols. 
 
-WWW:	http://ekiga.org
+WWW: http://www.ekiga.org
diff --git a/net/ekiga3/pkg-plist b/net-im/ekiga/pkg-plist
index 8f731ef4cd70..afda7b441973 100644
--- a/net/ekiga3/pkg-plist
+++ b/net-im/ekiga/pkg-plist
@@ -1,97 +1,23 @@
 bin/ekiga
 bin/ekiga-config-tool
 %%DBUS%%bin/ekiga-helper
-%%NO_GCONF%%etc/ekiga/ekiga.schemas
-share/locale/am/LC_MESSAGES/ekiga.mo
-share/locale/ar/LC_MESSAGES/ekiga.mo
-share/locale/as/LC_MESSAGES/ekiga.mo
-share/locale/az/LC_MESSAGES/ekiga.mo
-share/locale/be/LC_MESSAGES/ekiga.mo
-share/locale/bg/LC_MESSAGES/ekiga.mo
-share/locale/bn/LC_MESSAGES/ekiga.mo
-share/locale/bn_IN/LC_MESSAGES/ekiga.mo
-share/locale/bs/LC_MESSAGES/ekiga.mo
-share/locale/ca/LC_MESSAGES/ekiga.mo
-share/locale/ca@valencia/LC_MESSAGES/ekiga.mo
-share/locale/crh/LC_MESSAGES/ekiga.mo
-share/locale/cs/LC_MESSAGES/ekiga.mo
-share/locale/cy/LC_MESSAGES/ekiga.mo
-share/locale/da/LC_MESSAGES/ekiga.mo
-share/locale/de/LC_MESSAGES/ekiga.mo
-share/locale/dz/LC_MESSAGES/ekiga.mo
-share/locale/el/LC_MESSAGES/ekiga.mo
-share/locale/en_CA/LC_MESSAGES/ekiga.mo
-share/locale/en_GB/LC_MESSAGES/ekiga.mo
-share/locale/eo/LC_MESSAGES/ekiga.mo
-share/locale/es/LC_MESSAGES/ekiga.mo
-share/locale/et/LC_MESSAGES/ekiga.mo
-share/locale/eu/LC_MESSAGES/ekiga.mo
-share/locale/fa/LC_MESSAGES/ekiga.mo
-share/locale/fi/LC_MESSAGES/ekiga.mo
-share/locale/fr/LC_MESSAGES/ekiga.mo
-share/locale/ga/LC_MESSAGES/ekiga.mo
-share/locale/gl/LC_MESSAGES/ekiga.mo
-share/locale/gu/LC_MESSAGES/ekiga.mo
-share/locale/he/LC_MESSAGES/ekiga.mo
-share/locale/hi/LC_MESSAGES/ekiga.mo
-share/locale/hr/LC_MESSAGES/ekiga.mo
-share/locale/hu/LC_MESSAGES/ekiga.mo
-share/locale/id/LC_MESSAGES/ekiga.mo
-share/locale/is/LC_MESSAGES/ekiga.mo
-share/locale/it/LC_MESSAGES/ekiga.mo
-share/locale/ja/LC_MESSAGES/ekiga.mo
-share/locale/ka/LC_MESSAGES/ekiga.mo
-share/locale/kn/LC_MESSAGES/ekiga.mo
-share/locale/ko/LC_MESSAGES/ekiga.mo
-share/locale/ku/LC_MESSAGES/ekiga.mo
-share/locale/lt/LC_MESSAGES/ekiga.mo
-share/locale/lv/LC_MESSAGES/ekiga.mo
-share/locale/mai/LC_MESSAGES/ekiga.mo
-share/locale/mk/LC_MESSAGES/ekiga.mo
-share/locale/ml/LC_MESSAGES/ekiga.mo
-share/locale/mn/LC_MESSAGES/ekiga.mo
-share/locale/mr/LC_MESSAGES/ekiga.mo
-share/locale/ms/LC_MESSAGES/ekiga.mo
-share/locale/nb/LC_MESSAGES/ekiga.mo
-share/locale/ne/LC_MESSAGES/ekiga.mo
-share/locale/nl/LC_MESSAGES/ekiga.mo
-share/locale/nn/LC_MESSAGES/ekiga.mo
-share/locale/oc/LC_MESSAGES/ekiga.mo
-share/locale/or/LC_MESSAGES/ekiga.mo
-share/locale/pa/LC_MESSAGES/ekiga.mo
-share/locale/pl/LC_MESSAGES/ekiga.mo
-share/locale/pt/LC_MESSAGES/ekiga.mo
-share/locale/pt_BR/LC_MESSAGES/ekiga.mo
-share/locale/ro/LC_MESSAGES/ekiga.mo
-share/locale/ru/LC_MESSAGES/ekiga.mo
-share/locale/rw/LC_MESSAGES/ekiga.mo
-share/locale/si/LC_MESSAGES/ekiga.mo
-share/locale/sk/LC_MESSAGES/ekiga.mo
-share/locale/sl/LC_MESSAGES/ekiga.mo
-share/locale/sq/LC_MESSAGES/ekiga.mo
-share/locale/sr/LC_MESSAGES/ekiga.mo
-share/locale/sr@latin/LC_MESSAGES/ekiga.mo
-share/locale/sv/LC_MESSAGES/ekiga.mo
-share/locale/ta/LC_MESSAGES/ekiga.mo
-share/locale/te/LC_MESSAGES/ekiga.mo
-share/locale/th/LC_MESSAGES/ekiga.mo
-share/locale/tr/LC_MESSAGES/ekiga.mo
-share/locale/uk/LC_MESSAGES/ekiga.mo
-share/locale/vi/LC_MESSAGES/ekiga.mo
-share/locale/wa/LC_MESSAGES/ekiga.mo
-share/locale/xh/LC_MESSAGES/ekiga.mo
-share/locale/zh_CN/LC_MESSAGES/ekiga.mo
-share/locale/zh_HK/LC_MESSAGES/ekiga.mo
-share/locale/zh_TW/LC_MESSAGES/ekiga.mo
+%%GCONF%%etc/ekiga/ekiga.schemas
+lib/ekiga/%%VERSION%%/libekiga.so
+lib/ekiga/%%VERSION%%/libekiga.la
+%%AVAHI%%lib/ekiga/%%VERSION%%/plugins/libgmavahi.so
+%%AVAHI%%lib/ekiga/%%VERSION%%/plugins/libgmavahi.la
+%%EVOLUTION%%lib/ekiga/4.0.1/plugins/libgmevolution.la
+%%EVOLUTION%%lib/ekiga/4.0.1/plugins/libgmevolution.so
+%%LDAP%%lib/ekiga/4.0.1/plugins/libgmldap.la
+%%LDAP%%lib/ekiga/4.0.1/plugins/libgmldap.so
+%%NOTIFY%%lib/ekiga/%%VERSION%%/plugins/libgmlibnotify.so
+%%NOTIFY%%lib/ekiga/%%VERSION%%/plugins/libgmlibnotify.la
 share/applications/ekiga.desktop
 %%DBUS%%share/dbus-1/services/org.ekiga.Ekiga.service
 %%DBUS%%share/dbus-1/services/org.ekiga.Helper.service
 %%GNOMEHELP%%share/gnome/help/ekiga/C/ekiga.xml
-%%GNOMEHELP%%share/gnome/help/ekiga/C/figures/accounts_d1.png
-%%GNOMEHELP%%share/gnome/help/ekiga/C/figures/accounts_h323.png
-%%GNOMEHELP%%share/gnome/help/ekiga/C/figures/accounts_sip.png
-%%GNOMEHELP%%share/gnome/help/ekiga/C/figures/audio_codecs.png
-%%GNOMEHELP%%share/gnome/help/ekiga/C/figures/call_d1.png
+%%GNOMEHELP%%share/gnome/help/ekiga/C/figures/lumi.png
+%%GNOMEHELP%%share/gnome/help/ekiga/C/figures/call_window.png
 %%GNOMEHELP%%share/gnome/help/ekiga/C/figures/config_d1.png
 %%GNOMEHELP%%share/gnome/help/ekiga/C/figures/config_d2.png
 %%GNOMEHELP%%share/gnome/help/ekiga/C/figures/config_d3.png
@@ -100,13 +26,26 @@ share/applications/ekiga.desktop
 %%GNOMEHELP%%share/gnome/help/ekiga/C/figures/config_d6.png
 %%GNOMEHELP%%share/gnome/help/ekiga/C/figures/config_d7.png
 %%GNOMEHELP%%share/gnome/help/ekiga/C/figures/config_d8.png
-%%GNOMEHELP%%share/gnome/help/ekiga/C/figures/lumi.png
+%%GNOMEHELP%%share/gnome/help/ekiga/C/figures/config_d9.png
+%%GNOMEHELP%%share/gnome/help/ekiga/C/figures/call_d1.png
+%%GNOMEHELP%%share/gnome/help/ekiga/C/figures/roster.png
+%%GNOMEHELP%%share/gnome/help/ekiga/C/figures/addressbook_d1.png
+%%GNOMEHELP%%share/gnome/help/ekiga/C/figures/addressbook_d2.png
+%%GNOMEHELP%%share/gnome/help/ekiga/C/figures/addressbook_d3.png
+%%GNOMEHELP%%share/gnome/help/ekiga/C/figures/chat_d1.png
+%%GNOMEHELP%%share/gnome/help/ekiga/C/figures/status.png
+%%GNOMEHELP%%share/gnome/help/ekiga/C/figures/call_history.png
+%%GNOMEHELP%%share/gnome/help/ekiga/C/figures/accounts_d1.png
+%%GNOMEHELP%%share/gnome/help/ekiga/C/figures/accounts_ekiga_net.png
+%%GNOMEHELP%%share/gnome/help/ekiga/C/figures/accounts_ekiga_call_out.png
+%%GNOMEHELP%%share/gnome/help/ekiga/C/figures/accounts_sip.png
+%%GNOMEHELP%%share/gnome/help/ekiga/C/figures/accounts_h323.png
+%%GNOMEHELP%%share/gnome/help/ekiga/C/figures/monitoring_lines.png
+%%GNOMEHELP%%share/gnome/help/ekiga/C/figures/audio_codecs.png
+%%GNOMEHELP%%share/gnome/help/ekiga/C/figures/video_codecs.png
 %%GNOMEHELP%%share/gnome/help/ekiga/bg/ekiga.xml
-%%GNOMEHELP%%share/gnome/help/ekiga/bg/figures/accounts_d1.png
-%%GNOMEHELP%%share/gnome/help/ekiga/bg/figures/accounts_h323.png
-%%GNOMEHELP%%share/gnome/help/ekiga/bg/figures/accounts_sip.png
-%%GNOMEHELP%%share/gnome/help/ekiga/bg/figures/audio_codecs.png
-%%GNOMEHELP%%share/gnome/help/ekiga/bg/figures/call_d1.png
+%%GNOMEHELP%%share/gnome/help/ekiga/bg/figures/lumi.png
+%%GNOMEHELP%%share/gnome/help/ekiga/bg/figures/call_window.png
 %%GNOMEHELP%%share/gnome/help/ekiga/bg/figures/config_d1.png
 %%GNOMEHELP%%share/gnome/help/ekiga/bg/figures/config_d2.png
 %%GNOMEHELP%%share/gnome/help/ekiga/bg/figures/config_d3.png
@@ -115,13 +54,26 @@ share/applications/ekiga.desktop
 %%GNOMEHELP%%share/gnome/help/ekiga/bg/figures/config_d6.png
 %%GNOMEHELP%%share/gnome/help/ekiga/bg/figures/config_d7.png
 %%GNOMEHELP%%share/gnome/help/ekiga/bg/figures/config_d8.png
-%%GNOMEHELP%%share/gnome/help/ekiga/bg/figures/lumi.png
+%%GNOMEHELP%%share/gnome/help/ekiga/bg/figures/config_d9.png
+%%GNOMEHELP%%share/gnome/help/ekiga/bg/figures/call_d1.png
+%%GNOMEHELP%%share/gnome/help/ekiga/bg/figures/roster.png
+%%GNOMEHELP%%share/gnome/help/ekiga/bg/figures/addressbook_d1.png
+%%GNOMEHELP%%share/gnome/help/ekiga/bg/figures/addressbook_d2.png
+%%GNOMEHELP%%share/gnome/help/ekiga/bg/figures/addressbook_d3.png
+%%GNOMEHELP%%share/gnome/help/ekiga/bg/figures/chat_d1.png
+%%GNOMEHELP%%share/gnome/help/ekiga/bg/figures/status.png
+%%GNOMEHELP%%share/gnome/help/ekiga/bg/figures/call_history.png
+%%GNOMEHELP%%share/gnome/help/ekiga/bg/figures/accounts_d1.png
+%%GNOMEHELP%%share/gnome/help/ekiga/bg/figures/accounts_ekiga_net.png
+%%GNOMEHELP%%share/gnome/help/ekiga/bg/figures/accounts_ekiga_call_out.png
+%%GNOMEHELP%%share/gnome/help/ekiga/bg/figures/accounts_sip.png
+%%GNOMEHELP%%share/gnome/help/ekiga/bg/figures/accounts_h323.png
+%%GNOMEHELP%%share/gnome/help/ekiga/bg/figures/monitoring_lines.png
+%%GNOMEHELP%%share/gnome/help/ekiga/bg/figures/audio_codecs.png
+%%GNOMEHELP%%share/gnome/help/ekiga/bg/figures/video_codecs.png
 %%GNOMEHELP%%share/gnome/help/ekiga/ca/ekiga.xml
-%%GNOMEHELP%%share/gnome/help/ekiga/ca/figures/accounts_d1.png
-%%GNOMEHELP%%share/gnome/help/ekiga/ca/figures/accounts_h323.png
-%%GNOMEHELP%%share/gnome/help/ekiga/ca/figures/accounts_sip.png
-%%GNOMEHELP%%share/gnome/help/ekiga/ca/figures/audio_codecs.png
-%%GNOMEHELP%%share/gnome/help/ekiga/ca/figures/call_d1.png
+%%GNOMEHELP%%share/gnome/help/ekiga/ca/figures/lumi.png
+%%GNOMEHELP%%share/gnome/help/ekiga/ca/figures/call_window.png
 %%GNOMEHELP%%share/gnome/help/ekiga/ca/figures/config_d1.png
 %%GNOMEHELP%%share/gnome/help/ekiga/ca/figures/config_d2.png
 %%GNOMEHELP%%share/gnome/help/ekiga/ca/figures/config_d3.png
@@ -130,13 +82,26 @@ share/applications/ekiga.desktop
 %%GNOMEHELP%%share/gnome/help/ekiga/ca/figures/config_d6.png
 %%GNOMEHELP%%share/gnome/help/ekiga/ca/figures/config_d7.png
 %%GNOMEHELP%%share/gnome/help/ekiga/ca/figures/config_d8.png
-%%GNOMEHELP%%share/gnome/help/ekiga/ca/figures/lumi.png
+%%GNOMEHELP%%share/gnome/help/ekiga/ca/figures/config_d9.png
+%%GNOMEHELP%%share/gnome/help/ekiga/ca/figures/call_d1.png
+%%GNOMEHELP%%share/gnome/help/ekiga/ca/figures/roster.png
+%%GNOMEHELP%%share/gnome/help/ekiga/ca/figures/addressbook_d1.png
+%%GNOMEHELP%%share/gnome/help/ekiga/ca/figures/addressbook_d2.png
+%%GNOMEHELP%%share/gnome/help/ekiga/ca/figures/addressbook_d3.png
+%%GNOMEHELP%%share/gnome/help/ekiga/ca/figures/chat_d1.png
+%%GNOMEHELP%%share/gnome/help/ekiga/ca/figures/status.png
+%%GNOMEHELP%%share/gnome/help/ekiga/ca/figures/call_history.png
+%%GNOMEHELP%%share/gnome/help/ekiga/ca/figures/accounts_d1.png
+%%GNOMEHELP%%share/gnome/help/ekiga/ca/figures/accounts_ekiga_net.png
+%%GNOMEHELP%%share/gnome/help/ekiga/ca/figures/accounts_ekiga_call_out.png
+%%GNOMEHELP%%share/gnome/help/ekiga/ca/figures/accounts_sip.png
+%%GNOMEHELP%%share/gnome/help/ekiga/ca/figures/accounts_h323.png
+%%GNOMEHELP%%share/gnome/help/ekiga/ca/figures/monitoring_lines.png
+%%GNOMEHELP%%share/gnome/help/ekiga/ca/figures/audio_codecs.png
+%%GNOMEHELP%%share/gnome/help/ekiga/ca/figures/video_codecs.png
 %%GNOMEHELP%%share/gnome/help/ekiga/de/ekiga.xml
-%%GNOMEHELP%%share/gnome/help/ekiga/de/figures/accounts_d1.png
-%%GNOMEHELP%%share/gnome/help/ekiga/de/figures/accounts_h323.png
-%%GNOMEHELP%%share/gnome/help/ekiga/de/figures/accounts_sip.png
-%%GNOMEHELP%%share/gnome/help/ekiga/de/figures/audio_codecs.png
-%%GNOMEHELP%%share/gnome/help/ekiga/de/figures/call_d1.png
+%%GNOMEHELP%%share/gnome/help/ekiga/de/figures/lumi.png
+%%GNOMEHELP%%share/gnome/help/ekiga/de/figures/call_window.png
 %%GNOMEHELP%%share/gnome/help/ekiga/de/figures/config_d1.png
 %%GNOMEHELP%%share/gnome/help/ekiga/de/figures/config_d2.png
 %%GNOMEHELP%%share/gnome/help/ekiga/de/figures/config_d3.png
@@ -145,13 +110,26 @@ share/applications/ekiga.desktop
 %%GNOMEHELP%%share/gnome/help/ekiga/de/figures/config_d6.png
 %%GNOMEHELP%%share/gnome/help/ekiga/de/figures/config_d7.png
 %%GNOMEHELP%%share/gnome/help/ekiga/de/figures/config_d8.png
-%%GNOMEHELP%%share/gnome/help/ekiga/de/figures/lumi.png
+%%GNOMEHELP%%share/gnome/help/ekiga/de/figures/config_d9.png
+%%GNOMEHELP%%share/gnome/help/ekiga/de/figures/call_d1.png
+%%GNOMEHELP%%share/gnome/help/ekiga/de/figures/roster.png
+%%GNOMEHELP%%share/gnome/help/ekiga/de/figures/addressbook_d1.png
+%%GNOMEHELP%%share/gnome/help/ekiga/de/figures/addressbook_d2.png
+%%GNOMEHELP%%share/gnome/help/ekiga/de/figures/addressbook_d3.png
+%%GNOMEHELP%%share/gnome/help/ekiga/de/figures/chat_d1.png
+%%GNOMEHELP%%share/gnome/help/ekiga/de/figures/status.png
+%%GNOMEHELP%%share/gnome/help/ekiga/de/figures/call_history.png
+%%GNOMEHELP%%share/gnome/help/ekiga/de/figures/accounts_d1.png
+%%GNOMEHELP%%share/gnome/help/ekiga/de/figures/accounts_ekiga_net.png
+%%GNOMEHELP%%share/gnome/help/ekiga/de/figures/accounts_ekiga_call_out.png
+%%GNOMEHELP%%share/gnome/help/ekiga/de/figures/accounts_sip.png
+%%GNOMEHELP%%share/gnome/help/ekiga/de/figures/accounts_h323.png
+%%GNOMEHELP%%share/gnome/help/ekiga/de/figures/monitoring_lines.png
+%%GNOMEHELP%%share/gnome/help/ekiga/de/figures/audio_codecs.png
+%%GNOMEHELP%%share/gnome/help/ekiga/de/figures/video_codecs.png
 %%GNOMEHELP%%share/gnome/help/ekiga/el/ekiga.xml
-%%GNOMEHELP%%share/gnome/help/ekiga/el/figures/accounts_d1.png
-%%GNOMEHELP%%share/gnome/help/ekiga/el/figures/accounts_h323.png
-%%GNOMEHELP%%share/gnome/help/ekiga/el/figures/accounts_sip.png
-%%GNOMEHELP%%share/gnome/help/ekiga/el/figures/audio_codecs.png
-%%GNOMEHELP%%share/gnome/help/ekiga/el/figures/call_d1.png
+%%GNOMEHELP%%share/gnome/help/ekiga/el/figures/lumi.png
+%%GNOMEHELP%%share/gnome/help/ekiga/el/figures/call_window.png
 %%GNOMEHELP%%share/gnome/help/ekiga/el/figures/config_d1.png
 %%GNOMEHELP%%share/gnome/help/ekiga/el/figures/config_d2.png
 %%GNOMEHELP%%share/gnome/help/ekiga/el/figures/config_d3.png
@@ -160,13 +138,26 @@ share/applications/ekiga.desktop
 %%GNOMEHELP%%share/gnome/help/ekiga/el/figures/config_d6.png
 %%GNOMEHELP%%share/gnome/help/ekiga/el/figures/config_d7.png
 %%GNOMEHELP%%share/gnome/help/ekiga/el/figures/config_d8.png
-%%GNOMEHELP%%share/gnome/help/ekiga/el/figures/lumi.png
+%%GNOMEHELP%%share/gnome/help/ekiga/el/figures/config_d9.png
+%%GNOMEHELP%%share/gnome/help/ekiga/el/figures/call_d1.png
+%%GNOMEHELP%%share/gnome/help/ekiga/el/figures/roster.png
+%%GNOMEHELP%%share/gnome/help/ekiga/el/figures/addressbook_d1.png
+%%GNOMEHELP%%share/gnome/help/ekiga/el/figures/addressbook_d2.png
+%%GNOMEHELP%%share/gnome/help/ekiga/el/figures/addressbook_d3.png
+%%GNOMEHELP%%share/gnome/help/ekiga/el/figures/chat_d1.png
+%%GNOMEHELP%%share/gnome/help/ekiga/el/figures/status.png
+%%GNOMEHELP%%share/gnome/help/ekiga/el/figures/call_history.png
+%%GNOMEHELP%%share/gnome/help/ekiga/el/figures/accounts_d1.png
+%%GNOMEHELP%%share/gnome/help/ekiga/el/figures/accounts_ekiga_net.png
+%%GNOMEHELP%%share/gnome/help/ekiga/el/figures/accounts_ekiga_call_out.png
+%%GNOMEHELP%%share/gnome/help/ekiga/el/figures/accounts_sip.png
+%%GNOMEHELP%%share/gnome/help/ekiga/el/figures/accounts_h323.png
+%%GNOMEHELP%%share/gnome/help/ekiga/el/figures/monitoring_lines.png
+%%GNOMEHELP%%share/gnome/help/ekiga/el/figures/audio_codecs.png
+%%GNOMEHELP%%share/gnome/help/ekiga/el/figures/video_codecs.png
 %%GNOMEHELP%%share/gnome/help/ekiga/en_GB/ekiga.xml
-%%GNOMEHELP%%share/gnome/help/ekiga/en_GB/figures/accounts_d1.png
-%%GNOMEHELP%%share/gnome/help/ekiga/en_GB/figures/accounts_h323.png
-%%GNOMEHELP%%share/gnome/help/ekiga/en_GB/figures/accounts_sip.png
-%%GNOMEHELP%%share/gnome/help/ekiga/en_GB/figures/audio_codecs.png
-%%GNOMEHELP%%share/gnome/help/ekiga/en_GB/figures/call_d1.png
+%%GNOMEHELP%%share/gnome/help/ekiga/en_GB/figures/lumi.png
+%%GNOMEHELP%%share/gnome/help/ekiga/en_GB/figures/call_window.png
 %%GNOMEHELP%%share/gnome/help/ekiga/en_GB/figures/config_d1.png
 %%GNOMEHELP%%share/gnome/help/ekiga/en_GB/figures/config_d2.png
 %%GNOMEHELP%%share/gnome/help/ekiga/en_GB/figures/config_d3.png
@@ -175,13 +166,26 @@ share/applications/ekiga.desktop
 %%GNOMEHELP%%share/gnome/help/ekiga/en_GB/figures/config_d6.png
 %%GNOMEHELP%%share/gnome/help/ekiga/en_GB/figures/config_d7.png
 %%GNOMEHELP%%share/gnome/help/ekiga/en_GB/figures/config_d8.png
-%%GNOMEHELP%%share/gnome/help/ekiga/en_GB/figures/lumi.png
+%%GNOMEHELP%%share/gnome/help/ekiga/en_GB/figures/config_d9.png
+%%GNOMEHELP%%share/gnome/help/ekiga/en_GB/figures/call_d1.png
+%%GNOMEHELP%%share/gnome/help/ekiga/en_GB/figures/roster.png
+%%GNOMEHELP%%share/gnome/help/ekiga/en_GB/figures/addressbook_d1.png
+%%GNOMEHELP%%share/gnome/help/ekiga/en_GB/figures/addressbook_d2.png
+%%GNOMEHELP%%share/gnome/help/ekiga/en_GB/figures/addressbook_d3.png
+%%GNOMEHELP%%share/gnome/help/ekiga/en_GB/figures/chat_d1.png
+%%GNOMEHELP%%share/gnome/help/ekiga/en_GB/figures/status.png
+%%GNOMEHELP%%share/gnome/help/ekiga/en_GB/figures/call_history.png
+%%GNOMEHELP%%share/gnome/help/ekiga/en_GB/figures/accounts_d1.png
+%%GNOMEHELP%%share/gnome/help/ekiga/en_GB/figures/accounts_ekiga_net.png
+%%GNOMEHELP%%share/gnome/help/ekiga/en_GB/figures/accounts_ekiga_call_out.png
+%%GNOMEHELP%%share/gnome/help/ekiga/en_GB/figures/accounts_sip.png
+%%GNOMEHELP%%share/gnome/help/ekiga/en_GB/figures/accounts_h323.png
+%%GNOMEHELP%%share/gnome/help/ekiga/en_GB/figures/monitoring_lines.png
+%%GNOMEHELP%%share/gnome/help/ekiga/en_GB/figures/audio_codecs.png
+%%GNOMEHELP%%share/gnome/help/ekiga/en_GB/figures/video_codecs.png
 %%GNOMEHELP%%share/gnome/help/ekiga/es/ekiga.xml
-%%GNOMEHELP%%share/gnome/help/ekiga/es/figures/accounts_d1.png
-%%GNOMEHELP%%share/gnome/help/ekiga/es/figures/accounts_h323.png
-%%GNOMEHELP%%share/gnome/help/ekiga/es/figures/accounts_sip.png
-%%GNOMEHELP%%share/gnome/help/ekiga/es/figures/audio_codecs.png
-%%GNOMEHELP%%share/gnome/help/ekiga/es/figures/call_d1.png
+%%GNOMEHELP%%share/gnome/help/ekiga/es/figures/lumi.png
+%%GNOMEHELP%%share/gnome/help/ekiga/es/figures/call_window.png
 %%GNOMEHELP%%share/gnome/help/ekiga/es/figures/config_d1.png
 %%GNOMEHELP%%share/gnome/help/ekiga/es/figures/config_d2.png
 %%GNOMEHELP%%share/gnome/help/ekiga/es/figures/config_d3.png
@@ -190,13 +194,26 @@ share/applications/ekiga.desktop
 %%GNOMEHELP%%share/gnome/help/ekiga/es/figures/config_d6.png
 %%GNOMEHELP%%share/gnome/help/ekiga/es/figures/config_d7.png
 %%GNOMEHELP%%share/gnome/help/ekiga/es/figures/config_d8.png
-%%GNOMEHELP%%share/gnome/help/ekiga/es/figures/lumi.png
+%%GNOMEHELP%%share/gnome/help/ekiga/es/figures/config_d9.png
+%%GNOMEHELP%%share/gnome/help/ekiga/es/figures/call_d1.png
+%%GNOMEHELP%%share/gnome/help/ekiga/es/figures/roster.png
+%%GNOMEHELP%%share/gnome/help/ekiga/es/figures/addressbook_d1.png
+%%GNOMEHELP%%share/gnome/help/ekiga/es/figures/addressbook_d2.png
+%%GNOMEHELP%%share/gnome/help/ekiga/es/figures/addressbook_d3.png
+%%GNOMEHELP%%share/gnome/help/ekiga/es/figures/chat_d1.png
+%%GNOMEHELP%%share/gnome/help/ekiga/es/figures/status.png
+%%GNOMEHELP%%share/gnome/help/ekiga/es/figures/call_history.png
+%%GNOMEHELP%%share/gnome/help/ekiga/es/figures/accounts_d1.png
+%%GNOMEHELP%%share/gnome/help/ekiga/es/figures/accounts_ekiga_net.png
+%%GNOMEHELP%%share/gnome/help/ekiga/es/figures/accounts_ekiga_call_out.png
+%%GNOMEHELP%%share/gnome/help/ekiga/es/figures/accounts_sip.png
+%%GNOMEHELP%%share/gnome/help/ekiga/es/figures/accounts_h323.png
+%%GNOMEHELP%%share/gnome/help/ekiga/es/figures/monitoring_lines.png
+%%GNOMEHELP%%share/gnome/help/ekiga/es/figures/audio_codecs.png
+%%GNOMEHELP%%share/gnome/help/ekiga/es/figures/video_codecs.png
 %%GNOMEHELP%%share/gnome/help/ekiga/eu/ekiga.xml
-%%GNOMEHELP%%share/gnome/help/ekiga/eu/figures/accounts_d1.png
-%%GNOMEHELP%%share/gnome/help/ekiga/eu/figures/accounts_h323.png
-%%GNOMEHELP%%share/gnome/help/ekiga/eu/figures/accounts_sip.png
-%%GNOMEHELP%%share/gnome/help/ekiga/eu/figures/audio_codecs.png
-%%GNOMEHELP%%share/gnome/help/ekiga/eu/figures/call_d1.png
+%%GNOMEHELP%%share/gnome/help/ekiga/eu/figures/lumi.png
+%%GNOMEHELP%%share/gnome/help/ekiga/eu/figures/call_window.png
 %%GNOMEHELP%%share/gnome/help/ekiga/eu/figures/config_d1.png
 %%GNOMEHELP%%share/gnome/help/ekiga/eu/figures/config_d2.png
 %%GNOMEHELP%%share/gnome/help/ekiga/eu/figures/config_d3.png
@@ -205,13 +222,26 @@ share/applications/ekiga.desktop
 %%GNOMEHELP%%share/gnome/help/ekiga/eu/figures/config_d6.png
 %%GNOMEHELP%%share/gnome/help/ekiga/eu/figures/config_d7.png
 %%GNOMEHELP%%share/gnome/help/ekiga/eu/figures/config_d8.png
-%%GNOMEHELP%%share/gnome/help/ekiga/eu/figures/lumi.png
+%%GNOMEHELP%%share/gnome/help/ekiga/eu/figures/config_d9.png
+%%GNOMEHELP%%share/gnome/help/ekiga/eu/figures/call_d1.png
+%%GNOMEHELP%%share/gnome/help/ekiga/eu/figures/roster.png
+%%GNOMEHELP%%share/gnome/help/ekiga/eu/figures/addressbook_d1.png
+%%GNOMEHELP%%share/gnome/help/ekiga/eu/figures/addressbook_d2.png
+%%GNOMEHELP%%share/gnome/help/ekiga/eu/figures/addressbook_d3.png
+%%GNOMEHELP%%share/gnome/help/ekiga/eu/figures/chat_d1.png
+%%GNOMEHELP%%share/gnome/help/ekiga/eu/figures/status.png
+%%GNOMEHELP%%share/gnome/help/ekiga/eu/figures/call_history.png
+%%GNOMEHELP%%share/gnome/help/ekiga/eu/figures/accounts_d1.png
+%%GNOMEHELP%%share/gnome/help/ekiga/eu/figures/accounts_ekiga_net.png
+%%GNOMEHELP%%share/gnome/help/ekiga/eu/figures/accounts_ekiga_call_out.png
+%%GNOMEHELP%%share/gnome/help/ekiga/eu/figures/accounts_sip.png
+%%GNOMEHELP%%share/gnome/help/ekiga/eu/figures/accounts_h323.png
+%%GNOMEHELP%%share/gnome/help/ekiga/eu/figures/monitoring_lines.png
+%%GNOMEHELP%%share/gnome/help/ekiga/eu/figures/audio_codecs.png
+%%GNOMEHELP%%share/gnome/help/ekiga/eu/figures/video_codecs.png
 %%GNOMEHELP%%share/gnome/help/ekiga/fi/ekiga.xml
-%%GNOMEHELP%%share/gnome/help/ekiga/fi/figures/accounts_d1.png
-%%GNOMEHELP%%share/gnome/help/ekiga/fi/figures/accounts_h323.png
-%%GNOMEHELP%%share/gnome/help/ekiga/fi/figures/accounts_sip.png
-%%GNOMEHELP%%share/gnome/help/ekiga/fi/figures/audio_codecs.png
-%%GNOMEHELP%%share/gnome/help/ekiga/fi/figures/call_d1.png
+%%GNOMEHELP%%share/gnome/help/ekiga/fi/figures/lumi.png
+%%GNOMEHELP%%share/gnome/help/ekiga/fi/figures/call_window.png
 %%GNOMEHELP%%share/gnome/help/ekiga/fi/figures/config_d1.png
 %%GNOMEHELP%%share/gnome/help/ekiga/fi/figures/config_d2.png
 %%GNOMEHELP%%share/gnome/help/ekiga/fi/figures/config_d3.png
@@ -220,13 +250,26 @@ share/applications/ekiga.desktop
 %%GNOMEHELP%%share/gnome/help/ekiga/fi/figures/config_d6.png
 %%GNOMEHELP%%share/gnome/help/ekiga/fi/figures/config_d7.png
 %%GNOMEHELP%%share/gnome/help/ekiga/fi/figures/config_d8.png
-%%GNOMEHELP%%share/gnome/help/ekiga/fi/figures/lumi.png
+%%GNOMEHELP%%share/gnome/help/ekiga/fi/figures/config_d9.png
+%%GNOMEHELP%%share/gnome/help/ekiga/fi/figures/call_d1.png
+%%GNOMEHELP%%share/gnome/help/ekiga/fi/figures/roster.png
+%%GNOMEHELP%%share/gnome/help/ekiga/fi/figures/addressbook_d1.png
+%%GNOMEHELP%%share/gnome/help/ekiga/fi/figures/addressbook_d2.png
+%%GNOMEHELP%%share/gnome/help/ekiga/fi/figures/addressbook_d3.png
+%%GNOMEHELP%%share/gnome/help/ekiga/fi/figures/chat_d1.png
+%%GNOMEHELP%%share/gnome/help/ekiga/fi/figures/status.png
+%%GNOMEHELP%%share/gnome/help/ekiga/fi/figures/call_history.png
+%%GNOMEHELP%%share/gnome/help/ekiga/fi/figures/accounts_d1.png
+%%GNOMEHELP%%share/gnome/help/ekiga/fi/figures/accounts_ekiga_net.png
+%%GNOMEHELP%%share/gnome/help/ekiga/fi/figures/accounts_ekiga_call_out.png
+%%GNOMEHELP%%share/gnome/help/ekiga/fi/figures/accounts_sip.png
+%%GNOMEHELP%%share/gnome/help/ekiga/fi/figures/accounts_h323.png
+%%GNOMEHELP%%share/gnome/help/ekiga/fi/figures/monitoring_lines.png
+%%GNOMEHELP%%share/gnome/help/ekiga/fi/figures/audio_codecs.png
+%%GNOMEHELP%%share/gnome/help/ekiga/fi/figures/video_codecs.png
 %%GNOMEHELP%%share/gnome/help/ekiga/fr/ekiga.xml
-%%GNOMEHELP%%share/gnome/help/ekiga/fr/figures/accounts_d1.png
-%%GNOMEHELP%%share/gnome/help/ekiga/fr/figures/accounts_h323.png
-%%GNOMEHELP%%share/gnome/help/ekiga/fr/figures/accounts_sip.png
-%%GNOMEHELP%%share/gnome/help/ekiga/fr/figures/audio_codecs.png
-%%GNOMEHELP%%share/gnome/help/ekiga/fr/figures/call_d1.png
+%%GNOMEHELP%%share/gnome/help/ekiga/fr/figures/lumi.png
+%%GNOMEHELP%%share/gnome/help/ekiga/fr/figures/call_window.png
 %%GNOMEHELP%%share/gnome/help/ekiga/fr/figures/config_d1.png
 %%GNOMEHELP%%share/gnome/help/ekiga/fr/figures/config_d2.png
 %%GNOMEHELP%%share/gnome/help/ekiga/fr/figures/config_d3.png
@@ -235,13 +278,26 @@ share/applications/ekiga.desktop
 %%GNOMEHELP%%share/gnome/help/ekiga/fr/figures/config_d6.png
 %%GNOMEHELP%%share/gnome/help/ekiga/fr/figures/config_d7.png
 %%GNOMEHELP%%share/gnome/help/ekiga/fr/figures/config_d8.png
-%%GNOMEHELP%%share/gnome/help/ekiga/fr/figures/lumi.png
+%%GNOMEHELP%%share/gnome/help/ekiga/fr/figures/config_d9.png
+%%GNOMEHELP%%share/gnome/help/ekiga/fr/figures/call_d1.png
+%%GNOMEHELP%%share/gnome/help/ekiga/fr/figures/roster.png
+%%GNOMEHELP%%share/gnome/help/ekiga/fr/figures/addressbook_d1.png
+%%GNOMEHELP%%share/gnome/help/ekiga/fr/figures/addressbook_d2.png
+%%GNOMEHELP%%share/gnome/help/ekiga/fr/figures/addressbook_d3.png
+%%GNOMEHELP%%share/gnome/help/ekiga/fr/figures/chat_d1.png
+%%GNOMEHELP%%share/gnome/help/ekiga/fr/figures/status.png
+%%GNOMEHELP%%share/gnome/help/ekiga/fr/figures/call_history.png
+%%GNOMEHELP%%share/gnome/help/ekiga/fr/figures/accounts_d1.png
+%%GNOMEHELP%%share/gnome/help/ekiga/fr/figures/accounts_ekiga_net.png
+%%GNOMEHELP%%share/gnome/help/ekiga/fr/figures/accounts_ekiga_call_out.png
+%%GNOMEHELP%%share/gnome/help/ekiga/fr/figures/accounts_sip.png
+%%GNOMEHELP%%share/gnome/help/ekiga/fr/figures/accounts_h323.png
+%%GNOMEHELP%%share/gnome/help/ekiga/fr/figures/monitoring_lines.png
+%%GNOMEHELP%%share/gnome/help/ekiga/fr/figures/audio_codecs.png
+%%GNOMEHELP%%share/gnome/help/ekiga/fr/figures/video_codecs.png
 %%GNOMEHELP%%share/gnome/help/ekiga/oc/ekiga.xml
-%%GNOMEHELP%%share/gnome/help/ekiga/oc/figures/accounts_d1.png
-%%GNOMEHELP%%share/gnome/help/ekiga/oc/figures/accounts_h323.png
-%%GNOMEHELP%%share/gnome/help/ekiga/oc/figures/accounts_sip.png
-%%GNOMEHELP%%share/gnome/help/ekiga/oc/figures/audio_codecs.png
-%%GNOMEHELP%%share/gnome/help/ekiga/oc/figures/call_d1.png
+%%GNOMEHELP%%share/gnome/help/ekiga/oc/figures/lumi.png
+%%GNOMEHELP%%share/gnome/help/ekiga/oc/figures/call_window.png
 %%GNOMEHELP%%share/gnome/help/ekiga/oc/figures/config_d1.png
 %%GNOMEHELP%%share/gnome/help/ekiga/oc/figures/config_d2.png
 %%GNOMEHELP%%share/gnome/help/ekiga/oc/figures/config_d3.png
@@ -250,13 +306,26 @@ share/applications/ekiga.desktop
 %%GNOMEHELP%%share/gnome/help/ekiga/oc/figures/config_d6.png
 %%GNOMEHELP%%share/gnome/help/ekiga/oc/figures/config_d7.png
 %%GNOMEHELP%%share/gnome/help/ekiga/oc/figures/config_d8.png
-%%GNOMEHELP%%share/gnome/help/ekiga/oc/figures/lumi.png
+%%GNOMEHELP%%share/gnome/help/ekiga/oc/figures/config_d9.png
+%%GNOMEHELP%%share/gnome/help/ekiga/oc/figures/call_d1.png
+%%GNOMEHELP%%share/gnome/help/ekiga/oc/figures/roster.png
+%%GNOMEHELP%%share/gnome/help/ekiga/oc/figures/addressbook_d1.png
+%%GNOMEHELP%%share/gnome/help/ekiga/oc/figures/addressbook_d2.png
+%%GNOMEHELP%%share/gnome/help/ekiga/oc/figures/addressbook_d3.png
+%%GNOMEHELP%%share/gnome/help/ekiga/oc/figures/chat_d1.png
+%%GNOMEHELP%%share/gnome/help/ekiga/oc/figures/status.png
+%%GNOMEHELP%%share/gnome/help/ekiga/oc/figures/call_history.png
+%%GNOMEHELP%%share/gnome/help/ekiga/oc/figures/accounts_d1.png
+%%GNOMEHELP%%share/gnome/help/ekiga/oc/figures/accounts_ekiga_net.png
+%%GNOMEHELP%%share/gnome/help/ekiga/oc/figures/accounts_ekiga_call_out.png
+%%GNOMEHELP%%share/gnome/help/ekiga/oc/figures/accounts_sip.png
+%%GNOMEHELP%%share/gnome/help/ekiga/oc/figures/accounts_h323.png
+%%GNOMEHELP%%share/gnome/help/ekiga/oc/figures/monitoring_lines.png
+%%GNOMEHELP%%share/gnome/help/ekiga/oc/figures/audio_codecs.png
+%%GNOMEHELP%%share/gnome/help/ekiga/oc/figures/video_codecs.png
 %%GNOMEHELP%%share/gnome/help/ekiga/pt_BR/ekiga.xml
-%%GNOMEHELP%%share/gnome/help/ekiga/pt_BR/figures/accounts_d1.png
-%%GNOMEHELP%%share/gnome/help/ekiga/pt_BR/figures/accounts_h323.png
-%%GNOMEHELP%%share/gnome/help/ekiga/pt_BR/figures/accounts_sip.png
-%%GNOMEHELP%%share/gnome/help/ekiga/pt_BR/figures/audio_codecs.png
-%%GNOMEHELP%%share/gnome/help/ekiga/pt_BR/figures/call_d1.png
+%%GNOMEHELP%%share/gnome/help/ekiga/pt_BR/figures/lumi.png
+%%GNOMEHELP%%share/gnome/help/ekiga/pt_BR/figures/call_window.png
 %%GNOMEHELP%%share/gnome/help/ekiga/pt_BR/figures/config_d1.png
 %%GNOMEHELP%%share/gnome/help/ekiga/pt_BR/figures/config_d2.png
 %%GNOMEHELP%%share/gnome/help/ekiga/pt_BR/figures/config_d3.png
@@ -265,13 +334,26 @@ share/applications/ekiga.desktop
 %%GNOMEHELP%%share/gnome/help/ekiga/pt_BR/figures/config_d6.png
 %%GNOMEHELP%%share/gnome/help/ekiga/pt_BR/figures/config_d7.png
 %%GNOMEHELP%%share/gnome/help/ekiga/pt_BR/figures/config_d8.png
-%%GNOMEHELP%%share/gnome/help/ekiga/pt_BR/figures/lumi.png
+%%GNOMEHELP%%share/gnome/help/ekiga/pt_BR/figures/config_d9.png
+%%GNOMEHELP%%share/gnome/help/ekiga/pt_BR/figures/call_d1.png
+%%GNOMEHELP%%share/gnome/help/ekiga/pt_BR/figures/roster.png
+%%GNOMEHELP%%share/gnome/help/ekiga/pt_BR/figures/addressbook_d1.png
+%%GNOMEHELP%%share/gnome/help/ekiga/pt_BR/figures/addressbook_d2.png
+%%GNOMEHELP%%share/gnome/help/ekiga/pt_BR/figures/addressbook_d3.png
+%%GNOMEHELP%%share/gnome/help/ekiga/pt_BR/figures/chat_d1.png
+%%GNOMEHELP%%share/gnome/help/ekiga/pt_BR/figures/status.png
+%%GNOMEHELP%%share/gnome/help/ekiga/pt_BR/figures/call_history.png
+%%GNOMEHELP%%share/gnome/help/ekiga/pt_BR/figures/accounts_d1.png
+%%GNOMEHELP%%share/gnome/help/ekiga/pt_BR/figures/accounts_ekiga_net.png
+%%GNOMEHELP%%share/gnome/help/ekiga/pt_BR/figures/accounts_ekiga_call_out.png
+%%GNOMEHELP%%share/gnome/help/ekiga/pt_BR/figures/accounts_sip.png
+%%GNOMEHELP%%share/gnome/help/ekiga/pt_BR/figures/accounts_h323.png
+%%GNOMEHELP%%share/gnome/help/ekiga/pt_BR/figures/monitoring_lines.png
+%%GNOMEHELP%%share/gnome/help/ekiga/pt_BR/figures/audio_codecs.png
+%%GNOMEHELP%%share/gnome/help/ekiga/pt_BR/figures/video_codecs.png
 %%GNOMEHELP%%share/gnome/help/ekiga/ru/ekiga.xml
-%%GNOMEHELP%%share/gnome/help/ekiga/ru/figures/accounts_d1.png
-%%GNOMEHELP%%share/gnome/help/ekiga/ru/figures/accounts_h323.png
-%%GNOMEHELP%%share/gnome/help/ekiga/ru/figures/accounts_sip.png
-%%GNOMEHELP%%share/gnome/help/ekiga/ru/figures/audio_codecs.png
-%%GNOMEHELP%%share/gnome/help/ekiga/ru/figures/call_d1.png
+%%GNOMEHELP%%share/gnome/help/ekiga/ru/figures/lumi.png
+%%GNOMEHELP%%share/gnome/help/ekiga/ru/figures/call_window.png
 %%GNOMEHELP%%share/gnome/help/ekiga/ru/figures/config_d1.png
 %%GNOMEHELP%%share/gnome/help/ekiga/ru/figures/config_d2.png
 %%GNOMEHELP%%share/gnome/help/ekiga/ru/figures/config_d3.png
@@ -280,13 +362,54 @@ share/applications/ekiga.desktop
 %%GNOMEHELP%%share/gnome/help/ekiga/ru/figures/config_d6.png
 %%GNOMEHELP%%share/gnome/help/ekiga/ru/figures/config_d7.png
 %%GNOMEHELP%%share/gnome/help/ekiga/ru/figures/config_d8.png
-%%GNOMEHELP%%share/gnome/help/ekiga/ru/figures/lumi.png
+%%GNOMEHELP%%share/gnome/help/ekiga/ru/figures/config_d9.png
+%%GNOMEHELP%%share/gnome/help/ekiga/ru/figures/call_d1.png
+%%GNOMEHELP%%share/gnome/help/ekiga/ru/figures/roster.png
+%%GNOMEHELP%%share/gnome/help/ekiga/ru/figures/addressbook_d1.png
+%%GNOMEHELP%%share/gnome/help/ekiga/ru/figures/addressbook_d2.png
+%%GNOMEHELP%%share/gnome/help/ekiga/ru/figures/addressbook_d3.png
+%%GNOMEHELP%%share/gnome/help/ekiga/ru/figures/chat_d1.png
+%%GNOMEHELP%%share/gnome/help/ekiga/ru/figures/status.png
+%%GNOMEHELP%%share/gnome/help/ekiga/ru/figures/call_history.png
+%%GNOMEHELP%%share/gnome/help/ekiga/ru/figures/accounts_d1.png
+%%GNOMEHELP%%share/gnome/help/ekiga/ru/figures/accounts_ekiga_net.png
+%%GNOMEHELP%%share/gnome/help/ekiga/ru/figures/accounts_ekiga_call_out.png
+%%GNOMEHELP%%share/gnome/help/ekiga/ru/figures/accounts_sip.png
+%%GNOMEHELP%%share/gnome/help/ekiga/ru/figures/accounts_h323.png
+%%GNOMEHELP%%share/gnome/help/ekiga/ru/figures/monitoring_lines.png
+%%GNOMEHELP%%share/gnome/help/ekiga/ru/figures/audio_codecs.png
+%%GNOMEHELP%%share/gnome/help/ekiga/ru/figures/video_codecs.png
+%%GNOMEHELP%%share/gnome/help/ekiga/sl/ekiga.xml
+%%GNOMEHELP%%share/gnome/help/ekiga/sl/figures/lumi.png
+%%GNOMEHELP%%share/gnome/help/ekiga/sl/figures/call_window.png
+%%GNOMEHELP%%share/gnome/help/ekiga/sl/figures/config_d1.png
+%%GNOMEHELP%%share/gnome/help/ekiga/sl/figures/config_d2.png
+%%GNOMEHELP%%share/gnome/help/ekiga/sl/figures/config_d3.png
+%%GNOMEHELP%%share/gnome/help/ekiga/sl/figures/config_d4.png
+%%GNOMEHELP%%share/gnome/help/ekiga/sl/figures/config_d5.png
+%%GNOMEHELP%%share/gnome/help/ekiga/sl/figures/config_d6.png
+%%GNOMEHELP%%share/gnome/help/ekiga/sl/figures/config_d7.png
+%%GNOMEHELP%%share/gnome/help/ekiga/sl/figures/config_d8.png
+%%GNOMEHELP%%share/gnome/help/ekiga/sl/figures/config_d9.png
+%%GNOMEHELP%%share/gnome/help/ekiga/sl/figures/call_d1.png
+%%GNOMEHELP%%share/gnome/help/ekiga/sl/figures/roster.png
+%%GNOMEHELP%%share/gnome/help/ekiga/sl/figures/addressbook_d1.png
+%%GNOMEHELP%%share/gnome/help/ekiga/sl/figures/addressbook_d2.png
+%%GNOMEHELP%%share/gnome/help/ekiga/sl/figures/addressbook_d3.png
+%%GNOMEHELP%%share/gnome/help/ekiga/sl/figures/chat_d1.png
+%%GNOMEHELP%%share/gnome/help/ekiga/sl/figures/status.png
+%%GNOMEHELP%%share/gnome/help/ekiga/sl/figures/call_history.png
+%%GNOMEHELP%%share/gnome/help/ekiga/sl/figures/accounts_d1.png
+%%GNOMEHELP%%share/gnome/help/ekiga/sl/figures/accounts_ekiga_net.png
+%%GNOMEHELP%%share/gnome/help/ekiga/sl/figures/accounts_ekiga_call_out.png
+%%GNOMEHELP%%share/gnome/help/ekiga/sl/figures/accounts_sip.png
+%%GNOMEHELP%%share/gnome/help/ekiga/sl/figures/accounts_h323.png
+%%GNOMEHELP%%share/gnome/help/ekiga/sl/figures/monitoring_lines.png
+%%GNOMEHELP%%share/gnome/help/ekiga/sl/figures/audio_codecs.png
+%%GNOMEHELP%%share/gnome/help/ekiga/sl/figures/video_codecs.png
 %%GNOMEHELP%%share/gnome/help/ekiga/sv/ekiga.xml
-%%GNOMEHELP%%share/gnome/help/ekiga/sv/figures/accounts_d1.png
-%%GNOMEHELP%%share/gnome/help/ekiga/sv/figures/accounts_h323.png
-%%GNOMEHELP%%share/gnome/help/ekiga/sv/figures/accounts_sip.png
-%%GNOMEHELP%%share/gnome/help/ekiga/sv/figures/audio_codecs.png
-%%GNOMEHELP%%share/gnome/help/ekiga/sv/figures/call_d1.png
+%%GNOMEHELP%%share/gnome/help/ekiga/sv/figures/lumi.png
+%%GNOMEHELP%%share/gnome/help/ekiga/sv/figures/call_window.png
 %%GNOMEHELP%%share/gnome/help/ekiga/sv/figures/config_d1.png
 %%GNOMEHELP%%share/gnome/help/ekiga/sv/figures/config_d2.png
 %%GNOMEHELP%%share/gnome/help/ekiga/sv/figures/config_d3.png
@@ -295,13 +418,26 @@ share/applications/ekiga.desktop
 %%GNOMEHELP%%share/gnome/help/ekiga/sv/figures/config_d6.png
 %%GNOMEHELP%%share/gnome/help/ekiga/sv/figures/config_d7.png
 %%GNOMEHELP%%share/gnome/help/ekiga/sv/figures/config_d8.png
-%%GNOMEHELP%%share/gnome/help/ekiga/sv/figures/lumi.png
+%%GNOMEHELP%%share/gnome/help/ekiga/sv/figures/config_d9.png
+%%GNOMEHELP%%share/gnome/help/ekiga/sv/figures/call_d1.png
+%%GNOMEHELP%%share/gnome/help/ekiga/sv/figures/roster.png
+%%GNOMEHELP%%share/gnome/help/ekiga/sv/figures/addressbook_d1.png
+%%GNOMEHELP%%share/gnome/help/ekiga/sv/figures/addressbook_d2.png
+%%GNOMEHELP%%share/gnome/help/ekiga/sv/figures/addressbook_d3.png
+%%GNOMEHELP%%share/gnome/help/ekiga/sv/figures/chat_d1.png
+%%GNOMEHELP%%share/gnome/help/ekiga/sv/figures/status.png
+%%GNOMEHELP%%share/gnome/help/ekiga/sv/figures/call_history.png
+%%GNOMEHELP%%share/gnome/help/ekiga/sv/figures/accounts_d1.png
+%%GNOMEHELP%%share/gnome/help/ekiga/sv/figures/accounts_ekiga_net.png
+%%GNOMEHELP%%share/gnome/help/ekiga/sv/figures/accounts_ekiga_call_out.png
+%%GNOMEHELP%%share/gnome/help/ekiga/sv/figures/accounts_sip.png
+%%GNOMEHELP%%share/gnome/help/ekiga/sv/figures/accounts_h323.png
+%%GNOMEHELP%%share/gnome/help/ekiga/sv/figures/monitoring_lines.png
+%%GNOMEHELP%%share/gnome/help/ekiga/sv/figures/audio_codecs.png
+%%GNOMEHELP%%share/gnome/help/ekiga/sv/figures/video_codecs.png
 %%GNOMEHELP%%share/gnome/help/ekiga/uk/ekiga.xml
-%%GNOMEHELP%%share/gnome/help/ekiga/uk/figures/accounts_d1.png
-%%GNOMEHELP%%share/gnome/help/ekiga/uk/figures/accounts_h323.png
-%%GNOMEHELP%%share/gnome/help/ekiga/uk/figures/accounts_sip.png
-%%GNOMEHELP%%share/gnome/help/ekiga/uk/figures/audio_codecs.png
-%%GNOMEHELP%%share/gnome/help/ekiga/uk/figures/call_d1.png
+%%GNOMEHELP%%share/gnome/help/ekiga/uk/figures/lumi.png
+%%GNOMEHELP%%share/gnome/help/ekiga/uk/figures/call_window.png
 %%GNOMEHELP%%share/gnome/help/ekiga/uk/figures/config_d1.png
 %%GNOMEHELP%%share/gnome/help/ekiga/uk/figures/config_d2.png
 %%GNOMEHELP%%share/gnome/help/ekiga/uk/figures/config_d3.png
@@ -310,14 +446,143 @@ share/applications/ekiga.desktop
 %%GNOMEHELP%%share/gnome/help/ekiga/uk/figures/config_d6.png
 %%GNOMEHELP%%share/gnome/help/ekiga/uk/figures/config_d7.png
 %%GNOMEHELP%%share/gnome/help/ekiga/uk/figures/config_d8.png
-%%GNOMEHELP%%share/gnome/help/ekiga/uk/figures/lumi.png
+%%GNOMEHELP%%share/gnome/help/ekiga/uk/figures/config_d9.png
+%%GNOMEHELP%%share/gnome/help/ekiga/uk/figures/call_d1.png
+%%GNOMEHELP%%share/gnome/help/ekiga/uk/figures/roster.png
+%%GNOMEHELP%%share/gnome/help/ekiga/uk/figures/addressbook_d1.png
+%%GNOMEHELP%%share/gnome/help/ekiga/uk/figures/addressbook_d2.png
+%%GNOMEHELP%%share/gnome/help/ekiga/uk/figures/addressbook_d3.png
+%%GNOMEHELP%%share/gnome/help/ekiga/uk/figures/chat_d1.png
+%%GNOMEHELP%%share/gnome/help/ekiga/uk/figures/status.png
+%%GNOMEHELP%%share/gnome/help/ekiga/uk/figures/call_history.png
+%%GNOMEHELP%%share/gnome/help/ekiga/uk/figures/accounts_d1.png
+%%GNOMEHELP%%share/gnome/help/ekiga/uk/figures/accounts_ekiga_net.png
+%%GNOMEHELP%%share/gnome/help/ekiga/uk/figures/accounts_ekiga_call_out.png
+%%GNOMEHELP%%share/gnome/help/ekiga/uk/figures/accounts_sip.png
+%%GNOMEHELP%%share/gnome/help/ekiga/uk/figures/accounts_h323.png
+%%GNOMEHELP%%share/gnome/help/ekiga/uk/figures/monitoring_lines.png
+%%GNOMEHELP%%share/gnome/help/ekiga/uk/figures/audio_codecs.png
+%%GNOMEHELP%%share/gnome/help/ekiga/uk/figures/video_codecs.png
+%%GNOMEHELP%%share/gnome/help/ekiga/zh_CN/ekiga.xml
+%%GNOMEHELP%%share/gnome/help/ekiga/zh_CN/figures/lumi.png
+%%GNOMEHELP%%share/gnome/help/ekiga/zh_CN/figures/call_window.png
+%%GNOMEHELP%%share/gnome/help/ekiga/zh_CN/figures/config_d1.png
+%%GNOMEHELP%%share/gnome/help/ekiga/zh_CN/figures/config_d2.png
+%%GNOMEHELP%%share/gnome/help/ekiga/zh_CN/figures/config_d3.png
+%%GNOMEHELP%%share/gnome/help/ekiga/zh_CN/figures/config_d4.png
+%%GNOMEHELP%%share/gnome/help/ekiga/zh_CN/figures/config_d5.png
+%%GNOMEHELP%%share/gnome/help/ekiga/zh_CN/figures/config_d6.png
+%%GNOMEHELP%%share/gnome/help/ekiga/zh_CN/figures/config_d7.png
+%%GNOMEHELP%%share/gnome/help/ekiga/zh_CN/figures/config_d8.png
+%%GNOMEHELP%%share/gnome/help/ekiga/zh_CN/figures/config_d9.png
+%%GNOMEHELP%%share/gnome/help/ekiga/zh_CN/figures/call_d1.png
+%%GNOMEHELP%%share/gnome/help/ekiga/zh_CN/figures/roster.png
+%%GNOMEHELP%%share/gnome/help/ekiga/zh_CN/figures/addressbook_d1.png
+%%GNOMEHELP%%share/gnome/help/ekiga/zh_CN/figures/addressbook_d2.png
+%%GNOMEHELP%%share/gnome/help/ekiga/zh_CN/figures/addressbook_d3.png
+%%GNOMEHELP%%share/gnome/help/ekiga/zh_CN/figures/chat_d1.png
+%%GNOMEHELP%%share/gnome/help/ekiga/zh_CN/figures/status.png
+%%GNOMEHELP%%share/gnome/help/ekiga/zh_CN/figures/call_history.png
+%%GNOMEHELP%%share/gnome/help/ekiga/zh_CN/figures/accounts_d1.png
+%%GNOMEHELP%%share/gnome/help/ekiga/zh_CN/figures/accounts_ekiga_net.png
+%%GNOMEHELP%%share/gnome/help/ekiga/zh_CN/figures/accounts_ekiga_call_out.png
+%%GNOMEHELP%%share/gnome/help/ekiga/zh_CN/figures/accounts_sip.png
+%%GNOMEHELP%%share/gnome/help/ekiga/zh_CN/figures/accounts_h323.png
+%%GNOMEHELP%%share/gnome/help/ekiga/zh_CN/figures/monitoring_lines.png
+%%GNOMEHELP%%share/gnome/help/ekiga/zh_CN/figures/audio_codecs.png
+%%GNOMEHELP%%share/gnome/help/ekiga/zh_CN/figures/video_codecs.png
 share/icons/hicolor/128x128/apps/ekiga.png
 share/icons/hicolor/16x16/apps/ekiga.png
 share/icons/hicolor/22x22/apps/ekiga.png
+share/icons/hicolor/24x24/apps/ekiga.png
 share/icons/hicolor/32x32/apps/ekiga.png
 share/icons/hicolor/48x48/apps/ekiga.png
 share/icons/hicolor/64x64/apps/ekiga.png
 share/icons/hicolor/72x72/apps/ekiga.png
+share/locale/am/LC_MESSAGES/ekiga.mo
+share/locale/ar/LC_MESSAGES/ekiga.mo
+share/locale/as/LC_MESSAGES/ekiga.mo
+share/locale/ast/LC_MESSAGES/ekiga.mo
+share/locale/az/LC_MESSAGES/ekiga.mo
+share/locale/bg/LC_MESSAGES/ekiga.mo
+share/locale/bn/LC_MESSAGES/ekiga.mo
+share/locale/bn_IN/LC_MESSAGES/ekiga.mo
+share/locale/bs/LC_MESSAGES/ekiga.mo
+share/locale/ca/LC_MESSAGES/ekiga.mo
+share/locale/ca@valencia/LC_MESSAGES/ekiga.mo
+share/locale/crh/LC_MESSAGES/ekiga.mo
+share/locale/cs/LC_MESSAGES/ekiga.mo
+share/locale/cy/LC_MESSAGES/ekiga.mo
+share/locale/da/LC_MESSAGES/ekiga.mo
+share/locale/de/LC_MESSAGES/ekiga.mo
+share/locale/dz/LC_MESSAGES/ekiga.mo
+share/locale/el/LC_MESSAGES/ekiga.mo
+share/locale/en@shaw/LC_MESSAGES/ekiga.mo
+share/locale/en_CA/LC_MESSAGES/ekiga.mo
+share/locale/en_GB/LC_MESSAGES/ekiga.mo
+share/locale/eo/LC_MESSAGES/ekiga.mo
+share/locale/es/LC_MESSAGES/ekiga.mo
+share/locale/et/LC_MESSAGES/ekiga.mo
+share/locale/eu/LC_MESSAGES/ekiga.mo
+share/locale/fa/LC_MESSAGES/ekiga.mo
+share/locale/fi/LC_MESSAGES/ekiga.mo
+share/locale/fr/LC_MESSAGES/ekiga.mo
+share/locale/ga/LC_MESSAGES/ekiga.mo
+share/locale/gl/LC_MESSAGES/ekiga.mo
+share/locale/gu/LC_MESSAGES/ekiga.mo
+share/locale/he/LC_MESSAGES/ekiga.mo
+share/locale/hi/LC_MESSAGES/ekiga.mo
+share/locale/hr/LC_MESSAGES/ekiga.mo
+share/locale/hu/LC_MESSAGES/ekiga.mo
+share/locale/id/LC_MESSAGES/ekiga.mo
+share/locale/is/LC_MESSAGES/ekiga.mo
+share/locale/it/LC_MESSAGES/ekiga.mo
+share/locale/ja/LC_MESSAGES/ekiga.mo
+share/locale/ka/LC_MESSAGES/ekiga.mo
+share/locale/kk/LC_MESSAGES/ekiga.mo
+share/locale/kn/LC_MESSAGES/ekiga.mo
+share/locale/ko/LC_MESSAGES/ekiga.mo
+share/locale/ku/LC_MESSAGES/ekiga.mo
+share/locale/lt/LC_MESSAGES/ekiga.mo
+share/locale/lv/LC_MESSAGES/ekiga.mo
+share/locale/mai/LC_MESSAGES/ekiga.mo
+share/locale/mk/LC_MESSAGES/ekiga.mo
+share/locale/ml/LC_MESSAGES/ekiga.mo
+share/locale/mn/LC_MESSAGES/ekiga.mo
+share/locale/mr/LC_MESSAGES/ekiga.mo
+share/locale/ms/LC_MESSAGES/ekiga.mo
+share/locale/nb/LC_MESSAGES/ekiga.mo
+share/locale/ne/LC_MESSAGES/ekiga.mo
+share/locale/nl/LC_MESSAGES/ekiga.mo
+share/locale/nn/LC_MESSAGES/ekiga.mo
+share/locale/oc/LC_MESSAGES/ekiga.mo
+share/locale/or/LC_MESSAGES/ekiga.mo
+share/locale/pa/LC_MESSAGES/ekiga.mo
+share/locale/pl/LC_MESSAGES/ekiga.mo
+share/locale/pt/LC_MESSAGES/ekiga.mo
+share/locale/pt_BR/LC_MESSAGES/ekiga.mo
+share/locale/ro/LC_MESSAGES/ekiga.mo
+share/locale/ru/LC_MESSAGES/ekiga.mo
+share/locale/rw/LC_MESSAGES/ekiga.mo
+share/locale/si/LC_MESSAGES/ekiga.mo
+share/locale/sk/LC_MESSAGES/ekiga.mo
+share/locale/sl/LC_MESSAGES/ekiga.mo
+share/locale/sq/LC_MESSAGES/ekiga.mo
+share/locale/sr/LC_MESSAGES/ekiga.mo
+share/locale/sr@latin/LC_MESSAGES/ekiga.mo
+share/locale/sv/LC_MESSAGES/ekiga.mo
+share/locale/ta/LC_MESSAGES/ekiga.mo
+share/locale/te/LC_MESSAGES/ekiga.mo
+share/locale/th/LC_MESSAGES/ekiga.mo
+share/locale/tr/LC_MESSAGES/ekiga.mo
+share/locale/ug/LC_MESSAGES/ekiga.mo
+share/locale/uk/LC_MESSAGES/ekiga.mo
+share/locale/vi/LC_MESSAGES/ekiga.mo
+share/locale/wa/LC_MESSAGES/ekiga.mo
+share/locale/xh/LC_MESSAGES/ekiga.mo
+share/locale/zh_CN/LC_MESSAGES/ekiga.mo
+share/locale/zh_HK/LC_MESSAGES/ekiga.mo
+share/locale/zh_TW/LC_MESSAGES/ekiga.mo
 %%GNOMEHELP%%share/omf/ekiga/ekiga-C.omf
 %%GNOMEHELP%%share/omf/ekiga/ekiga-bg.omf
 %%GNOMEHELP%%share/omf/ekiga/ekiga-ca.omf
@@ -331,8 +596,10 @@ share/icons/hicolor/72x72/apps/ekiga.png
 %%GNOMEHELP%%share/omf/ekiga/ekiga-oc.omf
 %%GNOMEHELP%%share/omf/ekiga/ekiga-pt_BR.omf
 %%GNOMEHELP%%share/omf/ekiga/ekiga-ru.omf
+%%GNOMEHELP%%share/omf/ekiga/ekiga-sl.omf
 %%GNOMEHELP%%share/omf/ekiga/ekiga-sv.omf
 %%GNOMEHELP%%share/omf/ekiga/ekiga-uk.omf
+%%GNOMEHELP%%share/omf/ekiga/ekiga-zh_CN.omf
 share/pixmaps/ekiga/ekiga-logo.png
 share/sounds/ekiga/busytone.wav
 share/sounds/ekiga/dialtone.wav
@@ -355,6 +622,8 @@ share/sounds/ekiga/voicemail.wav
 @dirrmtry share/locale/vi
 @dirrmtry share/locale/uk/LC_MESSAGES
 @dirrmtry share/locale/uk
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
 @dirrmtry share/locale/tr/LC_MESSAGES
 @dirrmtry share/locale/tr
 @dirrmtry share/locale/th/LC_MESSAGES
@@ -425,6 +694,8 @@ share/sounds/ekiga/voicemail.wav
 @dirrmtry share/locale/ko
 @dirrmtry share/locale/kn/LC_MESSAGES
 @dirrmtry share/locale/kn
+@dirrmtry share/locale/kk/LC_MESSAGES
+@dirrmtry share/locale/kk
 @dirrmtry share/locale/ka/LC_MESSAGES
 @dirrmtry share/locale/ka
 @dirrmtry share/locale/ja/LC_MESSAGES
@@ -467,6 +738,8 @@ share/sounds/ekiga/voicemail.wav
 @dirrmtry share/locale/en_GB
 @dirrmtry share/locale/en_CA/LC_MESSAGES
 @dirrmtry share/locale/en_CA
+@dirrmtry share/locale/en@shaw/LC_MESSAGES
+@dirrmtry share/locale/en@shaw
 @dirrmtry share/locale/el/LC_MESSAGES
 @dirrmtry share/locale/el
 @dirrmtry share/locale/dz/LC_MESSAGES
@@ -497,6 +770,8 @@ share/sounds/ekiga/voicemail.wav
 @dirrmtry share/locale/be
 @dirrmtry share/locale/az/LC_MESSAGES
 @dirrmtry share/locale/az
+@dirrmtry share/locale/ast/LC_MESSAGES
+@dirrmtry share/locale/ast
 @dirrmtry share/locale/as/LC_MESSAGES
 @dirrmtry share/locale/as
 @dirrmtry share/locale/ar/LC_MESSAGES
@@ -505,10 +780,14 @@ share/sounds/ekiga/voicemail.wav
 @dirrmtry share/locale/am
 @dirrmtry share/locale
 %%GNOMEHELP%%@dirrm share/omf/ekiga
+%%GNOMEHELP%%@dirrm share/gnome/help/ekiga/zh_CN/figures
+%%GNOMEHELP%%@dirrm share/gnome/help/ekiga/zh_CN
 %%GNOMEHELP%%@dirrm share/gnome/help/ekiga/uk/figures
 %%GNOMEHELP%%@dirrm share/gnome/help/ekiga/uk
 %%GNOMEHELP%%@dirrm share/gnome/help/ekiga/sv/figures
 %%GNOMEHELP%%@dirrm share/gnome/help/ekiga/sv
+%%GNOMEHELP%%@dirrm share/gnome/help/ekiga/sl/figures
+%%GNOMEHELP%%@dirrm share/gnome/help/ekiga/sl
 %%GNOMEHELP%%@dirrm share/gnome/help/ekiga/ru/figures
 %%GNOMEHELP%%@dirrm share/gnome/help/ekiga/ru
 %%GNOMEHELP%%@dirrm share/gnome/help/ekiga/pt_BR/figures
@@ -537,3 +816,7 @@ share/sounds/ekiga/voicemail.wav
 %%GNOMEHELP%%@dirrm share/gnome/help/ekiga/C
 %%GNOMEHELP%%@dirrm share/gnome/help/ekiga
 @dirrmtry share/applications
+%%PLUGINS%%@dirrm lib/ekiga/%%VERSION%%/plugins
+@dirrm lib/ekiga/%%VERSION%%
+@dirrm lib/ekiga
+%%GCONF%%@dirrm etc/ekiga
diff --git a/net/Makefile b/net/Makefile
index 504bb44f3c65..2abe471ef7ae 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -123,8 +123,6 @@
     SUBDIR += easysoap
     SUBDIR += echoping
     SUBDIR += ecore-con
-    SUBDIR += ekiga
-    SUBDIR += ekiga3
     SUBDIR += empty
     SUBDIR += enet
     SUBDIR += entitymib
@@ -460,7 +458,6 @@
     SUBDIR += onioncat
     SUBDIR += online-desktop
     SUBDIR += opal
-    SUBDIR += opal3
     SUBDIR += openafs
     SUBDIR += openam
     SUBDIR += openbgpd
diff --git a/net/ekiga3/Makefile b/net/ekiga3/Makefile
deleted file mode 100644
index 8f4b305fe193..000000000000
--- a/net/ekiga3/Makefile
+++ /dev/null
@@ -1,134 +0,0 @@
-# Created by: Charlie & <root@ws.ipfw.ru>
-# $FreeBSD$
-
-PORTNAME=	ekiga3
-PORTVERSION=	3.2.6
-PORTREVISION=	10
-CATEGORIES=	net
-MASTER_SITES=	http://www.ekiga.org/admin/downloads/latest/sources/ekiga_${PORTVERSION}/
-DISTNAME=	ekiga-${PORTVERSION}
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	VoIP and video conferencing application
-
-LIB_DEPENDS=	sigc-2:${PORTSDIR}/devel/libsigc++20 \
-		opal-3.6.[6-9]:${PORTSDIR}/net/opal3
-BUILD_DEPENDS=	intltoolize:${PORTSDIR}/textproc/intltool \
-		p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser \
-		${LOCALBASE}/bin/scrollkeeper-config:${PORTSDIR}/textproc/rarian
-
-CONFLICTS=	ekiga-2.*
-
-USE_GCC=	any
-USE_AUTOTOOLS=	libtool
-GNU_CONFIGURE=	yes
-USES=		gettext gmake perl5 pkgconfig
-USE_XORG=	xv
-USE_GNOME=	gtk20 gnomehack
-DIST_SUBDIR=	gnome2
-INSTALLS_OMF=	yes
-INSTALLS_ICONS=	yes
-
-MAN1=		ekiga.1
-
-OPTIONS_DEFINE=	LDAP KDE4 H323 VIDEO NOTIFY EVOLUTION GCONF DBUS AVAHI \
-		GNOMEHELP GCONFEDITOR
-OPTIONS_DEFAULT=VIDEO NOTIFY GCONF AVAHI 
-KDE4_DESC=	KDE4 support (experimental)
-EVOLUTION_DESC=	Evolution data server support
-GNOMEHELP_DESC=	Build Ekiga help files
-GCONFEDITOR_DESC=Depend on gconf-editor
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MKDE4}
-. if !${PORT_OPTIONS:MDBUS}
-BROKEN=		Please set DBUS option or remove the KDE4 option!
-. endif
-USE_KDE4=		kdehier kdelibs
-USE_QT4=		# empty
-CONFIGURE_ARGS+=	--enable-kde
-CONFIGURE_ENV+=		KDE_CFLAGS="-I${KDE4_PREFIX}/include -I${QT_INCDIR} \
-			-I${LOCALBASE}/include" KDE_LIBS="-L${KDE4_PREFIX}/lib"
-.else
-CONFIGURE_ARGS+=	--disable-kde
-.endif
-
-.if ${PORT_OPTIONS:MVIDEO}
-BUILD_DEPENDS+=		${LOCALBASE}/include/linux/videodev.h:${PORTSDIR}/multimedia/v4l_compat
-.endif
-
-.if ${PORT_OPTIONS:MLDAP}
-USE_OPENLDAP=	yes
-LIB_DEPENDS+=	sasl2:${PORTSDIR}/security/cyrus-sasl2
-CONFIGURE_ARGS+=	--enable-ldap --with-ldap-dir="${LOCALBASE}" --with-libsasl2-dir="${LOCALBASE}"
-.else
-CONFIGURE_ARGS+=	--disable-ldap
-.endif
-
-.if ${PORT_OPTIONS:MH323}
-CONFIGURE_ARGS+=	--enable-h323
-.else
-CONFIGURE_ARGS+=	--disable-h323
-.endif
-
-.if ${PORT_OPTIONS:MNOTIFY}
-LIB_DEPENDS+=		notify:${PORTSDIR}/devel/libnotify
-CONFIGURE_ARGS+=	--enable-notify
-.else
-CONFIGURE_ARGS+=	--disable-notify
-.endif
-
-.if ${PORT_OPTIONS:MDBUS}
-LIB_DEPENDS+=		dbus-1:${PORTSDIR}/devel/dbus
-CONFIGURE_ARGS+=	--enable-dbus --enable-dbus-service
-PLIST_SUB+=		DBUS=""
-.else
-CONFIGURE_ARGS+=	--disable-dbus --disable-dbus-service
-PLIST_SUB+=		DBUS="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MGCONF}
-USE_GNOME+=		gconf2
-CONFIGURE_ARGS+=	--enable-gconf
-GCONF_SCHEMAS=		ekiga.schemas
-PLIST_SUB+=		NO_GCONF="@comment "
-.else
-CONFIGURE_ARGS+=	--disable-gconf
-PLIST_SUB+=		NO_GCONF=""
-.endif
-
-.if ${PORT_OPTIONS:MEVOLUTION}
-USE_GNOME+=		evolutiondataserver
-CONFIGURE_ARGS+=	--enable-eds
-.else
-CONFIGURE_ARGS+=	--disable-eds
-.endif
-
-.if ${PORT_OPTIONS:MAVAHI}
-CONFIGURE_ARGS+=	--enable-avahi
-LIB_DEPENDS+=		avahi-client:${PORTSDIR}/net/avahi-app
-.else
-CONFIGURE_ARGS+=	--disable-avahi
-.endif
-
-.if ${PORT_OPTIONS:MGCONFEDITOR}
-RUN_DEPENDS+=		${LOCALBASE}/bin/gconf-editor:${PORTSDIR}/sysutils/gconf-editor
-.endif
-
-.if ${PORT_OPTIONS:MGNOMEHELP}
-PLIST_SUB+=		GNOMEHELP=""
-USE_GNOME+=		gnomedocutils
-.else
-CONFIGURE_ARGS+=	--disable-gdu
-PLIST_SUB+=		GNOMEHELP="@comment "
-.endif
-
-post-patch:
-	@${REINPLACE_CMD} -e 's/V4L="enabled"/V4L="disabled"/' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's?^\(KDE_CFLAGS.*\)$$?\1 -I'"${KDE4_PREFIX}/include?" ${WRKSRC}/lib/engine/components/kde/Makefile.in
-
-post-configure:
-	@${REINPLACE_CMD} -e 's?^\(CPPFLAGS\) =\(.*\)$$?\1 = '"-I${LOCALBASE}/include"' \2?' ${WRKSRC}/lib/engine/addressbook/Makefile
-
-.include <bsd.port.mk>
diff --git a/net/ekiga3/distinfo b/net/ekiga3/distinfo
deleted file mode 100644
index a7a96e901c8d..000000000000
--- a/net/ekiga3/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (gnome2/ekiga-3.2.6.tar.gz) = 92e91a92fa13c9634c9cc35282a6db0f0d0bd4fed999d343bb54f9c993bc873f
-SIZE (gnome2/ekiga-3.2.6.tar.gz) = 9939808
diff --git a/net/ekiga3/files/patch-configure b/net/ekiga3/files/patch-configure
deleted file mode 100644
index 79bfbea51ed0..000000000000
--- a/net/ekiga3/files/patch-configure
+++ /dev/null
@@ -1,20 +0,0 @@
---- configure.orig	2010-08-28 15:04:35.000000000 -0400
-+++ configure	2010-08-28 15:05:31.000000000 -0400
-@@ -17255,7 +17255,7 @@ if test -n "$PKG_CONFIG"; then
-   ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
--  pkg_cv_NOTIFY_CFLAGS=`$PKG_CONFIG --cflags "libnotify" 2>/dev/null`
-+  pkg_cv_NOTIFY_CFLAGS=`$PKG_CONFIG --cflags "libnotify" "gtk+-2.0" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-@@ -17273,7 +17273,7 @@ if test -n "$PKG_CONFIG"; then
-   ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
--  pkg_cv_NOTIFY_LIBS=`$PKG_CONFIG --libs "libnotify" 2>/dev/null`
-+  pkg_cv_NOTIFY_LIBS=`$PKG_CONFIG --libs "libnotify" "gtk+-2.0" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
diff --git a/net/ekiga3/files/patch-halodbus.diff b/net/ekiga3/files/patch-halodbus.diff
deleted file mode 100644
index b5ce29cf143e..000000000000
--- a/net/ekiga3/files/patch-halodbus.diff
+++ /dev/null
@@ -1,15 +0,0 @@
---- lib/engine/components/hal-dbus/Makefile.in.orig	2009-10-25 01:38:37.000000000 +0400
-+++ lib/engine/components/hal-dbus/Makefile.in	2009-10-25 01:38:58.000000000 +0400
-@@ -648,10 +648,10 @@
- 
- 
- hal-marshal.h: hal-marshal.list
--	$(LIBTOOL) --mode=execute glib-genmarshal --prefix=gm_hal_dbus_marshal $^ --header > $@.tmp && mv $@.tmp $@
-+	$(LIBTOOL) --mode=execute glib-genmarshal --prefix=gm_hal_dbus_marshal $^ --header < hal-marshal.list > $@.tmp && mv $@.tmp $@
- 
- hal-marshal.c: hal-marshal.list
--	$(LIBTOOL) --mode=execute glib-genmarshal --prefix=gm_hal_dbus_marshal $^ --body > $@.tmp && mv $@.tmp $@
-+	$(LIBTOOL) --mode=execute glib-genmarshal --prefix=gm_hal_dbus_marshal $^ --body < hal-marshal.list > $@.tmp && mv $@.tmp $@
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/net/ekiga3/files/patch-lib_engine_components_libnotify_libnotify-main.cpp b/net/ekiga3/files/patch-lib_engine_components_libnotify_libnotify-main.cpp
deleted file mode 100644
index 5b5f5c23b63e..000000000000
--- a/net/ekiga3/files/patch-lib_engine_components_libnotify_libnotify-main.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
---- lib/engine/components/libnotify/libnotify-main.cpp.orig	2009-09-22 16:27:35.000000000 +0200
-+++ lib/engine/components/libnotify/libnotify-main.cpp	2011-03-08 22:11:18.000000000 +0100
-@@ -38,6 +38,7 @@
- #include <map>
- #include <tr1/memory>
- 
-+#include <gtk/gtk.h>
- #include <libnotify/notify.h>
- 
- #include "services.h"
-@@ -158,7 +159,7 @@ LibNotify::on_notification_added (gmref_
- 
-   notif = notify_notification_new (notification->get_title ().c_str (),
- 				   notification->get_body ().c_str (),
--				   urgency, NULL);
-+				   urgency);
- 
-   g_signal_connect (notif, "closed",
- 		    G_CALLBACK (on_notif_closed), notification.get ());
diff --git a/net/ekiga3/files/patch-src_gui_main.cpp b/net/ekiga3/files/patch-src_gui_main.cpp
deleted file mode 100644
index 3982ef64fb96..000000000000
--- a/net/ekiga3/files/patch-src_gui_main.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
---- src/gui/main.cpp.orig	2011-03-08 22:31:52.000000000 +0100
-+++ src/gui/main.cpp	2011-03-08 22:47:35.000000000 +0100
-@@ -2807,12 +2807,11 @@ ekiga_main_window_incoming_call_notify (
- 
-   body = g_strdup_printf ("%s\n%s\n%s", uri, app, account);
-   
--  notify = notify_notification_new (title, body, GM_ICON_LOGO, NULL);
-+  notify = notify_notification_new (title, body, GM_ICON_LOGO);
-   notify_notification_add_action (notify, "accept", _("Accept"), notify_action_cb, mw, NULL);
-   notify_notification_add_action (notify, "reject", _("Reject"), notify_action_cb, mw, NULL);
-   notify_notification_set_timeout (notify, NOTIFY_EXPIRES_NEVER);
-   notify_notification_set_urgency (notify, NOTIFY_URGENCY_CRITICAL);
--  notify_notification_attach_to_status_icon (notify, statusicon);
-   if (!notify_notification_show (notify, NULL)) {
-     ekiga_main_window_incoming_call_dialog_show (mw, call);
-   }
diff --git a/net/opal3/Makefile b/net/opal/Makefile
index 58608051b3bb..c533d6ce1313 100644
--- a/net/opal3/Makefile
+++ b/net/opal/Makefile
@@ -1,28 +1,20 @@
 # Created by: Roger Hardiman <roger@freebsd.org>
 # $FreeBSD$
 
-PORTNAME=	opal3
-PORTVERSION=	3.6.6
-PORTREVISION=	17
+PORTNAME=	opal
+PORTVERSION=	3.10.10
 CATEGORIES=	net
 MASTER_SITES=	GNOME
-MASTER_SITE_SUBDIR=	sources/${PORTNAME:S|3||g}/${PORTVERSION:R}
-DISTNAME=	opal-${PORTVERSION}
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	VoIP abstraction library
 
 LICENSE=	MPL
 
-LIB_DEPENDS=	pt-2.6.[4-9]:${PORTSDIR}/devel/ptlib26
+LIB_DEPENDS=	libpt.so:${PORTSDIR}/devel/ptlib
 
-CONFLICTS=	opal-2.*
-
-WRKSRC=		${WRKDIR}/opal-${PORTVERSION}
-
-USE_GCC=	any
-USE_BZIP2=	yes
-USES=		pathfix gmake pkgconfig
+USE_XZ=	yes
+USES=		gmake pathfix pkgconfig
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
@@ -30,35 +22,42 @@ CXXFLAGS+=	-I${LOCALBASE}/include
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-OPTIONS_DEFINE=	ZRTP JAVA CELT ILBC GSM SPEEX THEORA FFMPEG X264 SIP H323 IAX \
-		H224 H281 FAX MSRP SIPIM RTPTEXT H450 H460 H501 LID UVIDEO AEC
+OPTIONS_DEFINE=	JAVA CELT ILBC GSM SPEEX THEORA FFMPEG X264 SIP H323 IAX \
+		H224 H281 FAX MSRP SIPIM RTPTEXT H450 H460 H501 LID UVIDEO \
+		AEC DEBUG RUBY
+# ZRTP
+# MSRP = plist extra line vpd?
+# RTPTEXT disable == build fail, so make it default?
 OPTIONS_DEFAULT=CELT GSM SPEEX FFMPEG X264 SIP H224 H281 FAX MSRP SIPIM \
 		RTPTEXT LID AEC
+DEBUG_DESC=	Install debug library
 ZRTP_DESC=	ZRTP protocol support
 JAVA_DESC=	Java JNI support
+RUBY_DESC=	Ruby support
 CELT_DESC=	Celt codec from ports
 ILBC_DESC=	iLBC codec from ports
-GSM_DESC=	GSM codec from ports
+GSM_DESC=	GSM 06.10 codec from ports
 SPEEX_DESC=	SPEEX codec from ports
-THEORA_DESC=	Theora  codec support
+THEORA_DESC=	Theora codec support
 FFMPEG_DESC=	Ffmpeg codec support
 X264_DESC=	x.264 codec support
 SIP_DESC=	SIP protocol support
 H323_DESC=	H.323 protocol support
 IAX_DESC=	IAX2 protocol support
 H224_DESC=	H.224 control protocol
-H281_DESC=	H.281 (Far End Camera Control)
+H281_DESC=	H.281 (Far End Camera Control) protocol support
 FAX_DESC=	Fax T.38 support
 MSRP_DESC=	MSRP protocol
 SIPIM_DESC=	SIP-IM protocol
-RTPTEXT_DESC=	RFC4103 Text RTP payload
+RTPTEXT_DESC=	RFC4103 Text RTP payload support
 H450_DESC=	H.450 H.323 subset
 H460_DESC=	H.460 H.323 extension for NAT traversal
 H501_DESC=	H.501 H323 mobility extensions
-LID_DESC=	LID (Light-Weight Identity) support
+LID_DESC=	Light-Weight Identity (incl. xJack cards  and voicetronix vpb) support
 UVIDEO_DESC=	RFC4175 uncompressed video RTP payload
 AEC_DESC=	Accoustic echo cancellation
 
+NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .ifdef OPALDIR
@@ -66,28 +65,42 @@ AEC_DESC=	Accoustic echo cancellation
 		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]+.//}
+PLIST_SUB+=	VERSION=${PORTVERSION} \
+		PVERSION_MAJOR=${PVERSION_MAJOR} \
+		PVERSION_MINOR=${PVERSION_MINOR}
 
-.if ${PORT_OPTIONS:MZRTP}
+PVERSION_MAJOR=	${PORTVERSION:C/.[0-9]+.[0-9]+$//g}
+PVERSION_MINOR=	${PORTVERSION:C/.[0-9]+$//g}
+
+.if ${PORT_OPTIONS:MDEBUG}
+ALL_TARGET=	debug opt
+PLIST_SUB+=	DEBUG=""
+.else
+ALL_TARGET=	opt
+PLIST_SUB+=	DEBUG="@comment "
+.endif
+
+# libzrtpcpp uses port ssl, which will conflict with this port since we use
+# base ssl.
+#.if ${PORT_OPTIONS:MZRTP}
+.if 0
 .if !defined(SAFE_ZRTP)
 IGNORE=	please build devel/libzrtpcpp WITHOUT ports SSL and re-run build with SAFE_ZRTP set
 .endif
-LIB_DEPENDS+=	zrtpcpp:${PORTSDIR}/devel/libzrtpcpp
+LIB_DEPENDS+=	libzrtpcpp.so:${PORTSDIR}/devel/libzrtpcpp
 CONFIGURE_ARGS+=	--enable-zrtp
 .else
 CONFIGURE_ARGS+=	--disable-zrtp
 .endif
 
 .if ${PORT_OPTIONS:MGSM}
-LIB_DEPENDS+=	gsm:${PORTSDIR}/audio/gsm
+LIB_DEPENDS+=	libgsm.so:${PORTSDIR}/audio/gsm
 .else
 CONFIGURE_ARGS+=	--enable-localgsm
 .endif
 
 .if ${PORT_OPTIONS:MSPEEX}
-LIB_DEPENDS+=	speex:${PORTSDIR}/audio/speex
+LIB_DEPENDS+=	libspeex.so:${PORTSDIR}/audio/speex
 .else
 CONFIGURE_ARGS+=	--enable-localspeex
 .endif
@@ -98,8 +111,14 @@ CONFIGURE_ARGS+=	--enable-java
 CONFIGURE_ARGS+=	--disable-java
 .endif
 
+.if ${PORT_OPTIONS:MRUBY}
+CONFIGURE_ARGS+=	--enable-ruby
+.else
+CONFIGURE_ARGS+=	--disable-ruby
+.endif
+
 .if ${PORT_OPTIONS:MCELT}
-LIB_DEPENDS+=	celt0:${PORTSDIR}/audio/celt
+LIB_DEPENDS+=	libcelt0.so:${PORTSDIR}/audio/celt
 CONFIGURE_ARGS+=	--enable-celt
 PLIST_SUB+=	CELT=""
 .else
@@ -108,14 +127,13 @@ PLIST_SUB+=	CELT="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MILBC}
-LIB_DEPENDS+=	ilbc:${PORTSDIR}/net/ilbc
+LIB_DEPENDS+=	libilbc.so:${PORTSDIR}/net/ilbc
 .else
 CONFIGURE_ARGS+=	--enable-localilbc
 .endif
 
 .if ${PORT_OPTIONS:MTHEORA}
-LIB_DEPENDS+=	theora:${PORTSDIR}/multimedia/libtheora \
-		ogg:${PORTSDIR}/audio/libogg
+LIB_DEPENDS+=	libtheora.so:${PORTSDIR}/multimedia/libtheora
 CONFIGURE_ARGS+=	--enable-theora
 PLIST_SUB+=	THEORA=""
 WITH_VIDEO=	yes
@@ -124,26 +142,27 @@ CONFIGURE_ARGS+=	--disable-theora
 PLIST_SUB+=	THEORA="@comment "
 .endif
 
-.if ${PORT_OPTIONS:MX264}
-LIB_DEPENDS+=	x264:${PORTSDIR}/multimedia/x264
-CONFIGURE_ARGS+=	--enable-h264
+.if ${PORT_OPTIONS:MX264} && ${PORT_OPTIONS:MFFMPEG}
+LIB_DEPENDS+=	libx264.so:${PORTSDIR}/multimedia/x264
+CONFIGURE_ARGS+=	--enable-x264
 PLIST_SUB+=	X264=""
 WITH_VIDEO=	yes
+# work around some weirdness in plugins/configure where it looses the
+# cflags/libs of x264
+CONFIGURE_ENV+=	X264_CFLAGS="`pkg-config --cflags x264`" \
+		X264_LIBS="`pkg-config --libs x264`"
 .else
-CONFIGURE_ARGS+=	--disable-h264
+CONFIGURE_ARGS+=	--disable-x264
 PLIST_SUB+=	X264="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MFFMPEG}
-LIB_DEPENDS+=	avcodec:${PORTSDIR}/multimedia/ffmpeg
-CONFIGURE_ARGS+=	--enable-ffmpeg --enable-ffmpeg-h263
-CONFIGURE_ENV+=		ac_cv_lib_avcodec_h263p_encoder=yes \
-			ac_cv_lib_avcodec_h264_decoder=yes \
-			ac_cv_lib_avcodec_mpeg4_encoder=yes
+LIB_DEPENDS+=	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
+CONFIGURE_ARGS+=	--enable-libavcodec
 PLIST_SUB+=	FFMPEG=""
 WITH_VIDEO=	yes
 .else
-CONFIGURE_ARGS+=	--disable-ffmpeg --disable-ffmpeg-h263
+CONFIGURE_ARGS+=	--disable-libavcodec
 PLIST_SUB+=	FFMPEG="@comment "
 .endif
 
@@ -169,9 +188,9 @@ CONFIGURE_ARGS+=	--disable-h323
 .endif
 
 .if ${PORT_OPTIONS:MIAX}
-CONFIGURE_ARGS+=	--enable-iax
+CONFIGURE_ARGS+=	--enable-iax2
 .else
-CONFIGURE_ARGS+=	--disable-iax
+CONFIGURE_ARGS+=	--disable-iax2
 .endif
 
 .if ${PORT_OPTIONS:MH224}
@@ -188,8 +207,8 @@ CONFIGURE_ARGS+=	--disable-h281
 
 # keep version in lib_depend, to see the difference between spandsp-devel and normal
 .if ${PORT_OPTIONS:MFAX}
-LIB_DEPENDS+=	spandsp.2:${PORTSDIR}/comms/spandsp-devel
-CONFIGURE_ARGS+=	--enable-fax --enable-t38
+LIB_DEPENDS+=	libspandsp.so.2:${PORTSDIR}/comms/spandsp-devel
+CONFIGURE_ARGS+=	--enable-spandsp --enable-fax --enable-t38
 PLIST_SUB+=	FAX=""
 .else
 CONFIGURE_ARGS+=	--disable-fax --disable-t38 --disable-spandsp
@@ -247,29 +266,32 @@ CONFIGURE_ARGS+=	--enable-rfc4175
 CONFIGURE_ARGS+=	--disable-rfc4175
 .endif
 
+# xxxx
+.if ${PORT_OPTIONS:MXXXX}
+CONFIGURE_ARGS+=	--enable-rfc2435
+.else
+CONFIGURE_ARGS+=	--disable-rfc2435
+.endif
+
 .if ${PORT_OPTIONS:MAEC}
 CONFIGURE_ARGS+=	--enable-aec
 .else
 CONFIGURE_ARGS+=	--disable-aec
 .endif
 
+# ??
 CONFIGURE_ARGS+=	--disable-debug
 
-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?@@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 ! ${PORT_OPTIONS:MDEBUG}
-	@${REINPLACE_CMD} -e 's/^\(all:\).*/\1 optdepend opt/' ${WRKSRC}/Makefile.in
-.endif
+# configure flags not used
+CONFIGURE_ARGS+=	--disable-gsmamr \
+			--disable-ruby
 
-post-configure:
-	@${REINPLACE_CMD} -e 's?\$$(LIB_FILENAME_SHARED_PAT)?libopal-${PORTVERSION:C/.[0-9]+$//g}'.so.'${PORTVERSION:C/^[0-9]+.[0-9]+.//}?' ${WRKSRC}/opal_defs.mak
+post-install:
+	${LN} -sf libopal.so.${PORTVERSION} ${PREFIX}/lib/libopal.so.${PVERSION_MAJOR}
+	${LN} -sf libopal.so.${PORTVERSION} ${PREFIX}/lib/libopal.so.${PVERSION_MINOR}
+.if ${PORT_OPTIONS:MDEBUG}
+	${LN} -sf libopal_d.so.${PORTVERSION} ${PREFIX}/lib/libopal_d.so.${PVERSION_MAJOR}
+	${LN} -sf libopal_d.so.${PORTVERSION} ${PREFIX}/lib/libopal_d.so.${PVERSION_MINOR}
+.endif
 
 .include <bsd.port.mk>
diff --git a/net/opal/distinfo b/net/opal/distinfo
new file mode 100644
index 000000000000..7cbf2a283067
--- /dev/null
+++ b/net/opal/distinfo
@@ -0,0 +1,2 @@
+SHA256 (opal-3.10.10.tar.xz) = f208985003461b2743575eccac13ad890b3e5baac35b68ddef17162460aff864
+SIZE (opal-3.10.10.tar.xz) = 5886812
diff --git a/net/opal/files/patch-Makefile.in b/net/opal/files/patch-Makefile.in
new file mode 100644
index 000000000000..98d4b537af17
--- /dev/null
+++ b/net/opal/files/patch-Makefile.in
@@ -0,0 +1,15 @@
+--- Makefile.in.orig	2013-07-11 10:39:04.000000000 +0200
++++ Makefile.in	2013-07-11 10:39:56.000000000 +0200
+@@ -666,12 +666,6 @@
+ 
+ install:
+ 	mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir)
+-	( if test -e $(OPAL_LIBDIR)/$(LIB_FILENAME_STATIC) ; then \
+-	  $(INSTALL) -m 755 $(OPAL_LIBDIR)/$(LIB_FILENAME_STATIC) $(DESTDIR)$(libdir) ; \
+-	fi )
+-	( if test -e $(OPAL_LIBDIR)/$(DEBUG_LIB_FILENAME_STATIC) ; then \
+-	  $(INSTALL) -m 755 $(OPAL_LIBDIR)/$(DEBUG_LIB_FILENAME_STATIC) $(DESTDIR)$(libdir) ; \
+-	fi )
+ 	( if test -e $(OPAL_LIBDIR)/$(LIB_FILENAME_SHARED_PAT) ; then \
+ 	  $(INSTALL) -m 755 $(OPAL_LIBDIR)/$(LIB_FILENAME_SHARED_PAT) $(DESTDIR)$(libdir) ; \
+ 	  ln -snf $(LIB_FILENAME_SHARED_PAT) $(DESTDIR)$(libdir)/$(LIB_FILENAME_SHARED) ; \
diff --git a/net/opal/files/patch-plugins_audio_SILK_SILK-SDK_Makefile b/net/opal/files/patch-plugins_audio_SILK_SILK-SDK_Makefile
new file mode 100644
index 000000000000..9bc63799b9a1
--- /dev/null
+++ b/net/opal/files/patch-plugins_audio_SILK_SILK-SDK_Makefile
@@ -0,0 +1,17 @@
+--- plugins/audio/SILK/SILK_SDK/Makefile.orig	2013-09-17 11:51:45.000000000 +0200
++++ plugins/audio/SILK/SILK_SDK/Makefile	2013-09-17 11:55:40.000000000 +0200
+@@ -16,10 +16,10 @@
+ LIBSUFFIX = .a
+ OBJSUFFIX = .o
+ 
+-CC     = $(TOOLCHAIN_PREFIX)gcc$(TOOLCHAIN_SUFFIX)
+-AR     = $(TOOLCHAIN_PREFIX)ar
+-RANLIB = $(TOOLCHAIN_PREFIX)ranlib
+-CP     = $(TOOLCHAIN_PREFIX)cp
++CC     ?= $(TOOLCHAIN_PREFIX)gcc$(TOOLCHAIN_SUFFIX)
++AR     ?= $(TOOLCHAIN_PREFIX)ar
++RANLIB ?= $(TOOLCHAIN_PREFIX)ranlib
++CP     ?= $(TOOLCHAIN_PREFIX)cp
+ 
+ cflags-from-defines    = $(addprefix -D,$(1))
+ cflags-from-includes   = $(addprefix -I,$(1))
diff --git a/net/opal/files/patch-plugins_configure b/net/opal/files/patch-plugins_configure
new file mode 100644
index 000000000000..d93d437ebde4
--- /dev/null
+++ b/net/opal/files/patch-plugins_configure
@@ -0,0 +1,189 @@
+--- plugins/configure.orig	2013-07-09 00:25:14.000000000 +0200
++++ plugins/configure	2013-07-09 00:28:04.000000000 +0200
+@@ -6924,7 +6924,7 @@
+ if test "x${HAVE_GSM0610}" = "xyes" ; then
+   ac_config_files="$ac_config_files audio/GSM0610/Makefile"
+ 
+-  SUBDIRS+=" audio/GSM0610"
++  SUBDIRS="${SUBDIRS} audio/GSM0610"
+ 
+   # Check whether --enable-localgsm was given.
+ if test "${enable_localgsm+set}" = set; then :
+@@ -7181,7 +7181,7 @@
+ if test "x${HAVE_GSMAMR}" = "xyes" ; then
+   ac_config_files="$ac_config_files audio/gsm-amr/Makefile"
+ 
+-  SUBDIRS+=" audio/gsm-amr"
++  SUBDIRS="${SUBDIRS} audio/gsm-amr"
+ fi
+ 
+ 
+@@ -7199,7 +7199,7 @@
+ if test "x${HAVE_iLBC}" = "xyes" ; then
+   ac_config_files="$ac_config_files audio/iLBC/Makefile"
+ 
+-  SUBDIRS+=" audio/iLBC"
++  SUBDIRS="${SUBDIRS} audio/iLBC"
+ 
+   ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+@@ -8632,7 +8632,7 @@
+ 
+   ac_config_files="$ac_config_files audio/Speex/Makefile"
+ 
+-  SUBDIRS+=" audio/Speex"
++  SUBDIRS="${SUBDIRS} audio/Speex"
+ 
+ 
+           old_CFLAGS="$CFLAGS"
+@@ -9002,7 +9002,7 @@
+ if test "x${HAVE_G722}" = "xyes" ; then
+   ac_config_files="$ac_config_files audio/G722/Makefile"
+ 
+-  SUBDIRS+=" audio/G722"
++  SUBDIRS="${SUBDIRS} audio/G722"
+ fi
+ 
+ 
+@@ -9020,7 +9020,7 @@
+ if test "x${HAVE_G7221}" = "xyes" ; then
+   ac_config_files="$ac_config_files audio/G.722.1/Makefile"
+ 
+-  SUBDIRS+=" audio/G.722.1"
++  SUBDIRS="${SUBDIRS} audio/G.722.1"
+ fi
+ 
+ 
+@@ -9038,7 +9038,7 @@
+ if test "x${HAVE_G7222}" = "xyes" ; then
+   ac_config_files="$ac_config_files audio/G.722.2/Makefile"
+ 
+-  SUBDIRS+=" audio/G.722.2"
++  SUBDIRS="${SUBDIRS} audio/G.722.2"
+ fi
+ 
+ 
+@@ -9056,7 +9056,7 @@
+ if test "x${HAVE_G726}" = "xyes" ; then
+   ac_config_files="$ac_config_files audio/G726/Makefile"
+ 
+-  SUBDIRS+=" audio/G726"
++  SUBDIRS="${SUBDIRS} audio/G726"
+ fi
+ 
+ 
+@@ -9074,7 +9074,7 @@
+ if test "x${HAVE_LPC10}" = "xyes" ; then
+   ac_config_files="$ac_config_files audio/LPC_10/Makefile"
+ 
+-  SUBDIRS+=" audio/LPC_10"
++  SUBDIRS="${SUBDIRS} audio/LPC_10"
+ fi
+ 
+ 
+@@ -9092,7 +9092,7 @@
+ if test "x${HAVE_IMA_ADPCM}" = "xyes" ; then
+   ac_config_files="$ac_config_files audio/IMA_ADPCM/Makefile"
+ 
+-  SUBDIRS+=" audio/IMA_ADPCM"
++  SUBDIRS="${SUBDIRS} audio/IMA_ADPCM"
+ fi
+ 
+ 
+@@ -9155,7 +9155,7 @@
+ if test "x${HAVE_SBC}" = "xyes" ; then
+   ac_config_files="$ac_config_files audio/SBC/Makefile"
+ 
+-  SUBDIRS+=" audio/SBC"
++  SUBDIRS="${SUBDIRS} audio/SBC"
+ fi
+ 
+ 
+@@ -9251,7 +9251,7 @@
+                   sed -e "s/\./*10000+/" -e "s/\./*100+/"`\""
+   ac_config_files="$ac_config_files audio/celt/Makefile"
+ 
+-  SUBDIRS+=" audio/celt"
++  SUBDIRS="${SUBDIRS} audio/celt"
+ fi
+ 
+ 
+@@ -9269,7 +9269,7 @@
+ if test "x${HAVE_SILK}" = "xyes" ; then
+   ac_config_files="$ac_config_files audio/SILK/Makefile"
+ 
+-  SUBDIRS+=" audio/SILK"
++  SUBDIRS="${SUBDIRS} audio/SILK"
+ fi
+ 
+ 
+@@ -9288,7 +9288,7 @@
+ if test "x${HAVE_H261}" = "xyes" ; then
+   ac_config_files="$ac_config_files video/H.261-vic/Makefile"
+ 
+-  SUBDIRS+=" video/H.261-vic"
++  SUBDIRS="${SUBDIRS} video/H.261-vic"
+ fi
+ 
+ 
+@@ -9717,13 +9717,13 @@
+ if test "x${HAVE_LIBAVCODEC}" = "xyes"; then
+   ac_config_files="$ac_config_files video/H.263-1998/Makefile"
+ 
+-  SUBDIRS+=" video/H.263-1998"
++  SUBDIRS="${SUBDIRS} video/H.263-1998"
+ fi
+ 
+ if test "x${HAVE_LIBAVCODEC}" = "xyes"; then
+   ac_config_files="$ac_config_files video/MPEG4-ffmpeg/Makefile"
+ 
+-  SUBDIRS+=" video/MPEG4-ffmpeg"
++  SUBDIRS="${SUBDIRS} video/MPEG4-ffmpeg"
+ fi
+ 
+ 
+@@ -9875,7 +9875,7 @@
+ fi
+ 
+ 
+-  SUBDIRS+=" video/H.264"
++  SUBDIRS="${SUBDIRS} video/H.264"
+   ac_config_files="$ac_config_files video/H.264/Makefile"
+ 
+   ac_config_files="$ac_config_files video/H.264/gpl/Makefile"
+@@ -9973,7 +9973,7 @@
+ if test "x$HAVE_THEORA" = "xyes" ; then
+   ac_config_files="$ac_config_files video/THEORA/Makefile"
+ 
+-  SUBDIRS+=" video/THEORA"
++  SUBDIRS="${SUBDIRS} video/THEORA"
+ fi
+ 
+ 
+@@ -10054,7 +10054,7 @@
+ if test "x$HAVE_IXJ" = "xyes" ; then
+   ac_config_files="$ac_config_files LID/IxJ/Makefile"
+ 
+-  SUBDIRS+=" LID/IxJ"
++  SUBDIRS="${SUBDIRS} LID/IxJ"
+ fi
+ 
+ if test -d LID/VPB ; then
+@@ -10101,7 +10101,7 @@
+ if test "x$HAVE_VPB" = "xyes" ; then
+   ac_config_files="$ac_config_files LID/VPB/Makefile"
+ 
+-  SUBDIRS+=" LID/VPB"
++  SUBDIRS="${SUBDIRS} LID/VPB"
+ fi
+ 
+ 
+@@ -10284,7 +10284,7 @@
+ if test "x$HAVE_SPANDSP" = "xyes" ; then
+   ac_config_files="$ac_config_files fax/fax_spandsp/Makefile"
+ 
+-  SUBDIRS+=" fax/fax_spandsp"
++  SUBDIRS="${SUBDIRS} fax/fax_spandsp"
+ fi
+ 
+ 
diff --git a/net/opal/files/patch-plugins_video_H.263-1998_rfc2190.cxx b/net/opal/files/patch-plugins_video_H.263-1998_rfc2190.cxx
new file mode 100644
index 000000000000..6c693b4d2dfd
--- /dev/null
+++ b/net/opal/files/patch-plugins_video_H.263-1998_rfc2190.cxx
@@ -0,0 +1,11 @@
+--- plugins/video/H.263-1998/rfc2190.cxx.orig	2013-02-20 03:18:03.000000000 +0100
++++ plugins/video/H.263-1998/rfc2190.cxx	2013-07-09 00:32:54.000000000 +0200
+@@ -25,7 +25,7 @@
+ 
+ #include <iostream>
+ #include <string.h>
+-#include <malloc.h>
++#include <stdlib.h>
+ 
+ 
+ const unsigned char PSC[3]      = { 0x00, 0x00, 0x80 };
diff --git a/net/opal/files/patch-plugins_video_H.264_shared_x264wrap.h b/net/opal/files/patch-plugins_video_H.264_shared_x264wrap.h
new file mode 100644
index 000000000000..099d0631cbab
--- /dev/null
+++ b/net/opal/files/patch-plugins_video_H.264_shared_x264wrap.h
@@ -0,0 +1,11 @@
+--- plugins/video/H.264/shared/x264wrap.h.orig	2013-07-09 00:34:36.000000000 +0200
++++ plugins/video/H.264/shared/x264wrap.h	2013-07-09 00:38:14.000000000 +0200
+@@ -126,7 +126,7 @@
+     char  m_ulName[100];
+     int   m_pipeToProcess;
+     int   m_pipeFromProcess;
+-    pid_t m_pid;
++    int m_pid;
+   #endif // WIN32
+ 
+     bool m_startNewFrame;
diff --git a/net/opal3/pkg-descr b/net/opal/pkg-descr
index b337a0341444..b337a0341444 100644
--- a/net/opal3/pkg-descr
+++ b/net/opal/pkg-descr
diff --git a/net/opal3/pkg-plist b/net/opal/pkg-plist
index a0dd1570c433..ecce9e67f385 100644
--- a/net/opal3/pkg-plist
+++ b/net/opal/pkg-plist
@@ -26,6 +26,7 @@ include/opal/codec/opalplugin.h
 include/opal/codec/opalpluginmgr.h
 include/opal/codec/opalwavfile.h
 include/opal/codec/ratectl.h
+include/opal/codec/rfc2435.h
 include/opal/codec/rfc2833.h
 include/opal/codec/rfc4175.h
 include/opal/codec/silencedetect.h
@@ -64,7 +65,6 @@ 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
@@ -83,15 +83,16 @@ include/opal/im/msrp.h
 include/opal/im/rfc4103.h
 include/opal/im/sipim.h
 include/opal/im/t140.h
+include/opal/lids/capi_ep.h
 include/opal/lids/lid.h
 include/opal/lids/lidep.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/console_mgr.h
 include/opal/opal/endpoint.h
 include/opal/opal/guid.h
 include/opal/opal/ivr.h
@@ -105,11 +106,15 @@ include/opal/opal/opalmixer.h
 include/opal/opal/opalvxml.h
 include/opal/opal/patch.h
 include/opal/opal/pcss.h
+include/opal/opal/pres_ent.h
+include/opal/opal/recording.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/metrics.h
+include/opal/rtp/pcapfile.h
 include/opal/rtp/rtp.h
 include/opal/rtp/srtp.h
 include/opal/rtp/zrtpudp.h
@@ -119,6 +124,7 @@ include/opal/sip/sip.h
 include/opal/sip/sipcon.h
 include/opal/sip/sipep.h
 include/opal/sip/sippdu.h
+include/opal/sip/sippres.h
 include/opal/t120/h323t120.h
 include/opal/t120/t120proto.h
 include/opal/t120/x224.h
@@ -127,34 +133,39 @@ 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_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
+lib/libopal.so.%%PVERSION_MAJOR%%
+lib/libopal.so.%%PVERSION_MINOR%%
+lib/libopal.so.%%VERSION%%
+%%DEBUG%%lib/libopal_d.so
+%%DEBUG%%lib/libopal_d.so.%%PVERSION_MAJOR%%
+%%DEBUG%%lib/libopal_d.so.%%PVERSION_MINOR%%
+%%DEBUG%%lib/libopal_d.so.%%VERSION%%
+%%CELT%%lib/opal-%%VERSION%%/codecs/audio/celt_ptplugin.so
+lib/opal-%%VERSION%%/codecs/audio/g7221_ptplugin.so
+lib/opal-%%VERSION%%/codecs/audio/g7222_ptplugin.so
+lib/opal-%%VERSION%%/codecs/audio/g722_ptplugin.so
+lib/opal-%%VERSION%%/codecs/audio/g726_ptplugin.so
+lib/opal-%%VERSION%%/codecs/audio/gsm0610_ptplugin.so
+lib/opal-%%VERSION%%/codecs/audio/iLBC_ptplugin.so
+lib/opal-%%VERSION%%/codecs/audio/ima_adpcm_ptplugin.so
+lib/opal-%%VERSION%%/codecs/audio/lpc10_ptplugin.so
+lib/opal-%%VERSION%%/codecs/audio/silk_ptplugin.so
+lib/opal-%%VERSION%%/codecs/audio/speex_ptplugin.so
+lib/opal-%%VERSION%%/codecs/video/h261_vic_ptplugin.so
+lib/opal-%%VERSION%%/codecs/video/h263_ffmpeg_ptplugin.so
+lib/opal-%%VERSION%%/codecs/video/h264_video_pwplugin_helper
+lib/opal-%%VERSION%%/codecs/video/h264_x264_ptplugin.so
+lib/opal-%%VERSION%%/codecs/video/mpeg4_ffmpeg_ptplugin.so
+%%THEORA%%lib/opal-%%VERSION%%/codecs/video/theora_ptplugin.so
+%%FAX%%lib/opal-%%VERSION%%/fax/spandsp_ptplugin.so
+%%LID%%lib/opal-%%VERSION%%/lid/vpb_ptplugin.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%%
+%%FAX%%@dirrm lib/opal-%%VERSION%%/fax
+%%VIDEO%%@dirrm lib/opal-%%VERSION%%/codecs/video
+@dirrm lib/opal-%%VERSION%%/codecs/audio
+@dirrm lib/opal-%%VERSION%%/codecs
+@dirrm lib/opal-%%VERSION%%
 @dirrm include/opal/zrtp
 @dirrm include/opal/t38
 @dirrm include/opal/t120
diff --git a/net/opal3/distinfo b/net/opal3/distinfo
deleted file mode 100644
index e78965d9b2cb..000000000000
--- a/net/opal3/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index 1d52232f1d6c..000000000000
--- a/net/opal3/files/patch-Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
---- Makefile.in.orig	2013-03-21 10:43:22.000000000 +0100
-+++ Makefile.in	2013-03-21 10:44:48.000000000 +0100
-@@ -549,8 +549,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)$(prefix)/libdata/pkgconfig ; chmod 755 $(DESTDIR)$(prefix)/libdata/pkgconfig
- 	$(INSTALL) -m 644 opal.pc $(DESTDIR)$(prefix)/libdata/pkgconfig
- 
diff --git a/net/opal3/files/patch-configure b/net/opal3/files/patch-configure
deleted file mode 100644
index 0686bafad330..000000000000
--- a/net/opal3/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	2012-01-26 02:29:34.000000000 -0600
-+++ configure	2012-01-26 02:30:16.000000000 -0600
-@@ -4636,7 +4636,7 @@
- MACHTYPE=
- case "$target_cpu" in
-    x86 | i686 | i586 | i486 | i386 )                    MACHTYPE=x86;        ;;
--   x86_64)	                                        MACHTYPE=x86_64;     ;;
-+   amd64 | x86_64)                                      MACHTYPE=x86_64;     ;;
-    alpha | alphaev56 | alphaev6 | alphaev67 | alphaev7) MACHTYPE=alpha;      ;;
-    hppa )                                               MACHTYPE=hppa;       ;;
-    hppa64 )                                             MACHTYPE=hppa64;     ;;
diff --git a/net/opal3/files/patch-configure-spandsp b/net/opal3/files/patch-configure-spandsp
deleted file mode 100644
index 88424a0b7e54..000000000000
--- a/net/opal3/files/patch-configure-spandsp
+++ /dev/null
@@ -1,56 +0,0 @@
---- 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-include_h323_h323ep.h b/net/opal3/files/patch-include_h323_h323ep.h
deleted file mode 100644
index 4bcb555138fc..000000000000
--- a/net/opal3/files/patch-include_h323_h323ep.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- include/h323/h323ep.h.orig	2010-06-29 22:41:03.000000000 +0400
-+++ include/h323/h323ep.h	2010-06-29 22:41:17.000000000 +0400
-@@ -49,6 +49,7 @@
- #include <h323/h323con.h>
- #include <h323/h323caps.h>
- #include <h323/h235auth.h>
-+#include <asn/h225.h>
- 
- #if OPAL_H460
- #include <h460/h4601.h>
diff --git a/net/opal3/files/patch-includes_video_rfc2190.cxx b/net/opal3/files/patch-includes_video_rfc2190.cxx
deleted file mode 100644
index 02b026280223..000000000000
--- a/net/opal3/files/patch-includes_video_rfc2190.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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-plugins-audio-celt-celtcodec.c b/net/opal3/files/patch-plugins-audio-celt-celtcodec.c
deleted file mode 100644
index 823bca9cfb3c..000000000000
--- a/net/opal3/files/patch-plugins-audio-celt-celtcodec.c
+++ /dev/null
@@ -1,56 +0,0 @@
---- ./plugins/audio/celt/celtcodec.c.orig	2009-09-22 02:57:45.000000000 +0200
-+++ ./plugins/audio/celt/celtcodec.c	2011-04-12 12:26:00.485668577 +0200
-@@ -52,12 +52,12 @@
- {
-   int error = 0;
- 
--  celt->mode = celt_mode_create(codec->sampleRate, 1, codec->parm.audio.samplesPerFrame, &error);
-+  celt->mode = celt_mode_create(codec->sampleRate, codec->parm.audio.samplesPerFrame, &error);
-   if (celt->mode == NULL) {
-     return FALSE;
-   }
- 
--  celt_mode_info(celt->mode, CELT_GET_FRAME_SIZE, &celt->frame_size);
-+  celt->frame_size = 960; /* default from tools/celtenc.c */
-   celt->bytes_per_packet = (codec->bitsPerSec * celt->frame_size/codec->sampleRate + 4) / 8;
- 
-   return TRUE;
-@@ -74,7 +74,7 @@
-     return NULL;
-   }
-  	
--  celt->encoder_state = celt_encoder_create(celt->mode);
-+  celt->encoder_state = celt_encoder_create(celt->mode, 1, NULL);
-   if (celt->encoder_state == NULL ) {
-     celt_mode_destroy(celt->mode);
-     free(celt);
-@@ -96,7 +96,7 @@
-     return NULL;
-   }
- 
--  celt->decoder_state = celt_decoder_create(celt->mode);
-+  celt->decoder_state = celt_decoder_create(celt->mode, 1, NULL);
-   if (celt->decoder_state == NULL ) {
-     celt_mode_destroy(celt->mode);
-     free(celt);
-@@ -143,9 +143,9 @@
-     return FALSE;
- 
- #ifdef HAVE_CELT_0_5_0_OR_LATER
--  byteCount = celt_encode(celt->encoder_state, (celt_int16_t *)fromPtr, NULL, (char *)toPtr, celt->bytes_per_packet);
-+  byteCount = celt_encode(celt->encoder_state, (celt_int16 *)fromPtr, celt->frame_size, (char *)toPtr, celt->bytes_per_packet);
- #else
--  byteCount = celt_encode(celt->encoder_state, (celt_int16_t *)fromPtr, (char *)toPtr, celt->bytes_per_packet);
-+  byteCount = celt_encode(celt->encoder_state, (celt_int16 *)fromPtr, (char *)toPtr, celt->bytes_per_packet);
- #endif
-   if (byteCount < 0) {
- 	return 0;
-@@ -173,7 +173,7 @@
-   if (*fromLen == 0)
-     return FALSE;
- 
--  if (celt_decode(celt->decoder_state, (char *)fromPtr, *fromLen, (short *)toPtr) < 0) {
-+  if (celt_decode(celt->decoder_state, (char *)fromPtr, *fromLen, (short *)toPtr, celt->frame_size) < 0) {
-     return 0;
-   }
- 
diff --git a/net/opal3/files/patch-plugins-video-MPEG4-ffmpeg-mpeg4.cxx b/net/opal3/files/patch-plugins-video-MPEG4-ffmpeg-mpeg4.cxx
deleted file mode 100644
index b7a500489cb2..000000000000
--- a/net/opal3/files/patch-plugins-video-MPEG4-ffmpeg-mpeg4.cxx
+++ /dev/null
@@ -1,14 +0,0 @@
---- plugins/video/MPEG4-ffmpeg/mpeg4.cxx.orig	2011-06-25 11:31:14.153034898 +0200
-+++ plugins/video/MPEG4-ffmpeg/mpeg4.cxx	2011-06-25 11:32:04.791577475 +0200
-@@ -830,10 +830,10 @@
-         {
-             _avpicture->pict_type = FF_I_TYPE;
-         }
-         else // No IFrame requested, let avcodec decide what to do
-         {
--            _avpicture->pict_type = 0;
-+            _avpicture->pict_type = AV_PICTURE_TYPE_NONE;
-         }
- 
-         // Encode a frame
-         int total = FFMPEGLibraryInstance.AvcodecEncodeVideo
diff --git a/net/opal3/files/patch-plugins-video-h.263-1998-h.263-1998.cxx b/net/opal3/files/patch-plugins-video-h.263-1998-h.263-1998.cxx
deleted file mode 100644
index 9a75cf7c4962..000000000000
--- a/net/opal3/files/patch-plugins-video-h.263-1998-h.263-1998.cxx
+++ /dev/null
@@ -1,20 +0,0 @@
---- plugins/video/H.263-1998/h263-1998.cxx.orig	2009-09-22 02:57:52.000000000 +0200
-+++ plugins/video/H.263-1998/h263-1998.cxx	2011-06-25 11:37:56.719449353 +0200
-@@ -688,7 +688,7 @@
- 
-   _inputFrame->data[1] = _inputFrame->data[0] + size;
-   _inputFrame->data[2] = _inputFrame->data[1] + (size / 4);
--  _inputFrame->pict_type = (flags && forceIFrame) ? FF_I_TYPE : 0;
-+  _inputFrame->pict_type = (flags && forceIFrame) ? FF_I_TYPE : AV_PICTURE_TYPE_NONE;
- 
-   currentMb = 0;
-   currentBytes = 0;
-@@ -885,7 +886,7 @@
-   _inputFrame->data[0] = _inputFrameBuffer + FF_INPUT_BUFFER_PADDING_SIZE;
-   _inputFrame->data[1] = _inputFrame->data[0] + size;
-   _inputFrame->data[2] = _inputFrame->data[1] + (size / 4);
--  _inputFrame->pict_type = (flags && forceIFrame) ? FF_I_TYPE : 0;
-+  _inputFrame->pict_type = (flags && forceIFrame) ? FF_I_TYPE : AV_PICTURE_TYPE_NONE;
-  
-   _txH263PFrame->BeginNewFrame();
-   _txH263PFrame->SetTimestamp(srcRTP.GetTimestamp());
diff --git a/net/opal3/files/patch-plugins_configure b/net/opal3/files/patch-plugins_configure
deleted file mode 100644
index e81bd1893ba1..000000000000
--- a/net/opal3/files/patch-plugins_configure
+++ /dev/null
@@ -1,144 +0,0 @@
---- 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_fax.cpp b/net/opal3/files/patch-spandsp_fax.cpp
deleted file mode 100644
index a5652224f0a5..000000000000
--- a/net/opal3/files/patch-spandsp_fax.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- plugins/fax/fax_spandsp/spandsp_fax.cpp.orig	2011-12-26 21:02:09.000000000 +0000
-+++ plugins/fax/fax_spandsp/spandsp_fax.cpp	2011-12-26 21:01:38.000000000 +0000
-@@ -42,6 +42,7 @@
-  *
-  */
- 
-+#define __STDC_LIMIT_MACROS
- #include <codec/opalplugin.h>
- 
- extern "C" {
diff --git a/net/opal3/files/patch-spandsp_if.cpp b/net/opal3/files/patch-spandsp_if.cpp
deleted file mode 100644
index a130da05758f..000000000000
--- a/net/opal3/files/patch-spandsp_if.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- plugins/fax/fax_spandsp/spandsp_util/spandsp_if.cpp.orig	2011-12-26 21:04:48.000000000 +0000
-+++ plugins/fax/fax_spandsp/spandsp_util/spandsp_if.cpp	2011-12-26 21:05:21.000000000 +0000
-@@ -23,6 +23,7 @@
-  * $Id: spandsp_if.cpp,v 1.7 2007/07/24 04:39:44 csoutheren Exp $
-  */
- 
-+#define __STDC_LIMIT_MACROS
- #include "spandsp_if.h"
- 
- #include <iostream>
author	kwm <kwm@FreeBSD.org>	2013-09-21 05:50:39 +0800
committer	kwm <kwm@FreeBSD.org>	2013-09-21 05:50:39 +0800
commit	7886f477be92414f643a2d7504d632aef3cf9501 (patch)
tree	c62b4e58e684a810c47846f1e9a173a16b0d27d1
parent	a9210df4691ddad7f7398bd6dc25d23ecd6d1b69 (diff)
download	freebsd-ports-gnome-7886f477be92414f643a2d7504d632aef3cf9501.tar.gz freebsd-ports-gnome-7886f477be92414f643a2d7504d632aef3cf9501.tar.zst freebsd-ports-gnome-7886f477be92414f643a2d7504d632aef3cf9501.zip