[src/pkgviews]: src/usr.sbin/pkg_install Nuke PKG_REGISTRY from the pkg_* too...

[jlam <jlam%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/3c312da6e48a
branches:  pkgviews
changeset: 534278:3c312da6e48a
user:      jlam <jlam%NetBSD.org@localhost>
date:      Sat Aug 30 12:09:13 2003 +0000

description:
Nuke PKG_REGISTRY from the pkg_* tools.  I've been using these tools
extensively the past two weeks, and I always use the -K option instead of
setting the environment variable since it's more convenient (less typing).
Bump the version to 20020822.

In general, PKG_DBDIR should be set in the environment to point to the
location of the package database directory for the default view (if it
differs from /var/db/pkg), but in the mixed pkgviews/overwrite world, you
will almost always want to specify -K <pkgdb_dir>.

diffstat:

 usr.sbin/pkg_install/add/pkg_add.1       |  19 +++++++++----------
 usr.sbin/pkg_install/admin/pkg_admin.1   |  11 +++++------
 usr.sbin/pkg_install/create/pkg_create.1 |   4 +---
 usr.sbin/pkg_install/delete/pkg_delete.1 |   4 +---
 usr.sbin/pkg_install/info/pkg_info.1     |  11 +++++------
 usr.sbin/pkg_install/lib/lib.h           |   6 ++----
 usr.sbin/pkg_install/lib/pkgdb.c         |   8 +++-----
 usr.sbin/pkg_install/lib/version.h       |   4 ++--
 8 files changed, 28 insertions(+), 39 deletions(-)

diffs (220 lines):

diff -r 38cdc8207ceb -r 3c312da6e48a usr.sbin/pkg_install/add/pkg_add.1
--- a/usr.sbin/pkg_install/add/pkg_add.1        Thu Aug 28 00:57:15 2003 +0000
+++ b/usr.sbin/pkg_install/add/pkg_add.1        Sat Aug 30 12:09:13 2003 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: pkg_add.1,v 1.33.4.7 2003/08/26 22:32:12 jlam Exp $
+.\" $NetBSD: pkg_add.1,v 1.33.4.8 2003/08/30 12:09:13 jlam Exp $
 .\"
 .\" FreeBSD install - a package for the installation and maintenance
 .\" of non-core utilities.
@@ -120,8 +120,6 @@
 as the package database directory.
 If this option isn't specified, then the package database directory is
 taken from the value of the environment variable
-.Ev PKG_REGISTRY
-if it's set, otherwise it's taken from the value of the environment variable
 .Ev PKG_DBDIR
 if it's set, otherwise it defaults to
 .Pa /var/db/pkg .
@@ -468,6 +466,14 @@
 .Cm pkg_add .
 .Sh ENVIRONMENT
 .Bl -tag -width PKG_TMPDIR
+.It Ev PKG_DBDIR
+If the
+.Fl K
+flag isn't given, then
+.Ev PKG_DBDIR
+is the location of the package database directory.
+The default package database directory is
+.Pa /var/db/pkg .
 .It Ev PKG_PATH
 The value of the
 .Ev PKG_PATH
@@ -479,13 +485,6 @@
 The current directory may be indicated implicitly by an empty directory
 name, or explicitly by a single period.
 FTP URLs may not end with a slash.
-.It Ev PKG_REGISTRY , Ev PKG_DBDIR
-If the
-.Fl K
-flag isn't given, then these are tried in turn (if set) as the location
-of the package database directory.
-The default package database directory is
-.Pa /var/db/pkg .
 .It Ev PKG_TMPDIR
 Staging directory for installing packages, defaults to /var/tmp.
 Set to directory with lots of free disk if you run out of
diff -r 38cdc8207ceb -r 3c312da6e48a usr.sbin/pkg_install/admin/pkg_admin.1
--- a/usr.sbin/pkg_install/admin/pkg_admin.1    Thu Aug 28 00:57:15 2003 +0000
+++ b/usr.sbin/pkg_install/admin/pkg_admin.1    Sat Aug 30 12:09:13 2003 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: pkg_admin.1,v 1.16.4.4 2003/08/25 20:17:09 jlam Exp $
+.\"    $NetBSD: pkg_admin.1,v 1.16.4.5 2003/08/30 12:09:14 jlam Exp $
 .\"
 .\" Copyright (c) 1999-2002 Hubert Feyrer.  All rights reserved.
 .\"
@@ -57,8 +57,6 @@
 as the package database directory.
 If this option isn't specified, then the package database directory is
 taken from the value of the environment variable
-.Ev PKG_REGISTRY
-if it's set, otherwise it's taken from the value of the environment variable
 .Ev PKG_DBDIR
 if it's set, otherwise it defaults to
 .Pa /var/db/pkg .
@@ -145,11 +143,12 @@
 .El
 .Sh ENVIRONMENT
 .Bl -tag -width indent -compact
-.It Ev PKG_REGISTRY , Ev PKG_DBDIR
+.It Ev PKG_DBDIR
 If the
 .Fl K
-flag isn't given, then these are tried in turn (if set) as the location
-of the package database directory.
+flag isn't given, then
+.Ev PKG_DBDIR
+is the location of the package database directory.
 The default package database directory is
 .Pa /var/db/pkg .
 .El
diff -r 38cdc8207ceb -r 3c312da6e48a usr.sbin/pkg_install/create/pkg_create.1
--- a/usr.sbin/pkg_install/create/pkg_create.1  Thu Aug 28 00:57:15 2003 +0000
+++ b/usr.sbin/pkg_install/create/pkg_create.1  Sat Aug 30 12:09:13 2003 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: pkg_create.1,v 1.32.4.5 2003/08/25 20:17:09 jlam Exp $
+.\" $NetBSD: pkg_create.1,v 1.32.4.6 2003/08/30 12:09:14 jlam Exp $
 .\"
 .\" FreeBSD install - a package for the installation and maintenance
 .\" of non-core utilities.
@@ -186,8 +186,6 @@
 as the package database directory.
 If this option isn't specified, then the package database directory is
 taken from the value of the environment variable
-.Ev PKG_REGISTRY
-if it's set, otherwise it's taken from the value of the environment variable
 .Ev PKG_DBDIR
 if it's set, otherwise it defaults to
 .Pa /var/db/pkg .
diff -r 38cdc8207ceb -r 3c312da6e48a usr.sbin/pkg_install/delete/pkg_delete.1
--- a/usr.sbin/pkg_install/delete/pkg_delete.1  Thu Aug 28 00:57:15 2003 +0000
+++ b/usr.sbin/pkg_install/delete/pkg_delete.1  Sat Aug 30 12:09:13 2003 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: pkg_delete.1,v 1.24.4.4 2003/08/25 20:17:10 jlam Exp $
+.\" $NetBSD: pkg_delete.1,v 1.24.4.5 2003/08/30 12:09:15 jlam Exp $
 .\"
 .\" FreeBSD install - a package for the installation and maintenance
 .\" of non-core utilities.
@@ -108,8 +108,6 @@
 as the package database directory.
 If this option isn't specified, then the package database directory is
 taken from the value of the environment variable
-.Ev PKG_REGISTRY
-if it's set, otherwise it's taken from the value of the environment variable
 .Ev PKG_DBDIR
 if it's set, otherwise it defaults to
 .Pa /var/db/pkg .
diff -r 38cdc8207ceb -r 3c312da6e48a usr.sbin/pkg_install/info/pkg_info.1
--- a/usr.sbin/pkg_install/info/pkg_info.1      Thu Aug 28 00:57:15 2003 +0000
+++ b/usr.sbin/pkg_install/info/pkg_info.1      Sat Aug 30 12:09:13 2003 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: pkg_info.1,v 1.29.2.4 2003/08/25 20:17:10 jlam Exp $
+.\" $NetBSD: pkg_info.1,v 1.29.2.5 2003/08/30 12:09:15 jlam Exp $
 .\"
 .\" FreeBSD install - a package for the installation and maintenance
 .\" of non-core utilities.
@@ -161,8 +161,6 @@
 as the package database directory.
 If this option isn't specified, then the package database directory is
 taken from the value of the environment variable
-.Ev PKG_REGISTRY
-if it's set, otherwise it's taken from the value of the environment variable
 .Ev PKG_DBDIR
 if it's set, otherwise it defaults to
 .Pa /var/db/pkg .
@@ -210,11 +208,12 @@
 .El
 .Sh ENVIRONMENT
 .Bl -tag -width PKG_DBDIR
-.It Ev PKG_REGISTRY , Ev PKG_DBDIR
+.It Ev PKG_DBDIR
 If the
 .Fl K
-flag isn't given, then these are tried in turn (if set) as the location
-of the package database directory.
+flag isn't given, then
+.Ev PKG_DBDIR
+is the location of the package database directory.
 The default package database directory is
 .Pa /var/db/pkg .
 .It Ev PKG_PATH
diff -r 38cdc8207ceb -r 3c312da6e48a usr.sbin/pkg_install/lib/lib.h
--- a/usr.sbin/pkg_install/lib/lib.h    Thu Aug 28 00:57:15 2003 +0000
+++ b/usr.sbin/pkg_install/lib/lib.h    Sat Aug 30 12:09:13 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: lib.h,v 1.43.2.8 2003/08/26 22:32:13 jlam Exp $ */
+/* $NetBSD: lib.h,v 1.43.2.9 2003/08/30 12:09:15 jlam Exp $ */
 
 /* from FreeBSD Id: lib.h,v 1.25 1997/10/08 07:48:03 charnier Exp */
 
@@ -90,8 +90,7 @@
 #endif
 
 /*
- * Where we put logging information by default, if PKG_REGISTRY and
- * PKG_DBDIR are both unset.
+ * Where we put logging information by default if PKG_DBDIR is unset.
  */
 #ifndef DEF_LOG_DIR
 #define DEF_LOG_DIR            "/var/db/pkg"
@@ -99,7 +98,6 @@
 
 /* just in case we change the environment variable name */
 #define PKG_DBDIR              "PKG_DBDIR"
-#define PKG_REGISTRY           "PKG_REGISTRY"
 
 /* The names of our "special" files */
 #define CONTENTS_FNAME         "+CONTENTS"
diff -r 38cdc8207ceb -r 3c312da6e48a usr.sbin/pkg_install/lib/pkgdb.c
--- a/usr.sbin/pkg_install/lib/pkgdb.c  Thu Aug 28 00:57:15 2003 +0000
+++ b/usr.sbin/pkg_install/lib/pkgdb.c  Sat Aug 30 12:09:13 2003 +0000
@@ -1,8 +1,8 @@
-/*     $NetBSD: pkgdb.c,v 1.9.4.3 2003/08/25 20:17:11 jlam Exp $       */
+/*     $NetBSD: pkgdb.c,v 1.9.4.4 2003/08/30 12:09:16 jlam Exp $       */
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: pkgdb.c,v 1.9.4.3 2003/08/25 20:17:11 jlam Exp $");
+__RCSID("$NetBSD: pkgdb.c,v 1.9.4.4 2003/08/30 12:09:16 jlam Exp $");
 #endif
 
 /*
@@ -241,9 +241,7 @@
        char *tmp;
 
        if (pkgdb_dir == NULL) {
-               if ((tmp = getenv(PKG_REGISTRY)))
-                       _pkgdb_setPKGDB_DIR(tmp);
-               else if ((tmp = getenv(PKG_DBDIR)))
+               if ((tmp = getenv(PKG_DBDIR)))
                        _pkgdb_setPKGDB_DIR(tmp);
                else
                        _pkgdb_setPKGDB_DIR(DEF_LOG_DIR);
diff -r 38cdc8207ceb -r 3c312da6e48a usr.sbin/pkg_install/lib/version.h
--- a/usr.sbin/pkg_install/lib/version.h        Thu Aug 28 00:57:15 2003 +0000
+++ b/usr.sbin/pkg_install/lib/version.h        Sat Aug 30 12:09:13 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: version.h,v 1.13.4.13 2003/08/25 20:17:11 jlam Exp $   */
+/*     $NetBSD: version.h,v 1.13.4.14 2003/08/30 12:09:16 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 "20030821"
+#define PKGTOOLS_VERSION "20030822"
 
 #endif /* _INST_LIB_VERSION_H_ */