summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--bin/Makefile1
-rw-r--r--bin/pkill/Makefile (renamed from usr.bin/pkill/Makefile)2
-rw-r--r--bin/pkill/pkill.1 (renamed from usr.bin/pkill/pkill.1)0
-rw-r--r--bin/pkill/pkill.c (renamed from usr.bin/pkill/pkill.c)0
-rw-r--r--rescue/rescue/Makefile6
-rw-r--r--usr.bin/Makefile1
6 files changed, 3 insertions, 7 deletions
diff --git a/bin/Makefile b/bin/Makefile
index 3beb06c..7491be9 100644
--- a/bin/Makefile
+++ b/bin/Makefile
@@ -25,6 +25,7 @@ SUBDIR= cat \
mkdir \
mv \
pax \
+ pkill \
ps \
pwd \
${_rcp} \
diff --git a/usr.bin/pkill/Makefile b/bin/pkill/Makefile
index 51ddc8d..3437c0d 100644
--- a/usr.bin/pkill/Makefile
+++ b/bin/pkill/Makefile
@@ -1,8 +1,6 @@
# $NetBSD: Makefile,v 1.1 2002/03/01 11:21:58 ad Exp $
# $FreeBSD$
-BINDIR= /bin
-
PROG= pkill
WARNS?= 5
diff --git a/usr.bin/pkill/pkill.1 b/bin/pkill/pkill.1
index 725f27e..725f27e 100644
--- a/usr.bin/pkill/pkill.1
+++ b/bin/pkill/pkill.1
diff --git a/usr.bin/pkill/pkill.c b/bin/pkill/pkill.c
index 2547744..2547744 100644
--- a/usr.bin/pkill/pkill.c
+++ b/bin/pkill/pkill.c
diff --git a/rescue/rescue/Makefile b/rescue/rescue/Makefile
index a21d0f2..4d74258 100644
--- a/rescue/rescue/Makefile
+++ b/rescue/rescue/Makefile
@@ -70,7 +70,8 @@ CRUNCH_LIBS+= ${.OBJDIR}/../librescue/*.o
#
CRUNCH_SRCDIRS+= bin
CRUNCH_PROGS_bin= cat chflags chio chmod cp date dd df echo \
- ed expr getfacl hostname kenv kill ln ls mkdir mv pax ps pwd \
+ ed expr getfacl hostname kenv kill ln ls mkdir mv \
+ pax pkill ps pwd \
realpath rm rmdir setfacl sh stty sync test
CRUNCH_LIBS+= -lcrypt -ledit -lkvm -ll -lm -ltermcap -lutil
.if ${MK_OPENSSL} != "no"
@@ -85,9 +86,6 @@ CRUNCH_SUPPRESS_LINK_-sh= 1
CRUNCH_ALIAS_ln= link
CRUNCH_ALIAS_rm= unlink
CRUNCH_ALIAS_ed= red
-
-CRUNCH_PROGS_bin+= pkill
-CRUNCH_SRCDIR_pkill= ${.CURDIR}/../../usr.bin/pkill
CRUNCH_ALIAS_pkill= pgrep
.if ${MK_RCMDS} != "no"
diff --git a/usr.bin/Makefile b/usr.bin/Makefile
index 02ae8b4..f1b54d0 100644
--- a/usr.bin/Makefile
+++ b/usr.bin/Makefile
@@ -149,7 +149,6 @@ SUBDIR= alias \
passwd \
paste \
pathchk \
- pkill \
pr \
printenv \
printf \
OpenPOWER on IntegriCloud