Upgrade to 0.94.1 which uses the gnome 2 libs.

This version works behind NAT with basic port forwarding.

9 files changed, 186 insertions, 111 deletions

diff --git a/net/ekiga/Makefile b/net/ekiga/Makefile
index d9dffed091fe..ccc45c4bc034 100644
--- a/net/ekiga/Makefile
+++ b/net/ekiga/Makefile
@@ -6,15 +6,13 @@
 #
 
 PORTNAME=	gnomemeeting
-PORTVERSION=	0.85.1
-PORTREVISION=	4
+PORTVERSION=	0.94.1
 CATEGORIES=	net gnome
-MASTER_SITES=	http://www.gnomemeeting.org/downloads/0.85/sources/
-DISTNAME=	GnomeMeeting-0.85.1
+MASTER_SITES=	http://www.gnomemeeting.org/downloads/0.94.1/sources/
 
 MAINTAINER=	roger@FreeBSD.org
 
-LIB_DEPENDS=	ldap.1:${PORTSDIR}/net/openldap
+LIB_DEPENDS=	ldap.2:${PORTSDIR}/net/openldap2
 BUILD_DEPENDS=  ${NONEXISTENT}:${PORTSDIR}/net/openh323:build
 
 # note, we do not want to clean openh323, otherwise it has to build
@@ -22,19 +20,26 @@ BUILD_DEPENDS=  ${NONEXISTENT}:${PORTSDIR}/net/openh323:build
 NOCLEANDEPENDS= yes
 
 USE_X_PREFIX=	yes
-USE_BISON=	yes
-USE_AUTOCONF=	yes		# we need this so configure is regenerated
-USE_GNOMENG=	yes
-USE_GNOME=	gnomecanvas gnomelibs gnomehack gnomeprefix gconf
 USE_GMAKE=	yes
-CONFIGURE_ARGS=	--with-ptlib-includes=${WRKDIRPREFIX}${.CURDIR}/../openh323/work/pwlib/include/ptlib \
+USE_GNOMENG=	yes
+USE_GNOME=	gdkpixbuf gnomelibs gnomehack gnomeprefix gconf bonobo esound
+USE_BISON=	yes
+# Clear configure target so we stop getting binaries prefixed with i386-portbld-freebsd46
+CONFIGURE_TARGET=
+GNU_CONFIGURE=	YES
+CONFIGURE_ENV=  OSTYPE=${OPSYS} \
+		LIBS="-L${PREFIX}/lib -L${LOCALBASE}/lib" \
+		PTLIBDIR=${WRKDIRPREFIX}${.CURDIR}/../openh323/work/pwlib \
+		OPENH323DIR=${WRKDIRPREFIX}${.CURDIR}/../openh323/work/openh323 \
+		SDL_CONFIG=${LOCALBASE}/bin/sdl11-config \
+		CPPFLAGS="-I${LOCALBASE}/include"
+
+CONFIGURE_ARGS= --with-ptlib-includes=${WRKDIRPREFIX}${.CURDIR}/../openh323/work/pwlib/include/ptlib \
 		--with-ptlib-libs=${WRKDIRPREFIX}${.CURDIR}/../openh323/work/pwlib/lib \
 		--with-openh323-includes=${WRKDIRPREFIX}${.CURDIR}/../openh323/work/openh323/include \
 		--with-openh323-libs=${WRKDIRPREFIX}${.CURDIR}/../openh323/work/openh323/lib \
-		--with-ldap=${LOCALBASE}
-CONFIGURE_ENV=	OSTYPE=${OPSYS} \
-		LIBS=-L${PREFIX}/lib \
-		PTLIBDIR=${WRKDIRPREFIX}${.CURDIR}/../openh323/work/pwlib \
-		OPENH323DIR=${WRKDIRPREFIX}${.CURDIR}/../openh323/work/openh323
+		--with-ldap-includes=${LOCALBASE}/include \
+		--with-openldap-libs=${LOCALBASE}/lib
 
