Upgrade to GnomeMeeting 0.12.2.

Many new features including better ILS support, video preview
detachable video windows and video scaling.
Plus many bug fixes.

24 files changed, 417 insertions, 396 deletions

diff --git a/net/ekiga/Makefile b/net/ekiga/Makefile
index 34f3c2d3e310..49fb274f1c77 100644
--- a/net/ekiga/Makefile
+++ b/net/ekiga/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	gnomemeeting
-PORTVERSION=	0.10
+PORTVERSION=	0.12.2
 CATEGORIES=	net gnome
-MASTER_SITES=	http://130.104.229.225/gnomemeeting/downloads/0.10/sources/ \
-		ftp://telepresence.dmem.strath.ac.uk/pub/openh323/
+MASTER_SITES=	http://www.gnomemeeting.org/downloads/latest/sources/
+DISTNAME=	GnomeMeeting-0.12.2
 
 MAINTAINER=	roger@FreeBSD.org
 
@@ -27,8 +27,13 @@ USE_GNOME=	yes
 USE_AUTOCONF=	yes
 USE_GTK=	yes
 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=/usr/local
 CONFIGURE_ENV=	LIBS=-L${PREFIX}/lib \
-		PWLIBDIR=${WRKDIRPREFIX}${.CURDIR}/../openh323/work/pwlib \
+		PTLIBDIR=${WRKDIRPREFIX}${.CURDIR}/../openh323/work/pwlib \
 		OPENH323DIR=${WRKDIRPREFIX}${.CURDIR}/../openh323/work/openh323 \
 
 .include <bsd.port.mk>
diff --git a/net/ekiga/distinfo b/net/ekiga/distinfo
index e23ad8317204..a3102c568edf 100644
--- a/net/ekiga/distinfo
+++ b/net/ekiga/distinfo
@@ -1 +1 @@
-MD5 (gnomemeeting-0.10.tar.gz) = 1d14f7ade38a7b7033825b9550c7da59
+MD5 (GnomeMeeting-0.12.2.tar.gz) = d724fa9f6289b83362a1641f4030baa2
diff --git a/net/ekiga/files/patch-aa b/net/ekiga/files/patch-aa
index 2bf26cd444d1..75cba9477bde 100644
--- a/net/ekiga/files/patch-aa
+++ b/net/ekiga/files/patch-aa
@@ -1,78 +1,106 @@
-*** configure.in.orig	Sat Aug 18 00:20:58 2001
---- configure.in	Mon Aug 20 14:50:48 2001
-*************** AC_HEADER_STDC
-*** 27,38 ****
-  AC_ARG_PROGRAM
-  
-  
-! H323_INCLUDES="-I$PTLIB_INCLUDE_DIR/unix -I$PTLIB_INCLUDE_DIR/.. -I$PTLIB_INCLUDE_DIR/../ptclib -I/usr/include -I$OPENH323_INCLUDE_DIR"
-! H323_LIBS="-lh323_linux_x86_r -ldl -lpt_linux_x86_r -lpthread"
-  
-  
-! LDAP_INCLUDES="-I/usr/local/include"
+*** configure.in.orig	Fri Dec  7 06:35:07 2001
+--- configure.in	Fri Dec  7 07:24:28 2001
+*************** fi
+*** 58,64 ****
+  AC_ARG_WITH(ptlib-libs, [  --with-ptlib-libs=PFX       Location of PTLib libs.],
+  	with_ptlib_libs="$withval", with_ptlib_libs="/usr/lib")
+  if test "x${with_ptlib_libs}" != "xno" -a "x${have_ptlib_includes}" != "xno"; then
+! 	AC_CHECK_FILE(${with_ptlib_libs}/libpt.so, ptlib_libs="yes", ptlib_libs="no")
+  	
+  	if test "x${ptlib_libs}" != "xno"; then
+  		PTLIB_LDFLAGS="-L${with_ptlib_libs} ${H323_LIBS}"
+--- 58,64 ----
+  AC_ARG_WITH(ptlib-libs, [  --with-ptlib-libs=PFX       Location of PTLib libs.],
+  	with_ptlib_libs="$withval", with_ptlib_libs="/usr/lib")
+  if test "x${with_ptlib_libs}" != "xno" -a "x${have_ptlib_includes}" != "xno"; then
+! 	AC_CHECK_FILE(${with_ptlib_libs}/libpt_FreeBSD_x86_r.a, ptlib_libs="yes", ptlib_libs="no")
+  	
+  	if test "x${ptlib_libs}" != "xno"; then
+  		PTLIB_LDFLAGS="-L${with_ptlib_libs} ${H323_LIBS}"
+*************** else
+*** 70,76 ****
+  	AC_MSG_ERROR([You need PTLib to enjoy GnomeMeeting])
+  fi
+  
+! H323_LIBS="-lopenh323 -ldl -lpt -lpthread -lssl -lcrypto"
+  
+  dnl ***************************************
+  dnl OpenH323
+--- 70,77 ----
+  	AC_MSG_ERROR([You need PTLib to enjoy GnomeMeeting])
+  fi
+  
+! dnl H323_LIBS="-lopenh323 -ldl -lpt -lpthread -lssl -lcrypto"
+! H323_LIBS="-lh323_FreeBSD_x86_r -lpt_FreeBSD_x86_r -pthread -lssl -lcrypto"
+  
+  dnl ***************************************
+  dnl OpenH323
+*************** AC_ARG_WITH(openh323-libs, [  --with-ope
+*** 104,110 ****
+  	with_openh323_libs="$withval", with_openh323_libs="/usr/lib")
+  msg_openh323="no"
+  if test "x${with_openh323_libs}" != "xno" -a "x${have_openh323_includes}" != "xno"; then
+! 	AC_CHECK_FILE(${with_openh323_libs}/libopenh323.so, openh323_libs="yes", openh323_libs="no")
+  	if test "x${openh323_libs}" != "xno"; then
+  		msg_openh323="yes"
+  		OPENH323_LDFLAGS="-L${with_openh323_libs} ${H323_LIBS}"
+--- 105,111 ----
+  	with_openh323_libs="$withval", with_openh323_libs="/usr/lib")
+  msg_openh323="no"
+  if test "x${with_openh323_libs}" != "xno" -a "x${have_openh323_includes}" != "xno"; then
+! 	AC_CHECK_FILE(${with_openh323_libs}/libh323_FreeBSD_x86_r.a, openh323_libs="yes", openh323_libs="no")
+  	if test "x${openh323_libs}" != "xno"; then
+  		msg_openh323="yes"
+  		OPENH323_LDFLAGS="-L${with_openh323_libs} ${H323_LIBS}"
+*************** fi
+*** 164,170 ****
+  dnl *****************************
+  
+  LDAP_INCLUDES=""
 ! LDAP_LIBS="-lldap -llber -lresolv"
   
