Update to GNOME 2.0 RC2.

3 files changed, 26 insertions, 25 deletions

diff --git a/devel/gnomevfs2/files/patch-aa b/devel/gnomevfs2/files/patch-aa
index fe31e4719654..62d8d7cbfa40 100644
--- a/devel/gnomevfs2/files/patch-aa
+++ b/devel/gnomevfs2/files/patch-aa
@@ -1,6 +1,6 @@
---- configure.orig	Mon Jun 10 13:08:18 2002
-+++ configure	Mon Jun 10 13:09:52 2002
-@@ -7493,6 +7493,7 @@
+--- configure.orig	Tue Jun 25 18:16:23 2002
++++ configure	Tue Jun 25 18:20:43 2002
+@@ -7209,6 +7209,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -8,18 +8,18 @@
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -12412,8 +12413,8 @@
+@@ -12128,8 +12129,8 @@
    done
  fi
  
--echo "$as_me:12415: checking for bzCompressInit in -lbz2" >&5
+-echo "$as_me:12131: checking for bzCompressInit in -lbz2" >&5
 -echo $ECHO_N "checking for bzCompressInit in -lbz2... $ECHO_C" >&6
-+echo "$as_me:12415: checking for BZ2_bzCompressInit in -lbz2" >&5
++echo "$as_me:12131: checking for BZ2_bzCompressInit in -lbz2" >&5
 +echo $ECHO_N "checking for BZ2_bzCompressInit in -lbz2... $ECHO_C" >&6
  if test "${ac_cv_lib_bz2_bzCompressInit+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -12429,11 +12430,11 @@
+@@ -12145,11 +12146,11 @@
  #endif
  /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
@@ -33,16 +33,16 @@
    ;
    return 0;
  }
-@@ -12762,7 +12763,7 @@
+@@ -12478,7 +12479,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
 -		LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcrypto -ldl"
 +		LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcryptofoo -ldl"
  		cat >conftest.$ac_ext <<_ACEOF
- #line 12767 "configure"
+ #line 12483 "configure"
  #include "confdefs.h"
-@@ -12813,9 +12814,9 @@
+@@ -12529,9 +12530,9 @@
  
  		msg_openssl="yes"
                  if test x$with_openssl_libs != x/usr/lib; then
@@ -54,7 +54,7 @@
                  fi
  
  if true; then
-@@ -14018,7 +14019,7 @@
+@@ -13622,7 +13623,7 @@
  s,@ORBIT_IDL@,$ORBIT_IDL,;t t
  s,@BONOBO_IDLDIR@,$BONOBO_IDLDIR,;t t
  s,@WARN_CFLAGS@,$WARN_CFLAGS,;t t
diff --git a/devel/gnomevfs2/files/patch-ab b/devel/gnomevfs2/files/patch-ab
index 535e326cd949..71079f6affb8 100644
--- a/devel/gnomevfs2/files/patch-ab
+++ b/devel/gnomevfs2/files/patch-ab
@@ -1,10 +1,11 @@
---- Makefile.in.orig	Mon Jun 10 13:10:15 2002
-+++ Makefile.in	Mon Jun 10 13:10:42 2002
-@@ -182,7 +182,6 @@
- 	schemas					\
- 	devel-docs				\
- 	doc					\
--	test					\
- 	monikers				\
- 	po
+--- Makefile.in.orig	Tue Jun 25 18:21:17 2002
++++ Makefile.in	Tue Jun 25 18:22:25 2002
+@@ -170,7 +170,7 @@
  
+ SUBDIRS_GNOME = monikers doc schemas
+ 
+-SUBDIRS =  	libgnomevfs					modules						schemas						devel-docs					doc						test						monikers					po
++SUBDIRS =  	libgnomevfs					modules						schemas						devel-docs					doc											monikers					po
+ 
+ 
+ EXTRA_DIST =  	HACKING						TODO						autogen.sh					gnome-vfs.spec					gnome-vfs-2.0.pc.in				gnome-vfs-module-2.0.pc.in			intltool-extract.in				intltool-merge.in				intltool-update.in
diff --git a/devel/gnomevfs2/files/patch-libgnomevfs::Makefile.in b/devel/gnomevfs2/files/patch-libgnomevfs::Makefile.in
index 2884f343c186..f82a5fcd0b6a 100644
--- a/devel/gnomevfs2/files/patch-libgnomevfs::Makefile.in
+++ b/devel/gnomevfs2/files/patch-libgnomevfs::Makefile.in
@@ -1,11 +1,11 @@
---- libgnomevfs/Makefile.in.orig	Mon Jun 10 13:10:56 2002
-+++ libgnomevfs/Makefile.in	Mon Jun 10 13:11:51 2002
-@@ -330,7 +330,7 @@
+--- libgnomevfs/Makefile.in.orig	Tue Jun 25 18:22:53 2002
++++ libgnomevfs/Makefile.in	Tue Jun 25 18:23:39 2002
+@@ -192,7 +192,7 @@
  
  
  # Platform specific includes
 -libgnomevfsplatformincludedir = $(libdir)/gnome-vfs-2.0/include
 +libgnomevfsplatformincludedir = $(includedir)/gnome-vfs-2.0/libgnomevfs
- libgnomevfsplatforminclude_HEADERS = \
- 	gnome-vfs-file-size.h
+ libgnomevfsplatforminclude_HEADERS =  	gnome-vfs-file-size.h
+