synch doc with reality

3 files changed, 13 insertions, 152 deletions

diff --git a/usr.sbin/pkg_add/pkg_add.1 b/usr.sbin/pkg_add/pkg_add.1
index 73dba2609a0..052ba6b5640 100644
--- a/usr.sbin/pkg_add/pkg_add.1
+++ b/usr.sbin/pkg_add/pkg_add.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pkg_add.1,v 1.4 2003/11/08 19:17:29 jmc Exp $
+.\"	$OpenBSD: pkg_add.1,v 1.5 2003/11/14 23:03:55 espie Exp $
 .\"
 .\" FreeBSD install - a package for the installation and maintenance
 .\" of non-core utilities.
@@ -26,8 +26,6 @@
 .Sh SYNOPSIS
 .Nm pkg_add
 .Op Fl vInfRMS
-.Op Fl t Ar template
-.Op Fl p Ar prefix
 .Ar pkg-name Op Ar ...
 .Sh DESCRIPTION
 The
@@ -53,13 +51,10 @@ packages and may not be installed using
 .Nm pkg_add .
 .Ed
 .Pp
-Package names may be specified as filenames (which normally consist of the
+Each package name may be specified as a filename (which normally consists of the
 package name itself plus the
-.Dq .tgz ,
-.Dq .tar.gz ,
-or
-.Dq .tar
-suffix) or URL referring to FTP, HTTP, or SCP locations.
+.Dq .tgz
+suffix) or an URL referring to FTP, HTTP, or SCP locations.
 For example, the following is valid:
 .Pp
 .Ic pkg_add -v ftp://ftp.openbsd.org/pub/OpenBSD/2.7/packages/i386/m4-1.4.tgz
@@ -241,21 +236,6 @@ path shown above).
 Finally, the staging area is deleted and the program terminates.
 .El
 .Pp
-The
-.Ar install
-and
-.Ar require
-scripts are called with the environment variable
-.Ev PKG_PREFIX
-set to the installation prefix (see the
-.Fl p
-option above).
-This allows a package author to write a script
-that reliably performs some action on the directory where the package
-is installed, even if the user might change it with the
-.Fl p
-flag to
-.Cm pkg_add .
 .Sh ENVIRONMENT
 .Bl -tag -width PKG_TMPDIR
 .It Ev PKG_PATH
diff --git a/usr.sbin/pkg_add/pkg_create.1 b/usr.sbin/pkg_add/pkg_create.1
index 2fb5406b229..042dfcf56b8 100644
--- a/usr.sbin/pkg_add/pkg_create.1
+++ b/usr.sbin/pkg_add/pkg_create.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pkg_create.1,v 1.1 2003/10/19 18:38:06 espie Exp $
+.\"	$OpenBSD: pkg_create.1,v 1.2 2003/11/14 23:03:55 espie Exp $
 .\"
 .\" FreeBSD install - a package for the installation and maintenance
 .\" of non-core utilities.
@@ -33,19 +33,15 @@
 .Sh SYNOPSIS
 .Nm pkg_create
 .Bk -words
-.Op Fl Ohv
+.Op Fl hv
 .Op Fl P Ar dpkgs
 .Op Fl C Ar cpkgs
 .Op Fl p Ar prefix
 .Op Fl i Ar iscript
 .Op Fl k Ar dscript
 .Op Fl r Ar rscript
-.Op Fl s Ar fake-prefix
 .Op Fl S Ar fake-base
-.Op Fl t Ar template
-.Op Fl X Ar excludefile
 .Op Fl D Ar displayfile
-.Op Fl m Ar mtreefile
 .Fl c Ar comment
 .Fl d Ar description
 .Fl f Ar packlist
@@ -93,30 +89,13 @@ Fetch long description for package from file
 or, if preceded by
 .Dq \&- ,
 the argument itself.
-.It Fl Y
-Assume a default answer of
-.Dq Yes
-for any questions asked.
-.It Fl N
-Assume a default answer of
-.Dq \&No
-for any questions asked.
-.It Fl O
-Go into a
-.Dq packing list only
-mode.
-This is used to do
-.Dq fake pkg_add
-operations when a package is installed.
-In such cases, it is necessary to know what the final, adjusted packing
-list will look like.
 .It Fl v
 Turn on verbose output.
 .It Fl h
 Force
 .Xr tar
 to follow symbolic links, so that the files they point to
-are dumped, rather than the links themselves.
+are dumped, rather than the links themselves (deprecated).
 .It Fl i Ar iscript
 Set
 .Ar iscript
@@ -126,22 +105,12 @@ It will be invoked automatically
 when the package is later installed.
 .It Fl P Ar dpkgs
 Set the initial package dependency list to
-.Ar dpkgs .
-This is assumed to be a whitespace separated list of package names
-and is meant as a convenient shorthand for specifying multiple
-.Cm @pkgdep
-directives in the packing list (see
-.Sx PACKING LIST DETAILS
-section below).
+.Ar dpkgs 
+(deprecated).
 .It Fl C Ar cpkgs
 Set the initial package conflict list to
