kill old MTREE option that was never implemented in the new tools anyways.

kill -C and -P options which are definitely no longer used as well.
Reorder special files so that REQUIRE is at front (and it's executed first
anyways).

6 files changed, 12 insertions, 45 deletions

diff --git a/usr.sbin/pkg_add/OpenBSD/PackageInfo.pm b/usr.sbin/pkg_add/OpenBSD/PackageInfo.pm
index 23cba57fd29..c5da0fd09c1 100644
--- a/usr.sbin/pkg_add/OpenBSD/PackageInfo.pm
+++ b/usr.sbin/pkg_add/OpenBSD/PackageInfo.pm
@@ -1,5 +1,5 @@
 # ex:ts=8 sw=4:
-# $OpenBSD: PackageInfo.pm,v 1.7 2004/08/06 07:51:17 espie Exp $
+# $OpenBSD: PackageInfo.pm,v 1.8 2004/10/11 10:07:37 espie Exp $
 #
 # Copyright (c) 2003-2004 Marc Espie <espie@openbsd.org>
 #
@@ -39,7 +39,7 @@ my $pkg_db = $ENV{"PKG_DBDIR"} || '/var/db/pkg';
 
 our $list;
 
-our @info = (CONTENTS, COMMENT, DESC, INSTALL, DEINSTALL, REQUIRE, REQUIRED_BY, DISPLAY, MTREE_DIRS);
+our @info = (CONTENTS, COMMENT, DESC, REQUIRE, INSTALL, DEINSTALL, REQUIRED_BY, DISPLAY, MTREE_DIRS);
 
 our %info = ();
 for my $i (@info) {
diff --git a/usr.sbin/pkg_add/pkg_add.1 b/usr.sbin/pkg_add/pkg_add.1
index af3256a44e3..b554769ec87 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.16 2004/09/18 13:28:19 espie Exp $
+.\"	$OpenBSD: pkg_add.1,v 1.17 2004/10/11 10:07:37 espie Exp $
 .\"
 .\" FreeBSD install - a package for the installation and maintenance
 .\" of non-core utilities.
@@ -355,8 +355,7 @@ Temporary area where package information files will be extracted, instead of
 .Xr pkg_delete 1 ,
 .Xr pkg_info 1 ,
 .Xr mkdtemp 3 ,
-.Xr sysconf 3 ,
-.Xr mtree 8
+.Xr sysconf 3
 .Sh AUTHORS
 .Bl -tag -width indent -compact
 .It "Jordan Hubbard"
diff --git a/usr.sbin/pkg_add/pkg_create b/usr.sbin/pkg_add/pkg_create
index 5b24765deef..62b6287ef94 100644
--- a/usr.sbin/pkg_add/pkg_create
+++ b/usr.sbin/pkg_add/pkg_create
@@ -1,6 +1,6 @@
 #! /usr/bin/perl
 # ex:ts=8 sw=4:
-# $OpenBSD: pkg_create,v 1.19 2004/09/20 10:36:39 espie Exp $
+# $OpenBSD: pkg_create,v 1.20 2004/10/11 10:07:37 espie Exp $
 #
 # Copyright (c) 2003-2004 Marc Espie <espie@openbsd.org>
 #
@@ -218,13 +218,13 @@ sub deduce_name
 our $errors = 0;
 
 our ($opt_p, $opt_f, $opt_c, $opt_d, $opt_v, $opt_i, $opt_k, $opt_r, 
-	$opt_S, $opt_m, $opt_h, $opt_s, $opt_O, $opt_P, $opt_C, $opt_A, $opt_L,
+	$opt_S, $opt_h, $opt_s, $opt_O, $opt_A, $opt_L,
 	$opt_M,
 	$opt_B);
 
 my @contents;
 
-getopts('p:f:c:d:vi:k:r:M:S:m:hs:OP:C:A:L:B:D:', 
+getopts('p:f:c:d:vi:k:r:M:S:hs:OA:L:B:D:', 
 	{'D' => 
 		sub { 
 			local $_ = shift;
@@ -297,19 +297,6 @@ if ($ARGV[0] =~ m|([^/]+)$|) {
 	OpenBSD::PackingElement::Name->add($plist, $pkgname);
 } 
 
-if (defined $opt_P) {
-	for my $e (split(/\s+/, $opt_P)) {
-		OpenBSD::PackingElement::PkgDep->add($plist, $e);
-    	}
-}
-
-if (defined $opt_C) {
-	for my $e (split(/\s+/, $opt_C)) {
-		OpenBSD::PackingElement::PkgConflict->add($plist, $e);
-    	}
-
-}
-
 if (defined $opt_A) {
 	OpenBSD::PackingElement::Arch->add($plist, $opt_A);
 }
@@ -401,11 +388,6 @@ if (defined $opt_M) {
     copy_subst($opt_M, $dir.DISPLAY);
 }
 
-if (defined $opt_m) {
-    copy_subst($opt_m, $dir.MTREE_DIRS);
-}
-
-
 my @extra_files = ();
 OpenBSD::PackingElement::Cwd->add($plist, '.');
 for my $special (info_names()) {
diff --git a/usr.sbin/pkg_add/pkg_create.1 b/usr.sbin/pkg_add/pkg_create.1
index b13a282d784..08f1193b935 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.14 2004/09/22 10:57:27 espie Exp $
+.\"	$OpenBSD: pkg_create.1,v 1.15 2004/10/11 10:07:37 espie Exp $
 .\"
 .\" FreeBSD install - a package for the installation and maintenance
 .\" of non-core utilities.
@@ -37,8 +37,6 @@
 .Op Fl A Ar arches
 .Op Fl B Ar pkg-destdir
 .Op Fl D Ar name=value
-.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
@@ -121,14 +119,6 @@ to be the install procedure for the package.
 This can be any executable program (or shell script).
 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 
-(deprecated).
-.It Fl C Ar cpkgs
-Set the initial package conflict list to
-.Ar cpkgs 
-(deprecated).
 .It Fl p Ar prefix
 Set
 .Ar prefix
diff --git a/usr.sbin/pkg_add/pkg_delete.1 b/usr.sbin/pkg_add/pkg_delete.1
index 189034d9add..bd6bf6751ab 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.8 2004/08/06 16:45:51 millert Exp $
+.\"	$OpenBSD: pkg_delete.1,v 1.9 2004/10/11 10:07:37 espie Exp $
 .\"
 .\" FreeBSD install - a package for the installation and maintenance
 .\" of non-core utilities.
@@ -162,8 +162,7 @@ script invoked from the package.
 .Xr pkg_add 1 ,
 .Xr pkg_create 1 ,
 .Xr pkg_info 1 ,
-.Xr mkstemp 3 ,
-.Xr mtree 8
+.Xr mkstemp 3
 .Sh AUTHORS
 .Bl -tag -width indent -compact
 .It "Jordan Hubbard"
diff --git a/usr.sbin/pkg_add/pkg_info.1 b/usr.sbin/pkg_add/pkg_info.1
index b9023d626eb..1c1d7b97288 100644
--- a/usr.sbin/pkg_add/pkg_info.1
+++ b/usr.sbin/pkg_add/pkg_info.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pkg_info.1,v 1.2 2003/11/14 23:18:51 espie Exp $
+.\"	$OpenBSD: pkg_info.1,v 1.3 2004/10/11 10:07:37 espie Exp $
 .\"
 .\" FreeBSD install - a package for the installation and maintenance
 .\" of non-core utilities.
@@ -118,8 +118,6 @@ lot of different information fields at once for a package, but don't
 necessary want the output intermingled in such a way that they can't
 organize it.
 This lets you add a special token to the start of each field.
-.It Fl m
-Show the mtree file (if any) for each package.
 .It Fl p
 Show the installation prefix for each package.
 .It Fl q
@@ -170,8 +168,7 @@ in
 .Xr pkg_add 1 ,
 .Xr pkg_create 1 ,
 .Xr pkg_delete 1 ,
-.Xr mkstemp 3 ,
-.Xr mtree 8
+.Xr mkstemp 3
 .Sh AUTHORS
 .Bl -tag -width indent -compact
 .It "Jordan Hubbard"