Updates from Maxim Sobolev.

6 files changed, 228 insertions, 90 deletions

diff --git a/net/ekiga/Makefile b/net/ekiga/Makefile
index 9d77a870da75..d77be0e20f17 100644
--- a/net/ekiga/Makefile
+++ b/net/ekiga/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnomemeeting
 PORTVERSION=	0.85.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net gnome
 MASTER_SITES=	http://www.gnomemeeting.org/downloads/0.85/sources/
 DISTNAME=	GnomeMeeting-0.85.1
@@ -21,19 +21,20 @@ BUILD_DEPENDS=  ${NONEXISTENT}:${PORTSDIR}/net/openh323:build
 # it all over again which can take several hours.
 NOCLEANDEPENDS= yes
 
+USE_X_PREFIX=	yes
 USE_BISON=	yes
-USE_AUTOCONF=	yes
+GNU_CONFIGURE=	yes
 USE_GNOMENG=	yes
-USE_GNOME=	gdkpixbuf
+USE_GNOME=	gdkpixbuf gnomelibs gnomehack gnomeprefix
 USE_GMAKE=	yes
-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=${PREFIX}
+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 \
+		OPENH323DIR=${WRKDIRPREFIX}${.CURDIR}/../openh323/work/openh323
 
 .include <bsd.port.mk>
diff --git a/net/ekiga/pkg-plist b/net/ekiga/pkg-plist
index ae0743ce0f49..c81faf0f2fa7 100644
--- a/net/ekiga/pkg-plist
+++ b/net/ekiga/pkg-plist
@@ -1,26 +1,71 @@
-share/gnome/locale/cs.mo/LC_MESSAGES/GnomeMeeting.mo
-share/gnome/locale/de.mo/LC_MESSAGES/GnomeMeeting.mo
-share/gnome/locale/el.mo/LC_MESSAGES/GnomeMeeting.mo
-share/gnome/locale/es.mo/LC_MESSAGES/GnomeMeeting.mo
-share/gnome/locale/fr.mo/LC_MESSAGES/GnomeMeeting.mo
-share/gnome/locale/gl.mo/LC_MESSAGES/GnomeMeeting.mo
-share/gnome/locale/it.mo/LC_MESSAGES/GnomeMeeting.mo
-share/gnome/locale/ja.mo/LC_MESSAGES/GnomeMeeting.mo
-share/gnome/locale/nl.mo/LC_MESSAGES/GnomeMeeting.mo
-share/gnome/locale/no.mo/LC_MESSAGES/GnomeMeeting.mo
-share/gnome/locale/pt_BR.mo/LC_MESSAGES/GnomeMeeting.mo
-share/gnome/locale/ru.mo/LC_MESSAGES/GnomeMeeting.mo
-share/gnome/locale/sk.mo/LC_MESSAGES/GnomeMeeting.mo
-share/gnome/locale/sv.mo/LC_MESSAGES/GnomeMeeting.mo
-share/gnome/locale/tr.mo/LC_MESSAGES/GnomeMeeting.mo
-share/gnome/locale/wa.mo/LC_MESSAGES/GnomeMeeting.mo
-share/gnome/locale/zh_CN.mo/LC_MESSAGES/GnomeMeeting.mo
-share/gnome/locale/zh_TW.mo/LC_MESSAGES/GnomeMeeting.mo
 bin/gnomemeeting
+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/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_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/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_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
 share/gnome/pixmaps/gnomemeeting-logo-icon.png
 share/gnome/pixmaps/gnomemeeting-logo.png
 share/gnome/pixmaps/gnomemeeting-splash.png
 share/gnome/sounds/gnomemeeting/gnomemeeting.wav