+MAN1=		gnomemeeting.1
 .include <bsd.port.mk>
diff --git a/net/ekiga/distinfo b/net/ekiga/distinfo
index 7943db0b8b03..2fd0feb489eb 100644
--- a/net/ekiga/distinfo
+++ b/net/ekiga/distinfo
@@ -1 +1 @@
-MD5 (GnomeMeeting-0.85.1.tar.gz) = 18cc61799805e4bc03dbe61a4c602639
+MD5 (gnomemeeting-0.94.1.tar.gz) = 5a37f98406e634718bc5018c44cdc07f
diff --git a/net/ekiga/pkg-plist b/net/ekiga/pkg-plist
index c81faf0f2fa7..df73472b17f1 100644
--- a/net/ekiga/pkg-plist
+++ b/net/ekiga/pkg-plist
@@ -1,71 +1,91 @@
 bin/gnomemeeting
+bin/gnomemeeting-config-tool
 etc/gconf/gconf.xml.defaults/apps/gnomemeeting/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gnomemeeting/audio_codecs/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gnomemeeting/audio_settings/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/gnomemeeting/call_forwarding/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gnomemeeting/devices/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gnomemeeting/gatekeeper/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gnomemeeting/general/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gnomemeeting/history/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gnomemeeting/ldap/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gnomemeeting/personal_data/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/gnomemeeting/video_display/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gnomemeeting/video_settings/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gnomemeeting/view/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/audio_codecs/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/audio_settings/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/call_forwarding/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/devices/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/gatekeeper/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/general/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/history/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/ldap/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/personal_data/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/video_display/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/video_settings/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/view/%gconf.xml
-etc/gconf/schemas/gnomemeeting.schema
-etc/sound/events/GnomeMeeting.soundlist
-share/gnome/apps/Internet/gnomemeeting.desktop
+etc/gconf/schemas/gnomemeeting.schemas
+etc/sound/events/gnomemeeting.soundlist
+lib/bonobo/servers/gnomemeeting.server
+share/gnome/applications/gnomemeeting.desktop
+share/gnome/gnomemeeting/xdap/ils_nm_reg.xml
+share/gnome/gnomemeeting/xdap/ils_nm_unreg.xml
+share/gnome/gnomemeeting/xdap/ils_nm_mod.xml
 share/gnome/pixmaps/gnomemeeting-logo-icon.png
 share/gnome/pixmaps/gnomemeeting-logo.png
 share/gnome/pixmaps/gnomemeeting-splash.png
+share/gnome/pixmaps/Lumi.png
 share/gnome/sounds/gnomemeeting/gnomemeeting.wav
