[src/pkgviews]: src/usr.sbin/pkg_install/add Remove section describing and us...

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

details:   https://anonhg.NetBSD.org/src/rev/6c333c8f338d
branches:  pkgviews
changeset: 534254:6c333c8f338d
user:      jlam <jlam%NetBSD.org@localhost>
date:      Mon Aug 18 04:58:07 2003 +0000

description:
Remove section describing and using PKG_VIEW, since pkg_add(1) doesn't
really use it, instead relying on pkg_view(1) to do the right thing with
PKG_VIEW.

diffstat:

 usr.sbin/pkg_install/add/perform.c |  16 +++++-----------
 usr.sbin/pkg_install/add/pkg_add.1 |  11 +++++------
 2 files changed, 10 insertions(+), 17 deletions(-)

diffs (86 lines):

diff -r cb48e2efc3bf -r 6c333c8f338d usr.sbin/pkg_install/add/perform.c
--- a/usr.sbin/pkg_install/add/perform.c        Sun Aug 17 22:02:20 2003 +0000
+++ b/usr.sbin/pkg_install/add/perform.c        Mon Aug 18 04:58:07 2003 +0000
@@ -1,11 +1,11 @@
-/*     $NetBSD: perform.c,v 1.70.2.4 2003/08/17 04:55:21 jlam Exp $    */
+/*     $NetBSD: perform.c,v 1.70.2.5 2003/08/18 04:58:07 jlam Exp $    */
 
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static const char *rcsid = "from FreeBSD Id: perform.c,v 1.44 1997/10/13 15:03:46 jkh Exp";
 #else
-__RCSID("$NetBSD: perform.c,v 1.70.2.4 2003/08/17 04:55:21 jlam Exp $");
+__RCSID("$NetBSD: perform.c,v 1.70.2.5 2003/08/18 04:58:07 jlam Exp $");
 #endif
 #endif
 
@@ -74,9 +74,7 @@
        if (Verbose)
                printf("Loading it from %s.\n", name);
        path_setenv("PKG_PATH");
-       if (vsystem("env %s=%s %s/pkg_add -s %s %s%s%s %s%s %s%s%s %s%s",
-                       PKG_VIEW,
-                       (tmp = getenv(PKG_VIEW) ? tmp : ""),
+       if (vsystem("%s/pkg_add -s %s %s%s%s %s%s %s%s%s %s%s",
                        BINDIR,
                        get_verification(),
                        NoView ? "-L " : "",
@@ -769,11 +767,9 @@
        /* Add the package to a default view. */
        if (!NoView && is_depoted_pkg) {
                if (Verbose) {
-                       printf("env %s=%s %s=%s %s/pkg_view %s%s %s%s %sadd %s\n",
+                       printf("env %s=%s %s/pkg_view %s%s %s%s %sadd %s\n",
                                PKG_DBDIR,
                                DEF_LOG_DIR,
-                               PKG_VIEW,
-                               (tmp = getenv(PKG_VIEW) ? tmp : ""),
                                BINDIR,
                                View ? "-w " : "",
                                View ? View : "",
@@ -782,11 +778,9 @@
                                Verbose ? "-v " : "",
                                PkgName);
                }
-               vsystem("env %s=%s %s=%s %s/pkg_view %s%s %s%s %sadd %s",
+               vsystem("env %s=%s %s/pkg_view %s%s %s%s %sadd %s",
                                PKG_DBDIR,
                                DEF_LOG_DIR,
-                               PKG_VIEW,
-                               (tmp = getenv(PKG_VIEW) ? tmp : ""),
                                BINDIR,
                                View ? "-w " : "",
                                View ? View : "",
diff -r cb48e2efc3bf -r 6c333c8f338d usr.sbin/pkg_install/add/pkg_add.1
--- a/usr.sbin/pkg_install/add/pkg_add.1        Sun Aug 17 22:02:20 2003 +0000
+++ b/usr.sbin/pkg_install/add/pkg_add.1        Mon Aug 18 04:58:07 2003 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: pkg_add.1,v 1.33.4.2 2003/08/17 04:55:21 jlam Exp $
+.\" $NetBSD: pkg_add.1,v 1.33.4.3 2003/08/18 04:58:07 jlam Exp $
 .\"
 .\" FreeBSD install - a package for the installation and maintenance
 .\" of non-core utilities.
@@ -243,9 +243,10 @@
 Set the
 .Ar view
 to which packages should be added after installation.
-The default view is the empty view but may be overridden by the
-.Ev PKG_VIEW
-environment variable.
+The default
+.Ar view
+is set by
+.Xr pkg_view 1 .
 .El
 .Pp
 One or more
@@ -467,8 +468,6 @@
 Staging directory for installing packages, defaults to /var/tmp.
 Set to directory with lots of free disk if you run out of
 space when installing a binary package.
-.Ss PKG_VIEW
-The default view to which packages are added after installation.
 .Sh EXAMPLES
 In all cases,
 .Nm