Update ekiga to 3.2.0.

* Changes in ekiga 3.2.0 (2009-03-16)
- Fix some NAT related issues (use internal port instead of external
  port in Cone NAT)
- Uniformise detection of libnotify; fix compilation with mingw
- Fix "URL completion combobox shows identical completions"
- Fix "Assistant loosing values when going backward"
- Fix GmConf settings when compiled with another package name
- Fix unregistration of accounts
- Fix build with -enable-kde
- Fix OS X build
- Fix a crash in chat
- New translations: crh, or
- Updated translations: as, bg, bn_IN, da, de, el, eu, gl, gu, hi, hu,
  ja, kn, ko, ku, lt, ml, mr, or, pt, ro, ru, ta, te, tr
- New help translation: en_GB
- Updated help translation: fr

* Changes in ekiga 3.1.2 (2009-03-03)
- Removal of the old H.263 ffmpeg plug in and enhancement of the
  H.263-1998 plug in to take its place.
- Allow compilation with CELT 0.4 and 0.5
- Allow several ALSA devices to have the same name
- STUN enabling/disabling has been readded to the GUI
- Remove white spaces from the URI (useful when copy/paste)
- Clear the URI edit box after a call
- Fixed crash when clearing call history
- Fix Windows compilation
- Fixes for tarball generation
- Fixed account data corruption when the authentication user name is
  left blank
- Fixed possible crash when answering incoming calls
- Fixed G.722 usage
- Other various fixes, cleanups, removal of deprecated symbols etc.
- Updated translations: ca, cs, da, el, en_GB, es, eu, fi, fr, he, hu,
  it, ja, ko, kn, nb, nl, pl, pt_BR, sl, sv, th, vi, zh_HK, zh_TW
- New help/eu localisation
Experimental features:
- Significant improvements in IPv6 support
- Gstreamer audio and video capture support near to be finished...

* ekiga 3.1.1 unreleased

* Changes in ekiga 3.1.0 (2009-01-05)
- Added support for G.722 and CELT audio wideband codecs
- Added support for H.263
- Added support for SIP dialog-info notifications, it allows being
  notified of incoming calls for the phones of your colleagues with
  software like Asterisk
- Added support to disable STUN detection
- Improved LDAP support in the address book, authentication is now
  possible
- Killed the gconf_test_age test, Ekiga can now finally work with
  badly installed GConf schemas
- More efficient memory handling using gmref_ptr, increases stability
- Better handling of multiple network interfaces with dynamic addition
  and removal
- libgnome is not required anymore when using GTK+ 2.14
- Many code cleanups, new GObjects, ...
- Work in progress : XCAP support, Resource List support, GStreamer
  audio and video capture support, ...

5 files changed, 130 insertions, 8 deletions

diff --git a/net/ekiga/Makefile b/net/ekiga/Makefile
index 0c9dc115468..9205e5d6971 100644
--- a/net/ekiga/Makefile
+++ b/net/ekiga/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2009/01/13 03:23:51 jmcneill Exp $
+# $NetBSD: Makefile,v 1.7 2009/03/18 13:08:07 jmcneill Exp $
 #
 
-DISTNAME=		ekiga-3.0.2
+DISTNAME=		ekiga-3.2.0
 CATEGORIES=		net comms
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/ekiga/3.0/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/ekiga/3.2/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
@@ -14,9 +14,11 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_DIRS+=		gnome2-1.5
 USE_TOOLS+=		gmake intltool msgfmt pkg-config
+USE_TOOLS+=		autoconf
 USE_PKGLOCALEDIR=	yes
 
 CONFIGURE_ARGS+=	--with-ldap-dir=${BUILDLINK_PREFIX.openldap-client:Q}
+CONFIGURE_ARGS+=	--enable-gstreamer
 
 PKG_OPTIONS_VAR=        PKG_OPTIONS.ekiga
 PKG_SUPPORTED_OPTIONS+= avahi
@@ -35,6 +37,17 @@ GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
 USE_LANGUAGES=		c c++
 
