9 files changed, 80 insertions, 265 deletions

diff --git a/net/gnomemeeting/Makefile b/net/gnomemeeting/Makefile
index 531c7fe72751..84e24ab005b2 100644
--- a/net/gnomemeeting/Makefile
+++ b/net/gnomemeeting/Makefile
@@ -6,28 +6,32 @@
 #
 
 PORTNAME=	gnomemeeting
-PORTVERSION=	0.9-1
+PORTVERSION=	0.10
 CATEGORIES=	net gnome
-MASTER_SITES=	http://130.104.229.225/gnomemeeting/downloads/
+MASTER_SITES=	http://130.104.229.225/gnomemeeting/downloads/ \
+		ftp://telepresence.dmem.strath.ac.uk/pub/openh323/
 
 MAINTAINER=	roger@FreeBSD.org
 
 LIB_DEPENDS=	ldap.1:${PORTSDIR}/net/openldap \
 		gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf/
 
-BUILD_DEPENDS=  ${NONEXISTENT}:${PORTSDIR}/net/openh323_1.1:build
+BUILD_DEPENDS=  ${NONEXISTENT}:${PORTSDIR}/net/openh323:build
 
-# note, we do not want to clean openh323_1.1, otherwise it has to build
+# note, we do not want to clean openh323, otherwise it has to build
 # it all over again which can take several hours.
 NOCLEANDEPENDS= yes
 
+#USE_X_PREFIX=   yes
 USE_NEWGCC=     yes
 USE_GNOME=	yes
 USE_AUTOCONF=	yes
 USE_GTK=	yes
 USE_GMAKE=	yes
 CONFIGURE_ENV=	LIBS=-L${PREFIX}/lib \
-		PWLIBDIR=${WRKDIRPREFIX}${.CURDIR}/../openh323_1.1/work/pwlib \
-		OPENH323DIR=${WRKDIRPREFIX}${.CURDIR}/../openh323_1.1/work/openh323
+		PWLIBDIR=${WRKDIRPREFIX}${.CURDIR}/../openh323/work/pwlib \
+		OPENH323DIR=${WRKDIRPREFIX}${.CURDIR}/../openh323/work/openh323
+post-patch:
+		rm ${WRKSRC}/config.cache
 
 .include <bsd.port.mk>
diff --git a/net/gnomemeeting/distinfo b/net/gnomemeeting/distinfo
index ea44c94e4498..639855a0a6f3 100644
--- a/net/gnomemeeting/distinfo
+++ b/net/gnomemeeting/distinfo
@@ -1 +1 @@
-MD5 (gnomemeeting-0.9-1.tar.gz) = 856e984c30e80c0e5e08e554113be961
+MD5 (gnomemeeting-0.10.tar.gz) = 87f4f6de4708fe307868990f00a41e8b
diff --git a/net/gnomemeeting/files/patch-aa b/net/gnomemeeting/files/patch-aa
index 830812d69a70..de9ae39cd136 100644
--- a/net/gnomemeeting/files/patch-aa
+++ b/net/gnomemeeting/files/patch-aa
@@ -1,5 +1,5 @@
-*** configure.in.orig	Sun Jun 17 22:17:49 2001
---- configure.in	Thu Jul 26 11:36:11 2001
+*** configure.in.orig	Thu Aug 16 17:31:42 2001
+--- configure.in	Fri Aug 17 16:51:41 2001
 *************** AC_ARG_PROGRAM
 *** 28,38 ****
   
@@ -8,27 +8,27 @@
 ! H323_LIBS="-L$PWLIBDIR/lib -L$OPENH323DIR/lib -lh323_linux_x86_r -ldl -lpt_linux_x86_r -lpthread"
   
   
-  LDAP_INCLUDES="-I/usr/local/include"
+  LDAP_INCLUDES="-I/usr/include -I/usr/local/include"
 ! LDAP_LIBS="-lldap -llber -lresolv"
   
-  
-  
+  GNOMEMEETING_INCLUDES=""
+  GNOMEMEETING_LDADD=""
 --- 28,38 ----
   
   
   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"
+! H323_LIBS="-L$PWLIBDIR/lib -L$OPENH323DIR/lib -lh323_FreeBSD_x86_r -lpt_FreeBSD_x86_r -pthread -lssl -lcrypto -DP_SSL"
   
   
-  LDAP_INCLUDES="-I/usr/local/include"
+  LDAP_INCLUDES="-I/usr/include -I/usr/local/include"
 ! LDAP_LIBS="-L/usr/local/lib -lldap -llber"
   
-  
-  
+  GNOMEMEETING_INCLUDES=""
+  GNOMEMEETING_LDADD=""
 *************** dnl ************************************
 *** 48,55 ****
   if test "x${OSTYPE}" = "xlinux-gnu"; then
-    H323_CFLAGS="-D_REENTRANT -DP_HAS_SEMAPHORES -DP_PTHREADS -DPBYTE_ORDER=PLITTLE_ENDIAN -DHAS_OSS -DPTRACING -O2 -DLINUX"
+    H323_CFLAGS="-DP_LINUX -m486 -D_REENTRANT -DP_HAS_SEMAPHORES -DP_PTHREADS -DPBYTE_ORDER=PLITTLE_ENDIAN -DHAS_OSS -O2 -DLINUX"
   else
 !   H323_CFLAGS="-DP_SOLARIS=8 -D_REENTRANT -D_DEBUG -DPMEMORY_CHECK=1 -DP_THREADS
 ! -DPBYTE_ORDER=PLITTLE_ENDIAN -DPTRACING -02 -DSOLARIS"
@@ -37,12 +37,29 @@
   dnl *********************************************************************
 --- 48,54 ----
   if test "x${OSTYPE}" = "xlinux-gnu"; then
-    H323_CFLAGS="-D_REENTRANT -DP_HAS_SEMAPHORES -DP_PTHREADS -DPBYTE_ORDER=PLITTLE_ENDIAN -DHAS_OSS -DPTRACING -O2 -DLINUX"
+    H323_CFLAGS="-DP_LINUX -m486 -D_REENTRANT -DP_HAS_SEMAPHORES -DP_PTHREADS -DPBYTE_ORDER=PLITTLE_ENDIAN -DHAS_OSS -O2 -DLINUX"
   else
 !   H323_CFLAGS="-DP_FREEBSD=400001 -DP_PTHREADS -DPBYTE_ORDER=PLITTLE_ENDIAN -DPTRACING -02 -DNDEBUG"
   fi
   
   dnl *********************************************************************
+*************** dnl ************************************
+*** 58,64 ****
+  
+  
+  GNOMEMEETING_INCLUDES="$LDAP_INCLUDES $H323_INCLUDES $H323_CFLAGS"
+! GNOMEMEETING_LDADD="`gtk-config --libs gthread` $GNOME_LIBDIR $GTK_LIBS $GNOMEGNORBA_LIBS $GNOME_APPLETS_LIBS $LDAP_LIBS $H323_LIBS"
+  
+  
+  GNOME_COMPILE_WARNINGS
+--- 57,63 ----
+  
+  
+  GNOMEMEETING_INCLUDES="$LDAP_INCLUDES $H323_INCLUDES $H323_CFLAGS"
+! GNOMEMEETING_LDADD="`gtk12-config --libs gthread` $GNOME_LIBDIR $GTK_LIBS $GNOMEGNORBA_LIBS $GNOME_APPLETS_LIBS $LDAP_LIBS $H323_LIBS"
+  
+  
+  GNOME_COMPILE_WARNINGS
 *************** AM_PROG_LIBTOOL
 *** 69,77 ****
   dnl #########################################################################
diff --git a/net/gnomemeeting/files/patch-ab b/net/gnomemeeting/files/patch-ab
deleted file mode 100644
index 2e0f244a530d..000000000000
--- a/net/gnomemeeting/files/patch-ab
+++ /dev/null
@@ -1,23 +0,0 @@
-*** src/common.h.orig	Thu Jul 26 11:38:18 2001
---- src/common.h	Thu Jul 26 11:40:18 2001
-***************
-*** 20,26 ****
-  
-  #include <gnome.h>
-  
-! #ifdef LINUX
-  #define AUDIO1 "/dev/dsp"
-  #define AUDIO2 "/dev/dsp1"
-  #define AUDIO3 "/dev/dsp2"
---- 20,30 ----
-  
-  #include <gnome.h>
-  
-! #ifdef __FreeBSD__
-! #include <pthread.h>
-! #endif
-! 
-! #if defined(LINUX) || defined (__FreeBSD__)
-  #define AUDIO1 "/dev/dsp"
-  #define AUDIO2 "/dev/dsp1"
-  #define AUDIO3 "/dev/dsp2"
diff --git a/net/gnomemeeting/files/patch-ac b/net/gnomemeeting/files/patch-ac
deleted file mode 100644
index a3ce8c75ca1a..000000000000
--- a/net/gnomemeeting/files/patch-ac
+++ /dev/null
@@ -1,14 +0,0 @@
-*** src/ldap_h.h.orig	Thu Jul 26 11:40:56 2001
---- src/ldap_h.h	Thu Jul 26 11:41:23 2001
-***************
-*** 21,26 ****
---- 21,29 ----
-  #ifndef _LDAP_H_H_
-  #define _LDAP_H_H
-  
-+ #ifdef __FreeBSD__
-+ #include <lber.h>
-+ #endif
-  #include <ldap.h>
-  #include <iostream.h>
-  #include <string.h>
diff --git a/net/gnomemeeting/files/patch-af b/net/gnomemeeting/files/patch-af
deleted file mode 100644
index 612f4fd0c440..000000000000
--- a/net/gnomemeeting/files/patch-af
+++ /dev/null
@@ -1,48 +0,0 @@
-*** src/endpoint.cpp.orig	Sun Jun 17 22:37:03 2001
---- src/endpoint.cpp	Fri Jul 27 14:27:01 2001
-*************** GMH323EndPoint::GMH323EndPoint (GM_windo
-*** 83,88 ****
---- 83,90 ----
-  
-    SetCurrentConnection (NULL);
-    SetCallingState (0);
-+ 
-+   ring_thread = NULL;
-  }
-  
-  
-*************** void GMH323EndPoint::OnConnectionEstabli
-*** 525,531 ****
-    applet_widget_set_tooltip (APPLET_WIDGET (gw->applet), NULL);
-    gdk_threads_leave ();
-  
-!   pthread_cancel (ring_thread);
-  
-    calling_state = 2;
-  
---- 527,534 ----
-    applet_widget_set_tooltip (APPLET_WIDGET (gw->applet), NULL);
-    gdk_threads_leave ();
-  
-!   if (ring_thread != NULL)
-!     pthread_cancel (ring_thread);
-  
-    calling_state = 2;
-  
-*************** BOOL GMH323EndPoint::OpenVideoDevice (H3
-*** 700,706 ****
-        codec.SetVideoDevice("/dev/video");
-        codec.SetVideoInput (0);
-        codec.SetTxQualityLevel (opts->tr_vq);
-!       codec.SetTxFPS (opts->tr_fps);
-        codec.SetBackgroundFill(opts->tr_ub);
-        codec.SetVideoFormat(opts->video_format);
-  
---- 703,709 ----
-        codec.SetVideoDevice("/dev/video");
-        codec.SetVideoInput (0);
-        codec.SetTxQualityLevel (opts->tr_vq);
-! /*      codec.SetTxFPS (opts->tr_fps); */
-        codec.SetBackgroundFill(opts->tr_ub);
-        codec.SetVideoFormat(opts->video_format);
-  
diff --git a/net/gnomemeeting/files/patch-ag b/net/gnomemeeting/files/patch-ag
deleted file mode 100644
index a4ec7176275e..000000000000
--- a/net/gnomemeeting/files/patch-ag
+++ /dev/null
@@ -1,148 +0,0 @@
-*** src/webcam.cpp.orig	Thu Jul 26 11:46:12 2001
---- src/webcam.cpp	Thu Jul 26 11:50:00 2001
-*************** void * GM_cam_capture_thread (GM_window_
-*** 80,101 ****
-    int len;
-    void *pic;
-    GdkRectangle update_rec;
-    struct video_window vid_win;
-  
-    update_rec.x = 0;
-    update_rec.y = 0;
-    update_rec.width = 176;
-    update_rec.height = 144;
-  
-    vid_win.width = 176;
-    vid_win.height = 144;
-! 
-  
-    // if video device not opened
-    if (gw->dev == -1)
-      gw->dev = open("/dev/video", O_RDWR);
-  
-    ioctl (gw->dev, VIDIOCSWIN, &vid_win);
-  
-    pic = malloc (176* 144 * 3);  
-  
---- 80,107 ----
-    int len;
-    void *pic;
-    GdkRectangle update_rec;
-+ #ifdef __linux__
-    struct video_window vid_win;
-+ #endif
-  
-    update_rec.x = 0;
-    update_rec.y = 0;
-    update_rec.width = 176;
-    update_rec.height = 144;
-  
-+ #ifdef __linux__
-    vid_win.width = 176;
-    vid_win.height = 144;
-! #endif
-  
-    // if video device not opened
-    if (gw->dev == -1)
-      gw->dev = open("/dev/video", O_RDWR);
-  
-+ 
-+ #ifdef __linux__
-    ioctl (gw->dev, VIDIOCSWIN, &vid_win);
-+ #endif
-  
-    pic = malloc (176* 144 * 3);  
-  
-*************** void * GM_cam_capture_thread (GM_window_
-*** 132,138 ****
---- 138,146 ----
-  
-  int GM_cam_info (GM_window_widgets *gw, GtkWidget *text)
-  {
-+ #ifdef __linux__
-    struct video_capability vid_cap;
-+ #endif
-    char *maxh, *maxw, *minh, *minw;
-    int was_opened = 1;
-  
-*************** int GM_cam_info (GM_window_widgets *gw, 
-*** 148,153 ****
---- 156,162 ----
-        was_opened = 0; // webcam was not opened, so we will close it
-      }
-  
-+ #ifdef __linux__
-    ioctl (gw->dev, VIDIOCGCAP, &vid_cap);
-  
-    gtk_text_insert (GTK_TEXT (text), NULL, NULL, NULL, 
-*************** int GM_cam_info (GM_window_widgets *gw, 
-*** 176,181 ****
---- 185,191 ----
-    else
-      gtk_text_insert (GTK_TEXT (text), NULL, NULL, NULL, 
-  		     "\n Can not capture  : ", -1);
-+ #endif
-  
-    if (was_opened == 0)
-      {
-*************** void GM_cam_set_params (GM_window_widget
-*** 196,202 ****
---- 206,214 ----
-  			int brightness, int colour, int contrast)
-  {
-    int was_opened = 1;
-+ #ifdef __linux__
-    struct video_picture vid_pic;
-+ #endif
-  
-    // If the webcam device is not opened, then open it
-    if (gw->dev == -1)
-*************** void GM_cam_set_params (GM_window_widget
-*** 206,211 ****
---- 218,224 ----
-      }
-  
-    // Read the current values
-+ #ifdef __linux__
-    ioctl (gw->dev, VIDIOCGPICT, &vid_pic);
-  
-    vid_pic.whiteness = (int) whiteness * 256;
-*************** void GM_cam_set_params (GM_window_widget
-*** 214,219 ****
---- 227,233 ----
-    vid_pic.contrast = (int) contrast * 256;
-  
-    ioctl (gw->dev, VIDIOCSPICT, &vid_pic);
-+ #endif
-  
-    if (was_opened == 0)
-      {
-*************** void GM_cam_get_params (GM_window_widget
-*** 227,233 ****
---- 241,249 ----
-  			int *brightness, int *colour, int *contrast)
-  {
-    int was_opened = 1;
-+ #ifdef __linux__
-    struct video_picture vid_pic;
-+ #endif
-  
-    // If the webcam device is not opened, then open it
-    if (gw->dev == -1)
-*************** void GM_cam_get_params (GM_window_widget
-*** 237,248 ****
---- 253,266 ----
-      }
-  
-    // Read the current values
-+ #ifdef __linux__
-    ioctl (gw->dev, VIDIOCGPICT, &vid_pic);
-  
-    *whiteness = (int) vid_pic.whiteness / 256;
-    *brightness = (int) vid_pic.brightness / 256;
-    *colour = (int) vid_pic.colour / 256;
-    *contrast = (int) vid_pic.contrast / 256;
-+ #endif
-  
-    if (was_opened == 0)
-      {
diff --git a/net/gnomemeeting/files/patch-ah b/net/gnomemeeting/files/patch-ah
deleted file mode 100644
index 17ded12bf208..000000000000
--- a/net/gnomemeeting/files/patch-ah
+++ /dev/null
@@ -1,14 +0,0 @@
-*** src/main.cpp.orig	Thu Jul 26 12:01:33 2001
---- src/main.cpp	Thu Jul 26 12:01:50 2001
-*************** int main (int argc, char ** argv, char *
-*** 235,241 ****
---- 235,243 ----
-    read_config (opts);
-  
-    // Init
-+ #ifdef __linux__
-    g_thread_init(NULL);
-+ #endif
-    textdomain (PACKAGE);
-    bindtextdomain (PACKAGE, GNOMELOCALEDIR);
-    gw->pixmap = NULL;
diff --git a/net/gnomemeeting/files/patch-ai b/net/gnomemeeting/files/patch-ai
new file mode 100644
index 000000000000..77763d4e07fa
--- /dev/null
+++ b/net/gnomemeeting/files/patch-ai
@@ -0,0 +1,41 @@
+*** 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",