-etc/sound/events/GnomeMeeting.soundlist
-share/gnome/gnome/apps/Internet/gnomemeeting.desktop
-etc/gconf/schemas/gnomemeeting.schema
+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
+@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/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/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/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/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 9d77a870da75..d77be0e20f17 100644
--- a/net/gnomemeeting/Makefile
+++ b/net/gnomemeeting/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnomemeeting
 PORTVERSION=	0.85.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net gnome
 MASTER_SITES=	http://www.gnomemeeting.org/downloads/0.85/sources/
 DISTNAME=	GnomeMeeting-0.85.1
@@ -21,19 +21,20 @@ BUILD_DEPENDS=  ${NONEXISTENT}:${PORTSDIR}/net/openh323:build
 # it all over again which can take several hours.
 NOCLEANDEPENDS= yes
 
+USE_X_PREFIX=	yes
 USE_BISON=	yes
-USE_AUTOCONF=	yes
+GNU_CONFIGURE=	yes
 USE_GNOMENG=	yes
-USE_GNOME=	gdkpixbuf
+USE_GNOME=	gdkpixbuf gnomelibs gnomehack gnomeprefix
 USE_GMAKE=	yes
-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=${PREFIX}
+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 \
+		OPENH323DIR=${WRKDIRPREFIX}${.CURDIR}/../openh323/work/openh323
 
 .include <bsd.port.mk>
diff --git a/net/gnomemeeting/pkg-plist b/net/gnomemeeting/pkg-plist
index ae0743ce0f49..c81faf0f2fa7 100644
--- a/net/gnomemeeting/pkg-plist
+++ b/net/gnomemeeting/pkg-plist
@@ -1,26 +1,71 @@
-share/gnome/locale/cs.mo/LC_MESSAGES/GnomeMeeting.mo
-share/gnome/locale/de.mo/LC_MESSAGES/GnomeMeeting.mo
-share/gnome/locale/el.mo/LC_MESSAGES/GnomeMeeting.mo
-share/gnome/locale/es.mo/LC_MESSAGES/GnomeMeeting.mo
-share/gnome/locale/fr.mo/LC_MESSAGES/GnomeMeeting.mo
-share/gnome/locale/gl.mo/LC_MESSAGES/GnomeMeeting.mo
-share/gnome/locale/it.mo/LC_MESSAGES/GnomeMeeting.mo
-share/gnome/locale/ja.mo/LC_MESSAGES/GnomeMeeting.mo
-share/gnome/locale/nl.mo/LC_MESSAGES/GnomeMeeting.mo
-share/gnome/locale/no.mo/LC_MESSAGES/GnomeMeeting.mo
-share/gnome/locale/pt_BR.mo/LC_MESSAGES/GnomeMeeting.mo
-share/gnome/locale/ru.mo/LC_MESSAGES/GnomeMeeting.mo
-share/gnome/locale/sk.mo/LC_MESSAGES/GnomeMeeting.mo
-share/gnome/locale/sv.mo/LC_MESSAGES/GnomeMeeting.mo
-share/gnome/locale/tr.mo/LC_MESSAGES/GnomeMeeting.mo
-share/gnome/locale/wa.mo/LC_MESSAGES/GnomeMeeting.mo
-share/gnome/locale/zh_CN.mo/LC_MESSAGES/GnomeMeeting.mo
-share/gnome/locale/zh_TW.mo/LC_MESSAGES/GnomeMeeting.mo
 bin/gnomemeeting
+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/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_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/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_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
 share/gnome/pixmaps/gnomemeeting-logo-icon.png
 share/gnome/pixmaps/gnomemeeting-logo.png
 share/gnome/pixmaps/gnomemeeting-splash.png
 share/gnome/sounds/gnomemeeting/gnomemeeting.wav
-etc/sound/events/GnomeMeeting.soundlist
-share/gnome/gnome/apps/Internet/gnomemeeting.desktop
-etc/gconf/schemas/gnomemeeting.schema
+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
+@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/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/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/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/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 9d77a870da75..d77be0e20f17 100644
--- a/net/gnomemeeting2/Makefile
+++ b/net/gnomemeeting2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnomemeeting
 PORTVERSION=	0.85.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net gnome
 MASTER_SITES=	http://www.gnomemeeting.org/downloads/0.85/sources/
 DISTNAME=	GnomeMeeting-0.85.1