-share/locale/cs/LC_MESSAGES/GnomeMeeting.mo
-share/locale/de/LC_MESSAGES/GnomeMeeting.mo
-share/locale/el/LC_MESSAGES/GnomeMeeting.mo
-share/locale/es/LC_MESSAGES/GnomeMeeting.mo
-share/locale/fr/LC_MESSAGES/GnomeMeeting.mo
-share/locale/gl/LC_MESSAGES/GnomeMeeting.mo
-share/locale/it/LC_MESSAGES/GnomeMeeting.mo
-share/locale/ja/LC_MESSAGES/GnomeMeeting.mo
-share/locale/nl/LC_MESSAGES/GnomeMeeting.mo
-share/locale/no/LC_MESSAGES/GnomeMeeting.mo
-share/locale/pt_BR/LC_MESSAGES/GnomeMeeting.mo
-share/locale/ru/LC_MESSAGES/GnomeMeeting.mo
-share/locale/sk/LC_MESSAGES/GnomeMeeting.mo
-share/locale/sv/LC_MESSAGES/GnomeMeeting.mo
-share/locale/tr/LC_MESSAGES/GnomeMeeting.mo
-share/locale/wa/LC_MESSAGES/GnomeMeeting.mo
-share/locale/zh_CN/LC_MESSAGES/GnomeMeeting.mo
-share/locale/zh_TW/LC_MESSAGES/GnomeMeeting.mo
+share/locale/cs/LC_MESSAGES/gnomemeeting.mo
+share/locale/da/LC_MESSAGES/gnomemeeting.mo
+share/locale/de/LC_MESSAGES/gnomemeeting.mo
+share/locale/el/LC_MESSAGES/gnomemeeting.mo
+share/locale/es/LC_MESSAGES/gnomemeeting.mo
+share/locale/fr/LC_MESSAGES/gnomemeeting.mo
+share/locale/gl/LC_MESSAGES/gnomemeeting.mo
+share/locale/hu/LC_MESSAGES/gnomemeeting.mo
+share/locale/it/LC_MESSAGES/gnomemeeting.mo
+share/locale/ja/LC_MESSAGES/gnomemeeting.mo
+share/locale/nl/LC_MESSAGES/gnomemeeting.mo
+share/locale/no/LC_MESSAGES/gnomemeeting.mo
+share/locale/pl/LC_MESSAGES/gnomemeeting.mo
+share/locale/pt/LC_MESSAGES/gnomemeeting.mo
+share/locale/pt_BR/LC_MESSAGES/gnomemeeting.mo
+share/locale/ru/LC_MESSAGES/gnomemeeting.mo
+share/locale/sk/LC_MESSAGES/gnomemeeting.mo
+share/locale/sv/LC_MESSAGES/gnomemeeting.mo
+share/locale/ta/LC_MESSAGES/gnomemeeting.mo
+share/locale/tr/LC_MESSAGES/gnomemeeting.mo
+share/locale/vi/LC_MESSAGES/gnomemeeting.mo
+share/locale/wa/LC_MESSAGES/gnomemeeting.mo
+share/locale/zh_CN/LC_MESSAGES/gnomemeeting.mo
+share/locale/zh_TW/LC_MESSAGES/gnomemeeting.mo
 @dirrm share/gnome/sounds/gnomemeeting
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/view
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/video_settings
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/video_display
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/personal_data
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/ldap
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/history
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/general
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/gatekeeper
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/devices
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/call_forwarding
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/audio_settings
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/audio_codecs
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnomemeeting/view
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnomemeeting/video_settings
+@dirrm etc/gconf/gconf.xml.defaults/apps/gnomemeeting/video_display
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnomemeeting/personal_data
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnomemeeting/ldap
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnomemeeting/history
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnomemeeting/general
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnomemeeting/gatekeeper
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnomemeeting/devices
+@dirrm etc/gconf/gconf.xml.defaults/apps/gnomemeeting/call_forwarding
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnomemeeting/audio_settings
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnomemeeting/audio_codecs
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnomemeeting
diff --git a/net/gnomemeeting/Makefile b/net/gnomemeeting/Makefile
index d9dffed091fe..ccc45c4bc034 100644
--- a/net/gnomemeeting/Makefile
+++ b/net/gnomemeeting/Makefile
@@ -6,15 +6,13 @@
 #
 
 PORTNAME=	gnomemeeting
-PORTVERSION=	0.85.1
-PORTREVISION=	4
+PORTVERSION=	0.94.1
 CATEGORIES=	net gnome
-MASTER_SITES=	http://www.gnomemeeting.org/downloads/0.85/sources/
-DISTNAME=	GnomeMeeting-0.85.1
+MASTER_SITES=	http://www.gnomemeeting.org/downloads/0.94.1/sources/
 
 MAINTAINER=	roger@FreeBSD.org
 
-LIB_DEPENDS=	ldap.1:${PORTSDIR}/net/openldap
+LIB_DEPENDS=	ldap.2:${PORTSDIR}/net/openldap2
 BUILD_DEPENDS=  ${NONEXISTENT}:${PORTSDIR}/net/openh323:build
 
 # note, we do not want to clean openh323, otherwise it has to build
