s/LTCONFIG_OVERRIDE/LIBTOOL_OVERRIDE/ to use pkgsrc libtool

Patch configure instead of configure.in to remove dependency on autoconf

3 files changed, 32 insertions, 18 deletions

diff --git a/sysutils/gnome-vfs/Makefile b/sysutils/gnome-vfs/Makefile
index a7ef40ba042..7a5d55d6d84 100644
--- a/sysutils/gnome-vfs/Makefile
+++ b/sysutils/gnome-vfs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2001/10/05 06:56:45 rh Exp $
+# $NetBSD: Makefile,v 1.16 2001/10/07 11:45:02 rh Exp $
 
 DISTNAME=		gnome-vfs-1.0.2
 CATEGORIES=		sysutils gnome
@@ -8,20 +8,15 @@ MAINTAINER=		rh@netbsd.org
 HOMEPAGE=		http://www.gnome.org/
 COMMENT=		GNOME Virtual File System
 
-BUILD_DEPENDS+=		autoconf>=2.13:../../devel/autoconf
-BUILD_DEPENDS+=		automake>=1.4:../../devel/automake
 BUILD_USES_MSGFMT=	YES
 
 USE_X11BASE=		YES
 USE_GMAKE=		YES
 USE_LIBTOOL=		YES
-LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
-
+LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 GNU_CONFIGURE=		YES
-CPPFLAGS+=		-D_POSIX_THREAD_SYSCALL_SOFT=1
 
-pre-configure:
-	cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf && ${LOCALBASE}/bin/automake
+CPPFLAGS+=		-D_POSIX_THREAD_SYSCALL_SOFT=1
 
 .include "../../devel/gettext-lib/buildlink.mk"
 .include "../../devel/GConf/buildlink.mk"
diff --git a/sysutils/gnome-vfs/distinfo b/sysutils/gnome-vfs/distinfo
index 92f1e616be4..1c6ecf181aa 100644
--- a/sysutils/gnome-vfs/distinfo
+++ b/sysutils/gnome-vfs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2001/10/05 06:56:45 rh Exp $
+$NetBSD: distinfo,v 1.6 2001/10/07 11:45:02 rh Exp $
 
 SHA1 (gnome-vfs-1.0.2.tar.gz) = 047e9fa874ddaa6bf1b6dc750b92904db3f87530
 Size (gnome-vfs-1.0.2.tar.gz) = 1267925 bytes
@@ -8,4 +8,4 @@ SHA1 (patch-ac) = 4da6d9b46d059710dcd8248dd9d23cb79e5253e1
 SHA1 (patch-ad) = cf959c7d8eb70dba844ea01e887e7487111d9cbd
 SHA1 (patch-ae) = a0906ba19a6953aca3b173f03fb1b2d9bf742a09
 SHA1 (patch-af) = c76c64801b643828f6cb8751131447335d39c28e
-SHA1 (patch-ag) = f4d23a856cda63390f7fb9b1f5aae7d8f1f66bf0
+SHA1 (patch-ag) = d5ffffbfcb0a65d47b873f20a6514ad85c260057
diff --git a/sysutils/gnome-vfs/patches/patch-ag b/sysutils/gnome-vfs/patches/patch-ag
index 27df2b06ebb..23ffbaeaa01 100644
--- a/sysutils/gnome-vfs/patches/patch-ag
+++ b/sysutils/gnome-vfs/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.2 2001/10/05 06:56:46 rh Exp $
+$NetBSD: patch-ag,v 1.3 2001/10/07 11:45:03 rh Exp $
 
---- configure.in.orig	Tue Sep 11 09:20:37 2001
-+++ configure.in
-@@ -573,7 +573,6 @@
+--- configure.orig	Tue Sep 11 09:27:44 2001
++++ configure
+@@ -11052,7 +11052,6 @@
  data/Makefile
  data/mime/Makefile
  idl/Makefile
@@ -10,7 +10,7 @@ $NetBSD: patch-ag,v 1.2 2001/10/05 06:56:46 rh Exp $
  libgnomevfs-pthread/Makefile
  libgnomevfs/Makefile
  modules/Makefile
-@@ -593,7 +592,9 @@
+@@ -11072,7 +11071,9 @@
  test/Makefile
  test/vfs-run
  doc/Makefile
@@ -18,6 +18,25 @@ $NetBSD: patch-ag,v 1.2 2001/10/05 06:56:46 rh Exp $
 +xml-i18n-extract
 +xml-i18n-merge
 +xml-i18n-update
- ])
- 
- chmod u+x test/vfs-run
+  config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+ EOF
+ cat >> $CONFIG_STATUS <<EOF
+@@ -11321,7 +11322,6 @@
+ data/Makefile
+ data/mime/Makefile
+ idl/Makefile
+-intl/Makefile
+ libgnomevfs-pthread/Makefile
+ libgnomevfs/Makefile
+ modules/Makefile
+@@ -11341,7 +11341,9 @@
+ test/Makefile
+ test/vfs-run
+ doc/Makefile
+-macros/Makefile
++xml-i18n-extract
++xml-i18n-merge
++xml-i18n-update
+ "}
+ EOF
+ cat >> $CONFIG_STATUS <<\EOF