kill pkg(1) for good. with help from espie.

espie@ ok.

3 files changed, 5 insertions, 63 deletions

diff --git a/usr.sbin/pkg_add/Makefile b/usr.sbin/pkg_add/Makefile
index 298126c4a3c..69c22f30d83 100644
--- a/usr.sbin/pkg_add/Makefile
+++ b/usr.sbin/pkg_add/Makefile
@@ -1,9 +1,8 @@
-# $OpenBSD: Makefile,v 1.75 2012/07/13 23:54:24 deraadt Exp $
+# $OpenBSD: Makefile,v 1.76 2012/08/06 00:00:28 fgsch Exp $
 
 .include <bsd.own.mk>
 
-MAN1=pkg_add.1 pkg_info.1 pkg_create.1 pkg_delete.1 \
-	pkg.1 pkg_mklocatedb.1
+MAN1=pkg_add.1 pkg_info.1 pkg_create.1 pkg_delete.1 pkg_mklocatedb.1
 MAN5=package.5 pkg.conf.5
 MAN8=pkg_check.8
 MAN=${MAN1} ${MAN5} ${MAN8}
diff --git a/usr.sbin/pkg_add/pkg.1 b/usr.sbin/pkg_add/pkg.1
deleted file mode 100644
index 7c233eb3dbc..00000000000
--- a/usr.sbin/pkg_add/pkg.1
+++ /dev/null
@@ -1,49 +0,0 @@
-.\"	$OpenBSD: pkg.1,v 1.9 2010/06/10 23:40:34 espie Exp $
-.\"
-.\" Copyright (c) 2010 Marc Espie <espie@openbsd.org>
-.\"
-.\" Permission to use, copy, modify, and distribute this software for any
-.\" purpose with or without fee is hereby granted, provided that the above
-.\" copyright notice and this permission notice appear in all copies.
-.\"
-.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-.\"
-.Dd $Mdocdate: June 10 2010 $
-.Dt PKG 1
-.Os
-.Sh NAME
-.Nm pkg
-.Nd front-end to package tools
-.Sh DESCRIPTION
-.Nm
-is the actual script that starts
-.Xr pkg_add 1 ,
-.Xr pkg_check 8 ,
-.Xr pkg_create 1 ,
-.Xr pkg_delete 1 ,
-and
-.Xr pkg_info 1 .
-.Pp
-It can be invoked as a link to those commands, or with
-.Ar add ,
-.Ar check ,
-.Ar create ,
-.Ar delete ,
-.Ar info
-as first argument.
-.Pp
-Refer to the documentation of those commands for further info.
-.Sh SEE ALSO
-.Xr pkg_add 1 ,
-.Xr pkg_create 1 ,
-.Xr pkg_delete 1 ,
-.Xr pkg_info 1 ,
-.Xr pkg_check 8
-.Sh AUTHORS
-This program was written by Marc Espie.
diff --git a/usr.sbin/pkg_add/pkg_add b/usr.sbin/pkg_add/pkg_add
index bf8ea66a6d6..f5d98d314e2 100644
--- a/usr.sbin/pkg_add/pkg_add
+++ b/usr.sbin/pkg_add/pkg_add
@@ -1,6 +1,6 @@
 #! /usr/bin/perl
 # ex:ts=8 sw=4:
-# $OpenBSD: pkg_add,v 1.480 2012/07/13 16:47:49 deraadt Exp $
+# $OpenBSD: pkg_add,v 1.481 2012/08/06 00:00:28 fgsch Exp $
 #
 # Copyright (c) 2010 Marc Espie <espie@openbsd.org>
 #
@@ -37,13 +37,5 @@ for my $i (@l) {
 	}
 }
 
-if (@ARGV) {
-	for my $i (@l) {
-		if ($ARGV[0] eq $i) {
-			shift;
-			run($i, "pkg $i");
-		}
-	}
-}
-print STDERR "Usage: pkg [",join("|", @l),"] [args]\n";
-exit(1);
+# defaults to pkg_info personality but keeps the command name
+run('info', $0);