Sync with FreeBSD ports.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@9033 df743ca5-7f9a-e211-a948-0013205c9059

3 files changed, 42 insertions, 9 deletions

diff --git a/net/ekiga/Makefile b/net/ekiga/Makefile
index 6a960517d..3a23576a8 100644
--- a/net/ekiga/Makefile
+++ b/net/ekiga/Makefile
@@ -6,16 +6,19 @@
 #
 
 PORTNAME=	ekiga
-PORTVERSION=	2.0.4
-PORTREVISION=	3
+PORTVERSION=	2.0.9
+PORTREVISION=	1
 CATEGORIES=	net gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.0
 
-MAINTAINER=	jbq@caraldi.com
+MAINTAINER=	mi@aldan.algebra.com
 COMMENT=	VoIP phone for GNOME
 
-LIB_DEPENDS=	opal_r.2:${PORTSDIR}/net/opal
+OPTIONS=	AVAHI	"Support Avahi for service discovery on LAN" on \
+		DBUS	"Use D-BUS for interprocess communication" on
+
+LIB_DEPENDS=	opal_r:${PORTSDIR}/net/opal
 
 USE_BZIP2=	yes
 USE_XLIB=	yes
@@ -34,17 +37,25 @@ CONFIGURE_ARGS=	--with-pwlib-dir=${LOCALBASE} \
 GCONF_SCHEMAS=	ekiga.schemas
 MAN1=		ekiga.1
 
+pre-configure:
+	${REINPLACE_CMD} -e "s,PWLIB_REC_VERSION=.*,PWLIB_REC_VERSION=`ptlib-config \
+			--version`," \
+	    -e "s,OPAL_REC_VERSION=.*,OPAL_REC_VERSION=`${AWK} \
+	    		'/define OPAL_VERSION/ \
+	    		{printf $$NF}' ${LOCALBASE}/include/opal/opal/buildopts.h`," \
+	    ${WRKSRC}/configure
+
 .include <bsd.port.pre.mk>
 
 .ifndef (WITHOUT_AVAHI)
-LIB_DEPENDS+=	avahi-core.5:${PORTSDIR}/net/avahi
+LIB_DEPENDS+=	avahi-core:${PORTSDIR}/net/avahi
 CONFIGURE_ARGS+=--enable-avahi
 .else
 CONFIGURE_ARGS+=--disable-avahi
 .endif
 
 .ifndef (WITHOUT_DBUS)
-LIB_DEPENDS+=	dbus-1.3:${PORTSDIR}/devel/dbus
+LIB_DEPENDS+=	dbus-1:${PORTSDIR}/devel/dbus
 CONFIGURE_ARGS+=--enable-dbus
 PLIST_SUB+=	DBUS:=""
 .else
diff --git a/net/ekiga/distinfo b/net/ekiga/distinfo
index 358983a3c..543195451 100644
--- a/net/ekiga/distinfo
+++ b/net/ekiga/distinfo
@@ -1,3 +1,3 @@
-MD5 (ekiga-2.0.4.tar.bz2) = b06ad9538c064e5475f5b29b80d6fbf5
-SHA256 (ekiga-2.0.4.tar.bz2) = f617d2f4a0e2e1a4a9d4b95be43c781c5fe5c5be90f7a552fd830dc86ac3ddab
-SIZE (ekiga-2.0.4.tar.bz2) = 5459800
+MD5 (ekiga-2.0.9.tar.bz2) = 6c7a01faef8203d6f0ba0dfe6188bb1a
+SHA256 (ekiga-2.0.9.tar.bz2) = 686b303f807460cd5486dab07654a7f76acaee44db640748b62dd0326f15ec72
+SIZE (ekiga-2.0.9.tar.bz2) = 5530540
diff --git a/net/ekiga/pkg-plist b/net/ekiga/pkg-plist
index 459e0881e..111b4da66 100644
--- a/net/ekiga/pkg-plist
+++ b/net/ekiga/pkg-plist
@@ -24,6 +24,25 @@ share/gnome/help/ekiga/C/figures/config_d8.png
 share/gnome/help/ekiga/C/figures/config_d9.png
 share/gnome/help/ekiga/C/figures/lumi.png
 share/gnome/help/ekiga/C/figures/stats.png
+share/gnome/help/ekiga/pt_BR/ekiga.xml
+share/gnome/help/ekiga/pt_BR/figures/accounts_d1.png
+share/gnome/help/ekiga/pt_BR/figures/accounts_h323.png
+share/gnome/help/ekiga/pt_BR/figures/accounts_sip.png
+share/gnome/help/ekiga/pt_BR/figures/audio_codecs.png
+share/gnome/help/ekiga/pt_BR/figures/call_d1.png
+share/gnome/help/ekiga/pt_BR/figures/chat_d1.png
+share/gnome/help/ekiga/pt_BR/figures/config_d1.png
+share/gnome/help/ekiga/pt_BR/figures/config_d10.png
+share/gnome/help/ekiga/pt_BR/figures/config_d2.png
+share/gnome/help/ekiga/pt_BR/figures/config_d3.png
+share/gnome/help/ekiga/pt_BR/figures/config_d4.png
+share/gnome/help/ekiga/pt_BR/figures/config_d5.png
+share/gnome/help/ekiga/pt_BR/figures/config_d6.png
+share/gnome/help/ekiga/pt_BR/figures/config_d7.png
+share/gnome/help/ekiga/pt_BR/figures/config_d8.png
+share/gnome/help/ekiga/pt_BR/figures/config_d9.png
+share/gnome/help/ekiga/pt_BR/figures/lumi.png
+share/gnome/help/ekiga/pt_BR/figures/stats.png
 share/gnome/help/ekiga/bg/ekiga.xml
 share/gnome/help/ekiga/bg/figures/accounts_d1.png
 share/gnome/help/ekiga/bg/figures/accounts_h323.png
@@ -143,6 +162,7 @@ share/omf/ekiga/ekiga-bg.omf
 share/omf/ekiga/ekiga-de.omf
 share/omf/ekiga/ekiga-es.omf
 share/omf/ekiga/ekiga-fr.omf
+share/gnome/omf/ekiga/ekiga-pt_BR.omf
 share/omf/ekiga/ekiga-sv.omf
 share/omf/ekiga/ekiga-uk.omf
 share/pixmaps/ekiga.png
@@ -231,6 +251,8 @@ share/locale/zh_TW/LC_MESSAGES/ekiga.mo
 @dirrm share/gnome/help/ekiga/uk
 @dirrm share/gnome/help/ekiga/sv/figures
 @dirrm share/gnome/help/ekiga/sv
+@dirrm share/gnome/help/ekiga/pt_BR/figures
+@dirrm share/gnome/help/ekiga/pt_BR
 @dirrm share/gnome/help/ekiga/fr/figures
 @dirrm share/gnome/help/ekiga/fr
 @dirrm share/gnome/help/ekiga/es/figures