Upgrade to version 20021123, which fixes PR pkg/18384 by Grant.

Curiously, several of the patches required some changes -- have these
not been tested with the latest version of pkg_install?

5 files changed, 39 insertions, 67 deletions

diff --git a/pkgtools/pkg_install/Makefile b/pkgtools/pkg_install/Makefile
index 4f272a5e3ce..27303132db8 100644
--- a/pkgtools/pkg_install/Makefile
+++ b/pkgtools/pkg_install/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2002/11/17 09:37:21 cjep Exp $
+# $NetBSD: Makefile,v 1.55 2002/11/23 22:49:47 jschauma 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-20020723
+DISTNAME=		pkg_install-20021123
 CATEGORIES=		pkgtools
 MASTER_SITES=		${MASTER_SITE_LOCAL}
 
diff --git a/pkgtools/pkg_install/distinfo b/pkgtools/pkg_install/distinfo
index 358fa737729..0e1a4cc7cc6 100644
--- a/pkgtools/pkg_install/distinfo
+++ b/pkgtools/pkg_install/distinfo
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.21 2002/09/23 13:16:59 abs Exp $
+$NetBSD: distinfo,v 1.22 2002/11/23 22:49:47 jschauma Exp $
 
-SHA1 (pkg_install-20020723.tar.gz) = c16763363a8ff4341c866d50e40dfa2639288009
-Size (pkg_install-20020723.tar.gz) = 81502 bytes
-SHA1 (patch-aa) = 3f0c9b4e8853341c696c02d3f68fe53eae59fbef
+SHA1 (pkg_install-20021123.tar.gz) = 7c67cfd6a6fc3d9b4c6835a7f3e8652637c5597f
+Size (pkg_install-20021123.tar.gz) = 83299 bytes
+SHA1 (patch-aa) = 97e9444d5dff2d614da27c61e0a333768a3e7382
 SHA1 (patch-ab) = 0b5effbb41b34f96877d3f9494d6cf5054795414
 SHA1 (patch-ac) = fb24ffdc0fbf4ca85d588afcfac39a960b763706
-SHA1 (patch-ad) = 6936e8e5d0d6142402e80a024e2d3998e45d6572
+SHA1 (patch-ad) = a8263b96bddfdeed8119b04a791e5c21c69f33f2
 SHA1 (patch-ae) = 1e9ca0cd01c27337fb7ad688b16775cea325d7e6
 SHA1 (patch-af) = b1d9ce8d3c3e592a67db7ac9676a72317a1485c5
 SHA1 (patch-ag) = e30435f0a626a893934c725c605486a145e27690
 SHA1 (patch-ah) = ae0cee4e6f6efd740fc0d4288f8f71dd0039a913
 SHA1 (patch-ai) = 9636b51fdc386cd445684a934f5f77a6612c6bca
-SHA1 (patch-aj) = 7d220018c533849f7d9b7e68828f89bbe67ec68c
+SHA1 (patch-aj) = f87df801155e859bc61e045c13f6b12e25692cf2
diff --git a/pkgtools/pkg_install/patches/patch-aa b/pkgtools/pkg_install/patches/patch-aa
index 0042ebcc1b5..5dadc23537a 100644
--- a/pkgtools/pkg_install/patches/patch-aa
+++ b/pkgtools/pkg_install/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.10 2002/08/12 01:58:26 schmonz Exp $
+$NetBSD: patch-aa,v 1.11 2002/11/23 22:49:48 jschauma Exp $
 
---- Makefile.inc.orig	Thu Aug  1 04:46:30 2002
-+++ Makefile.inc
+--- Makefile.inc.orig	Sat Nov 23 17:37:17 2002
++++ Makefile.inc	Sat Nov 23 17:39:38 2002
 @@ -3,6 +3,9 @@
  
  .include <bsd.own.mk>
@@ -12,46 +12,12 @@ $NetBSD: patch-aa,v 1.10 2002/08/12 01:58:26 schmonz Exp $
  LIBINSTALL != cd ${.CURDIR}/../lib && ${PRINTOBJDIR}
  CPPFLAGS+=-I${.CURDIR}/../lib ${DEBUG} -DBINDIR='"${BINDIR}"'
  
-@@ -20,11 +23,11 @@ OPSYS="unknown"
- CHMOD?= /bin/chmod
- CHOWN?= /usr/sbin/chown
- CHGRP?= /usr/bin/chgrp
+@@ -29,7 +32,7 @@
+ #CHMOD_CMD?= /bin/chmod
+ #CHOWN_CMD?= /usr/sbin/chown
+ #CHGRP_CMD?= /usr/bin/chgrp
 -WARNS=2
 +WARNS=1
