2 files changed, 59 insertions, 35 deletions
diff --git a/sysutils/gnome-vfs/patches/patch-aa b/sysutils/gnome-vfs/patches/patch-aa
index 7649503b733..fca9db05daf 100644
--- a/sysutils/gnome-vfs/patches/patch-aa
+++ b/sysutils/gnome-vfs/patches/patch-aa
@@ -1,40 +1,64 @@
-$NetBSD: patch-aa,v 1.3 2001/08/27 20:10:16 tron Exp $
+$NetBSD: patch-aa,v 1.4 2001/10/05 06:56:46 rh Exp $
 
---- aclocal.m4.orig	Tue May  8 01:12:25 2001
-+++ aclocal.m4	Mon Aug 27 21:59:51 2001
-@@ -210,25 +210,16 @@
+--- aclocal.m4.orig	Tue Sep 11 09:27:38 2001
++++ aclocal.m4
+@@ -221,46 +221,37 @@
  dnl AC_SUBST itself to avoid automake putting 
  dnl XML_I18N_MERGE_OAF_RULE = @XML_I18N_MERGE_OAF_RULE@
- dnl in all the Makefile.in's
+ dnl in all the Makefile.in's, because that will blow up when substituted.
 -XML_I18N_MERGE_OAF_RULE='\%.oaf : \%.oaf.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po\
--	$(top_builddir)/xml-i18n-merge -o $(top_srcdir)/po $< [$]*.oaf'
--AC_DIVERT_PUSH(AC_DIVERSION_SED)dnl
--s%@XML_I18N_MERGE_OAF_RULE@%[$]XML_I18N_MERGE_OAF_RULE%g
--AC_DIVERT_POP()dnl
-+XML_I18N_MERGE_OAF_RULE='\%.oaf : \%.oaf.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po $(top_builddir)/xml-i18n-merge -o $(top_srcdir)/po $< [$]*.oaf'
-+AC_SUBST(XML_I18N_MERGE_OAF_RULE)
+-	$(top_builddir)/xml-i18n-merge -o -p $(top_srcdir)/po $< [$]*.oaf'
++XML_I18N_MERGE_OAF_RULE='\%.oaf : \%.oaf.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po $(top_builddir)/xml-i18n-merge -o -p $(top_srcdir)/po $< [$]*.oaf'
+ HACK_SUBST(XML_I18N_MERGE_OAF_RULE)
+ 
+-XML_I18N_MERGE_SERVER_RULE='\%.server : \%.server.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po\
+-	$(top_builddir)/xml-i18n-merge -o -u $(top_srcdir)/po $< [$]*.server'
++XML_I18N_MERGE_SERVER_RULE='\%.server : \%.server.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po $(top_builddir)/xml-i18n-merge -o -u $(top_srcdir)/po $< [$]*.server'
+ HACK_SUBST(XML_I18N_MERGE_SERVER_RULE)
  
  dnl same deal
 -XML_I18N_MERGE_KEYS_RULE='\%.keys : \%.keys.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po\
--	$(top_builddir)/xml-i18n-merge -k $(top_srcdir)/po $< [$]*.keys'
--AC_DIVERT_PUSH(AC_DIVERSION_SED)dnl
--s%@XML_I18N_MERGE_KEYS_RULE@%[$]XML_I18N_MERGE_KEYS_RULE%g
--AC_DIVERT_POP()dnl
-+XML_I18N_MERGE_KEYS_RULE='\%.keys : \%.keys.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po $(top_builddir)/xml-i18n-merge -k $(top_srcdir)/po $< [$]*.keys'
-+AC_SUBST(XML_I18N_MERGE_KEYS_RULE)@%[$]XML_I18N_MERGE_KEYS_RULE%g
- 
+-	$(top_builddir)/xml-i18n-merge -k X18T_KEYS_KIND $(top_srcdir)/po $< [$]*.keys'
++XML_I18N_MERGE_KEYS_RULE='\%.keys : \%.keys.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po $(top_builddir)/xml-i18n-merge -k X18T_KEYS_KIND $(top_srcdir)/po $< [$]*.keys'
+ HACK_SUBST(XML_I18N_MERGE_KEYS_RULE)
  dnl same deal
 -XML_I18N_MERGE_DESKTOP_RULE='\%.desktop : \%.desktop.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po\
--	$(top_builddir)/xml-i18n-merge -d $(top_srcdir)/po $< [$]*.desktop'
--AC_DIVERT_PUSH(AC_DIVERSION_SED)dnl
--s%@XML_I18N_MERGE_DESKTOP_RULE@%[$]XML_I18N_MERGE_DESKTOP_RULE%g
--AC_DIVERT_POP()dnl
-+XML_I18N_MERGE_DESKTOP_RULE='\%.desktop : \%.desktop.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po $(top_builddir)/xml-i18n-merge -d $(top_srcdir)/po $< [$]*.desktop'
-+AC_SUBST(XML_I18N_MERGE_DESKTOP_RULE)
- 
- # Always use our own xml-i18n-tools.
- XML_I18N_EXTRACT='$(top_builddir)/xml-i18n-extract'
-@@ -1460,17 +1451,6 @@
+-	$(top_builddir)/xml-i18n-merge -d X18T_PFORG1 $(top_srcdir)/po $< [$]*.desktop'
++XML_I18N_MERGE_DESKTOP_RULE='\%.desktop : \%.desktop.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po $(top_builddir)/xml-i18n-merge -d X18T_PFORG1 $(top_srcdir)/po $< [$]*.desktop'
+ HACK_SUBST(XML_I18N_MERGE_DESKTOP_RULE)
+ 
+ dnl same deal
+-XML_I18N_MERGE_DIRECTORY_RULE='\%.directory : \%.directory.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po\
+-	$(top_builddir)/xml-i18n-merge -d X18T_PFORG1 $(top_srcdir)/po $< [$]*.directory'
++XML_I18N_MERGE_DIRECTORY_RULE='\%.directory : \%.directory.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po $(top_builddir)/xml-i18n-merge -d X18T_PFORG1 $(top_srcdir)/po $< [$]*.directory'
+ HACK_SUBST(XML_I18N_MERGE_DIRECTORY_RULE)
+ 
+ dnl same deal
+-XML_I18N_MERGE_SOUNDLIST_RULE='\%.soundlist : \%.soundlist.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po\
+-	$(top_builddir)/xml-i18n-merge -d X18T_PFORG1 $(top_srcdir)/po $< [$]*.soundlist'
++XML_I18N_MERGE_SOUNDLIST_RULE='\%.soundlist : \%.soundlist.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po $(top_builddir)/xml-i18n-merge -d X18T_PFORG1 $(top_srcdir)/po $< [$]*.soundlist'
+ HACK_SUBST(XML_I18N_MERGE_SOUNDLIST_RULE)
+ 
+ dnl same deal
+-XML_I18N_MERGE_PONG_RULE='\%.pong : \%.pong.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po\
+-	$(top_builddir)/xml-i18n-merge -x X18T_PFORG1 $(top_srcdir)/po $< [$]*.pong'
++XML_I18N_MERGE_PONG_RULE='\%.pong : \%.pong.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po $(top_builddir)/xml-i18n-merge -x X18T_PFORG1 $(top_srcdir)/po $< [$]*.pong'
+ HACK_SUBST(XML_I18N_MERGE_PONG_RULE)
+ 
+ dnl same deal
+-XML_I18N_MERGE_XML_RULE='\%.xml : \%.xml.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po\
+-	$(top_builddir)/xml-i18n-merge -x X18T_XML_KIND $(top_srcdir)/po $< [$]*.xml'
++XML_I18N_MERGE_XML_RULE='\%.xml : \%.xml.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po $(top_builddir)/xml-i18n-merge -x X18T_XML_KIND $(top_srcdir)/po $< [$]*.xml'
+ HACK_SUBST(XML_I18N_MERGE_XML_RULE)
+ 
+ dnl same deal
+-XML_I18N_MERGE_SHEET_RULE='\%.sheet : \%.sheet.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po\
+-	$(top_builddir)/xml-i18n-merge -x -u $(top_srcdir)/po $< [$]*.sheet'
++XML_I18N_MERGE_SHEET_RULE='\%.sheet : \%.sheet.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po $(top_builddir)/xml-i18n-merge -x -u $(top_srcdir)/po $< [$]*.sheet'
+ HACK_SUBST(XML_I18N_MERGE_SHEET_RULE)
+ 
+ 
+@@ -4556,17 +4547,6 @@
  dnl From Jim Meyering.  Use this if you use the GNU error.[ch].
  dnl FIXME: Migrate into libit
  
