18 files changed, 123 insertions, 531 deletions

diff --git a/net/ekiga/Makefile b/net/ekiga/Makefile
index 80dceade12c1..234177395859 100644
--- a/net/ekiga/Makefile
+++ b/net/ekiga/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	gnomemeeting
-PORTVERSION=	0.12.2
-PORTREVISION=	1
+PORTVERSION=	0.85.1
 CATEGORIES=	net gnome
 MASTER_SITES=	http://www.gnomemeeting.org/downloads/latest/sources/
-DISTNAME=	GnomeMeeting-0.12.2
+DISTNAME=	GnomeMeeting-0.85.1
 
 MAINTAINER=	roger@FreeBSD.org
 
diff --git a/net/ekiga/distinfo b/net/ekiga/distinfo
index a3102c568edf..7943db0b8b03 100644
--- a/net/ekiga/distinfo
+++ b/net/ekiga/distinfo
@@ -1 +1 @@
-MD5 (GnomeMeeting-0.12.2.tar.gz) = d724fa9f6289b83362a1641f4030baa2
+MD5 (GnomeMeeting-0.85.1.tar.gz) = 18cc61799805e4bc03dbe61a4c602639
diff --git a/net/ekiga/files/patch-aa b/net/ekiga/files/patch-aa
index aea55ffce929..e73a5b3f8325 100644
--- a/net/ekiga/files/patch-aa
+++ b/net/ekiga/files/patch-aa
@@ -1,123 +1,19 @@
-*** configure.in.orig	Tue Dec  4 21:52:21 2001
---- configure.in	Fri Dec  7 19:00:01 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"
-  
-  
-  AC_ARG_WITH(ldap, [  --with-ldap=PFX       Location of ldap.],
---- 165,171 ----
-  dnl *****************************
-  
-  LDAP_INCLUDES=""
-! LDAP_LIBS="-lldap -llber"
-  
-  
-  AC_ARG_WITH(ldap, [  --with-ldap=PFX       Location of ldap.],
-*************** dnl * -D_DEBUG -DPMEMORY_CHECK=1 -DPTRAC
-*** 197,203 ****
-  dnl *************************************************************************
-  
-  
-! H323_CFLAGS="-DP_LINUX -D_REENTRANT -DP_HAS_SEMAPHORES -DP_PTHREADS -DPBYTE_ORDER=PLITTLE_ENDIAN -DHAS_OSS -O2"
-  
-  dnl *********************************************************************
-  dnl * Gdk-pixbuf ********************************************************
---- 198,205 ----
-  dnl *************************************************************************
-  
-  
-! 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 * Gdk-pixbuf ********************************************************
-*************** dnl ** GNOME ***************************
-*** 225,231 ****
-  dnl *********************************************************************
-  
-  GNOMEMEETING_INCLUDES="$GNOMEMEETING_INCLUDES $H323_CFLAGS $GDK_PIXBUF_CFLAGS $GCONF_CFLAGS $GNORBA_CFLAGS $ORBIT_CFLAGS"
-! GNOMEMEETING_LDADD="$GNOMEMEETING_LDADD $GNOME_LIBDIR $GTK_LIBS $GNOMEGNORBA_LIBS $LDAP_LIBS $H323_LIBS `gtk-config --libs gthread` $GDK_PIXBUF_LIBS $GCONF_LIBS $GNORBA_LIBS $ORBIT_LIBS"
-  
-  GNOME_COMPILE_WARNINGS
-  GNOME_X_CHECKS
---- 227,233 ----
-  dnl *********************************************************************
-  
-  GNOMEMEETING_INCLUDES="$GNOMEMEETING_INCLUDES $H323_CFLAGS $GDK_PIXBUF_CFLAGS $GCONF_CFLAGS $GNORBA_CFLAGS $ORBIT_CFLAGS"
-! GNOMEMEETING_LDADD="$GNOMEMEETING_LDADD $GNOME_LIBDIR $GTK_LIBS $GNOMEGNORBA_LIBS $LDAP_LIBS $H323_LIBS `$GTK_CONFIG --libs gthread` $GDK_PIXBUF_LIBS $GCONF_LIBS $GNORBA_LIBS $ORBIT_LIBS"
-  
-  GNOME_COMPILE_WARNINGS
-  GNOME_X_CHECKS
-*************** 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)
-  
-  
-  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)
-  
-  
-  LIBS="$LDAP_LIBS $LIBS"
+*** src/videograbber.cpp.orig	Thu Apr 18 23:30:25 2002
+--- src/videograbber.cpp	Thu Apr 18 23:31:13 2002
+*************** void GMVideoGrabber::VGOpen (void)
+*** 463,469 ****
+      if (!grabber->Open (video_device, FALSE))
+        error_code = 0;
+      else
+!       if (!grabber->SetVideoDeviceParameters (video_channel, video_format))
+  	error_code = 2;
+      else
+        if (!grabber->SetColourFormatConverter ("YUV420P"))
+--- 463,469 ----
+      if (!grabber->Open (video_device, FALSE))
+        error_code = 0;
+      else
+!       if (!grabber->SetVideoChannelFormat (video_channel, video_format))
+  	error_code = 2;
+      else
+        if (!grabber->SetColourFormatConverter ("YUV420P"))
diff --git a/net/ekiga/files/patch-ab b/net/ekiga/files/patch-ab
deleted file mode 100644
index f3fe65da116e..000000000000
--- a/net/ekiga/files/patch-ab
+++ /dev/null
@@ -1,31 +0,0 @@
-*** 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 12eade185aaa..000000000000
--- a/net/ekiga/files/patch-ad
+++ /dev/null
@@ -1,19 +0,0 @@
-*** src/gnomemeeting.cpp.orig	Tue Jan  8 10:32:05 2002
---- src/gnomemeeting.cpp	Tue Jan  8 10:32:35 2002
-*************** gint gnome_idle_timer (void)
-*** 74,80 ****
-      gtk_main_iteration(); 
-    gdk_threads_leave ();
-  
-!   usleep (100);
-    return TRUE;
-  }
-  
---- 74,80 ----
-      gtk_main_iteration(); 
-    gdk_threads_leave ();
-  
-!   usleep (100000);
-    return TRUE;
-  }
-  
diff --git a/net/gnomemeeting/Makefile b/net/gnomemeeting/Makefile
index 80dceade12c1..234177395859 100644
--- a/net/gnomemeeting/Makefile
+++ b/net/gnomemeeting/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	gnomemeeting
-PORTVERSION=	0.12.2
-PORTREVISION=	1
+PORTVERSION=	0.85.1
 CATEGORIES=	net gnome
 MASTER_SITES=	http://www.gnomemeeting.org/downloads/latest/sources/
