From b1014f6d7be3185d9c0119afcdcf5226a6b56f1b Mon Sep 17 00:00:00 2001
From: jung <jung@openbsd.org>
Date: Mon, 26 Oct 2015 10:08:14 +0000
Subject: [PATCH] remove util.h include and -lutil after pidfile removal

ok deraadt
---
 usr.bin/usbhidaction/Makefile       | 4 ++--
 usr.bin/usbhidaction/usbhidaction.c | 3 +--
 usr.sbin/mrouted/Makefile           | 3 +--
 usr.sbin/mrouted/main.c             | 1 -
 usr.sbin/rarpd/Makefile             | 3 +--
 usr.sbin/rarpd/rarpd.c              | 3 +--
 usr.sbin/rbootd/Makefile            | 3 +--
 usr.sbin/rbootd/rbootd.c            | 3 +--
 8 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/usr.bin/usbhidaction/Makefile b/usr.bin/usbhidaction/Makefile
index 1ce2fe8b7ad..c23b5320cae 100644
--- a/usr.bin/usbhidaction/Makefile
+++ b/usr.bin/usbhidaction/Makefile
@@ -1,10 +1,10 @@
-#	$OpenBSD: Makefile,v 1.1 2002/05/10 00:09:17 nate Exp $
+#	$OpenBSD: Makefile,v 1.2 2015/10/26 10:08:14 jung Exp $
 #	$NetBSD: Makefile,v 1.4 2002/02/02 16:54:26 veego Exp $
 
 PROG=	usbhidaction
 SRCS=	usbhidaction.c
 
-LDADD+=	-lusbhid -lutil
+LDADD+=	-lusbhid
 DPADD+=	${LIBUSBHID} ${LIBUTIL}
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/usbhidaction/usbhidaction.c b/usr.bin/usbhidaction/usbhidaction.c
index 4b61105359b..704d4e45dac 100644
--- a/usr.bin/usbhidaction/usbhidaction.c
+++ b/usr.bin/usbhidaction/usbhidaction.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: usbhidaction.c,v 1.20 2015/10/26 09:57:55 deraadt Exp $ */
+/*	$OpenBSD: usbhidaction.c,v 1.21 2015/10/26 10:08:14 jung Exp $ */
 /*      $NetBSD: usbhidaction.c,v 1.7 2002/01/18 14:38:59 augustss Exp $ */
 
 /*
@@ -43,7 +43,6 @@
 #include <dev/usb/usb.h>
 #include <dev/usb/usbhid.h>
 #include <usbhid.h>
-#include <util.h>
 #include <syslog.h>
 #include <signal.h>
 #include <paths.h>
diff --git a/usr.sbin/mrouted/Makefile b/usr.sbin/mrouted/Makefile
index 15ed2d1efb8..150e3b0322c 100644
--- a/usr.sbin/mrouted/Makefile
+++ b/usr.sbin/mrouted/Makefile
@@ -1,11 +1,10 @@
-#	$OpenBSD: Makefile,v 1.5 2004/01/05 02:55:28 espie Exp $
+#	$OpenBSD: Makefile,v 1.6 2015/10/26 10:08:15 jung Exp $
 
 PROG=	mrouted
 SRCS=	callout.c cfparse.c config.c igmp.c inet.c kern.c main.c prune.c \
 	route.c vif.c
 MAN=	mrouted.8
 
-LDADD+=	-lutil
 CFLAGS+=-I${.CURDIR}
 DPADD+=	${LIBUTIL}
 
diff --git a/usr.sbin/mrouted/main.c b/usr.sbin/mrouted/main.c
index 8a0cdc5dc7d..ada4b09a63a 100644
--- a/usr.sbin/mrouted/main.c
+++ b/usr.sbin/mrouted/main.c
@@ -23,7 +23,6 @@
 #include <stdarg.h>
 #include <fcntl.h>
 #include <poll.h>
-#include <util.h>
 #include <err.h>
 
 extern char *configfilename;
diff --git a/usr.sbin/rarpd/Makefile b/usr.sbin/rarpd/Makefile
index 12b5b659f23..73d76510856 100644
--- a/usr.sbin/rarpd/Makefile
+++ b/usr.sbin/rarpd/Makefile
@@ -1,9 +1,8 @@
-#	$OpenBSD: Makefile,v 1.6 2003/05/15 14:52:12 itojun Exp $
+#	$OpenBSD: Makefile,v 1.7 2015/10/26 10:08:14 jung Exp $
 
 PROG=	rarpd
 SRCS=	rarpd.c arptab.c
 MAN=	rarpd.8
-LDADD+=	-lutil
 DPADD+=	${LIBUTIL}
 
 # Uncomment the following to require a boot file in TFTP_DIR
diff --git a/usr.sbin/rarpd/rarpd.c b/usr.sbin/rarpd/rarpd.c
index d8a2b4202c8..4cf9a0051af 100644
--- a/usr.sbin/rarpd/rarpd.c
+++ b/usr.sbin/rarpd/rarpd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rarpd.c,v 1.63 2015/10/26 09:57:55 deraadt Exp $ */
+/*	$OpenBSD: rarpd.c,v 1.64 2015/10/26 10:08:14 jung Exp $ */
 /*	$NetBSD: rarpd.c,v 1.25 1998/04/23 02:48:33 mrg Exp $	*/
 
 /*
@@ -48,7 +48,6 @@
 #include <netdb.h>
 #include <arpa/inet.h>
 #include <dirent.h>
-#include <util.h>
 #include <poll.h>
 #include <ifaddrs.h>
 #include <paths.h>
diff --git a/usr.sbin/rbootd/Makefile b/usr.sbin/rbootd/Makefile
index 11361492ec6..a2fb6cb235f 100644
--- a/usr.sbin/rbootd/Makefile
+++ b/usr.sbin/rbootd/Makefile
@@ -1,9 +1,8 @@
-#	$OpenBSD: Makefile,v 1.3 2001/12/01 23:27:23 miod Exp $
+#	$OpenBSD: Makefile,v 1.4 2015/10/26 10:08:14 jung Exp $
 
 PROG=	rbootd
 SRCS=	bpf.c conf.c parseconf.c rbootd.c rmpproto.c utils.c
 MAN=	rbootd.8
-LDADD+=	-lutil
 DPADD+=	${LIBUTIL}
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/rbootd/rbootd.c b/usr.sbin/rbootd/rbootd.c
index 61ba851a772..54b9a4e7eb2 100644
--- a/usr.sbin/rbootd/rbootd.c
+++ b/usr.sbin/rbootd/rbootd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rbootd.c,v 1.27 2015/10/26 09:57:55 deraadt Exp $	*/
+/*	$OpenBSD: rbootd.c,v 1.28 2015/10/26 10:08:14 jung Exp $	*/
 /*	$NetBSD: rbootd.c,v 1.5 1995/10/06 05:12:17 thorpej Exp $	*/
 
 /*
@@ -56,7 +56,6 @@
 #include <syslog.h>
 #include <unistd.h>
 #include <limits.h>
-#include <util.h>
 #include <pwd.h>
 #include <poll.h>
 
-- 
2.20.1