@@ -21,19 +21,20 @@ BUILD_DEPENDS=  ${NONEXISTENT}:${PORTSDIR}/net/openh323:build
 # it all over again which can take several hours.
 NOCLEANDEPENDS= yes
 
+USE_X_PREFIX=	yes
 USE_BISON=	yes
-USE_AUTOCONF=	yes
+GNU_CONFIGURE=	yes
 USE_GNOMENG=	yes
-USE_GNOME=	gdkpixbuf
+USE_GNOME=	gdkpixbuf gnomelibs gnomehack gnomeprefix
 USE_GMAKE=	yes
-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=${PREFIX}
+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 \
+		OPENH323DIR=${WRKDIRPREFIX}${.CURDIR}/../openh323/work/openh323
 
 .include <bsd.port.mk>
diff --git a/net/gnomemeeting2/pkg-plist b/net/gnomemeeting2/pkg-plist
index ae0743ce0f49..c81faf0f2fa7 100644
--- a/net/gnomemeeting2/pkg-plist
+++ b/net/gnomemeeting2/pkg-plist
@@ -1,26 +1,71 @@
-share/gnome/locale/cs.mo/LC_MESSAGES/GnomeMeeting.mo
-share/gnome/locale/de.mo/LC_MESSAGES/GnomeMeeting.mo
-share/gnome/locale/el.mo/LC_MESSAGES/GnomeMeeting.mo
-share/gnome/locale/es.mo/LC_MESSAGES/GnomeMeeting.mo
-share/gnome/locale/fr.mo/LC_MESSAGES/GnomeMeeting.mo
-share/gnome/locale/gl.mo/LC_MESSAGES/GnomeMeeting.mo
-share/gnome/locale/it.mo/LC_MESSAGES/GnomeMeeting.mo
-share/gnome/locale/ja.mo/LC_MESSAGES/GnomeMeeting.mo
-share/gnome/locale/nl.mo/LC_MESSAGES/GnomeMeeting.mo
-share/gnome/locale/no.mo/LC_MESSAGES/GnomeMeeting.mo
-share/gnome/locale/pt_BR.mo/LC_MESSAGES/GnomeMeeting.mo
-share/gnome/locale/ru.mo/LC_MESSAGES/GnomeMeeting.mo
-share/gnome/locale/sk.mo/LC_MESSAGES/GnomeMeeting.mo
-share/gnome/locale/sv.mo/LC_MESSAGES/GnomeMeeting.mo
-share/gnome/locale/tr.mo/LC_MESSAGES/GnomeMeeting.mo
-share/gnome/locale/wa.mo/LC_MESSAGES/GnomeMeeting.mo
-share/gnome/locale/zh_CN.mo/LC_MESSAGES/GnomeMeeting.mo
-share/gnome/locale/zh_TW.mo/LC_MESSAGES/GnomeMeeting.mo
 bin/gnomemeeting
+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/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_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/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_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
 share/gnome/pixmaps/gnomemeeting-logo-icon.png
 share/gnome/pixmaps/gnomemeeting-logo.png
 share/gnome/pixmaps/gnomemeeting-splash.png
 share/gnome/sounds/gnomemeeting/gnomemeeting.wav
-etc/sound/events/GnomeMeeting.soundlist
-share/gnome/gnome/apps/Internet/gnomemeeting.desktop
-etc/gconf/schemas/gnomemeeting.schema
+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
+@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/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/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/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/audio_settings
+@dirrm etc/gconf/gconf.xml.defaults/apps/gnomemeeting/audio_codecs
+@dirrm etc/gconf/gconf.xml.defaults/apps/gnomemeeting