Heavily patch auto configure stuff to make this work with the new

"autoconf" package.

4 files changed, 83 insertions, 8 deletions

diff --git a/sysutils/gnome-vfs/Makefile b/sysutils/gnome-vfs/Makefile
index 966215dee11..b5b62643646 100644
--- a/sysutils/gnome-vfs/Makefile
+++ b/sysutils/gnome-vfs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2001/08/27 13:12:51 tron Exp $
+# $NetBSD: Makefile,v 1.12 2001/08/27 20:10:16 tron Exp $
 #
 
 DISTNAME=		gnome-vfs-1.0.1
@@ -10,8 +10,9 @@ MAINTAINER=		rh@netbsd.org
 HOMEPAGE=		http://www.gnome.org/
 COMMENT=		GNOME Virtual File System
 
-BUILD_DEPENDS+=		autoconf>=2.13:../../devel/autoconf
+BUILD_DEPENDS+=		autoconf>=2.50:../../devel/autoconf
 BUILD_DEPENDS+=		automake>=1.4:../../devel/automake
+BUILD_DEPENDS+=		xml-i18n-tools>=0.9:../../textproc/xml-i18n-tools
 DEPENDS+=		GConf>=1.0.0:../../devel/GConf
 BUILD_USES_MSGFMT=	YES
 
diff --git a/sysutils/gnome-vfs/distinfo b/sysutils/gnome-vfs/distinfo
index 6e65a4e3a16..c84f0fb2988 100644
--- a/sysutils/gnome-vfs/distinfo
+++ b/sysutils/gnome-vfs/distinfo
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.3 2001/05/14 17:11:36 rh Exp $
+$NetBSD: distinfo,v 1.4 2001/08/27 20:10:16 tron Exp $
 
 SHA1 (gnome-vfs-1.0.1.tar.bz2) = 7d7cc6b7ee76792a5fa9818320fc54d39e00896e
 Size (gnome-vfs-1.0.1.tar.bz2) = 801601 bytes
-SHA1 (patch-aa) = 5a86a14df10278920af3df0340353c8fa1e978ca
+SHA1 (patch-aa) = 109e5a4284b246cfd0ae80441f6ef1dbd9fecf60
 SHA1 (patch-ab) = 6d038601f881185f8a4c55a604f7baccb8693ffe
 SHA1 (patch-ac) = 4da6d9b46d059710dcd8248dd9d23cb79e5253e1
 SHA1 (patch-ad) = cf959c7d8eb70dba844ea01e887e7487111d9cbd
 SHA1 (patch-ae) = a0906ba19a6953aca3b173f03fb1b2d9bf742a09
 SHA1 (patch-af) = c76c64801b643828f6cb8751131447335d39c28e
+SHA1 (patch-ag) = f37a54fdbe3a8141ed81ab8d03e055a3305afd44
diff --git a/sysutils/gnome-vfs/patches/patch-aa b/sysutils/gnome-vfs/patches/patch-aa
index 2d66f164dc2..7649503b733 100644
--- a/sysutils/gnome-vfs/patches/patch-aa
+++ b/sysutils/gnome-vfs/patches/patch-aa
@@ -1,8 +1,58 @@
-$NetBSD: patch-aa,v 1.2 2000/11/30 04:07:18 mycroft Exp $
+$NetBSD: patch-aa,v 1.3 2001/08/27 20:10:16 tron Exp $
 
---- aclocal.m4.orig	Fri Nov  3 19:45:45 2000
-+++ aclocal.m4	Thu Nov 30 04:01:25 2000
-@@ -1532,7 +1532,7 @@
+--- aclocal.m4.orig	Tue May  8 01:12:25 2001
++++ aclocal.m4	Mon Aug 27 21:59:51 2001
+@@ -210,25 +210,16 @@
+ 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
+-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)
+ 
+ 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
+ 
+ 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 @@
+ dnl From Jim Meyering.  Use this if you use the GNU error.[ch].
+ dnl FIXME: Migrate into libit
+ 
+-AC_DEFUN(AM_FUNC_ERROR_AT_LINE,
+-[AC_CACHE_CHECK([for error_at_line], am_cv_lib_error_at_line,
+- [AC_TRY_LINK([],[error_at_line(0, 0, "", 0, "");],
+-              am_cv_lib_error_at_line=yes,
+-	      am_cv_lib_error_at_line=no)])
+- if test $am_cv_lib_error_at_line = no; then
+-   LIBOBJS="$LIBOBJS error.o"
+- fi
+- AC_SUBST(LIBOBJS)dnl
+-])
+-
+ 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 @@
  		  [CATOBJEXT=.gmo
  		   DATADIRNAME=share],
  		  [CATOBJEXT=.mo
diff --git a/sysutils/gnome-vfs/patches/patch-ag b/sysutils/gnome-vfs/patches/patch-ag
new file mode 100644
index 00000000000..ddb24613f03
--- /dev/null
+++ b/sysutils/gnome-vfs/patches/patch-ag
@@ -0,0 +1,23 @@
+$NetBSD: patch-ag,v 1.1 2001/08/27 20:10:17 tron Exp $
+
+--- configure.in.orig	Fri May  4 03:35:41 2001
++++ configure.in	Mon Aug 27 21:56:10 2001
+@@ -483,7 +483,6 @@
+ data/Makefile
+ data/mime/Makefile
+ idl/Makefile
+-intl/Makefile
+ libgnomevfs-pthread/Makefile
+ libgnomevfs/Makefile
+ modules/Makefile
+@@ -503,7 +502,9 @@
+ po/Makefile.in
+ test/Makefile
+ test/vfs-run
+-macros/Makefile
++xml-i18n-extract
++xml-i18n-merge
++xml-i18n-update
+ ])
+ 
+ chmod u+x test/vfs-run