Solaris has strerror()

Remove unneeded #include <util.h> and -lutil

5 files changed, 8 insertions, 15 deletions

diff --git a/usr.bin/sup/src/Makefile.sunos5.gcc b/usr.bin/sup/src/Makefile.sunos5.gcc
index 431641185b3..65d92ec4673 100644
--- a/usr.bin/sup/src/Makefile.sunos5.gcc
+++ b/usr.bin/sup/src/Makefile.sunos5.gcc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.sunos5.gcc,v 1.1 1997/10/11 23:34:20 beck Exp $
+#	$OpenBSD: Makefile.sunos5.gcc,v 1.2 2001/05/05 15:32:11 millert Exp $
 
 # Copyright (c) 1992,1991 Carnegie Mellon University
 # All Rights Reserved.
@@ -45,7 +45,7 @@
 SITE			= NETBSD
 #SITE			= CMUCS
 NETBSD_DEFINES		= -UMACH -DVAR_TMP -DHAS_DAEMON -DHAS_POSIX_DIR
-SOLARIS_DEFINES		= -UMACH -DNO_SETLOGIN -DVAR_TMP -DHAS_POSIX_DIR -DNEED_VSNPRINTF -DHAS_VFPRINTF -DNEED_SNPRINTF -DNEED_VIS -DUSE_LOCKF
+SOLARIS_DEFINES		= -UMACH -DNO_SETLOGIN -DVAR_TMP -DHAS_POSIX_DIR -DNEED_VSNPRINTF -DHAS_VFPRINTF -DNEED_SNPRINTF -DNEED_VIS -DUSE_LOCKF -DHAS_STRERROR
 AFS_DEFINES		= -DAFS -I/usr/afsws/include
 OSF_DEFINES		= -UMACH -DOSF -D_BSD -noshrlib -g -DNEED_VSNPRINTF -DVAR_TMP
 CMUCS_DEFINES		= -DMACH -DDOPRINT_VA -DNEED_VPRINTF
diff --git a/usr.bin/sup/src/supcdefs.h b/usr.bin/sup/src/supcdefs.h
index f80f3c14cc0..4bf7cf8548b 100644
--- a/usr.bin/sup/src/supcdefs.h
+++ b/usr.bin/sup/src/supcdefs.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: supcdefs.h,v 1.6 2001/05/02 22:56:53 millert Exp $	*/
+/*	$OpenBSD: supcdefs.h,v 1.7 2001/05/05 15:32:11 millert Exp $	*/
 
 /*
  * Copyright (c) 1992 Carnegie Mellon University
@@ -73,9 +73,6 @@
 #include <sys/ioctl.h>
 #include <sys/resource.h>
 #endif	/* MACH */
-#ifdef HAS_FPARSELN
-#include <util.h>
-#endif /* HAS_FPARSELN */
 #include <c.h>
 #include "sup.h"
 #include "supmsg.h"
diff --git a/usr.bin/sup/sup/Makefile b/usr.bin/sup/sup/Makefile
index 51d4bee28c9..8af95078230 100644
--- a/usr.bin/sup/sup/Makefile
+++ b/usr.bin/sup/sup/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.5 2001/05/04 22:16:17 millert Exp $
+#	$OpenBSD: Makefile,v 1.6 2001/05/05 15:32:11 millert Exp $
 
 PROG=	sup
 MAN=	sup.1
@@ -6,8 +6,6 @@ SRCS=	supcmain.c supcvers.c supcparse.c supcname.c supcmisc.c supcmeat.c \
 	scm.c scmio.c stree.c log.c supmsg.c \
 	atoo.c errmsg.c expand.c ffilecopy.c filecopy.c nxtarg.c \
 	path.c quit.c run.c skipto.c vprintf.c netcryptvoid.c
-LDADD+=-lutil
-DPADD+=	${LIBUTIL}
 BINOWN=	root
 BINGRP=	daemon
 BINMODE=555
diff --git a/usr.bin/sup/supfilesrv/Makefile b/usr.bin/sup/supfilesrv/Makefile
index 8e7efccf477..c091b389bf6 100644
--- a/usr.bin/sup/supfilesrv/Makefile
+++ b/usr.bin/sup/supfilesrv/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.9 2001/05/04 22:16:18 millert Exp $
+#	$OpenBSD: Makefile,v 1.10 2001/05/05 15:32:11 millert Exp $
 
 PROG=	supfilesrv
 MAN=	supservers.8
@@ -7,8 +7,8 @@ MLINKS+=supservers.8 supscan.8
 SRCS=	supfilesrv.c scan.c scm.c scmio.c stree.c log.c supmsg.c \
 	atoo.c errmsg.c expand.c ffilecopy.c filecopy.c nxtarg.c \
 	path.c quit.c run.c skipto.c vprintf.c netcryptvoid.c
-LDADD+=	-lutil -lwrap
-DPADD+=	${LIBUTIL} ${LIBWRAP}
+LDADD+=	-lwrap
+DPADD+=	${LIBWRAP}
 BINOWN=	root
 BINGRP=	daemon
 BINMODE=555
diff --git a/usr.bin/sup/supscan/Makefile b/usr.bin/sup/supscan/Makefile
index afcad8cc697..c20d3880df0 100644
--- a/usr.bin/sup/supscan/Makefile
+++ b/usr.bin/sup/supscan/Makefile
@@ -1,12 +1,10 @@
-#	$OpenBSD: Makefile,v 1.5 2001/05/04 22:16:18 millert Exp $
+#	$OpenBSD: Makefile,v 1.6 2001/05/05 15:32:12 millert Exp $
 
 PROG=	supscan
 NOMAN=
 SRCS=	supscan.c stree.c scan.c \
 	atoo.c errmsg.c expand.c ffilecopy.c filecopy.c nxtarg.c \
 	path.c quit.c run.c skipto.c vprintf.c netcryptvoid.c
-LDADD+=	-lutil
-DPADD+=	${LIBUTIL}
 BINOWN=	root
 BINGRP=	daemon
 BINMODE=555