Sync pkgtools/pkg_install with src/usr.sbin/pkg_install from 20031003.

New features include fetching binary packages using HTTP (thanks wiz!)
and some minor speed optimizations for pkg_delete.

3 files changed, 31 insertions, 24 deletions

diff --git a/pkgtools/pkg_install/files/add/futil.c b/pkgtools/pkg_install/files/add/futil.c
index 28802b01ea2..b15874ff500 100644
--- a/pkgtools/pkg_install/files/add/futil.c
+++ b/pkgtools/pkg_install/files/add/futil.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: futil.c,v 1.5 2003/09/23 13:22:38 grant Exp $	*/
+/*	$NetBSD: futil.c,v 1.6 2003/10/29 23:00:28 jlam Exp $	*/
 
 #if HAVE_CONFIG_H
 #include "config.h"
@@ -11,7 +11,7 @@
 #if 0
 static const char *rcsid = "from FreeBSD Id: futil.c,v 1.7 1997/10/08 07:45:39 charnier Exp";
 #else
-__RCSID("$NetBSD: futil.c,v 1.5 2003/09/23 13:22:38 grant Exp $");
+__RCSID("$NetBSD: futil.c,v 1.6 2003/10/29 23:00:28 jlam Exp $");
 #endif
 #endif
 
@@ -95,8 +95,8 @@ apply_perms(char *dir, char *arg)
 	if (Owner != NULL && Group != NULL) {
 		if (snprintf(owner_group, sizeof(owner_group),
 			     "%s:%s", Owner, Group) > sizeof(owner_group)) {
-			warnx("'%s:%s' is too long (%d max)",
-			      Owner, Group, sizeof(owner_group));
+			warnx("'%s:%s' is too long (%lu max)",
+			      Owner, Group, (unsigned long) sizeof(owner_group));
 			return;
 		}
 		if (fcexec(cd_to, CHOWN_CMD, "-R", owner_group, arg))
diff --git a/pkgtools/pkg_install/files/add/pkg_add.1 b/pkgtools/pkg_install/files/add/pkg_add.1
index 6c816a8a283..8d76d763a73 100644
--- a/pkgtools/pkg_install/files/add/pkg_add.1
+++ b/pkgtools/pkg_install/files/add/pkg_add.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: pkg_add.1,v 1.5 2003/09/23 07:13:47 grant Exp $
+.\" $NetBSD: pkg_add.1,v 1.6 2003/10/29 23:00:28 jlam Exp $
 .\"
 .\" FreeBSD install - a package for the installation and maintenance
 .\" of non-core utilities.
@@ -17,7 +17,7 @@
 .\"
 .\"     @(#)pkg_add.1
 .\"
-.Dd September 8, 2003
+.Dd October 3, 2003
 .Dt PKG_ADD 1
 .Os
 .Sh NAME
@@ -44,7 +44,7 @@
 .Bk -words
 .Op Fl w Ar view
 .Ek
-.Ar \fR[ftp://[\fIuser\fR[:\fIpassword]\fR@]\fIhost\fR[:\fIport\fR]][/\fIpath/\fR]pkg-name ...
+.Ar \fR[[ftp|http]://[\fIuser\fR[:\fIpassword]\fR@]\fIhost\fR[:\fIport\fR]][/\fIpath/\fR]pkg-name ...
 .Sh DESCRIPTION
 The
 .Nm
@@ -56,7 +56,7 @@ Packages are prepared collections of pre-built binaries, documentation,
 configurations, installation instructions and/or other files.
 .Nm
 can recursively install other packages that the current package
-depends on or requires from both local disk and via FTP.
+depends on or requires from both local disk and via FTP or HTTP.
 .Sh WARNING
 .Bf -emphasis
 Since the
@@ -273,15 +273,17 @@ arguments may be specified, each being either a file containing the
 package (these usually ending with the ``.tgz'' suffix) or a
 URL pointing at a file available on an ftp or web site.
 Thus you may extract files directly from their anonymous ftp or WWW
-locations (e.g.
+locations (e.g.,
 .Nm
-ftp://ftp.NetBSD.org/pub/NetBSD/packages/1.5/i386/shells/bash-2.04.tgz).
-Note:  If you wish to use
+ftp://ftp.NetBSD.org/pub/NetBSD/packages/1.5/i386/shells/bash-2.04.tgz
+or
+.Nm
+http://www.example.org/packages/screen-4.0.tbz).
+Note:  For ftp transfers, if you wish to use
 .Bf -emphasis
 passive mode
 .Ef
-ftp in such transfers, set
-the variable
+ftp in such transfers, set the variable
 .Bf -emphasis
 FTP_PASSIVE_MODE
 .Ef
@@ -558,6 +560,8 @@ refinements.
 .It "Hubert Feyrer"
 .Nx
 wildcard dependency processing, pkgdb, upgrading, etc.
+.It Thomas Klausner
+HTTP support.
 .El
 .Sh BUGS
 Hard links between files in a distribution are only preserved if either
diff --git a/pkgtools/pkg_install/files/add/pkg_add.cat1 b/pkgtools/pkg_install/files/add/pkg_add.cat1
index e0e4b3f5009..e466a6f7d15 100644
--- a/pkgtools/pkg_install/files/add/pkg_add.cat1
+++ b/pkgtools/pkg_install/files/add/pkg_add.cat1
@@ -1,4 +1,4 @@
-PKG_ADD(1)              NetBSD General Commands Manual              PKG_ADD(1)
+PKG_ADD(1)                  NetBSD Reference Manual                 PKG_ADD(1)
 
 NNAAMMEE
      ppkkgg__aadddd - a utility for installing and upgrading software package distri-
@@ -7,7 +7,7 @@ NNAAMMEE
 SSYYNNOOPPSSIISS
      ppkkgg__aadddd [--ffIILLMMnnRRSSuuVVvv] [--KK _p_k_g___d_b_d_i_r] [--pp _p_r_e_f_i_x] [--ss _v_e_r_i_f_i_c_a_t_i_o_n_-_t_y_p_e]
              [--tt _t_e_m_p_l_a_t_e] [--WW _v_i_e_w_b_a_s_e] [--ww _v_i_e_w]
-             [ftp://[_u_s_e_r[:_p_a_s_s_w_o_r_d_]@]_h_o_s_t[:_p_o_r_t]][/_p_a_t_h_/]pkg-name ...
+             [[ftp|http]://[_u_s_e_r[:_p_a_s_s_w_o_r_d_]@]_h_o_s_t[:_p_o_r_t]][/_p_a_t_h_/]pkg-name ...
 
 DDEESSCCRRIIPPTTIIOONN
      The ppkkgg__aadddd command is used to extract and upgrade packages that have
@@ -15,7 +15,7 @@ DDEESSCCRRIIPPTTIIOONN
      prepared collections of pre-built binaries, documentation, configura-
      tions, installation instructions and/or other files.  ppkkgg__aadddd can recur-
      sively install other packages that the current package depends on or re-
-     quires from both local disk and via FTP.
+     quires from both local disk and via FTP or HTTP.
 
 WWAARRNNIINNGG
      _S_i_n_c_e _t_h_e ppkkgg__aadddd _c_o_m_m_a_n_d _m_a_y _e_x_e_c_u_t_e _s_c_r_i_p_t_s _o_r _p_r_o_g_r_a_m_s _c_o_n_t_a_i_n_e_d _w_i_t_h_-
@@ -146,14 +146,15 @@ OOPPTTIIOONNSS
      One or more _p_k_g_-_n_a_m_e arguments may be specified, each being either a file
      containing the package (these usually ending with the ``.tgz'' suffix) or
      a URL pointing at a file available on an ftp or web site.  Thus you may
-     extract files directly from their anonymous ftp or WWW locations (e.g.
+     extract files directly from their anonymous ftp or WWW locations (e.g.,
      ppkkgg__aadddd ftp://ftp.NetBSD.org/pub/NetBSD/pack-
-     ages/1.5/i386/shells/bash-2.04.tgz).  Note:  If you wish to use _p_a_s_s_i_v_e
-     _m_o_d_e ftp in such transfers, set the variable _F_T_P___P_A_S_S_I_V_E___M_O_D_E to some
-     value in your environment.  Otherwise, the more standard ACTIVE mode may
-     be used.  If ppkkgg__aadddd consistently fails to fetch a package from a site
-     known to work, it may be because you have a firewall that demands the us-
-     age of _p_a_s_s_i_v_e _m_o_d_e ftp.
+     ages/1.5/i386/shells/bash-2.04.tgz or ppkkgg__aadddd http://www.exam-
+     ple.org/packages/screen-4.0.tbz).  Note:  For ftp transfers, if you wish
+     to use _p_a_s_s_i_v_e _m_o_d_e  ftp in such transfers, set the variable _F_T_P___P_A_S_-
+     _S_I_V_E___M_O_D_E  to some value in your environment.  Otherwise, the more stan-
+     dard ACTIVE mode may be used.  If ppkkgg__aadddd consistently fails to fetch a
+     package from a site known to work, it may be because you have a firewall
+     that demands the usage of _p_a_s_s_i_v_e _m_o_d_e  ftp.
 
 TTEECCHHNNIICCAALL DDEETTAAIILLSS
      ppkkgg__aadddd extracts each package's "packing list" into a special staging di-
@@ -320,6 +321,8 @@ AAUUTTHHOORRSS
              NetBSD refinements.
      Hubert Feyrer
              NetBSD wildcard dependency processing, pkgdb, upgrading, etc.
+     Thomas Klausner
+             HTTP support.
 
 BBUUGGSS
      Hard links between files in a distribution are only preserved if either
@@ -334,4 +337,4 @@ BBUUGGSS
 
      Sure to be others.
 
-NetBSD 1.6                     September 8, 2003                    NetBSD 1.6
+NetBSD 1.6.1                    October 3, 2003                              6