@@ -22,19 +20,26 @@ BUILD_DEPENDS=  ${NONEXISTENT}:${PORTSDIR}/net/openh323:build
 NOCLEANDEPENDS= yes
 
 USE_X_PREFIX=	yes
-USE_BISON=	yes
-USE_AUTOCONF=	yes		# we need this so configure is regenerated
-USE_GNOMENG=	yes
-USE_GNOME=	gnomecanvas gnomelibs gnomehack gnomeprefix gconf
 USE_GMAKE=	yes
-CONFIGURE_ARGS=	--with-ptlib-includes=${WRKDIRPREFIX}${.CURDIR}/../openh323/work/pwlib/include/ptlib \
+USE_GNOMENG=	yes
+USE_GNOME=	gdkpixbuf gnomelibs gnomehack gnomeprefix gconf bonobo esound
+USE_BISON=	yes
+# Clear configure target so we stop getting binaries prefixed with i386-portbld-freebsd46
+CONFIGURE_TARGET=
+GNU_CONFIGURE=	YES
+CONFIGURE_ENV=  OSTYPE=${OPSYS} \
+		LIBS="-L${PREFIX}/lib -L${LOCALBASE}/lib" \
+		PTLIBDIR=${WRKDIRPREFIX}${.CURDIR}/../openh323/work/pwlib \
+		OPENH323DIR=${WRKDIRPREFIX}${.CURDIR}/../openh323/work/openh323 \
+		SDL_CONFIG=${LOCALBASE}/bin/sdl11-config \
+		CPPFLAGS="-I${LOCALBASE}/include"
+
+CONFIGURE_ARGS= --with-ptlib-includes=${WRKDIRPREFIX}${.CURDIR}/../openh323/work/pwlib/include/ptlib \
 		--with-ptlib-libs=${WRKDIRPREFIX}${.CURDIR}/../openh323/work/pwlib/lib \
 		--with-openh323-includes=${WRKDIRPREFIX}${.CURDIR}/../openh323/work/openh323/include \
 		--with-openh323-libs=${WRKDIRPREFIX}${.CURDIR}/../openh323/work/openh323/lib \
-		--with-ldap=${LOCALBASE}
-CONFIGURE_ENV=	OSTYPE=${OPSYS} \
-		LIBS=-L${PREFIX}/lib \
-		PTLIBDIR=${WRKDIRPREFIX}${.CURDIR}/../openh323/work/pwlib \
-		OPENH323DIR=${WRKDIRPREFIX}${.CURDIR}/../openh323/work/openh323
+		--with-ldap-includes=${LOCALBASE}/include \
+		--with-openldap-libs=${LOCALBASE}/lib
 
+MAN1=		gnomemeeting.1
 .include <bsd.port.mk>
diff --git a/net/gnomemeeting/distinfo b/net/gnomemeeting/distinfo
index 7943db0b8b03..2fd0feb489eb 100644
--- a/net/gnomemeeting/distinfo
+++ b/net/gnomemeeting/distinfo
@@ -1 +1 @@
-MD5 (GnomeMeeting-0.85.1.tar.gz) = 18cc61799805e4bc03dbe61a4c602639
+MD5 (gnomemeeting-0.94.1.tar.gz) = 5a37f98406e634718bc5018c44cdc07f
diff --git a/net/gnomemeeting/pkg-plist b/net/gnomemeeting/pkg-plist
index c81faf0f2fa7..df73472b17f1 100644
--- a/net/gnomemeeting/pkg-plist
+++ b/net/gnomemeeting/pkg-plist
@@ -1,71 +1,91 @@
 bin/gnomemeeting
+bin/gnomemeeting-config-tool
 etc/gconf/gconf.xml.defaults/apps/gnomemeeting/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gnomemeeting/audio_codecs/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gnomemeeting/audio_settings/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/gnomemeeting/call_forwarding/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gnomemeeting/devices/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gnomemeeting/gatekeeper/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gnomemeeting/general/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gnomemeeting/history/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gnomemeeting/ldap/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gnomemeeting/personal_data/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/gnomemeeting/video_display/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gnomemeeting/video_settings/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gnomemeeting/view/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/audio_codecs/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/audio_settings/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/call_forwarding/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/devices/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/gatekeeper/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/general/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/history/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/ldap/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/personal_data/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/video_display/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/video_settings/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/view/%gconf.xml