-  GNOMEMEETING_INCLUDES=""
-  GNOMEMEETING_LDADD=""
---- 27,38 ----
-  AC_ARG_PROGRAM
   
+  AC_ARG_WITH(ldap, [  --with-ldap=PFX       Location of ldap.],
+--- 165,171 ----
+  dnl *****************************
   
-! H323_INCLUDES="-I$PWLIBDIR/include/ptlib/unix -I$PWLIBDIR/include -I$OPENH323DIR/include"
-! H323_LIBS="-L$PWLIBDIR/lib -L$OPENH323DIR/lib -lh323_FreeBSD_x86_r -lpt_FreeBSD_x86_r -pthread -lssl -lcrypto -DP_SSL"
+  LDAP_INCLUDES=""
+! LDAP_LIBS="-lldap -llber"
   
   
-! LDAP_INCLUDES="-I/usr/include -I/usr/local/include"
-! LDAP_LIBS="-L/usr/local/lib -lldap -llber"
-  
-  GNOMEMEETING_INCLUDES=""
-  GNOMEMEETING_LDADD=""
+  AC_ARG_WITH(ldap, [  --with-ldap=PFX       Location of ldap.],
 *************** dnl * -D_DEBUG -DPMEMORY_CHECK=1 -DPTRAC
-*** 46,60 ****
+*** 197,203 ****
   dnl *************************************************************************
   
   
-! H323_CFLAGS="-DP_LINUX -m486 -D_REENTRANT -DP_HAS_SEMAPHORES -DP_PTHREADS -DPBYTE_ORDER=PLITTLE_ENDIAN -DHAS_OSS -O2"
-! 
+! H323_CFLAGS="-DP_LINUX -D_REENTRANT -DP_HAS_SEMAPHORES -DP_PTHREADS -DPBYTE_ORDER=PLITTLE_ENDIAN -DHAS_OSS -O2"
   
   dnl *********************************************************************
-  dnl ** GNOME ************************************************************
-  dnl *********************************************************************
-  
-! GNOMEMEETING_INCLUDES="$H323_INCLUDES $H323_CFLAGS"
-! GNOMEMEETING_LDADD="$GNOME_LIBDIR $GTK_LIBS $GNOMEGNORBA_LIBS $GNOME_APPLETS_LIBS $LDAP_LIBS $H323_LIBS `gtk-config --libs gthread`"
-  
-  GNOME_COMPILE_WARNINGS
-  GNOME_X_CHECKS
---- 46,59 ----
+  dnl * Gdk-pixbuf ********************************************************
+--- 198,205 ----
   dnl *************************************************************************
   
   
-! H323_CFLAGS="-DP_FREEBSD=400001 -DP_PTHREADS -DPBYTE_ORDER=PLITTLE_ENDIAN -DPTRACING -02 -DNDEBUG"
+! dnl H323_CFLAGS="-DP_LINUX -D_REENTRANT -DP_HAS_SEMAPHORES -DP_PTHREADS -DPBYTE_ORDER=PLITTLE_ENDIAN -DHAS_OSS -O2"
+! H323_CFLAGS="-DP_FREEBSD=400001 -DP_SSL -DP_PTHREADS -DPBYTE_ORDER=PLITTLE_ENDIAN -O2"
   
   dnl *********************************************************************
-  dnl ** GNOME ************************************************************
-  dnl *********************************************************************
-  
-! GNOMEMEETING_INCLUDES="$LDAP_INCLUDES $H323_INCLUDES $H323_CFLAGS"
-! GNOMEMEETING_LDADD="$GNOME_LIBDIR $GTK_LIBS $GNOMEGNORBA_LIBS $GNOME_APPLETS_LIBS $LDAP_LIBS $H323_LIBS `gtk12-config --libs gthread`"
-  
-  GNOME_COMPILE_WARNINGS
-  GNOME_X_CHECKS
-*************** AM_PROG_LIBTOOL
-*** 64,70 ****
-  dnl #########################################################################
+  dnl * Gdk-pixbuf ********************************************************
+*************** dnl ####################################
+*** 236,242 ****
   dnl  Check for LDAP if available.
   dnl ########################################################################
+  
 ! AC_CHECK_LIB(resolv, res_gethostbyaddr, [LIBS="-lresolv $LIBS"], AC_MSG_ERROR([*** libresolv not found.]), -lresolv)
   
-  AC_CHECK_LIB(ldap, ldap_simple_bind, LIBS="-lldap -llber $LIBS", AC_MSG_ERROR([*** LDAP library is not found.]), -llber)
   
---- 63,69 ----
-  dnl #########################################################################
+  LIBS="$LDAP_LIBS $LIBS"
+--- 238,244 ----
   dnl  Check for LDAP if available.
   dnl ########################################################################
+  
 ! dnl AC_CHECK_LIB(resolv, res_gethostbyaddr, [LIBS="-lresolv $LIBS"], AC_MSG_ERROR([*** libresolv not found.]), -lresolv)
   
-  AC_CHECK_LIB(ldap, ldap_simple_bind, LIBS="-lldap -llber $LIBS", AC_MSG_ERROR([*** LDAP library is not found.]), -llber)
   
+  LIBS="$LDAP_LIBS $LIBS"
diff --git a/net/ekiga/files/patch-ab b/net/ekiga/files/patch-ab
new file mode 100644
index 000000000000..f3fe65da116e
--- /dev/null
+++ b/net/ekiga/files/patch-ab
@@ -0,0 +1,31 @@
+*** src/audio.cpp.orig	Fri Dec  7 07:17:19 2001
+--- src/audio.cpp	Fri Dec  7 07:18:24 2001
+*************** int gnomemeeting_set_recording_source (c
+*** 103,108 ****
+--- 103,111 ----
+  
+  int gnomemeeting_get_mixer_name (char *mixer, char *name)
+  {
++ #ifdef __FreeBSD__
++   strcpy(name,"/dev/mixer");
++ #else
+    int mixerfd, res;
+    mixer_info info;
+  
+*************** int gnomemeeting_get_mixer_name (char *m
+*** 115,121 ****
+    strcpy (name, info.name);
+  
+    close (mixerfd);
+! 
+    return 0;
+  }
+  
+--- 118,124 ----
+    strcpy (name, info.name);
+  
+    close (mixerfd);
+! #endif
+    return 0;
+  }
+  
diff --git a/net/ekiga/files/patch-ac b/net/ekiga/files/patch-ac
new file mode 100644
index 000000000000..daa7c9329827
--- /dev/null
+++ b/net/ekiga/files/patch-ac
@@ -0,0 +1,19 @@
+*** intltool-merge.in.orig	Fri Dec  7 10:13:04 2001
+--- intltool-merge.in	Fri Dec  7 09:46:41 2001
+*************** sub create_translation_database
+*** 237,243 ****
+  
+          if ($UTF8_ARG) {
+              my $encoding = get_po_encoding($po_file);
+!             open PO_FILE, "iconv -f $encoding -t UTF-8 $po_file|";	
+          } else {
+              open PO_FILE, "<$po_file";	
+          }
+--- 237,243 ----
+  
+          if ($UTF8_ARG) {
+              my $encoding = get_po_encoding($po_file);
+!             open PO_FILE, "giconv -f $encoding -t UTF-8 $po_file|";	
+          } else {
+              open PO_FILE, "<$po_file";	
+          }
diff --git a/net/ekiga/files/patch-ad b/net/ekiga/files/patch-ad
deleted file mode 100644
index 90a3118a4274..000000000000
--- a/net/ekiga/files/patch-ad
+++ /dev/null
@@ -1,18 +0,0 @@
-*** src/audio.h.orig	Fri Aug 17 20:08:26 2001
---- src/audio.h	Mon Aug 20 07:54:33 2001
-***************
-*** 21,27 ****
---- 21,33 ----
-  #define _AUDIO_H_
-  
-  
-+ #ifdef __linux__
-  #include <linux/soundcard.h>
-+ #endif
-+ #ifdef __FreeBSD__
-+ #include <machine/soundcard.h>
-+ #endif
-+ 
-  
-  
-  #include <sys/ioctl.h>
diff --git a/net/ekiga/files/patch-ae b/net/ekiga/files/patch-ae
deleted file mode 100644
index 9a8d68f49ca4..000000000000
--- a/net/ekiga/files/patch-ae
+++ /dev/null
@@ -1,17 +0,0 @@
-*** src/webcam.h.orig	Mon Aug 20 07:55:24 2001
---- src/webcam.h	Mon Aug 20 07:55:51 2001
-***************
-*** 23,29 ****
---- 23,34 ----
-  #include <fcntl.h>
-  #include <unistd.h>
-  
-+ #ifdef __linux__
-  #include <linux/videodev.h>
-+ #endif
-+ #ifdef __FreeBSD__
-+ #include <machine/ioctl_meteor.h>
-+ #endif
-  
-  #include <sys/ioctl.h>
-  #include <gtk/gtk.h>
diff --git a/net/ekiga/files/patch-ai b/net/ekiga/files/patch-ai
deleted file mode 100644
index 77763d4e07fa..000000000000
--- a/net/ekiga/files/patch-ai
+++ /dev/null
@@ -1,41 +0,0 @@
-*** src/config.cpp.orig	Mon Aug 13 17:19:15 2001
---- src/config.cpp	Fri Aug 17 18:03:23 2001
-*************** void read_config (options *opts)
-*** 161,167 ****
-        // Do not free key and value as they are assigned as pointers to opts->audio_codecs
-        cpt++;
-      }
-!   
-  }
-  
-  
---- 161,175 ----
-        // Do not free key and value as they are assigned as pointers to opts->audio_codecs
-        cpt++;
-      }
-! 
-!   /* handle old config files which do not have a Devices section */
-!   if(opts->audio_device == NULL) opts->audio_device="/dev/dsp";
-!   if(opts->audio_mixer == NULL)  opts->audio_mixer="/dev/mixer";
-! #ifdef __linux__
-!   if(opts->video_device == NULL) opts->video_device="/dev/video";
-! #else
-!   if(opts->video_device == NULL) opts->video_device="/dev/bktr0";
-! #endif
-  }
-  
-  
-*************** void init_config (void)
-*** 419,425 ****
---- 427,437 ----
-  
-    gnome_config_set_string ("Devices/audio_device", "/dev/dsp");
-    gnome_config_set_string ("Devices/audio_mixer", "/dev/mixer");
-+ #ifdef __linux__
-    gnome_config_set_string ("Devices/video_device", "/dev/video");
-+ #else
-+   gnome_config_set_string ("Devices/video_device", "/dev/bktr0");
-+ #endif
-    gnome_config_set_int ("Devices/video_channel", 0);
-  
-    gnome_config_set_string ("Placement/Dock", 
diff --git a/net/gnomemeeting/Makefile b/net/gnomemeeting/Makefile
index 34f3c2d3e310..49fb274f1c77 100644
--- a/net/gnomemeeting/Makefile
+++ b/net/gnomemeeting/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	gnomemeeting
-PORTVERSION=	0.10
+PORTVERSION=	0.12.2
 CATEGORIES=	net gnome
-MASTER_SITES=	http://130.104.229.225/gnomemeeting/downloads/0.10/sources/ \
-		ftp://telepresence.dmem.strath.ac.uk/pub/openh323/
+MASTER_SITES=	http://www.gnomemeeting.org/downloads/latest/sources/
+DISTNAME=	GnomeMeeting-0.12.2
 
 MAINTAINER=	roger@FreeBSD.org
 
@@ -27,8 +27,13 @@ USE_GNOME=	yes
 USE_AUTOCONF=	yes
 USE_GTK=	yes
 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=/usr/local
 CONFIGURE_ENV=	LIBS=-L${PREFIX}/lib \
-		PWLIBDIR=${WRKDIRPREFIX}${.CURDIR}/../openh323/work/pwlib \
+		PTLIBDIR=${WRKDIRPREFIX}${.CURDIR}/../openh323/work/pwlib \
 		OPENH323DIR=${WRKDIRPREFIX}${.CURDIR}/../openh323/work/openh323 \
 
 .include <bsd.port.mk>
diff --git a/net/gnomemeeting/distinfo b/net/gnomemeeting/distinfo
index e23ad8317204..a3102c568edf 100644
--- a/net/gnomemeeting/distinfo
+++ b/net/gnomemeeting/distinfo
@@ -1 +1 @@
-MD5 (gnomemeeting-0.10.tar.gz) = 1d14f7ade38a7b7033825b9550c7da59
+MD5 (GnomeMeeting-0.12.2.tar.gz) = d724fa9f6289b83362a1641f4030baa2
diff --git a/net/gnomemeeting/files/patch-aa b/net/gnomemeeting/files/patch-aa
index 2bf26cd444d1..75cba9477bde 100644
--- a/net/gnomemeeting/files/patch-aa
+++ b/net/gnomemeeting/files/patch-aa
@@ -1,78 +1,106 @@
-*** configure.in.orig	Sat Aug 18 00:20:58 2001
---- configure.in	Mon Aug 20 14:50:48 2001
-*************** AC_HEADER_STDC
-*** 27,38 ****
-  AC_ARG_PROGRAM
-  
-  
-! H323_INCLUDES="-I$PTLIB_INCLUDE_DIR/unix -I$PTLIB_INCLUDE_DIR/.. -I$PTLIB_INCLUDE_DIR/../ptclib -I/usr/include -I$OPENH323_INCLUDE_DIR"
-! H323_LIBS="-lh323_linux_x86_r -ldl -lpt_linux_x86_r -lpthread"
-  
-  
-! LDAP_INCLUDES="-I/usr/local/include"
+*** configure.in.orig	Fri Dec  7 06:35:07 2001
+--- configure.in	Fri Dec  7 07:24:28 2001
+*************** fi
+*** 58,64 ****
+  AC_ARG_WITH(ptlib-libs, [  --with-ptlib-libs=PFX       Location of PTLib libs.],
+  	with_ptlib_libs="$withval", with_ptlib_libs="/usr/lib")
+  if test "x${with_ptlib_libs}" != "xno" -a "x${have_ptlib_includes}" != "xno"; then
+! 	AC_CHECK_FILE(${with_ptlib_libs}/libpt.so, ptlib_libs="yes", ptlib_libs="no")
+  	
+  	if test "x${ptlib_libs}" != "xno"; then
+  		PTLIB_LDFLAGS="-L${with_ptlib_libs} ${H323_LIBS}"
+--- 58,64 ----
+  AC_ARG_WITH(ptlib-libs, [  --with-ptlib-libs=PFX       Location of PTLib libs.],
+  	with_ptlib_libs="$withval", with_ptlib_libs="/usr/lib")
+  if test "x${with_ptlib_libs}" != "xno" -a "x${have_ptlib_includes}" != "xno"; then
+! 	AC_CHECK_FILE(${with_ptlib_libs}/libpt_FreeBSD_x86_r.a, ptlib_libs="yes", ptlib_libs="no")
+  	
+  	if test "x${ptlib_libs}" != "xno"; then
+  		PTLIB_LDFLAGS="-L${with_ptlib_libs} ${H323_LIBS}"
+*************** else
+*** 70,76 ****
+  	AC_MSG_ERROR([You need PTLib to enjoy GnomeMeeting])
+  fi
+  
+! H323_LIBS="-lopenh323 -ldl -lpt -lpthread -lssl -lcrypto"
+  
+  dnl ***************************************
+  dnl OpenH323
+--- 70,77 ----
+  	AC_MSG_ERROR([You need PTLib to enjoy GnomeMeeting])
+  fi
+  
+! dnl H323_LIBS="-lopenh323 -ldl -lpt -lpthread -lssl -lcrypto"
+! H323_LIBS="-lh323_FreeBSD_x86_r -lpt_FreeBSD_x86_r -pthread -lssl -lcrypto"
+  
+  dnl ***************************************
+  dnl OpenH323
+*************** AC_ARG_WITH(openh323-libs, [  --with-ope
+*** 104,110 ****
+  	with_openh323_libs="$withval", with_openh323_libs="/usr/lib")
+  msg_openh323="no"
+  if test "x${with_openh323_libs}" != "xno" -a "x${have_openh323_includes}" != "xno"; then
+! 	AC_CHECK_FILE(${with_openh323_libs}/libopenh323.so, openh323_libs="yes", openh323_libs="no")
+  	if test "x${openh323_libs}" != "xno"; then
+  		msg_openh323="yes"
+  		OPENH323_LDFLAGS="-L${with_openh323_libs} ${H323_LIBS}"
+--- 105,111 ----
+  	with_openh323_libs="$withval", with_openh323_libs="/usr/lib")
+  msg_openh323="no"
+  if test "x${with_openh323_libs}" != "xno" -a "x${have_openh323_includes}" != "xno"; then
+! 	AC_CHECK_FILE(${with_openh323_libs}/libh323_FreeBSD_x86_r.a, openh323_libs="yes", openh323_libs="no")
+  	if test "x${openh323_libs}" != "xno"; then
+  		msg_openh323="yes"
+  		OPENH323_LDFLAGS="-L${with_openh323_libs} ${H323_LIBS}"
+*************** fi
+*** 164,170 ****
+  dnl *****************************
+  
+  LDAP_INCLUDES=""
 ! LDAP_LIBS="-lldap -llber -lresolv"
   
-  GNOMEMEETING_INCLUDES=""
-  GNOMEMEETING_LDADD=""
---- 27,38 ----
-  AC_ARG_PROGRAM
   
+  AC_ARG_WITH(ldap, [  --with-ldap=PFX       Location of ldap.],
+--- 165,171 ----
+  dnl *****************************
   
-! H323_INCLUDES="-I$PWLIBDIR/include/ptlib/unix -I$PWLIBDIR/include -I$OPENH323DIR/include"
-! H323_LIBS="-L$PWLIBDIR/lib -L$OPENH323DIR/lib -lh323_FreeBSD_x86_r -lpt_FreeBSD_x86_r -pthread -lssl -lcrypto -DP_SSL"
+  LDAP_INCLUDES=""
+! LDAP_LIBS="-lldap -llber"
   
   
-! LDAP_INCLUDES="-I/usr/include -I/usr/local/include"
-! LDAP_LIBS="-L/usr/local/lib -lldap -llber"
-  
-  GNOMEMEETING_INCLUDES=""
-  GNOMEMEETING_LDADD=""
+  AC_ARG_WITH(ldap, [  --with-ldap=PFX       Location of ldap.],
 *************** dnl * -D_DEBUG -DPMEMORY_CHECK=1 -DPTRAC
-*** 46,60 ****
+*** 197,203 ****
   dnl *************************************************************************
   
   
-! H323_CFLAGS="-DP_LINUX -m486 -D_REENTRANT -DP_HAS_SEMAPHORES -DP_PTHREADS -DPBYTE_ORDER=PLITTLE_ENDIAN -DHAS_OSS -O2"
-! 
+! H323_CFLAGS="-DP_LINUX -D_REENTRANT -DP_HAS_SEMAPHORES -DP_PTHREADS -DPBYTE_ORDER=PLITTLE_ENDIAN -DHAS_OSS -O2"
   
   dnl *********************************************************************
-  dnl ** GNOME ************************************************************
-  dnl *********************************************************************
-  
-! GNOMEMEETING_INCLUDES="$H323_INCLUDES $H323_CFLAGS"
-! GNOMEMEETING_LDADD="$GNOME_LIBDIR $GTK_LIBS $GNOMEGNORBA_LIBS $GNOME_APPLETS_LIBS $LDAP_LIBS $H323_LIBS `gtk-config --libs gthread`"
-  
-  GNOME_COMPILE_WARNINGS
-  GNOME_X_CHECKS
---- 46,59 ----
+  dnl * Gdk-pixbuf ********************************************************
+--- 198,205 ----
   dnl *************************************************************************
   
   
-! H323_CFLAGS="-DP_FREEBSD=400001 -DP_PTHREADS -DPBYTE_ORDER=PLITTLE_ENDIAN -DPTRACING -02 -DNDEBUG"
+! dnl H323_CFLAGS="-DP_LINUX -D_REENTRANT -DP_HAS_SEMAPHORES -DP_PTHREADS -DPBYTE_ORDER=PLITTLE_ENDIAN -DHAS_OSS -O2"
+! H323_CFLAGS="-DP_FREEBSD=400001 -DP_SSL -DP_PTHREADS -DPBYTE_ORDER=PLITTLE_ENDIAN -O2"
   
   dnl *********************************************************************
-  dnl ** GNOME ************************************************************
-  dnl *********************************************************************
-  
-! GNOMEMEETING_INCLUDES="$LDAP_INCLUDES $H323_INCLUDES $H323_CFLAGS"
-! GNOMEMEETING_LDADD="$GNOME_LIBDIR $GTK_LIBS $GNOMEGNORBA_LIBS $GNOME_APPLETS_LIBS $LDAP_LIBS $H323_LIBS `gtk12-config --libs gthread`"
-  
-  GNOME_COMPILE_WARNINGS
-  GNOME_X_CHECKS
-*************** AM_PROG_LIBTOOL
-*** 64,70 ****
-  dnl #########################################################################
+  dnl * Gdk-pixbuf ********************************************************
+*************** dnl ####################################
+*** 236,242 ****
   dnl  Check for LDAP if available.
   dnl ########################################################################
+  
 ! AC_CHECK_LIB(resolv, res_gethostbyaddr, [LIBS="-lresolv $LIBS"], AC_MSG_ERROR([*** libresolv not found.]), -lresolv)
   
-  AC_CHECK_LIB(ldap, ldap_simple_bind, LIBS="-lldap -llber $LIBS", AC_MSG_ERROR([*** LDAP library is not found.]), -llber)
   
---- 63,69 ----
-  dnl #########################################################################
+  LIBS="$LDAP_LIBS $LIBS"
+--- 238,244 ----
   dnl  Check for LDAP if available.
   dnl ########################################################################
+  
 ! dnl AC_CHECK_LIB(resolv, res_gethostbyaddr, [LIBS="-lresolv $LIBS"], AC_MSG_ERROR([*** libresolv not found.]), -lresolv)
   
-  AC_CHECK_LIB(ldap, ldap_simple_bind, LIBS="-lldap -llber $LIBS", AC_MSG_ERROR([*** LDAP library is not found.]), -llber)
   
+  LIBS="$LDAP_LIBS $LIBS"
diff --git a/net/gnomemeeting/files/patch-ab b/net/gnomemeeting/files/patch-ab
new file mode 100644
index 000000000000..f3fe65da116e
--- /dev/null
+++ b/net/gnomemeeting/files/patch-ab
@@ -0,0 +1,31 @@
+*** src/audio.cpp.orig	Fri Dec  7 07:17:19 2001
+--- src/audio.cpp	Fri Dec  7 07:18:24 2001
+*************** int gnomemeeting_set_recording_source (c
+*** 103,108 ****
+--- 103,111 ----
+  
+  int gnomemeeting_get_mixer_name (char *mixer, char *name)
+  {
++ #ifdef __FreeBSD__
++   strcpy(name,"/dev/mixer");
++ #else
+    int mixerfd, res;
+    mixer_info info;
+  
+*************** int gnomemeeting_get_mixer_name (char *m
+*** 115,121 ****
+    strcpy (name, info.name);
+  
+    close (mixerfd);
+! 
+    return 0;
+  }
+  
+--- 118,124 ----
+    strcpy (name, info.name);
+  
+    close (mixerfd);
+! #endif
+    return 0;
+  }
+  
diff --git a/net/gnomemeeting/files/patch-ac b/net/gnomemeeting/files/patch-ac
new file mode 100644
index 000000000000..daa7c9329827
--- /dev/null
+++ b/net/gnomemeeting/files/patch-ac
@@ -0,0 +1,19 @@
+*** intltool-merge.in.orig	Fri Dec  7 10:13:04 2001
+--- intltool-merge.in	Fri Dec  7 09:46:41 2001
+*************** sub create_translation_database
+*** 237,243 ****
+  
+          if ($UTF8_ARG) {
+              my $encoding = get_po_encoding($po_file);
+!             open PO_FILE, "iconv -f $encoding -t UTF-8 $po_file|";	
+          } else {
+              open PO_FILE, "<$po_file";	
+          }
+--- 237,243 ----
+  
+          if ($UTF8_ARG) {
+              my $encoding = get_po_encoding($po_file);
+!             open PO_FILE, "giconv -f $encoding -t UTF-8 $po_file|";	
+          } else {
+              open PO_FILE, "<$po_file";	
+          }
diff --git a/net/gnomemeeting/files/patch-ad b/net/gnomemeeting/files/patch-ad
deleted file mode 100644
index 90a3118a4274..000000000000
--- a/net/gnomemeeting/files/patch-ad
+++ /dev/null
@@ -1,18 +0,0 @@
-*** src/audio.h.orig	Fri Aug 17 20:08:26 2001
---- src/audio.h	Mon Aug 20 07:54:33 2001
-***************
-*** 21,27 ****
---- 21,33 ----
-  #define _AUDIO_H_
-  
-  
-+ #ifdef __linux__
-  #include <linux/soundcard.h>
-+ #endif
-+ #ifdef __FreeBSD__
-+ #include <machine/soundcard.h>
-+ #endif
-+ 
-  
-  
-  #include <sys/ioctl.h>
diff --git a/net/gnomemeeting/files/patch-ae b/net/gnomemeeting/files/patch-ae
deleted file mode 100644
index 9a8d68f49ca4..000000000000
--- a/net/gnomemeeting/files/patch-ae
+++ /dev/null
@@ -1,17 +0,0 @@
-*** src/webcam.h.orig	Mon Aug 20 07:55:24 2001
---- src/webcam.h	Mon Aug 20 07:55:51 2001
-***************
-*** 23,29 ****
---- 23,34 ----
-  #include <fcntl.h>
-  #include <unistd.h>
-  
-+ #ifdef __linux__
-  #include <linux/videodev.h>
-+ #endif
-+ #ifdef __FreeBSD__
-+ #include <machine/ioctl_meteor.h>
-+ #endif
-  
-  #include <sys/ioctl.h>
-  #include <gtk/gtk.h>
diff --git a/net/gnomemeeting/files/patch-ai b/net/gnomemeeting/files/patch-ai
deleted file mode 100644
index 77763d4e07fa..000000000000
--- a/net/gnomemeeting/files/patch-ai
+++ /dev/null
@@ -1,41 +0,0 @@
-*** src/config.cpp.orig	Mon Aug 13 17:19:15 2001
---- src/config.cpp	Fri Aug 17 18:03:23 2001
-*************** void read_config (options *opts)
-*** 161,167 ****
-        // Do not free key and value as they are assigned as pointers to opts->audio_codecs
-        cpt++;
-      }
-!   
-  }
-  
-  
---- 161,175 ----
-        // Do not free key and value as they are assigned as pointers to opts->audio_codecs
-        cpt++;
-      }
-! 
-!   /* handle old config files which do not have a Devices section */
-!   if(opts->audio_device == NULL) opts->audio_device="/dev/dsp";
-!   if(opts->audio_mixer == NULL)  opts->audio_mixer="/dev/mixer";
-! #ifdef __linux__
-!   if(opts->video_device == NULL) opts->video_device="/dev/video";
-! #else
-!   if(opts->video_device == NULL) opts->video_device="/dev/bktr0";
-! #endif
-  }
-  
-  
-*************** void init_config (void)
-*** 419,425 ****
---- 427,437 ----
-  
-    gnome_config_set_string ("Devices/audio_device", "/dev/dsp");
-    gnome_config_set_string ("Devices/audio_mixer", "/dev/mixer");
-+ #ifdef __linux__
-    gnome_config_set_string ("Devices/video_device", "/dev/video");
-+ #else
-+   gnome_config_set_string ("Devices/video_device", "/dev/bktr0");
-+ #endif
-    gnome_config_set_int ("Devices/video_channel", 0);
-  
-    gnome_config_set_string ("Placement/Dock", 
diff --git a/net/gnomemeeting2/Makefile b/net/gnomemeeting2/Makefile
index 34f3c2d3e310..49fb274f1c77 100644
--- a/net/gnomemeeting2/Makefile
+++ b/net/gnomemeeting2/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	gnomemeeting
-PORTVERSION=	0.10
+PORTVERSION=	0.12.2
 CATEGORIES=	net gnome
-MASTER_SITES=	http://130.104.229.225/gnomemeeting/downloads/0.10/sources/ \
-		ftp://telepresence.dmem.strath.ac.uk/pub/openh323/
+MASTER_SITES=	http://www.gnomemeeting.org/downloads/latest/sources/
+DISTNAME=	GnomeMeeting-0.12.2
 
 MAINTAINER=	roger@FreeBSD.org
 
@@ -27,8 +27,13 @@ USE_GNOME=	yes
 USE_AUTOCONF=	yes
 USE_GTK=	yes
 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=/usr/local
 CONFIGURE_ENV=	LIBS=-L${PREFIX}/lib \
-		PWLIBDIR=${WRKDIRPREFIX}${.CURDIR}/../openh323/work/pwlib \
+		PTLIBDIR=${WRKDIRPREFIX}${.CURDIR}/../openh323/work/pwlib \
 		OPENH323DIR=${WRKDIRPREFIX}${.CURDIR}/../openh323/work/openh323 \
 
 .include <bsd.port.mk>
diff --git a/net/gnomemeeting2/distinfo b/net/gnomemeeting2/distinfo
index e23ad8317204..a3102c568edf 100644
--- a/net/gnomemeeting2/distinfo
+++ b/net/gnomemeeting2/distinfo
@@ -1 +1 @@
-MD5 (gnomemeeting-0.10.tar.gz) = 1d14f7ade38a7b7033825b9550c7da59
+MD5 (GnomeMeeting-0.12.2.tar.gz) = d724fa9f6289b83362a1641f4030baa2
diff --git a/net/gnomemeeting2/files/patch-aa b/net/gnomemeeting2/files/patch-aa
index 2bf26cd444d1..75cba9477bde 100644
--- a/net/gnomemeeting2/files/patch-aa
+++ b/net/gnomemeeting2/files/patch-aa
@@ -1,78 +1,106 @@
-*** configure.in.orig	Sat Aug 18 00:20:58 2001
---- configure.in	Mon Aug 20 14:50:48 2001
-*************** AC_HEADER_STDC
-*** 27,38 ****
-  AC_ARG_PROGRAM
-  
-  
-! H323_INCLUDES="-I$PTLIB_INCLUDE_DIR/unix -I$PTLIB_INCLUDE_DIR/.. -I$PTLIB_INCLUDE_DIR/../ptclib -I/usr/include -I$OPENH323_INCLUDE_DIR"
-! H323_LIBS="-lh323_linux_x86_r -ldl -lpt_linux_x86_r -lpthread"
-  
-  
-! LDAP_INCLUDES="-I/usr/local/include"
+*** configure.in.orig	Fri Dec  7 06:35:07 2001
+--- configure.in	Fri Dec  7 07:24:28 2001
+*************** fi
+*** 58,64 ****
+  AC_ARG_WITH(ptlib-libs, [  --with-ptlib-libs=PFX       Location of PTLib libs.],
+  	with_ptlib_libs="$withval", with_ptlib_libs="/usr/lib")
+  if test "x${with_ptlib_libs}" != "xno" -a "x${have_ptlib_includes}" != "xno"; then
+! 	AC_CHECK_FILE(${with_ptlib_libs}/libpt.so, ptlib_libs="yes", ptlib_libs="no")
+  	
+  	if test "x${ptlib_libs}" != "xno"; then
+  		PTLIB_LDFLAGS="-L${with_ptlib_libs} ${H323_LIBS}"
+--- 58,64 ----
+  AC_ARG_WITH(ptlib-libs, [  --with-ptlib-libs=PFX       Location of PTLib libs.],
+  	with_ptlib_libs="$withval", with_ptlib_libs="/usr/lib")
+  if test "x${with_ptlib_libs}" != "xno" -a "x${have_ptlib_includes}" != "xno"; then
+! 	AC_CHECK_FILE(${with_ptlib_libs}/libpt_FreeBSD_x86_r.a, ptlib_libs="yes", ptlib_libs="no")
+  	
+  	if test "x${ptlib_libs}" != "xno"; then
+  		PTLIB_LDFLAGS="-L${with_ptlib_libs} ${H323_LIBS}"
+*************** else
+*** 70,76 ****
+  	AC_MSG_ERROR([You need PTLib to enjoy GnomeMeeting])
+  fi
+  
+! H323_LIBS="-lopenh323 -ldl -lpt -lpthread -lssl -lcrypto"
+  
+  dnl ***************************************
+  dnl OpenH323
+--- 70,77 ----
+  	AC_MSG_ERROR([You need PTLib to enjoy GnomeMeeting])
+  fi
+  
+! dnl H323_LIBS="-lopenh323 -ldl -lpt -lpthread -lssl -lcrypto"
+! H323_LIBS="-lh323_FreeBSD_x86_r -lpt_FreeBSD_x86_r -pthread -lssl -lcrypto"
+  
+  dnl ***************************************
+  dnl OpenH323
+*************** AC_ARG_WITH(openh323-libs, [  --with-ope
+*** 104,110 ****
+  	with_openh323_libs="$withval", with_openh323_libs="/usr/lib")
+  msg_openh323="no"
+  if test "x${with_openh323_libs}" != "xno" -a "x${have_openh323_includes}" != "xno"; then
+! 	AC_CHECK_FILE(${with_openh323_libs}/libopenh323.so, openh323_libs="yes", openh323_libs="no")
+  	if test "x${openh323_libs}" != "xno"; then
+  		msg_openh323="yes"
+  		OPENH323_LDFLAGS="-L${with_openh323_libs} ${H323_LIBS}"
+--- 105,111 ----
+  	with_openh323_libs="$withval", with_openh323_libs="/usr/lib")
+  msg_openh323="no"
+  if test "x${with_openh323_libs}" != "xno" -a "x${have_openh323_includes}" != "xno"; then
+! 	AC_CHECK_FILE(${with_openh323_libs}/libh323_FreeBSD_x86_r.a, openh323_libs="yes", openh323_libs="no")
+  	if test "x${openh323_libs}" != "xno"; then
+  		msg_openh323="yes"
+  		OPENH323_LDFLAGS="-L${with_openh323_libs} ${H323_LIBS}"
+*************** fi
+*** 164,170 ****
+  dnl *****************************
+  
+  LDAP_INCLUDES=""
 ! LDAP_LIBS="-lldap -llber -lresolv"
   
-  GNOMEMEETING_INCLUDES=""
-  GNOMEMEETING_LDADD=""
---- 27,38 ----
-  AC_ARG_PROGRAM
   
+  AC_ARG_WITH(ldap, [  --with-ldap=PFX       Location of ldap.],
+--- 165,171 ----
+  dnl *****************************
   
-! H323_INCLUDES="-I$PWLIBDIR/include/ptlib/unix -I$PWLIBDIR/include -I$OPENH323DIR/include"
-! H323_LIBS="-L$PWLIBDIR/lib -L$OPENH323DIR/lib -lh323_FreeBSD_x86_r -lpt_FreeBSD_x86_r -pthread -lssl -lcrypto -DP_SSL"
+  LDAP_INCLUDES=""
+! LDAP_LIBS="-lldap -llber"
   
   
-! LDAP_INCLUDES="-I/usr/include -I/usr/local/include"
-! LDAP_LIBS="-L/usr/local/lib -lldap -llber"
-  
-  GNOMEMEETING_INCLUDES=""
-  GNOMEMEETING_LDADD=""
+  AC_ARG_WITH(ldap, [  --with-ldap=PFX       Location of ldap.],
 *************** dnl * -D_DEBUG -DPMEMORY_CHECK=1 -DPTRAC
-*** 46,60 ****
+*** 197,203 ****
   dnl *************************************************************************
   
   
-! H323_CFLAGS="-DP_LINUX -m486 -D_REENTRANT -DP_HAS_SEMAPHORES -DP_PTHREADS -DPBYTE_ORDER=PLITTLE_ENDIAN -DHAS_OSS -O2"
-! 
+! H323_CFLAGS="-DP_LINUX -D_REENTRANT -DP_HAS_SEMAPHORES -DP_PTHREADS -DPBYTE_ORDER=PLITTLE_ENDIAN -DHAS_OSS -O2"
   
   dnl *********************************************************************
-  dnl ** GNOME ************************************************************
-  dnl *********************************************************************
-  
-! GNOMEMEETING_INCLUDES="$H323_INCLUDES $H323_CFLAGS"
-! GNOMEMEETING_LDADD="$GNOME_LIBDIR $GTK_LIBS $GNOMEGNORBA_LIBS $GNOME_APPLETS_LIBS $LDAP_LIBS $H323_LIBS `gtk-config --libs gthread`"
-  
-  GNOME_COMPILE_WARNINGS
-  GNOME_X_CHECKS
---- 46,59 ----
+  dnl * Gdk-pixbuf ********************************************************
+--- 198,205 ----
   dnl *************************************************************************
   
   
-! H323_CFLAGS="-DP_FREEBSD=400001 -DP_PTHREADS -DPBYTE_ORDER=PLITTLE_ENDIAN -DPTRACING -02 -DNDEBUG"
+! dnl H323_CFLAGS="-DP_LINUX -D_REENTRANT -DP_HAS_SEMAPHORES -DP_PTHREADS -DPBYTE_ORDER=PLITTLE_ENDIAN -DHAS_OSS -O2"
+! H323_CFLAGS="-DP_FREEBSD=400001 -DP_SSL -DP_PTHREADS -DPBYTE_ORDER=PLITTLE_ENDIAN -O2"
   
   dnl *********************************************************************
-  dnl ** GNOME ************************************************************
-  dnl *********************************************************************
-  
-! GNOMEMEETING_INCLUDES="$LDAP_INCLUDES $H323_INCLUDES $H323_CFLAGS"
-! GNOMEMEETING_LDADD="$GNOME_LIBDIR $GTK_LIBS $GNOMEGNORBA_LIBS $GNOME_APPLETS_LIBS $LDAP_LIBS $H323_LIBS `gtk12-config --libs gthread`"
-  
-  GNOME_COMPILE_WARNINGS
-  GNOME_X_CHECKS
-*************** AM_PROG_LIBTOOL
-*** 64,70 ****
-  dnl #########################################################################
+  dnl * Gdk-pixbuf ********************************************************
+*************** dnl ####################################
+*** 236,242 ****
   dnl  Check for LDAP if available.
   dnl ########################################################################
+  
 ! AC_CHECK_LIB(resolv, res_gethostbyaddr, [LIBS="-lresolv $LIBS"], AC_MSG_ERROR([*** libresolv not found.]), -lresolv)
   
-  AC_CHECK_LIB(ldap, ldap_simple_bind, LIBS="-lldap -llber $LIBS", AC_MSG_ERROR([*** LDAP library is not found.]), -llber)
   
---- 63,69 ----
-  dnl #########################################################################
+  LIBS="$LDAP_LIBS $LIBS"
+--- 238,244 ----
   dnl  Check for LDAP if available.
   dnl ########################################################################
+  
 ! dnl AC_CHECK_LIB(resolv, res_gethostbyaddr, [LIBS="-lresolv $LIBS"], AC_MSG_ERROR([*** libresolv not found.]), -lresolv)
   
-  AC_CHECK_LIB(ldap, ldap_simple_bind, LIBS="-lldap -llber $LIBS", AC_MSG_ERROR([*** LDAP library is not found.]), -llber)
   
+  LIBS="$LDAP_LIBS $LIBS"
diff --git a/net/gnomemeeting2/files/patch-ab b/net/gnomemeeting2/files/patch-ab
new file mode 100644
index 000000000000..f3fe65da116e
--- /dev/null
+++ b/net/gnomemeeting2/files/patch-ab
@@ -0,0 +1,31 @@
+*** src/audio.cpp.orig	Fri Dec  7 07:17:19 2001
+--- src/audio.cpp	Fri Dec  7 07:18:24 2001
+*************** int gnomemeeting_set_recording_source (c
+*** 103,108 ****
+--- 103,111 ----
+  
+  int gnomemeeting_get_mixer_name (char *mixer, char *name)
+  {
++ #ifdef __FreeBSD__
++   strcpy(name,"/dev/mixer");
++ #else
+    int mixerfd, res;
+    mixer_info info;
+  
+*************** int gnomemeeting_get_mixer_name (char *m
+*** 115,121 ****
+    strcpy (name, info.name);
+  
+    close (mixerfd);
+! 
+    return 0;
+  }
+  
+--- 118,124 ----
+    strcpy (name, info.name);
+  
+    close (mixerfd);
+! #endif
+    return 0;
+  }
+  
diff --git a/net/gnomemeeting2/files/patch-ac b/net/gnomemeeting2/files/patch-ac
new file mode 100644
index 000000000000..daa7c9329827
--- /dev/null
+++ b/net/gnomemeeting2/files/patch-ac
@@ -0,0 +1,19 @@
+*** intltool-merge.in.orig	Fri Dec  7 10:13:04 2001
+--- intltool-merge.in	Fri Dec  7 09:46:41 2001
+*************** sub create_translation_database
+*** 237,243 ****
+  
+          if ($UTF8_ARG) {
+              my $encoding = get_po_encoding($po_file);
+!             open PO_FILE, "iconv -f $encoding -t UTF-8 $po_file|";	
+          } else {
+              open PO_FILE, "<$po_file";	
+          }
+--- 237,243 ----
+  
+          if ($UTF8_ARG) {
+              my $encoding = get_po_encoding($po_file);
+!             open PO_FILE, "giconv -f $encoding -t UTF-8 $po_file|";	
+          } else {
+              open PO_FILE, "<$po_file";	
+          }
diff --git a/net/gnomemeeting2/files/patch-ad b/net/gnomemeeting2/files/patch-ad
deleted file mode 100644
index 90a3118a4274..000000000000
--- a/net/gnomemeeting2/files/patch-ad
+++ /dev/null
@@ -1,18 +0,0 @@
-*** src/audio.h.orig	Fri Aug 17 20:08:26 2001
---- src/audio.h	Mon Aug 20 07:54:33 2001
-***************
-*** 21,27 ****
---- 21,33 ----
-  #define _AUDIO_H_
-  
-  
-+ #ifdef __linux__
-  #include <linux/soundcard.h>
-+ #endif
-+ #ifdef __FreeBSD__
-+ #include <machine/soundcard.h>
-+ #endif
-+ 
-  
-  
-  #include <sys/ioctl.h>
diff --git a/net/gnomemeeting2/files/patch-ae b/net/gnomemeeting2/files/patch-ae
deleted file mode 100644
index 9a8d68f49ca4..000000000000
--- a/net/gnomemeeting2/files/patch-ae
+++ /dev/null
@@ -1,17 +0,0 @@
-*** src/webcam.h.orig	Mon Aug 20 07:55:24 2001
---- src/webcam.h	Mon Aug 20 07:55:51 2001
-***************
-*** 23,29 ****
---- 23,34 ----
-  #include <fcntl.h>
-  #include <unistd.h>
-  
-+ #ifdef __linux__
-  #include <linux/videodev.h>
-+ #endif
-+ #ifdef __FreeBSD__
-+ #include <machine/ioctl_meteor.h>
-+ #endif
-  
-  #include <sys/ioctl.h>
-  #include <gtk/gtk.h>
diff --git a/net/gnomemeeting2/files/patch-ai b/net/gnomemeeting2/files/patch-ai
deleted file mode 100644
index 77763d4e07fa..000000000000
--- a/net/gnomemeeting2/files/patch-ai
+++ /dev/null
@@ -1,41 +0,0 @@
-*** src/config.cpp.orig	Mon Aug 13 17:19:15 2001
---- src/config.cpp	Fri Aug 17 18:03:23 2001
-*************** void read_config (options *opts)
-*** 161,167 ****
-        // Do not free key and value as they are assigned as pointers to opts->audio_codecs
-        cpt++;
-      }
-!   
-  }
-  
-  
---- 161,175 ----
-        // Do not free key and value as they are assigned as pointers to opts->audio_codecs
-        cpt++;
-      }
-! 
-!   /* handle old config files which do not have a Devices section */
-!   if(opts->audio_device == NULL) opts->audio_device="/dev/dsp";
-!   if(opts->audio_mixer == NULL)  opts->audio_mixer="/dev/mixer";
-! #ifdef __linux__
-!   if(opts->video_device == NULL) opts->video_device="/dev/video";
-! #else
-!   if(opts->video_device == NULL) opts->video_device="/dev/bktr0";
-! #endif
-  }
-  
-  
-*************** void init_config (void)
-*** 419,425 ****
---- 427,437 ----
-  
-    gnome_config_set_string ("Devices/audio_device", "/dev/dsp");
-    gnome_config_set_string ("Devices/audio_mixer", "/dev/mixer");
-+ #ifdef __linux__
-    gnome_config_set_string ("Devices/video_device", "/dev/video");
-+ #else
-+   gnome_config_set_string ("Devices/video_device", "/dev/bktr0");
-+ #endif
-    gnome_config_set_int ("Devices/video_channel", 0);
-  
-    gnome_config_set_string ("Placement/Dock",