+# The gettext version in pkgsrc cannot handle the .po files, so
+# we strip out usage of the newer features (context and fuzzy matches)
+post-patch:
+	for f in ${WRKSRC}/po/*.po ${WRKSRC}/help/*/*.po ; do \
+		mv $$f $$f.original ; \
+		${AWK} -f ${FILESDIR}/msgfmtstrip $$f.original > $$f ; \
+	done
+
+pre-configure:
+	cd ${WRKSRC} && autoconf
+
 .include "../../audio/esound/buildlink3.mk"
 .include "../../databases/openldap-client/buildlink3.mk"
 .include "../../devel/GConf/schemas.mk"
@@ -49,6 +62,9 @@ USE_LANGUAGES=		c c++
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/libv4l/buildlink3.mk"
 .include "../../mail/evolution-data-server/buildlink3.mk"
+.include "../../multimedia/gstreamer0.10/buildlink3.mk"
+.include "../../multimedia/gst-plugins0.10-base/buildlink3.mk"
+.include "../../security/cyrus-sasl/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../sysutils/dbus/buildlink3.mk"
 .include "../../sysutils/libnotify/buildlink3.mk"
diff --git a/net/ekiga/PLIST b/net/ekiga/PLIST
index 7943d8ae8da..1e5f8a65426 100644
--- a/net/ekiga/PLIST
+++ b/net/ekiga/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2009/01/13 03:23:51 jmcneill Exp $
+@comment $NetBSD: PLIST,v 1.3 2009/03/18 13:08:07 jmcneill Exp $
 bin/ekiga
 bin/ekiga-config-tool
 bin/ekiga-helper
@@ -37,6 +37,21 @@ share/gnome/help/ekiga/bg/figures/config_d6.png
 share/gnome/help/ekiga/bg/figures/config_d7.png
 share/gnome/help/ekiga/bg/figures/config_d8.png
 share/gnome/help/ekiga/bg/figures/lumi.png
+share/gnome/help/ekiga/ca/ekiga.xml
+share/gnome/help/ekiga/ca/figures/accounts_d1.png
+share/gnome/help/ekiga/ca/figures/accounts_h323.png
+share/gnome/help/ekiga/ca/figures/accounts_sip.png
+share/gnome/help/ekiga/ca/figures/audio_codecs.png
+share/gnome/help/ekiga/ca/figures/call_d1.png
+share/gnome/help/ekiga/ca/figures/config_d1.png
+share/gnome/help/ekiga/ca/figures/config_d2.png
+share/gnome/help/ekiga/ca/figures/config_d3.png
+share/gnome/help/ekiga/ca/figures/config_d4.png
+share/gnome/help/ekiga/ca/figures/config_d5.png
+share/gnome/help/ekiga/ca/figures/config_d6.png
+share/gnome/help/ekiga/ca/figures/config_d7.png
+share/gnome/help/ekiga/ca/figures/config_d8.png
+share/gnome/help/ekiga/ca/figures/lumi.png
 share/gnome/help/ekiga/de/ekiga.xml
 share/gnome/help/ekiga/de/figures/accounts_d1.png
 share/gnome/help/ekiga/de/figures/accounts_h323.png
@@ -67,6 +82,21 @@ share/gnome/help/ekiga/el/figures/config_d6.png
 share/gnome/help/ekiga/el/figures/config_d7.png
 share/gnome/help/ekiga/el/figures/config_d8.png
 share/gnome/help/ekiga/el/figures/lumi.png
+share/gnome/help/ekiga/en_GB/ekiga.xml
+share/gnome/help/ekiga/en_GB/figures/accounts_d1.png
+share/gnome/help/ekiga/en_GB/figures/accounts_h323.png
+share/gnome/help/ekiga/en_GB/figures/accounts_sip.png
+share/gnome/help/ekiga/en_GB/figures/audio_codecs.png
+share/gnome/help/ekiga/en_GB/figures/call_d1.png
+share/gnome/help/ekiga/en_GB/figures/config_d1.png
+share/gnome/help/ekiga/en_GB/figures/config_d2.png
+share/gnome/help/ekiga/en_GB/figures/config_d3.png
+share/gnome/help/ekiga/en_GB/figures/config_d4.png
+share/gnome/help/ekiga/en_GB/figures/config_d5.png
+share/gnome/help/ekiga/en_GB/figures/config_d6.png
+share/gnome/help/ekiga/en_GB/figures/config_d7.png
+share/gnome/help/ekiga/en_GB/figures/config_d8.png
+share/gnome/help/ekiga/en_GB/figures/lumi.png
 share/gnome/help/ekiga/es/ekiga.xml
 share/gnome/help/ekiga/es/figures/accounts_d1.png
 share/gnome/help/ekiga/es/figures/accounts_h323.png
