rename -lutil to -lminixutil

. in preparation for netbsd -lutil

commands/cut/Makefile

@@ -3,7 +3,7 @@
 
 PROG=	cut
 
-LDADD+=	-lutil
-DPADD+=	${LIBUTIL}
+LDADD+=	-lminixutil
+DPADD+=	${LIBMINIXUTIL}
 
 .include <bsd.prog.mk>

commands/find/Makefile

@@ -6,7 +6,7 @@
 PROG=	find
 SRCS=	find.c function.c ls.c main.c misc.c operator.c option.c
 
-LDADD+=-lutil
-DPADD+=${LIBUTIL}
+LDADD+=-lminixutil
+DPADD+=${LIBMINIXUTIL}
 
 .include <bsd.prog.mk>

commands/hexdump/Makefile

@@ -6,8 +6,8 @@ SRCS=	conv.c display.c hexdump.c hexsyntax.c odsyntax.c parse.c
 MAN=	hexdump.1 #od.1
 
 .ifndef HOSTPROG
-LDADD+=-lutil
-DPADD+=${LIBUTIL}
+LDADD+=-lminixutil
+DPADD+=${LIBMINIXUTIL}
 
 #LINKS=	${BINDIR}/hexdump ${BINDIR}/od
 .endif

commands/man/Makefile

@@ -5,8 +5,8 @@ PROG=	man
 SRCS=	man.c manconf.c
 MAN=	man.1 man.conf.5
 
-DPADD+=	${LIBUTIL}
-LDADD+=	-lutil
+DPADD+=	${LIBMINIXUTIL}
+LDADD+=	-lminixutil
 
 FILES=man.conf
 FILESDIR=/etc

drivers/random/Makefile

@@ -4,8 +4,8 @@ SRCS=	main.c random.c rijndael_api.c rijndael_alg.c
 
 .PATH:	${.CURDIR}/aes
 
-DPADD+=	${LIBDRIVER} ${LIBSYS} ${LIBUTIL}
-LDADD+=	-ldriver -lsys -lutil
+DPADD+=	${LIBDRIVER} ${LIBSYS} ${LIBMINIXUTIL}
+LDADD+=	-ldriver -lsys -lminixutil
 
 MAN=
 

lib/Makefile

@@ -15,7 +15,7 @@ LIBMINLIB_DIR?=
 LIBASYN_DIR?=
 
 SUBDIR= csu ${LIBCOMPAT_DIR} ${LIBC_DIR} libdriver libnetdriver \
-	libedit ${LIBM_DIR} libsys libtimers libutil libbz2 libl libhgfs  \
+	libedit ${LIBM_DIR} libsys libtimers libminixutil libbz2 libl libhgfs  \
 	libz libfetch libarchive libvtreefs libaudiodriver libmthread     \
 	libexec libdevman libusb ${LIBMINLIB_DIR} ${LIBASYN_DIR}          \
 	libddekit

lib/libminixutil/Makefile

@@ -1,6 +1,6 @@
-# Makefile for libutil
+# Makefile for libminixutil
 
-LIB=	util
+LIB=	minixutil
 
 .if (${NBSD_LIBC} != "no")
 # SHA and MD5 functions already in libc

servers/inet/Makefile

@@ -12,8 +12,8 @@ SRCS=	buf.c clock.c inet.c inet_config.c \
 
 .PATH:	${.CURDIR}/generic
 
-DPADD+=	${LIBDRIVER} ${LIBSYS} ${LIBUTIL}
-LDADD+=	-ldriver -lsys -lutil
+DPADD+=	${LIBDRIVER} ${LIBSYS} ${LIBMINIXUTIL}
+LDADD+=	-ldriver -lsys -lminixutil
 
 MAN=
 

servers/lwip/Makefile

@@ -11,8 +11,8 @@ SRCS=	lwip.c		\
 
 .PATH:	${.CURDIR}/generic
 
-DPADD+=	${LIBDRIVER} ${LIBSYS} ${LIBUTIL}
-LDADD+=	-ldriver -lsys -lutil -ltimers -llwip
+DPADD+=	${LIBDRIVER} ${LIBSYS} ${LIBMINIXUTIL}
+LDADD+=	-ldriver -lsys -lminixutil -ltimers -llwip
 
 MAN=
 

usr.bin/m4/Makefile

@@ -16,8 +16,8 @@ SRCS+=	ohash_create_entry.c ohash_delete.c ohash_do.c ohash_entries.c \
 	ohash_qlookupi.c strtonum.c
 YHEADER=1
 .if (${HOSTPROG:U} == "")
-DPADD+=		${LIBUTIL} ${LIBL}
-LDADD+=		-lutil -ll
+DPADD+=		${LIBMINIXUTIL} ${LIBL}
+LDADD+=		-lminixutil -ll
 .endif
 
 tokenizer.o: parser.h