-etc/gconf/schemas/gnomemeeting.schema
-etc/sound/events/GnomeMeeting.soundlist
-share/gnome/apps/Internet/gnomemeeting.desktop
+etc/gconf/schemas/gnomemeeting.schemas
+etc/sound/events/gnomemeeting.soundlist
+lib/bonobo/servers/gnomemeeting.server
+share/gnome/applications/gnomemeeting.desktop
+share/gnome/gnomemeeting/xdap/ils_nm_reg.xml
+share/gnome/gnomemeeting/xdap/ils_nm_unreg.xml
+share/gnome/gnomemeeting/xdap/ils_nm_mod.xml
 share/gnome/pixmaps/gnomemeeting-logo-icon.png
 share/gnome/pixmaps/gnomemeeting-logo.png
 share/gnome/pixmaps/gnomemeeting-splash.png
+share/gnome/pixmaps/Lumi.png
 share/gnome/sounds/gnomemeeting/gnomemeeting.wav
-share/locale/cs/LC_MESSAGES/GnomeMeeting.mo
-share/locale/de/LC_MESSAGES/GnomeMeeting.mo
-share/locale/el/LC_MESSAGES/GnomeMeeting.mo
-share/locale/es/LC_MESSAGES/GnomeMeeting.mo
-share/locale/fr/LC_MESSAGES/GnomeMeeting.mo
-share/locale/gl/LC_MESSAGES/GnomeMeeting.mo
-share/locale/it/LC_MESSAGES/GnomeMeeting.mo
-share/locale/ja/LC_MESSAGES/GnomeMeeting.mo
-share/locale/nl/LC_MESSAGES/GnomeMeeting.mo
-share/locale/no/LC_MESSAGES/GnomeMeeting.mo
-share/locale/pt_BR/LC_MESSAGES/GnomeMeeting.mo
-share/locale/ru/LC_MESSAGES/GnomeMeeting.mo
-share/locale/sk/LC_MESSAGES/GnomeMeeting.mo
-share/locale/sv/LC_MESSAGES/GnomeMeeting.mo
-share/locale/tr/LC_MESSAGES/GnomeMeeting.mo
-share/locale/wa/LC_MESSAGES/GnomeMeeting.mo
-share/locale/zh_CN/LC_MESSAGES/GnomeMeeting.mo
-share/locale/zh_TW/LC_MESSAGES/GnomeMeeting.mo
+share/locale/cs/LC_MESSAGES/gnomemeeting.mo
+share/locale/da/LC_MESSAGES/gnomemeeting.mo
+share/locale/de/LC_MESSAGES/gnomemeeting.mo
+share/locale/el/LC_MESSAGES/gnomemeeting.mo
+share/locale/es/LC_MESSAGES/gnomemeeting.mo
+share/locale/fr/LC_MESSAGES/gnomemeeting.mo
+share/locale/gl/LC_MESSAGES/gnomemeeting.mo
+share/locale/hu/LC_MESSAGES/gnomemeeting.mo
+share/locale/it/LC_MESSAGES/gnomemeeting.mo
+share/locale/ja/LC_MESSAGES/gnomemeeting.mo
+share/locale/nl/LC_MESSAGES/gnomemeeting.mo
+share/locale/no/LC_MESSAGES/gnomemeeting.mo
+share/locale/pl/LC_MESSAGES/gnomemeeting.mo
+share/locale/pt/LC_MESSAGES/gnomemeeting.mo
+share/locale/pt_BR/LC_MESSAGES/gnomemeeting.mo
+share/locale/ru/LC_MESSAGES/gnomemeeting.mo
+share/locale/sk/LC_MESSAGES/gnomemeeting.mo
+share/locale/sv/LC_MESSAGES/gnomemeeting.mo
+share/locale/ta/LC_MESSAGES/gnomemeeting.mo
+share/locale/tr/LC_MESSAGES/gnomemeeting.mo
+share/locale/vi/LC_MESSAGES/gnomemeeting.mo
+share/locale/wa/LC_MESSAGES/gnomemeeting.mo
+share/locale/zh_CN/LC_MESSAGES/gnomemeeting.mo
+share/locale/zh_TW/LC_MESSAGES/gnomemeeting.mo
 @dirrm share/gnome/sounds/gnomemeeting
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/view
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/video_settings
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/video_display
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/personal_data
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/ldap
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/history
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/general
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/gatekeeper
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/devices
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/call_forwarding
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/audio_settings
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/audio_codecs
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnomemeeting/view
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnomemeeting/video_settings
+@dirrm etc/gconf/gconf.xml.defaults/apps/gnomemeeting/video_display
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnomemeeting/personal_data
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnomemeeting/ldap
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnomemeeting/history
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnomemeeting/general
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnomemeeting/gatekeeper
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnomemeeting/devices
+@dirrm etc/gconf/gconf.xml.defaults/apps/gnomemeeting/call_forwarding
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnomemeeting/audio_settings
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnomemeeting/audio_codecs
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnomemeeting
diff --git a/net/gnomemeeting2/Makefile b/net/gnomemeeting2/Makefile
index d9dffed091fe..ccc45c4bc034 100644
--- a/net/gnomemeeting2/Makefile
+++ b/net/gnomemeeting2/Makefile
@@ -6,15 +6,13 @@
 #
 
 PORTNAME=	gnomemeeting