-.Ar cpkgs .
-This is assumed to be a whitespace separated list of package names
-and is meant as a convenient shorthand for specifying multiple
-.Cm @pkgcfl
-directives in the packing list (see
-.Sx PACKING LIST DETAILS
-section below).
+.Ar cpkgs 
+(deprecated).
 .It Fl p Ar prefix
 Set
 .Ar prefix
@@ -149,11 +118,6 @@ as the initial directory
 .Dq base
 to start from in selecting files for
 the package, and to record as the base for installing the package.
-.It Fl s Ar fake-prefix
-Set
-.Ar fake-prefix
-as the real initial directory
-to start from in selecting files for the package.
 .It Fl S Ar fake-base
 Set
 .Ar fake-base
@@ -175,62 +139,12 @@ This can be any executable program (or shell script).
 It will be invoked automatically
 at installation/deinstallation time to determine whether or not
 installation/deinstallation should proceed.
-.It Fl t Ar template
-Use
-.Ar template
-as the input to
-.Xr mkstemp 3 .
-By default, this is the string
-.Pa /tmp/instmp.XXXXXX ,
-but it may be necessary to override it in the situation where
-space in your
-.Pa /tmp
-directory is limited.
-Be sure to leave some number of
-.Dq X
-characters for
-.Xr mkstemp 3
- to fill in with a unique ID.
-.It Fl X Ar excludefile
-Pass
-.Ar excludefile
-as a
-.Fl exclude-from
-argument to
-.Xr tar
-when creating final package.
-See
-.Xr tar
-man page (or run
-.Xr tar
-with
-.Fl -help
-flag) for further information on using this flag.
 .It Fl D Ar displayfile
 Display the file (using
 .Xr more 1 )
 after installing the package.
 Useful for things like
 legal notices on almost-free software, etc.
-.It Fl m Ar mtreefile
-Run
-.Xr mtree 8
-with input from mtreefile before the package is installed.
-.Xr mtree
-is invoked as
-.Cm mtree
-.Fl u
-.Fl f
-.Ar mtreefile
-.Fl d
-.Fl e
-.Fl p
-.Pa prefix ,
-where
-.Pa prefix
-is the name of the first directory named by a
-.Cm @cwd
-directive.
 .El
 .Sh PACKING LIST DETAILS
 The
@@ -256,14 +170,6 @@ All subsequent filenames will be assumed relative to this directory.
 Note:
 .Cm @cd
 is also an alias for this command.
-.It Cm @src Ar directory
-Set the internal directory pointer for creation
-.Em only
-to
-.Ar directory .
-That is to say that it overrides
-.Cm @cwd
-for package creation but not extraction.
 .It Cm @exec Ar command
 Execute
 .Ar command
@@ -390,17 +296,6 @@ ends with a slash, it is a directory.
 Extra
 .Ar command
 to execute when removing extra files.
-.It Cm @mtree Ar name
-Declare
-.Pa name
-as an
-.Xr mtree 8
-input file to be used at install time (see
-.Fl m
-above).
-Only the first
-.Cm @mtree
-directive is honored.
 .It Cm @display Ar name
 Declare
 .Pa name
diff --git a/usr.sbin/pkg_add/pkg_delete.1 b/usr.sbin/pkg_add/pkg_delete.1
index 3d40a3d18ef..0d328392a8f 100644
--- a/usr.sbin/pkg_add/pkg_delete.1
+++ b/usr.sbin/pkg_add/pkg_delete.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pkg_delete.1,v 1.2 2003/10/26 10:33:24 espie Exp $
+.\"	$OpenBSD: pkg_delete.1,v 1.3 2003/11/14 23:03:55 espie Exp $
 .\"
 .\" FreeBSD install - a package for the installation and maintenance
 .\" of non-core utilities.
@@ -25,8 +25,7 @@
 .Nd a utility for deleting previously installed software package distributions
 .Sh SYNOPSIS
 .Nm pkg_delete
-.Op Fl cvDdnfq
-.Op Fl p Ar prefix
+.Op Fl cvDnfq
 .Ar pkg-name Op Ar ...
 .Sh DESCRIPTION
 The
@@ -123,19 +122,6 @@ Passing the keyword
 lets you potentially write only one program/script that handles all
 aspects of installation and deletion.
 .Pp
-All scripts are called with the environment variable
-.Ev PKG_PREFIX
-set to the installation prefix (see the
-.Fl p
-option above).
-This allows a package author to write a script
-that reliably performs some action on the directory where the package
-is installed, even if the user might have changed it by specifying the
-.Fl p
-option when running
-.Nm
-or
-.Cm pkg_add .
 .Sh SEE ALSO
 .Xr pkg_add 1 ,
 .Xr pkg_create 1 ,