diff options
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/pkg_add/Makefile | 12 | ||||
| -rw-r--r-- | usr.sbin/pkg_add/pkg | 49 |
2 files changed, 5 insertions, 56 deletions
diff --git a/usr.sbin/pkg_add/Makefile b/usr.sbin/pkg_add/Makefile index ef23b485b2f..24aba795ae4 100644 --- a/usr.sbin/pkg_add/Makefile +++ b/usr.sbin/pkg_add/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.73 2012/06/11 10:16:46 espie Exp $ +# $OpenBSD: Makefile,v 1.74 2012/07/13 16:45:10 deraadt Exp $ .include <bsd.own.mk> @@ -74,14 +74,12 @@ PACKAGEDIRS=OpenBSD OpenBSD/PackageRepository OpenBSD/ProgressMeter \ SCRIPTS= \ pkg_mklocatedb \ - pkg SCRIPTS_LNK = \ - pkg pkg_add \ - pkg pkg_check \ - pkg pkg_create \ - pkg pkg_delete \ - pkg pkg_info + pkg_add pkg_check \ + pkg_add pkg_create \ + pkg_add pkg_delete \ + pkg_add pkg_info LIBBASE=/usr/libdata/perl5 diff --git a/usr.sbin/pkg_add/pkg b/usr.sbin/pkg_add/pkg deleted file mode 100644 index f9354b6f8a2..00000000000 --- a/usr.sbin/pkg_add/pkg +++ /dev/null @@ -1,49 +0,0 @@ -#! /usr/bin/perl -# ex:ts=8 sw=4: -# $OpenBSD: pkg,v 1.19 2010/12/05 09:41:55 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. - -use strict; -use warnings; - -sub run -{ - my ($cmd, $name) = @_; - my $module = "OpenBSD::Pkg\u$cmd"; - eval "require $module;"; - if ($@) { - die $@; - } - exit($module->parse_and_run($name)); -} -my @l = qw(add check create delete info); - -for my $i (@l) { - if ($0 =~ m/\/?pkg_$i$/) { - run($i, "pkg_$i"); - } -} - -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); |