- .elif ${OPSYS} == "SunOS"
- LOCALBASE?= /usr/pkg
- TAR_CMD?= tar
--FTP_CMD?= tar
-+FTP_CMD?= ftp
- ZOULARISBASE?=	${LOCALBASE}/bsd
- TAR_FULLPATHNAME?= ${ZOULARISBASE}/bin/${TAR_CMD}
- FTP_FULLPATHNAME?= ${ZOULARISBASE}/bin/${FTP_CMD}
-@@ -36,9 +39,28 @@ CHOWN?= /usr/bin/chown
- CHGRP?= /usr/bin/chgrp
- WARNS=0
- .elif ${OPSYS} == "Linux"
-+LOCALBASE?= /usr/pkg
- CHMOD?= /bin/chmod
- CHOWN?= /bin/chown
- CHGRP?= /bin/chgrp
-+LDADD+= -ldb1
-+.PATH: ${DIGESTDIR}
-+CPPFLAGS+= -I${DIGESTDIR}
-+MKCATPAGES=     no
-+TAR_CMD?= tar
-+TAR_FULLPATHNAME?= /bin/${TAR_CMD}
-+CPPFLAGS+=-DTAR_CMD='"${TAR_CMD}"' -DTAR_FULLPATHNAME='"${TAR_FULLPATHNAME}"'
-+CPPFLAGS+=-DTAR_MISSING_FAST_READ -DFGETLN_MISSING
-+.elif ${OPSYS} == "Darwin"
-+CHMOD?= /bin/chmod
-+CHOWN?= /usr/sbin/chown
-+CHGRP?= /usr/bin/chgrp
-+TAR_CMD?= gnutar
-+TAR_FULLPATHNAME?= /usr/bin/${TAR_CMD}
-+CPPFLAGS+=-DTAR_CMD='"${TAR_CMD}"' -DTAR_FULLPATHNAME='"${TAR_FULLPATHNAME}"'
-+CPPFLAGS+=-DTAR_MISSING_FAST_READ
-+.PATH: ${DIGESTDIR}
-+CPPFLAGS+= -I${DIGESTDIR}
- .endif
  
- CPPFLAGS+= -DCHMOD='"${CHMOD}"' -DCHOWN='"${CHOWN}"' -DCHGRP='"${CHGRP}"'
+ #CPPFLAGS+= -DCHMOD_CMD='"${CHMOD_CMD}"' -DCHOWN_CMD='"${CHOWN_CMD}"'
+ #CPPFLAGS+= -DCHGRP_CMD='"${CHGRP_CMD}"'
diff --git a/pkgtools/pkg_install/patches/patch-ad b/pkgtools/pkg_install/patches/patch-ad
index 0fbd4796620..400322d3940 100644
--- a/pkgtools/pkg_install/patches/patch-ad
+++ b/pkgtools/pkg_install/patches/patch-ad
@@ -1,10 +1,10 @@
-$NetBSD: patch-ad,v 1.5 2002/09/23 13:16:59 abs Exp $
+$NetBSD: patch-ad,v 1.6 2002/11/23 22:49:48 jschauma Exp $
 
---- lib/Makefile.orig	Thu Aug  1 10:46:31 2002
-+++ lib/Makefile
-@@ -5,13 +5,36 @@
- SRCS+=		exec.c file.c ftpio.c global.c lpkg.c pen.c pkgdb.c \
- 		plist.c str.c version.c path.c
+--- lib/Makefile.orig	Sat Nov 23 17:40:45 2002
++++ lib/Makefile	Sat Nov 23 17:42:52 2002
+@@ -1,17 +1,41 @@
+ # $NetBSD: patch-ad,v 1.6 2002/11/23 22:49:48 jschauma Exp $
+ # Original from FreeBSD, no rcs id.
  
 +OPSYS!=		uname -s
 +RELEASE!=	uname -r
@@ -25,10 +25,15 @@ $NetBSD: patch-ad,v 1.5 2002/09/23 13:16:59 abs Exp $
  NOMAN=		# defined
  NOPIC=		# defined
  NOPROFILE=	# defined
+ 
 +MKLINT=		no
 +MKMAN=		no
 +MKPIC=		no
 +MKPROFILE=	no
++
+ LIB+=		install
+ SRCS+=		exec.c file.c ftpio.c global.c lpkg.c pen.c pkgdb.c \
+ 		plist.c str.c version.c path.c
  
  # only needed during build - prevent installation of library
 +.if ${OPSYS} == "Darwin"
diff --git a/pkgtools/pkg_install/patches/patch-aj b/pkgtools/pkg_install/patches/patch-aj
index cd042507700..c170266695a 100644
--- a/pkgtools/pkg_install/patches/patch-aj
+++ b/pkgtools/pkg_install/patches/patch-aj
@@ -1,15 +1,16 @@
-$NetBSD: patch-aj,v 1.1 2002/08/05 15:54:57 wiz Exp $
+$NetBSD: patch-aj,v 1.2 2002/11/23 22:49:48 jschauma Exp $
 
---- lib/path.h	Fri Jul 19 12:04:41 2002
-+++ lib/path.h	Mon Aug  5 08:43:32 2002
-@@ -36,3 +36,10 @@
- void path_create(const char *);
- void path_free(void);
+--- lib/path.h.orig	Sat Nov 23 17:44:03 2002
++++ lib/path.h	Sat Nov 23 17:44:59 2002
+@@ -38,3 +38,11 @@
+ void path_prepend_from_pkgname(const char *);
+ void path_prepend_clear(void);
  void path_setenv(const char *);
 +
 +#ifndef TAILQ_FOREACH
-+#define TAILQ_FOREACH(var, head, field)                                 \
-+        for ((var) = ((head)->tqh_first);                               \
-+                (var);                                                  \
-+                (var) = ((var)->field.tqe_next))
++#define TAILQ_FOREACH(var, head, field)					\
++	for ((var) = ((head)->tqh_first);				\
++		(var);							\
++		(var) = ((var)->field.tqe_next))
 +#endif
++