[src/netbsd-1-4]: src/usr.sbin/pkg_install Pull up revision 1.30 (requested b...

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

details:   https://anonhg.NetBSD.org/src/rev/b6ef828e1e60
branches:  netbsd-1-4
changeset: 470233:b6ef828e1e60
user:      he <he%NetBSD.org@localhost>
date:      Mon Jan 31 20:57:50 2000 +0000

description:
Pull up revision 1.30 (requested by hubertf):
  Implement FTP wildcard depends, to give NetBSD full wildcard support
  not only in pkgsrc but also for binary packages installed from
  local disk or via FTP.

diffstat:

 usr.sbin/pkg_install/delete/perform.c |  6 +++---
 usr.sbin/pkg_install/info/perform.c   |  5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diffs (50 lines):

diff -r c4dd91bc7419 -r b6ef828e1e60 usr.sbin/pkg_install/delete/perform.c
--- a/usr.sbin/pkg_install/delete/perform.c     Mon Jan 31 20:57:28 2000 +0000
+++ b/usr.sbin/pkg_install/delete/perform.c     Mon Jan 31 20:57:50 2000 +0000
@@ -1,11 +1,11 @@
-/*     $NetBSD: perform.c,v 1.23.2.4 1999/12/20 15:12:51 he Exp $      */
+/*     $NetBSD: perform.c,v 1.23.2.5 2000/01/31 20:57:50 he Exp $      */
 
 #include <sys/cdefs.h>
 #ifndef lint
 #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.23.2.4 1999/12/20 15:12:51 he Exp $");
+__RCSID("$NetBSD: perform.c,v 1.23.2.5 2000/01/31 20:57:50 he Exp $");
 #endif
 #endif
 
@@ -539,7 +539,7 @@
                }
 
                /* No match */
-               warnx("no such package '%s' installed", pkg);
+               warnx("package '%s' not installed", pkg);
                return 1;
        }
        if (!getcwd(home, FILENAME_MAX)) {
diff -r c4dd91bc7419 -r b6ef828e1e60 usr.sbin/pkg_install/info/perform.c
--- a/usr.sbin/pkg_install/info/perform.c       Mon Jan 31 20:57:28 2000 +0000
+++ b/usr.sbin/pkg_install/info/perform.c       Mon Jan 31 20:57:50 2000 +0000
@@ -1,11 +1,11 @@
-/*     $NetBSD: perform.c,v 1.23.2.3 1999/12/20 15:36:09 he Exp $      */
+/*     $NetBSD: perform.c,v 1.23.2.4 2000/01/31 20:58:10 he Exp $      */
 
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static const char *rcsid = "from FreeBSD Id: perform.c,v 1.23 1997/10/13 15:03:53 jkh Exp";
 #else
-__RCSID("$NetBSD: perform.c,v 1.23.2.3 1999/12/20 15:36:09 he Exp $");
+__RCSID("$NetBSD: perform.c,v 1.23.2.4 2000/01/31 20:58:10 he Exp $");
 #endif
 #endif
 
@@ -333,5 +333,6 @@
                        free_lpkg(lpp);
                }
        }
+       ftp_stop();
        return err_cnt;
 }