From da2bb86507b78b6c58e49c85db25fb4be1c3f4b5 Mon Sep 17 00:00:00 2001
From: Mark Johnston <markj@FreeBSD.org>
Date: Wed, 24 Jan 2024 14:47:56 -0500
Subject: [PATCH] mpsutil: Clean up libutil deps

mpsutil doesn't use libutil, so doesn't need to include libutil.h.  See
commit 76103694a051335bec1da318f9c6e3a676dc0145.

No functional change intended.

MFC after:	1 week

(cherry picked from commit d56ce5915c41517ccc7de2510daec200e100ef68)
---
 usr.sbin/mpsutil/Makefile    | 4 ----
 usr.sbin/mpsutil/mps_debug.c | 1 -
 usr.sbin/mpsutil/mps_set.c   | 1 -
 usr.sbin/mpsutil/mps_show.c  | 1 -
 4 files changed, 7 deletions(-)

diff --git a/usr.sbin/mpsutil/Makefile b/usr.sbin/mpsutil/Makefile
index a19c2f310167..aa59d8cddf76 100644
--- a/usr.sbin/mpsutil/Makefile
+++ b/usr.sbin/mpsutil/Makefile
@@ -1,17 +1,13 @@
-
 PROG=	mpsutil
 SRCS=	mps_cmd.c mps_debug.c mps_flash.c mps_set.c mps_show.c mps_slot.c mpsutil.c
 MAN=	mpsutil.8
 
 WARNS?= 3
 
-#LIBADD=	cam util
 LINKS=	${BINDIR}/mpsutil ${BINDIR}/mprutil
 MLINKS=	mpsutil.8 mprutil.8
 
 CFLAGS+= -I${SRCTOP}/sys -I. -DUSE_MPT_IOCTLS
-# Avoid dirdep dependency on libutil
-CFLAGS+= -I${SRCTOP}/lib/libutil
 
 # Here be dragons
 .ifdef DEBUG
diff --git a/usr.sbin/mpsutil/mps_debug.c b/usr.sbin/mpsutil/mps_debug.c
index a3297b4176cd..7fabd41ab00b 100644
--- a/usr.sbin/mpsutil/mps_debug.c
+++ b/usr.sbin/mpsutil/mps_debug.c
@@ -33,7 +33,6 @@
 #include <sys/types.h>
 #include <sys/sysctl.h>
 #include <err.h>
-#include <libutil.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/usr.sbin/mpsutil/mps_set.c b/usr.sbin/mpsutil/mps_set.c
index b75f327cb993..8dd42a0acb41 100644
--- a/usr.sbin/mpsutil/mps_set.c
+++ b/usr.sbin/mpsutil/mps_set.c
@@ -29,7 +29,6 @@
 #include <sys/param.h>
 #include <sys/errno.h>
 #include <err.h>
-#include <libutil.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/usr.sbin/mpsutil/mps_show.c b/usr.sbin/mpsutil/mps_show.c
index 6efa9b76dd3d..15c88f72ad0b 100644
--- a/usr.sbin/mpsutil/mps_show.c
+++ b/usr.sbin/mpsutil/mps_show.c
@@ -36,7 +36,6 @@
 #include <sys/errno.h>
 #include <sys/endian.h>
 #include <err.h>
-#include <libutil.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>