-PORTVERSION=	0.85.1
-PORTREVISION=	4
+PORTVERSION=	0.94.1
 CATEGORIES=	net gnome
-MASTER_SITES=	http://www.gnomemeeting.org/downloads/0.85/sources/
-DISTNAME=	GnomeMeeting-0.85.1
+MASTER_SITES=	http://www.gnomemeeting.org/downloads/0.94.1/sources/
 
 MAINTAINER=	roger@FreeBSD.org
 
-LIB_DEPENDS=	ldap.1:${PORTSDIR}/net/openldap
+LIB_DEPENDS=	ldap.2:${PORTSDIR}/net/openldap2
 BUILD_DEPENDS=  ${NONEXISTENT}:${PORTSDIR}/net/openh323:build
 
 # note, we do not want to clean openh323, otherwise it has to build
@@ -22,19 +20,26 @@ BUILD_DEPENDS=  ${NONEXISTENT}:${PORTSDIR}/net/openh323:build
 NOCLEANDEPENDS= yes
 
 USE_X_PREFIX=	yes
-USE_BISON=	yes
-USE_AUTOCONF=	yes		# we need this so configure is regenerated
-USE_GNOMENG=	yes
-USE_GNOME=	gnomecanvas gnomelibs gnomehack gnomeprefix gconf
 USE_GMAKE=	yes
-CONFIGURE_ARGS=	--with-ptlib-includes=${WRKDIRPREFIX}${.CURDIR}/../openh323/work/pwlib/include/ptlib \
+USE_GNOMENG=	yes
+USE_GNOME=	gdkpixbuf gnomelibs gnomehack gnomeprefix gconf bonobo esound
+USE_BISON=	yes
+# Clear configure target so we stop getting binaries prefixed with i386-portbld-freebsd46
+CONFIGURE_TARGET=
+GNU_CONFIGURE=	YES
+CONFIGURE_ENV=  OSTYPE=${OPSYS} \
+		LIBS="-L${PREFIX}/lib -L${LOCALBASE}/lib" \
+		PTLIBDIR=${WRKDIRPREFIX}${.CURDIR}/../openh323/work/pwlib \
+		OPENH323DIR=${WRKDIRPREFIX}${.CURDIR}/../openh323/work/openh323 \
+		SDL_CONFIG=${LOCALBASE}/bin/sdl11-config \
+		CPPFLAGS="-I${LOCALBASE}/include"
+
+CONFIGURE_ARGS= --with-ptlib-includes=${WRKDIRPREFIX}${.CURDIR}/../openh323/work/pwlib/include/ptlib \
 		--with-ptlib-libs=${WRKDIRPREFIX}${.CURDIR}/../openh323/work/pwlib/lib \
 		--with-openh323-includes=${WRKDIRPREFIX}${.CURDIR}/../openh323/work/openh323/include \
 		--with-openh323-libs=${WRKDIRPREFIX}${.CURDIR}/../openh323/work/openh323/lib \