-DISTNAME=	GnomeMeeting-0.12.2
+DISTNAME=	GnomeMeeting-0.85.1
 
 MAINTAINER=	roger@FreeBSD.org
 
diff --git a/net/gnomemeeting/distinfo b/net/gnomemeeting/distinfo
index a3102c568edf..7943db0b8b03 100644
--- a/net/gnomemeeting/distinfo
+++ b/net/gnomemeeting/distinfo
@@ -1 +1 @@
-MD5 (GnomeMeeting-0.12.2.tar.gz) = d724fa9f6289b83362a1641f4030baa2
+MD5 (GnomeMeeting-0.85.1.tar.gz) = 18cc61799805e4bc03dbe61a4c602639
diff --git a/net/gnomemeeting/files/patch-aa b/net/gnomemeeting/files/patch-aa
index aea55ffce929..e73a5b3f8325 100644
--- a/net/gnomemeeting/files/patch-aa
+++ b/net/gnomemeeting/files/patch-aa
@@ -1,123 +1,19 @@
-*** configure.in.orig	Tue Dec  4 21:52:21 2001
---- configure.in	Fri Dec  7 19:00:01 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"
-  
-  
-  AC_ARG_WITH(ldap, [  --with-ldap=PFX       Location of ldap.],
---- 165,171 ----
-  dnl *****************************
-  
-  LDAP_INCLUDES=""
-! LDAP_LIBS="-lldap -llber"
-  
-  
-  AC_ARG_WITH(ldap, [  --with-ldap=PFX       Location of ldap.],
-*************** dnl * -D_DEBUG -DPMEMORY_CHECK=1 -DPTRAC
-*** 197,203 ****
-  dnl *************************************************************************
-  
-  
-! H323_CFLAGS="-DP_LINUX -D_REENTRANT -DP_HAS_SEMAPHORES -DP_PTHREADS -DPBYTE_ORDER=PLITTLE_ENDIAN -DHAS_OSS -O2"
-  
-  dnl *********************************************************************
-  dnl * Gdk-pixbuf ********************************************************
---- 198,205 ----
-  dnl *************************************************************************
-  
-  
-! 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 * Gdk-pixbuf ********************************************************
-*************** dnl ** GNOME ***************************
-*** 225,231 ****
-  dnl *********************************************************************
-  
-  GNOMEMEETING_INCLUDES="$GNOMEMEETING_INCLUDES $H323_CFLAGS $GDK_PIXBUF_CFLAGS $GCONF_CFLAGS $GNORBA_CFLAGS $ORBIT_CFLAGS"
-! GNOMEMEETING_LDADD="$GNOMEMEETING_LDADD $GNOME_LIBDIR $GTK_LIBS $GNOMEGNORBA_LIBS $LDAP_LIBS $H323_LIBS `gtk-config --libs gthread` $GDK_PIXBUF_LIBS $GCONF_LIBS $GNORBA_LIBS $ORBIT_LIBS"
-  
-  GNOME_COMPILE_WARNINGS
-  GNOME_X_CHECKS
---- 227,233 ----
-  dnl *********************************************************************
-  
-  GNOMEMEETING_INCLUDES="$GNOMEMEETING_INCLUDES $H323_CFLAGS $GDK_PIXBUF_CFLAGS $GCONF_CFLAGS $GNORBA_CFLAGS $ORBIT_CFLAGS"
-! GNOMEMEETING_LDADD="$GNOMEMEETING_LDADD $GNOME_LIBDIR $GTK_LIBS $GNOMEGNORBA_LIBS $LDAP_LIBS $H323_LIBS `$GTK_CONFIG --libs gthread` $GDK_PIXBUF_LIBS $GCONF_LIBS $GNORBA_LIBS $ORBIT_LIBS"
-  
-  GNOME_COMPILE_WARNINGS
-  GNOME_X_CHECKS
-*************** 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)
-  
-  
-  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)
-  
-  
-  LIBS="$LDAP_LIBS $LIBS"
+*** src/videograbber.cpp.orig	Thu Apr 18 23:30:25 2002
+--- src/videograbber.cpp	Thu Apr 18 23:31:13 2002
+*************** void GMVideoGrabber::VGOpen (void)
+*** 463,469 ****
+      if (!grabber->Open (video_device, FALSE))
+        error_code = 0;
+      else
+!       if (!grabber->SetVideoDeviceParameters (video_channel, video_format))
+  	error_code = 2;
+      else
+        if (!grabber->SetColourFormatConverter ("YUV420P"))
+--- 463,469 ----
+      if (!grabber->Open (video_device, FALSE))
+        error_code = 0;
+      else
+!       if (!grabber->SetVideoChannelFormat (video_channel, video_format))
+  	error_code = 2;
+      else
+        if (!grabber->SetColourFormatConverter ("YUV420P"))
diff --git a/net/gnomemeeting/files/patch-ab b/net/gnomemeeting/files/patch-ab
deleted file mode 100644
index f3fe65da116e..000000000000
--- a/net/gnomemeeting/files/patch-ab
+++ /dev/null
@@ -1,31 +0,0 @@
-*** 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 12eade185aaa..000000000000
--- a/net/gnomemeeting/files/patch-ad
+++ /dev/null
@@ -1,19 +0,0 @@
-*** src/gnomemeeting.cpp.orig	Tue Jan  8 10:32:05 2002
---- src/gnomemeeting.cpp	Tue Jan  8 10:32:35 2002
-*************** gint gnome_idle_timer (void)
-*** 74,80 ****
-      gtk_main_iteration(); 
-    gdk_threads_leave ();
-  
-!   usleep (100);
-    return TRUE;
-  }
-  
---- 74,80 ----
-      gtk_main_iteration(); 
-    gdk_threads_leave ();
-  
-!   usleep (100000);
-    return TRUE;
-  }
-  
diff --git a/net/gnomemeeting2/Makefile b/net/gnomemeeting2/Makefile
index 80dceade12c1..234177395859 100644
--- a/net/gnomemeeting2/Makefile
+++ b/net/gnomemeeting2/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	gnomemeeting
-PORTVERSION=	0.12.2
-PORTREVISION=	1
+PORTVERSION=	0.85.1
 CATEGORIES=	net gnome
 MASTER_SITES=	http://www.gnomemeeting.org/downloads/latest/sources/