@@ -82,6 +112,21 @@ share/gnome/help/ekiga/es/figures/config_d6.png
 share/gnome/help/ekiga/es/figures/config_d7.png
 share/gnome/help/ekiga/es/figures/config_d8.png
 share/gnome/help/ekiga/es/figures/lumi.png
+share/gnome/help/ekiga/eu/ekiga.xml
+share/gnome/help/ekiga/eu/figures/accounts_d1.png
+share/gnome/help/ekiga/eu/figures/accounts_h323.png
+share/gnome/help/ekiga/eu/figures/accounts_sip.png
+share/gnome/help/ekiga/eu/figures/audio_codecs.png
+share/gnome/help/ekiga/eu/figures/call_d1.png
+share/gnome/help/ekiga/eu/figures/config_d1.png
+share/gnome/help/ekiga/eu/figures/config_d2.png
+share/gnome/help/ekiga/eu/figures/config_d3.png
+share/gnome/help/ekiga/eu/figures/config_d4.png
+share/gnome/help/ekiga/eu/figures/config_d5.png
+share/gnome/help/ekiga/eu/figures/config_d6.png
+share/gnome/help/ekiga/eu/figures/config_d7.png
+share/gnome/help/ekiga/eu/figures/config_d8.png
+share/gnome/help/ekiga/eu/figures/lumi.png
 share/gnome/help/ekiga/fi/ekiga.xml
 share/gnome/help/ekiga/fi/figures/accounts_d1.png
 share/gnome/help/ekiga/fi/figures/accounts_h323.png
@@ -204,6 +249,7 @@ 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/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
@@ -247,6 +293,7 @@ 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
@@ -274,9 +321,12 @@ share/locale/zh_HK/LC_MESSAGES/ekiga.mo
 share/locale/zh_TW/LC_MESSAGES/ekiga.mo
 share/omf/ekiga/ekiga-C.omf
 share/omf/ekiga/ekiga-bg.omf
+share/omf/ekiga/ekiga-ca.omf
 share/omf/ekiga/ekiga-de.omf
 share/omf/ekiga/ekiga-el.omf
+share/omf/ekiga/ekiga-en_GB.omf
 share/omf/ekiga/ekiga-es.omf
+share/omf/ekiga/ekiga-eu.omf
 share/omf/ekiga/ekiga-fi.omf
 share/omf/ekiga/ekiga-fr.omf
 share/omf/ekiga/ekiga-oc.omf
@@ -295,6 +345,22 @@ share/sounds/ekiga/voicemail.wav
 @dirrm share/pixmaps/ekiga
 @comment in xdg-dirs: @dirrm share/pixmaps
 @dirrm share/omf/ekiga
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/72x72/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/72x72
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/64x64/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/64x64
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/48x48/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/48x48
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/32x32/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/32x32
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/22x22/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/22x22
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/16x16/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/16x16
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/128x128/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/128x128
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor
+@comment in xdg-dirs: @dirrm share/icons
 @dirrm share/gnome/help/ekiga/uk/figures
 @dirrm share/gnome/help/ekiga/uk
 @dirrm share/gnome/help/ekiga/sv/figures
@@ -309,18 +375,26 @@ share/sounds/ekiga/voicemail.wav
 @dirrm share/gnome/help/ekiga/fr
 @dirrm share/gnome/help/ekiga/fi/figures
 @dirrm share/gnome/help/ekiga/fi
+@dirrm share/gnome/help/ekiga/eu/figures
+@dirrm share/gnome/help/ekiga/eu
 @dirrm share/gnome/help/ekiga/es/figures
 @dirrm share/gnome/help/ekiga/es