-		--with-ldap=${LOCALBASE}
-CONFIGURE_ENV=	OSTYPE=${OPSYS} \
-		LIBS=-L${PREFIX}/lib \
-		PTLIBDIR=${WRKDIRPREFIX}${.CURDIR}/../openh323/work/pwlib \
-		OPENH323DIR=${WRKDIRPREFIX}${.CURDIR}/../openh323/work/openh323
+		--with-ldap-includes=${LOCALBASE}/include \
+		--with-openldap-libs=${LOCALBASE}/lib
 
+MAN1=		gnomemeeting.1
 .include <bsd.port.mk>
diff --git a/net/gnomemeeting2/distinfo b/net/gnomemeeting2/distinfo
index 7943db0b8b03..2fd0feb489eb 100644
--- a/net/gnomemeeting2/distinfo
+++ b/net/gnomemeeting2/distinfo
@@ -1 +1 @@
-MD5 (GnomeMeeting-0.85.1.tar.gz) = 18cc61799805e4bc03dbe61a4c602639
+MD5 (gnomemeeting-0.94.1.tar.gz) = 5a37f98406e634718bc5018c44cdc07f
diff --git a/net/gnomemeeting2/pkg-plist b/net/gnomemeeting2/pkg-plist
index c81faf0f2fa7..df73472b17f1 100644
--- a/net/gnomemeeting2/pkg-plist
+++ b/net/gnomemeeting2/pkg-plist
@@ -1,71 +1,91 @@
 bin/gnomemeeting
+bin/gnomemeeting-config-tool
 etc/gconf/gconf.xml.defaults/apps/gnomemeeting/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gnomemeeting/audio_codecs/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gnomemeeting/audio_settings/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/gnomemeeting/call_forwarding/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gnomemeeting/devices/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gnomemeeting/gatekeeper/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gnomemeeting/general/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gnomemeeting/history/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gnomemeeting/ldap/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gnomemeeting/personal_data/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/gnomemeeting/video_display/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gnomemeeting/video_settings/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gnomemeeting/view/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/audio_codecs/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/audio_settings/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/call_forwarding/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/devices/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/gatekeeper/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/general/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/history/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/ldap/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/personal_data/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/video_display/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/video_settings/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/view/%gconf.xml
-etc/gconf/schemas/gnomemeeting.schema
-etc/sound/events/GnomeMeeting.soundlist
-share/gnome/apps/Internet/gnomemeeting.desktop
+etc/gconf/schemas/gnomemeeting.schemas
+etc/sound/events/gnomemeeting.soundlist
+lib/bonobo/servers/gnomemeeting.server
+share/gnome/applications/gnomemeeting.desktop
+share/gnome/gnomemeeting/xdap/ils_nm_reg.xml
+share/gnome/gnomemeeting/xdap/ils_nm_unreg.xml
+share/gnome/gnomemeeting/xdap/ils_nm_mod.xml
 share/gnome/pixmaps/gnomemeeting-logo-icon.png
 share/gnome/pixmaps/gnomemeeting-logo.png
 share/gnome/pixmaps/gnomemeeting-splash.png
+share/gnome/pixmaps/Lumi.png
 share/gnome/sounds/gnomemeeting/gnomemeeting.wav
