work around the possibility of the configure script being re-run in

the build target by forcing LIBTOOL=libtool (instead of ./libtool).

3 files changed, 33 insertions, 1 deletions

diff --git a/devel/popt/distinfo b/devel/popt/distinfo
index da1ab1da05f..7e8edd956c8 100644
--- a/devel/popt/distinfo
+++ b/devel/popt/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.11 2002/11/30 23:21:39 salo Exp $
+$NetBSD: distinfo,v 1.12 2003/05/06 13:08:37 grant Exp $
 
 SHA1 (popt-1.7.tar.gz) = 66f3c77b87a160951b180447f4a6dce68ad2f71b
 Size (popt-1.7.tar.gz) = 574549 bytes
 SHA1 (patch-ab) = 7c9ad516baeb6343dfc21f8611f132592575d084
+SHA1 (patch-ac) = d95914024999789d60bd530865bb8613ed13f17c
+SHA1 (patch-ad) = 33ac94c57ad05d2fe99c9620181b59ce1402c21e
diff --git a/devel/popt/patches/patch-ac b/devel/popt/patches/patch-ac
new file mode 100644
index 00000000000..c459b0c0a18
--- /dev/null
+++ b/devel/popt/patches/patch-ac
@@ -0,0 +1,15 @@
+$NetBSD: patch-ac,v 1.1 2003/05/06 13:08:37 grant Exp $
+
+--- aclocal.m4.orig	Sat Aug 31 23:22:08 2002
++++ aclocal.m4
+@@ -1016,8 +1016,8 @@ AC_DEFUN([AC_PROG_LIBTOOL],
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+ 
+-# Always use our own libtool.
+-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
++# Always use pkgsrc libtool
++LIBTOOL=libtool
+ AC_SUBST(LIBTOOL)dnl
+ 
+ # Prevent multiple expansion
diff --git a/devel/popt/patches/patch-ad b/devel/popt/patches/patch-ad
new file mode 100644
index 00000000000..013bc50c137
--- /dev/null
+++ b/devel/popt/patches/patch-ad
@@ -0,0 +1,15 @@
+$NetBSD: patch-ad,v 1.1 2003/05/06 13:08:37 grant Exp $
+
+--- configure.orig	Sat Aug 31 23:22:20 2002
++++ configure
+@@ -8328,8 +8328,8 @@ fi
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+ 
+-# Always use our own libtool.
+-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
++# Always use pkgsrc libtool
++LIBTOOL=libtool
+ 
+ # Prevent multiple expansion
+