From 4decc1f6f418bcfb1e2e7438f93b8a749f4f9c96 Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Sun, 14 Sep 2003 04:58:30 +0000
Subject: Update pkg_install to 20030914.  Changes from version 20030913 are
 ensuring that recursive pkg_delete'ing works by using the correct pkg_dbdir
 to find packages.  This fixes recursive deleting if the -K flag is passed to
 pkg_delete(1), and the named dbdir differs from the default dbdir
 (/var/db/pkg).

---
 pkgtools/pkg_install/files/delete/perform.c | 7 ++++---
 pkgtools/pkg_install/files/lib/version.h    | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'pkgtools')

diff --git a/pkgtools/pkg_install/files/delete/perform.c b/pkgtools/pkg_install/files/delete/perform.c
index 59d74fcb5e9..aa1b1c1cca3 100644
--- a/pkgtools/pkg_install/files/delete/perform.c
+++ b/pkgtools/pkg_install/files/delete/perform.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: perform.c,v 1.6 2003/09/09 13:34:19 jlam Exp $	*/
+/*	$NetBSD: perform.c,v 1.7 2003/09/14 04:58:32 jlam Exp $	*/
 
 #if HAVE_CONFIG_H
 #include "config.h"
@@ -11,7 +11,7 @@
 #if 0
 static const char *rcsid = "from FreeBSD Id: perform.c,v 1.15 1997/10/13 15:03:52 jkh Exp";
 #else
-__RCSID("$NetBSD: perform.c,v 1.6 2003/09/09 13:34:19 jlam Exp $");
+__RCSID("$NetBSD: perform.c,v 1.7 2003/09/14 04:58:32 jlam Exp $");
 #endif
 #endif
 
@@ -321,7 +321,8 @@ require_delete(char *home, int tryall)
 		if (Fake)
 			rv = 0;
 		else
-			rv = vsystem("%s %s %s %s %s %s %s %s %s", ProgramPath,
+			rv = vsystem("%s -K %s %s %s %s %s %s %s %s %s", ProgramPath,
+			    _pkgdb_getPKGDB_DIR(),
 			    Prefix ? "-p" : "",
 			    Prefix ? Prefix : "",
 			    Verbose ? "-v" : "",
diff --git a/pkgtools/pkg_install/files/lib/version.h b/pkgtools/pkg_install/files/lib/version.h
index c15af2bf3bd..00b72eaba4f 100644
--- a/pkgtools/pkg_install/files/lib/version.h
+++ b/pkgtools/pkg_install/files/lib/version.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: version.h,v 1.14 2003/09/13 09:24:22 jlam Exp $	*/
+/*	$NetBSD: version.h,v 1.15 2003/09/14 04:58:32 jlam Exp $	*/
 
 /*
  * Copyright (c) 2001 Thomas Klausner.  All rights reserved.
@@ -33,6 +33,6 @@
 #ifndef _INST_LIB_VERSION_H_
 #define _INST_LIB_VERSION_H_
 
-#define PKGTOOLS_VERSION "20030913"
+#define PKGTOOLS_VERSION "20030914"
 
 #endif /* _INST_LIB_VERSION_H_ */
-- 
cgit v1.2.3