Updated pkg_install to 20020723

- remove handling of PKG_ADD_BASE.
- don't search current directory if PKG_PATH is set.
- don't prefer local directories.
- constify and cleanup.

6 files changed, 25 insertions, 25 deletions

diff --git a/pkgtools/pkg_install/Makefile b/pkgtools/pkg_install/Makefile
index 5cf890c10d2..2ba3f607845 100644
--- a/pkgtools/pkg_install/Makefile
+++ b/pkgtools/pkg_install/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2002/07/03 22:53:17 abs Exp $
+# $NetBSD: Makefile,v 1.51 2002/08/01 09:31:13 martti Exp $
 
 # Note to package maintainers:
 # To update the distfile of this pkg, cd to /usr/src/usr.sbin,
@@ -7,7 +7,7 @@
 # that file to ${MASTER_SITE_LOCAL}.
 # Also, modify PKGTOOLS_REQD value in pkgsrc/mk/bsd.pkg.mk
 # to the new value.
-DISTNAME=		pkg_install-20020402
+DISTNAME=		pkg_install-20020723
 CATEGORIES=		pkgtools
 MASTER_SITES=		${MASTER_SITE_LOCAL}
 
diff --git a/pkgtools/pkg_install/distinfo b/pkgtools/pkg_install/distinfo
index 6980348f04b..a69c6884c41 100644
--- a/pkgtools/pkg_install/distinfo
+++ b/pkgtools/pkg_install/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.11 2002/07/05 13:14:23 wiz Exp $
+$NetBSD: distinfo,v 1.12 2002/08/01 09:31:14 martti Exp $
 
-SHA1 (pkg_install-20020402.tar.gz) = 36094d2e056207a9cfd7ccc63a1e8bdfa7b88c33
-Size (pkg_install-20020402.tar.gz) = 81920 bytes
-SHA1 (patch-aa) = 0b2297284a506167cadb417d0d6fe74bf10fca89
+SHA1 (pkg_install-20020723.tar.gz) = c16763363a8ff4341c866d50e40dfa2639288009
+Size (pkg_install-20020723.tar.gz) = 81502 bytes
+SHA1 (patch-aa) = f7e8c1c445545d549e4b0655066877d43015bf1f
 SHA1 (patch-ab) = 0b5effbb41b34f96877d3f9494d6cf5054795414
-SHA1 (patch-ac) = c3ed2bd2cbe33d8bc0ea1d2de34aa44da0f4716b
-SHA1 (patch-ad) = 4adf3b44a81ce34bedf74530cccdca0b8a4f066d
-SHA1 (patch-ae) = 021db3f24f483c3eb10c966eeb8cde4b3b5baf2d
+SHA1 (patch-ac) = fb24ffdc0fbf4ca85d588afcfac39a960b763706
+SHA1 (patch-ad) = a4f9bef5d5861c8778cc492a2cb2cfcfff4603c5
+SHA1 (patch-ae) = ea360800e97e0cfdaf7cfe5790f70d8145aa0e23
 SHA1 (patch-af) = b1d9ce8d3c3e592a67db7ac9676a72317a1485c5
 SHA1 (patch-ag) = e30435f0a626a893934c725c605486a145e27690
 SHA1 (patch-ah) = ae0cee4e6f6efd740fc0d4288f8f71dd0039a913
diff --git a/pkgtools/pkg_install/patches/patch-aa b/pkgtools/pkg_install/patches/patch-aa
index f66811ca050..1812bfa650e 100644
--- a/pkgtools/pkg_install/patches/patch-aa
+++ b/pkgtools/pkg_install/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.6 2002/07/03 22:43:40 abs Exp $
+$NetBSD: patch-aa,v 1.7 2002/08/01 09:31:15 martti Exp $
 
---- Makefile.inc.orig	Sun Apr  8 15:11:48 2001
-+++ Makefile.inc
+--- Makefile.inc.orig	Thu Aug  1 10:46:30 2002
++++ Makefile.inc	Thu Aug  1 10:56:14 2002
 @@ -3,6 +3,9 @@
  
  .include <bsd.own.mk>
@@ -12,7 +12,7 @@ $NetBSD: patch-aa,v 1.6 2002/07/03 22:43:40 abs Exp $
  LIBINSTALL != cd ${.CURDIR}/../lib && ${PRINTOBJDIR}
  CPPFLAGS+=-I${.CURDIR}/../lib ${DEBUG} -DBINDIR='"${BINDIR}"'
  
-@@ -32,9 +35,27 @@
+@@ -36,9 +39,27 @@
  CHGRP?= /usr/bin/chgrp
  WARNS=0
  .elif ${OPSYS} == "Linux"
diff --git a/pkgtools/pkg_install/patches/patch-ac b/pkgtools/pkg_install/patches/patch-ac
index ae33c185d88..1cc2aedec54 100644
--- a/pkgtools/pkg_install/patches/patch-ac
+++ b/pkgtools/pkg_install/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.4 2002/07/03 22:43:40 abs Exp $
+$NetBSD: patch-ac,v 1.5 2002/08/01 09:31:16 martti Exp $
 
---- add/perform.c.orig	Tue Apr  2 16:08:33 2002
-+++ add/perform.c
-@@ -347,7 +347,11 @@
+--- add/perform.c.orig	Thu Aug  1 10:46:30 2002
++++ add/perform.c	Thu Aug  1 10:56:47 2002
+@@ -182,7 +182,11 @@
  						goto bomb;
  					}
  				}
diff --git a/pkgtools/pkg_install/patches/patch-ad b/pkgtools/pkg_install/patches/patch-ad
index 8c1dd4231b7..45e6aba7106 100644
--- a/pkgtools/pkg_install/patches/patch-ad
+++ b/pkgtools/pkg_install/patches/patch-ad
@@ -1,10 +1,10 @@
-$NetBSD: patch-ad,v 1.1 2002/07/03 22:43:40 abs Exp $
+$NetBSD: patch-ad,v 1.2 2002/08/01 09:31:16 martti Exp $
 
---- lib/Makefile.orig	Wed Dec 12 01:48:54 2001
-+++ lib/Makefile
+--- lib/Makefile.orig	Thu Aug  1 10:46:31 2002
++++ lib/Makefile	Thu Aug  1 10:57:09 2002
 @@ -5,13 +5,31 @@
  SRCS+=		exec.c file.c ftpio.c global.c lpkg.c pen.c pkgdb.c \
- 		plist.c str.c version.c
+ 		plist.c str.c version.c path.c
  
 +OPSYS!=		uname -s
 +
diff --git a/pkgtools/pkg_install/patches/patch-ae b/pkgtools/pkg_install/patches/patch-ae
index 11150cb8493..67aef04debf 100644
--- a/pkgtools/pkg_install/patches/patch-ae
+++ b/pkgtools/pkg_install/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.1 2002/07/03 22:43:40 abs Exp $
+$NetBSD: patch-ae,v 1.2 2002/08/01 09:31:16 martti Exp $
 
---- lib/lib.h.orig	Fri May 10 14:17:57 2002
-+++ lib/lib.h
-@@ -257,6 +257,10 @@
+--- lib/lib.h.orig	Thu Aug  1 10:46:31 2002
++++ lib/lib.h	Thu Aug  1 10:57:31 2002
+@@ -281,6 +281,10 @@
  /* For all */
  int     pkg_perform(lpkg_head_t *);