@@ -52,7 +76,7 @@ $NetBSD: patch-aa,v 1.3 2001/08/27 20:10:16 tron Exp $
  dnl See whether we need a declaration for a function.
  dnl GCC_NEED_DECLARATION(FUNCTION [, EXTRA-HEADER-FILES])
  AC_DEFUN([GCC_NEED_DECLARATION],
-@@ -1607,7 +1587,7 @@
+@@ -4706,7 +4686,7 @@
  		  [CATOBJEXT=.gmo
  		   DATADIRNAME=share],
  		  [CATOBJEXT=.mo
diff --git a/sysutils/gnome-vfs/patches/patch-ag b/sysutils/gnome-vfs/patches/patch-ag
index ddb24613f03..27df2b06ebb 100644
--- a/sysutils/gnome-vfs/patches/patch-ag
+++ b/sysutils/gnome-vfs/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.1 2001/08/27 20:10:17 tron Exp $
+$NetBSD: patch-ag,v 1.2 2001/10/05 06:56:46 rh Exp $
 
---- configure.in.orig	Fri May  4 03:35:41 2001
-+++ configure.in	Mon Aug 27 21:56:10 2001
-@@ -483,7 +483,6 @@
+--- configure.in.orig	Tue Sep 11 09:20:37 2001
++++ configure.in
+@@ -573,7 +573,6 @@
  data/Makefile
  data/mime/Makefile
  idl/Makefile
@@ -10,10 +10,10 @@ $NetBSD: patch-ag,v 1.1 2001/08/27 20:10:17 tron Exp $
  libgnomevfs-pthread/Makefile
  libgnomevfs/Makefile
  modules/Makefile
-@@ -503,7 +502,9 @@
- po/Makefile.in
+@@ -593,7 +592,9 @@
  test/Makefile
  test/vfs-run
+ doc/Makefile
 -macros/Makefile
 +xml-i18n-extract
 +xml-i18n-merge