Remove BUILD_DEPENDS on autoconf by patching configure instead of

configure.in.

3 files changed, 16 insertions, 19 deletions

diff --git a/net/ORBit/Makefile b/net/ORBit/Makefile
index 0aa04bdf616..d2e8eaaed31 100644
--- a/net/ORBit/Makefile
+++ b/net/ORBit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.61 2001/08/27 14:35:11 tron Exp $
+# $NetBSD: Makefile,v 1.62 2001/08/28 18:37:54 skrll Exp $
 #
 
 DISTNAME=		ORBit-0.${ORBIT_MAJOR}.${ORBIT_MINOR}
@@ -11,7 +11,6 @@ HOMEPAGE=		http://www.gnome.org/
 COMMENT=		high-performance CORBA ORB with support for the C language
 
 DEPENDS+=		gindent-*:../../devel/gindent
-BUILD_DEPENDS+=		autoconf>=2.13:../../devel/autoconf
 BUILD_DEPENDS+=		automake>=1.4:../../devel/automake
 
 BUILD_USES_GETTEXT_M4=	YES
@@ -32,9 +31,6 @@ PLIST_SUBST+=		ORBIT_MAJOR=${ORBIT_MAJOR} ORBIT_MINOR=${ORBIT_MINOR}
 
 INFO_FILES=		libIDL.info
 
-pre-configure:
-	cd ${WRKSRC}/popt && ${LOCALBASE}/bin/autoreconf --include-deps --force
-
 .include "../../devel/gettext-lib/buildlink.mk"
 .include "../../devel/glib/buildlink.mk"
 .include "../../security/tcp_wrappers/buildlink.mk"
diff --git a/net/ORBit/distinfo b/net/ORBit/distinfo
index e47bea743f8..c30ea67cc69 100644
--- a/net/ORBit/distinfo
+++ b/net/ORBit/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.4 2001/06/16 20:01:23 jlam Exp $
+$NetBSD: distinfo,v 1.5 2001/08/28 18:37:54 skrll Exp $
 
 SHA1 (ORBit-0.5.8.tar.bz2) = 89b7d79f44be59ab029b126c60e79143597db663
 Size (ORBit-0.5.8.tar.bz2) = 850158 bytes
-SHA1 (patch-aa) = 4abb149e8d15c973fbe810504ce79948f5c782f1
+SHA1 (patch-aa) = 84334e6a876ccb6d8cd01d74670b0646fc133518
 SHA1 (patch-ab) = 1a8d5c433941930d558a408ebfa2ba4a631bafea
 SHA1 (patch-ac) = 7fddddf08e9f35e1e506be3f71c5925d62ae760c
 SHA1 (patch-ad) = 688920ba423aa2994d9e2e6540f8738305cb7fd9
diff --git a/net/ORBit/patches/patch-aa b/net/ORBit/patches/patch-aa
index 7b2431827e1..b574f54425a 100644
--- a/net/ORBit/patches/patch-aa
+++ b/net/ORBit/patches/patch-aa
@@ -1,17 +1,18 @@
-$NetBSD: patch-aa,v 1.8 2001/01/14 12:19:35 tron Exp $
+$NetBSD: patch-aa,v 1.9 2001/08/28 18:37:55 skrll Exp $
 
---- popt/configure.in.orig	Wed May 31 02:55:40 2000
-+++ popt/configure.in	Sun Jan 14 12:52:56 2001
-@@ -59,12 +59,6 @@
- 	AC_MSG_RESULT(no)
+--- popt/configure.orig	Tue Aug 28 19:21:53 2001
++++ popt/configure
+@@ -2277,13 +2277,6 @@
+ 	echo "$ac_t""no" 1>&6
  fi
  
--AC_MSG_CHECKING(for GNU xgettext)
--xgettext --version 2>&1 | grep 'GNU gettext' >/dev/null 2>&1 || AC_MSG_ERROR([
+-echo $ac_n "checking for GNU xgettext""... $ac_c" 1>&6
+-echo "configure:2282: checking for GNU xgettext" >&5
+-xgettext --version 2>&1 | grep 'GNU gettext' >/dev/null 2>&1 || { echo "configure: error: 
 -*** GNU gettext is required. The latest version
--*** is always available from ftp://ftp.gnu.org/gnu/gettext/.])
--AC_MSG_RESULT(yes)
+-*** is always available from ftp://ftp.gnu.org/gnu/gettext/." 1>&2; exit 1; }
+-echo "$ac_t""yes" 1>&6
 -
- AC_CHECK_FUNCS(strerror mtrace)
- dnl AC_CHECK_FUNCS(gettext)
- dnl AC_CHECK_FUNCS(dgettext)
+ for ac_func in strerror mtrace
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6