-DISTNAME=	GnomeMeeting-0.12.2
+DISTNAME=	GnomeMeeting-0.85.1
 
 MAINTAINER=	roger@FreeBSD.org
 
diff --git a/net/gnomemeeting2/distinfo b/net/gnomemeeting2/distinfo
index a3102c568edf..7943db0b8b03 100644
--- a/net/gnomemeeting2/distinfo
+++ b/net/gnomemeeting2/distinfo
@@ -1 +1 @@
-MD5 (GnomeMeeting-0.12.2.tar.gz) = d724fa9f6289b83362a1641f4030baa2
+MD5 (GnomeMeeting-0.85.1.tar.gz) = 18cc61799805e4bc03dbe61a4c602639
diff --git a/net/gnomemeeting2/files/patch-aa b/net/gnomemeeting2/files/patch-aa
index aea55ffce929..e73a5b3f8325 100644
--- a/net/gnomemeeting2/files/patch-aa
+++ b/net/gnomemeeting2/files/patch-aa
@@ -1,123 +1,19 @@
-*** configure.in.orig	Tue Dec  4 21:52:21 2001
---- configure.in	Fri Dec  7 19:00:01 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"
-  
-  
-  AC_ARG_WITH(ldap, [  --with-ldap=PFX       Location of ldap.],
---- 165,171 ----
-  dnl *****************************
-  
-  LDAP_INCLUDES=""
-! LDAP_LIBS="-lldap -llber"
-  
-  
-  AC_ARG_WITH(ldap, [  --with-ldap=PFX       Location of ldap.],
-*************** dnl * -D_DEBUG -DPMEMORY_CHECK=1 -DPTRAC
-*** 197,203 ****
-  dnl *************************************************************************
-  
-  
-! H323_CFLAGS="-DP_LINUX -D_REENTRANT -DP_HAS_SEMAPHORES -DP_PTHREADS -DPBYTE_ORDER=PLITTLE_ENDIAN -DHAS_OSS -O2"
-  
-  dnl *********************************************************************
-  dnl * Gdk-pixbuf ********************************************************
---- 198,205 ----
-  dnl *************************************************************************
-  
-  
-! 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 * Gdk-pixbuf ********************************************************
-*************** dnl ** GNOME ***************************
-*** 225,231 ****
-  dnl *********************************************************************
-  
-  GNOMEMEETING_INCLUDES="$GNOMEMEETING_INCLUDES $H323_CFLAGS $GDK_PIXBUF_CFLAGS $GCONF_CFLAGS $GNORBA_CFLAGS $ORBIT_CFLAGS"
-! GNOMEMEETING_LDADD="$GNOMEMEETING_LDADD $GNOME_LIBDIR $GTK_LIBS $GNOMEGNORBA_LIBS $LDAP_LIBS $H323_LIBS `gtk-config --libs gthread` $GDK_PIXBUF_LIBS $GCONF_LIBS $GNORBA_LIBS $ORBIT_LIBS"
-  
-  GNOME_COMPILE_WARNINGS
-  GNOME_X_CHECKS
---- 227,233 ----
-  dnl *********************************************************************
-  
-  GNOMEMEETING_INCLUDES="$GNOMEMEETING_INCLUDES $H323_CFLAGS $GDK_PIXBUF_CFLAGS $GCONF_CFLAGS $GNORBA_CFLAGS $ORBIT_CFLAGS"
-! GNOMEMEETING_LDADD="$GNOMEMEETING_LDADD $GNOME_LIBDIR $GTK_LIBS $GNOMEGNORBA_LIBS $LDAP_LIBS $H323_LIBS `$GTK_CONFIG --libs gthread` $GDK_PIXBUF_LIBS $GCONF_LIBS $GNORBA_LIBS $ORBIT_LIBS"
-  
-  GNOME_COMPILE_WARNINGS
-  GNOME_X_CHECKS
-*************** 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)
-  
-  
-  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)
-  
-  
-  LIBS="$LDAP_LIBS $LIBS"
+*** src/videograbber.cpp.orig	Thu Apr 18 23:30:25 2002
+--- src/videograbber.cpp	Thu Apr 18 23:31:13 2002
+*************** void GMVideoGrabber::VGOpen (void)
+*** 463,469 ****
+      if (!grabber->Open (video_device, FALSE))
+        error_code = 0;
+      else
+!       if (!grabber->SetVideoDeviceParameters (video_channel, video_format))
+  	error_code = 2;
+      else
+        if (!grabber->SetColourFormatConverter ("YUV420P"))
+--- 463,469 ----
+      if (!grabber->Open (video_device, FALSE))
+        error_code = 0;
+      else
+!       if (!grabber->SetVideoChannelFormat (video_channel, video_format))
+  	error_code = 2;
+      else
+        if (!grabber->SetColourFormatConverter ("YUV420P"))
diff --git a/net/gnomemeeting2/files/patch-ab b/net/gnomemeeting2/files/patch-ab
deleted file mode 100644
index f3fe65da116e..000000000000
--- a/net/gnomemeeting2/files/patch-ab
+++ /dev/null
@@ -1,31 +0,0 @@
-*** 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 12eade185aaa..000000000000
--- a/net/gnomemeeting2/files/patch-ad
+++ /dev/null
@@ -1,19 +0,0 @@
-*** src/gnomemeeting.cpp.orig	Tue Jan  8 10:32:05 2002
---- src/gnomemeeting.cpp	Tue Jan  8 10:32:35 2002
-*************** gint gnome_idle_timer (void)
-*** 74,80 ****
-      gtk_main_iteration(); 
-    gdk_threads_leave ();
-  
-!   usleep (100);
-    return TRUE;
-  }
-  
---- 74,80 ----
-      gtk_main_iteration(); 
-    gdk_threads_leave ();
-  
-!   usleep (100000);
-    return TRUE;
-  }
-