-share/locale/cs/LC_MESSAGES/GnomeMeeting.mo
-share/locale/de/LC_MESSAGES/GnomeMeeting.mo
-share/locale/el/LC_MESSAGES/GnomeMeeting.mo
-share/locale/es/LC_MESSAGES/GnomeMeeting.mo
-share/locale/fr/LC_MESSAGES/GnomeMeeting.mo
-share/locale/gl/LC_MESSAGES/GnomeMeeting.mo
-share/locale/it/LC_MESSAGES/GnomeMeeting.mo
-share/locale/ja/LC_MESSAGES/GnomeMeeting.mo
-share/locale/nl/LC_MESSAGES/GnomeMeeting.mo
-share/locale/no/LC_MESSAGES/GnomeMeeting.mo
-share/locale/pt_BR/LC_MESSAGES/GnomeMeeting.mo
-share/locale/ru/LC_MESSAGES/GnomeMeeting.mo
-share/locale/sk/LC_MESSAGES/GnomeMeeting.mo
-share/locale/sv/LC_MESSAGES/GnomeMeeting.mo
-share/locale/tr/LC_MESSAGES/GnomeMeeting.mo
-share/locale/wa/LC_MESSAGES/GnomeMeeting.mo
-share/locale/zh_CN/LC_MESSAGES/GnomeMeeting.mo
-share/locale/zh_TW/LC_MESSAGES/GnomeMeeting.mo
+share/locale/cs/LC_MESSAGES/gnomemeeting.mo
+share/locale/da/LC_MESSAGES/gnomemeeting.mo
+share/locale/de/LC_MESSAGES/gnomemeeting.mo
+share/locale/el/LC_MESSAGES/gnomemeeting.mo
+share/locale/es/LC_MESSAGES/gnomemeeting.mo
+share/locale/fr/LC_MESSAGES/gnomemeeting.mo
+share/locale/gl/LC_MESSAGES/gnomemeeting.mo
+share/locale/hu/LC_MESSAGES/gnomemeeting.mo
+share/locale/it/LC_MESSAGES/gnomemeeting.mo
+share/locale/ja/LC_MESSAGES/gnomemeeting.mo
+share/locale/nl/LC_MESSAGES/gnomemeeting.mo
+share/locale/no/LC_MESSAGES/gnomemeeting.mo
+share/locale/pl/LC_MESSAGES/gnomemeeting.mo
+share/locale/pt/LC_MESSAGES/gnomemeeting.mo
+share/locale/pt_BR/LC_MESSAGES/gnomemeeting.mo
+share/locale/ru/LC_MESSAGES/gnomemeeting.mo
+share/locale/sk/LC_MESSAGES/gnomemeeting.mo
+share/locale/sv/LC_MESSAGES/gnomemeeting.mo
+share/locale/ta/LC_MESSAGES/gnomemeeting.mo
+share/locale/tr/LC_MESSAGES/gnomemeeting.mo
+share/locale/vi/LC_MESSAGES/gnomemeeting.mo
+share/locale/wa/LC_MESSAGES/gnomemeeting.mo
+share/locale/zh_CN/LC_MESSAGES/gnomemeeting.mo
+share/locale/zh_TW/LC_MESSAGES/gnomemeeting.mo
 @dirrm share/gnome/sounds/gnomemeeting
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/view
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/video_settings
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/video_display
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/personal_data
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/ldap
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/history
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/general
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/gatekeeper
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/devices
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/call_forwarding
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/audio_settings
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/audio_codecs
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnomemeeting/view
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnomemeeting/video_settings
+@dirrm etc/gconf/gconf.xml.defaults/apps/gnomemeeting/video_display
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnomemeeting/personal_data
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnomemeeting/ldap
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnomemeeting/history
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnomemeeting/general
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnomemeeting/gatekeeper
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnomemeeting/devices
+@dirrm etc/gconf/gconf.xml.defaults/apps/gnomemeeting/call_forwarding
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnomemeeting/audio_settings
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnomemeeting/audio_codecs
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnomemeeting