Updated tarball. No functional change.

5 files changed, 52 insertions, 60 deletions

diff --git a/net/gnomemeeting2/Makefile b/net/gnomemeeting2/Makefile
index 84e24ab005b2..95d09270f10c 100644
--- a/net/gnomemeeting2/Makefile
+++ b/net/gnomemeeting2/Makefile
@@ -22,7 +22,6 @@ BUILD_DEPENDS=  ${NONEXISTENT}:${PORTSDIR}/net/openh323: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
@@ -30,8 +29,6 @@ USE_GTK=	yes
 USE_GMAKE=	yes
 CONFIGURE_ENV=	LIBS=-L${PREFIX}/lib \
 		PWLIBDIR=${WRKDIRPREFIX}${.CURDIR}/../openh323/work/pwlib \
-		OPENH323DIR=${WRKDIRPREFIX}${.CURDIR}/../openh323/work/openh323
-post-patch:
-		rm ${WRKSRC}/config.cache
+		OPENH323DIR=${WRKDIRPREFIX}${.CURDIR}/../openh323/work/openh323 \
 
 .include <bsd.port.mk>
diff --git a/net/gnomemeeting2/distinfo b/net/gnomemeeting2/distinfo
index 639855a0a6f3..e23ad8317204 100644
--- a/net/gnomemeeting2/distinfo
+++ b/net/gnomemeeting2/distinfo
@@ -1 +1 @@
-MD5 (gnomemeeting-0.10.tar.gz) = 87f4f6de4708fe307868990f00a41e8b
+MD5 (gnomemeeting-0.10.tar.gz) = 1d14f7ade38a7b7033825b9550c7da59
diff --git a/net/gnomemeeting2/files/patch-aa b/net/gnomemeeting2/files/patch-aa
index de9ae39cd136..2bf26cd444d1 100644
--- a/net/gnomemeeting2/files/patch-aa
+++ b/net/gnomemeeting2/files/patch-aa
@@ -1,83 +1,78 @@
-*** configure.in.orig	Thu Aug 16 17:31:42 2001
---- configure.in	Fri Aug 17 16:51:41 2001
-*************** AC_ARG_PROGRAM
-*** 28,38 ****
+*** 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$PWLIBDIR/include/ptlib/unix -I$PWLIBDIR/include  -I$OPENH323DIR/include"
-! H323_LIBS="-L$PWLIBDIR/lib -L$OPENH323DIR/lib -lh323_linux_x86_r -ldl -lpt_linux_x86_r -lpthread"
+! 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/include -I/usr/local/include"
+! LDAP_INCLUDES="-I/usr/local/include"
 ! LDAP_LIBS="-lldap -llber -lresolv"
   
   GNOMEMEETING_INCLUDES=""
   GNOMEMEETING_LDADD=""
---- 28,38 ----
+--- 27,38 ----
+  AC_ARG_PROGRAM
   
   
-  H323_INCLUDES="-I$PWLIBDIR/include/ptlib/unix -I$PWLIBDIR/include  -I$OPENH323DIR/include"
+! 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="-I/usr/include -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="-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"
-  fi
+*************** dnl * -D_DEBUG -DPMEMORY_CHECK=1 -DPTRAC
+*** 46,60 ****
+  dnl *************************************************************************
   
-  dnl *********************************************************************
---- 48,54 ----
-  if test "x${OSTYPE}" = "xlinux-gnu"; then
-    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 ****
   
+! H323_CFLAGS="-DP_LINUX -m486 -D_REENTRANT -DP_HAS_SEMAPHORES -DP_PTHREADS -DPBYTE_ORDER=PLITTLE_ENDIAN -DHAS_OSS -O2"
+! 
   
-  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"
+  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
---- 57,63 ----
+  GNOME_X_CHECKS
+--- 46,59 ----
+  dnl *************************************************************************
+  
   
+! H323_CFLAGS="-DP_FREEBSD=400001 -DP_PTHREADS -DPBYTE_ORDER=PLITTLE_ENDIAN -DPTRACING -02 -DNDEBUG"
   
-  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"
+  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
-*** 69,77 ****
+*** 64,70 ****
   dnl #########################################################################
   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)
-  
+  AC_CHECK_LIB(ldap, ldap_simple_bind, LIBS="-lldap -llber $LIBS", AC_MSG_ERROR([*** LDAP library is not found.]), -llber)
   
-  dnl #########################################################################
---- 68,76 ----
+--- 63,69 ----
   dnl #########################################################################
   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=" -L/usr/local/lib -lldap -llber $LIBS", AC_MSG_ERROR([*** LDAP library is not found.]), -llber)
-  
+  AC_CHECK_LIB(ldap, ldap_simple_bind, LIBS="-lldap -llber $LIBS", AC_MSG_ERROR([*** LDAP library is not found.]), -llber)
   
-  dnl #########################################################################
diff --git a/net/gnomemeeting2/files/patch-ad b/net/gnomemeeting2/files/patch-ad
index 9e132a53e43a..90a3118a4274 100644
--- a/net/gnomemeeting2/files/patch-ad
+++ b/net/gnomemeeting2/files/patch-ad
@@ -1,11 +1,11 @@
-*** src/audio.h.orig	Thu Jul 26 11:42:22 2001
---- src/audio.h	Thu Jul 26 11:42:51 2001
+*** src/audio.h.orig	Fri Aug 17 20:08:26 2001
+--- src/audio.h	Mon Aug 20 07:54:33 2001
 ***************
-*** 20,26 ****
---- 20,32 ----
-  #ifndef _AUDIO_H_
+*** 21,27 ****
+--- 21,33 ----
   #define _AUDIO_H_
   
+  
 + #ifdef __linux__
   #include <linux/soundcard.h>
 + #endif
@@ -13,6 +13,6 @@
 + #include <machine/soundcard.h>
 + #endif
 + 
+  
+  
   #include <sys/ioctl.h>
-  #include <unistd.h>
-  #include <fcntl.h>
diff --git a/net/gnomemeeting2/files/patch-ae b/net/gnomemeeting2/files/patch-ae
index 4a723486f005..9a8d68f49ca4 100644
--- a/net/gnomemeeting2/files/patch-ae
+++ b/net/gnomemeeting2/files/patch-ae
@@ -1,17 +1,17 @@
-*** src/webcam.h.orig	Thu Jul 26 11:43:17 2001
---- src/webcam.h	Thu Jul 26 11:43:47 2001
+*** src/webcam.h.orig	Mon Aug 20 07:55:24 2001
+--- src/webcam.h	Mon Aug 20 07:55:51 2001
 ***************
-*** 22,28 ****
---- 22,33 ----
-  
+*** 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>
-  #include <gdk/gdk.h>