summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorderaadt <deraadt@openbsd.org>2012-07-13 16:45:10 +0000
committerderaadt <deraadt@openbsd.org>2012-07-13 16:45:10 +0000
commitca3b23e176b06fcf479ddfd1ae0376d22c469fab (patch)
tree997d0d628d00e71c3f752b9f9cd78f4d837f0db1
parent3 line diff to fix divert using connections from local system. (diff)
downloadwireguard-openbsd-ca3b23e176b06fcf479ddfd1ae0376d22c469fab.tar.xz
wireguard-openbsd-ca3b23e176b06fcf479ddfd1ae0376d22c469fab.zip
do not install the pkg(1) front-end stub in /usr/sbin anymore, everyone
uses the '_' variants ok espie
-rw-r--r--usr.sbin/pkg_add/Makefile12
-rw-r--r--usr.sbin/pkg_add/pkg_add (renamed from usr.sbin/pkg_add/pkg)2
2 files changed, 6 insertions, 8 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_add
index f9354b6f8a2..bf8ea66a6d6 100644
--- a/usr.sbin/pkg_add/pkg
+++ b/usr.sbin/pkg_add/pkg_add
@@ -1,6 +1,6 @@
#! /usr/bin/perl
# ex:ts=8 sw=4:
-# $OpenBSD: pkg,v 1.19 2010/12/05 09:41:55 espie Exp $
+# $OpenBSD: pkg_add,v 1.480 2012/07/13 16:47:49 deraadt Exp $
#
# Copyright (c) 2010 Marc Espie <espie@openbsd.org>
#