+@dirrm share/gnome/help/ekiga/en_GB/figures
+@dirrm share/gnome/help/ekiga/en_GB
 @dirrm share/gnome/help/ekiga/el/figures
 @dirrm share/gnome/help/ekiga/el
 @dirrm share/gnome/help/ekiga/de/figures
 @dirrm share/gnome/help/ekiga/de
+@dirrm share/gnome/help/ekiga/ca/figures
+@dirrm share/gnome/help/ekiga/ca
 @dirrm share/gnome/help/ekiga/bg/figures
 @dirrm share/gnome/help/ekiga/bg
 @dirrm share/gnome/help/ekiga/C/figures
 @dirrm share/gnome/help/ekiga/C
 @dirrm share/gnome/help/ekiga
 @comment in gnome2-dirs: @dirrm share/gnome/help
+@comment in gnome2-dirs: @dirrm share/gnome
 @comment in GConf: @dirrm share/gconf/schemas
 @comment in dbus: @dirrm share/dbus-1/services
+@comment in dbus: @dirrm share/dbus-1
 @comment in xdg-dirs: @dirrm share/applications
diff --git a/net/ekiga/distinfo b/net/ekiga/distinfo
index 27cce3bdd1c..71677852b0c 100644
--- a/net/ekiga/distinfo
+++ b/net/ekiga/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.4 2009/01/13 03:23:51 jmcneill Exp $
+$NetBSD: distinfo,v 1.5 2009/03/18 13:08:07 jmcneill Exp $
 
-SHA1 (ekiga-3.0.2.tar.bz2) = a89e2b493a1fcc518ffa2af36f6ffb2955bc2090
-RMD160 (ekiga-3.0.2.tar.bz2) = 997b890f5a18ae89020f7511db977f5ae0561ba2
-Size (ekiga-3.0.2.tar.bz2) = 7142789 bytes
+SHA1 (ekiga-3.2.0.tar.bz2) = 6a8d6f203cd982cbfb37822b2a96f176176cd763
+RMD160 (ekiga-3.2.0.tar.bz2) = f31e94dbe03038e39fb5b50bd71372992c13ae8b
+Size (ekiga-3.2.0.tar.bz2) = 7679645 bytes
+SHA1 (patch-aa) = feecff1e35c7c55d63354393f2d4c4d14e36a57d
diff --git a/net/ekiga/files/msgfmtstrip b/net/ekiga/files/msgfmtstrip
new file mode 100644
index 00000000000..9f1880d4945
--- /dev/null
+++ b/net/ekiga/files/msgfmtstrip
@@ -0,0 +1,18 @@
+# $Id: msgfmtstrip,v 1.1 2009/03/18 13:08:07 jmcneill Exp $
+# Simple awk script to strip out .po entries with "msgctxt" or "#~|", so the
+# resultant file can be handled by the msgfmt 0.14.4 in NetBSD 4.0
+{
+if (/^$/) { entry_end(); }
+else if ($1 == "msgctxt" || $2 == "msgctxt") { skip = 1; }
+else if ($1 == "#~|") { skip = 1; }
+else { entry = entry $0 "\n" }
+}
+
+END { entry_end(); }
+
+function entry_end() {
+    if (!skip)
+	print entry;
+    entry = "";
+    skip = 0;
+}
diff --git a/net/ekiga/patches/patch-aa b/net/ekiga/patches/patch-aa
new file mode 100644
index 00000000000..91936c9f907
--- /dev/null
+++ b/net/ekiga/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.3 2009/03/18 13:08:07 jmcneill Exp $
+
+--- configure.ac.orig	2009-03-16 17:42:46.000000000 -0400
++++ configure.ac
+@@ -340,6 +340,8 @@ if test "x$enable_ldap" = "xyes"; then
+   AC_SUBST(LDAP_LIBS)
+   LDAP="enabled"
+   AC_DEFINE(HAVE_LDAP,1,[LDAP support])
++
++  LDAP_LIBS="${LDAP_LIBS} -lsasl2"
+ fi
+ 
+ AM_CONDITIONAL(HAVE_LDAP, test "x$found_ldap" = "xyes")