summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Espie <espie@cvs.openbsd.org>2011-08-26 09:02:31 +0000
committerMarc Espie <espie@cvs.openbsd.org>2011-08-26 09:02:31 +0000
commitd247255c032f05d4da81025e9b0dfcd4552c02e7 (patch)
tree729b082987c9a7b726f3e9c3f49ee953419a6b52
parente061731513dd9b8e75c063331f4f3e5816c905dc (diff)
zap it from there too
-rw-r--r--usr.sbin/pkg_add/Makefile5
1 files changed, 2 insertions, 3 deletions
diff --git a/usr.sbin/pkg_add/Makefile b/usr.sbin/pkg_add/Makefile
index 1c4d6158b9c..7167c98c21b 100644
--- a/usr.sbin/pkg_add/Makefile
+++ b/usr.sbin/pkg_add/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.70 2011/07/06 13:05:52 espie Exp $
+# $OpenBSD: Makefile,v 1.71 2011/08/26 09:02:30 espie Exp $
.include <bsd.own.mk>
-MAN1=pkg_add.1 pkg_info.1 pkg_create.1 pkg_delete.1 pkg_merge.1 \
+MAN1=pkg_add.1 pkg_info.1 pkg_create.1 pkg_delete.1 \
pkg.1 pkg_mklocatedb.1
MAN5=package.5 pkg.conf.5
MAN8=pkg_check.8
@@ -74,7 +74,6 @@ PACKAGEDIRS=OpenBSD OpenBSD/PackageRepository OpenBSD/ProgressMeter \
OpenBSD/LibSpec
SCRIPTS= \
- pkg_merge \
pkg_mklocatedb \
pkg