aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bin/rmail/Makefile.depend1
-rw-r--r--contrib/sendmail/include/sm/conf.h2
-rw-r--r--lib/libmilter/Makefile.depend1
-rw-r--r--lib/libsm/Makefile.depend1
-rw-r--r--lib/libsmdb/Makefile.depend1
-rw-r--r--lib/libsmutil/Makefile.depend1
-rw-r--r--libexec/mail.local/Makefile.depend1
-rw-r--r--libexec/smrsh/Makefile.depend1
-rw-r--r--usr.bin/vacation/Makefile.depend1
-rw-r--r--usr.sbin/editmap/Makefile.depend1
-rw-r--r--usr.sbin/mailstats/Makefile.depend1
-rw-r--r--usr.sbin/makemap/Makefile.depend1
-rw-r--r--usr.sbin/praliases/Makefile.depend1
13 files changed, 2 insertions, 12 deletions
diff --git a/bin/rmail/Makefile.depend b/bin/rmail/Makefile.depend
index 377032c5f35c..de5f45e04d80 100644
--- a/bin/rmail/Makefile.depend
+++ b/bin/rmail/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
lib/libc \
lib/libcompiler_rt \
lib/libsm \
- lib/libutil \
.include <dirdeps.mk>
diff --git a/contrib/sendmail/include/sm/conf.h b/contrib/sendmail/include/sm/conf.h
index 459eda4cc7d9..761e01f1f244 100644
--- a/contrib/sendmail/include/sm/conf.h
+++ b/contrib/sendmail/include/sm/conf.h
@@ -1019,7 +1019,9 @@ extern unsigned int sleepX __P((unsigned int seconds));
# if __FreeBSD__ >= 2
# include <osreldate.h>
# if __FreeBSD_version >= 199512 /* 2.2-current when it appeared */
+# if __FreeBSD_version < 500012
# include <libutil.h>
+# endif
# define SPT_TYPE SPT_BUILTIN
# endif /* __FreeBSD_version >= 199512 */
# if __FreeBSD_version >= 222000 /* 2.2.2-release and later */
diff --git a/lib/libmilter/Makefile.depend b/lib/libmilter/Makefile.depend
index f78862e93b9a..d66a25bfdd84 100644
--- a/lib/libmilter/Makefile.depend
+++ b/lib/libmilter/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- lib/libutil \
usr.bin/xinstall.host \
diff --git a/lib/libsm/Makefile.depend b/lib/libsm/Makefile.depend
index 5d2e4c0b2826..661f59f7d6bc 100644
--- a/lib/libsm/Makefile.depend
+++ b/lib/libsm/Makefile.depend
@@ -4,7 +4,6 @@
DIRDEPS = \
include \
include/xlocale \
- lib/libutil \
.include <dirdeps.mk>
diff --git a/lib/libsmdb/Makefile.depend b/lib/libsmdb/Makefile.depend
index 1ee0d0e51765..302046a514ef 100644
--- a/lib/libsmdb/Makefile.depend
+++ b/lib/libsmdb/Makefile.depend
@@ -4,7 +4,6 @@
DIRDEPS = \
include \
include/xlocale \
- lib/libutil \
.include <dirdeps.mk>
diff --git a/lib/libsmutil/Makefile.depend b/lib/libsmutil/Makefile.depend
index d534e1114c26..c3fe50ff44c3 100644
--- a/lib/libsmutil/Makefile.depend
+++ b/lib/libsmutil/Makefile.depend
@@ -5,7 +5,6 @@ DIRDEPS = \
include \
include/arpa \
include/xlocale \
- lib/libutil \
.include <dirdeps.mk>
diff --git a/libexec/mail.local/Makefile.depend b/libexec/mail.local/Makefile.depend
index 59b2994f6eac..9e380975d95c 100644
--- a/libexec/mail.local/Makefile.depend
+++ b/libexec/mail.local/Makefile.depend
@@ -11,7 +11,6 @@ DIRDEPS = \
lib/libc \
lib/libcompiler_rt \
lib/libsm \
- lib/libutil \
.include <dirdeps.mk>
diff --git a/libexec/smrsh/Makefile.depend b/libexec/smrsh/Makefile.depend
index 0d59811d94ab..518da5b70db5 100644
--- a/libexec/smrsh/Makefile.depend
+++ b/libexec/smrsh/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
lib/libc \
lib/libcompiler_rt \
lib/libsm \
- lib/libutil \
.include <dirdeps.mk>
diff --git a/usr.bin/vacation/Makefile.depend b/usr.bin/vacation/Makefile.depend
index 1b8e03870d14..1636b07220d0 100644
--- a/usr.bin/vacation/Makefile.depend
+++ b/usr.bin/vacation/Makefile.depend
@@ -12,7 +12,6 @@ DIRDEPS = \
lib/libsm \
lib/libsmdb \
lib/libsmutil \
- lib/libutil \
.include <dirdeps.mk>
diff --git a/usr.sbin/editmap/Makefile.depend b/usr.sbin/editmap/Makefile.depend
index afbd08699ab3..bc24fb7ffef5 100644
--- a/usr.sbin/editmap/Makefile.depend
+++ b/usr.sbin/editmap/Makefile.depend
@@ -12,7 +12,6 @@ DIRDEPS = \
lib/libsm \
lib/libsmdb \
lib/libsmutil \
- lib/libutil \
.include <dirdeps.mk>
diff --git a/usr.sbin/mailstats/Makefile.depend b/usr.sbin/mailstats/Makefile.depend
index 9bf3d524fb4f..0f94091acf90 100644
--- a/usr.sbin/mailstats/Makefile.depend
+++ b/usr.sbin/mailstats/Makefile.depend
@@ -11,7 +11,6 @@ DIRDEPS = \
lib/libcompiler_rt \
lib/libsm \
lib/libsmutil \
- lib/libutil \
.include <dirdeps.mk>
diff --git a/usr.sbin/makemap/Makefile.depend b/usr.sbin/makemap/Makefile.depend
index f159c6f3b9c5..3e7ef5ec36e9 100644
--- a/usr.sbin/makemap/Makefile.depend
+++ b/usr.sbin/makemap/Makefile.depend
@@ -12,7 +12,6 @@ DIRDEPS = \
lib/libsm \
lib/libsmdb \
lib/libsmutil \
- lib/libutil \
.include <dirdeps.mk>
diff --git a/usr.sbin/praliases/Makefile.depend b/usr.sbin/praliases/Makefile.depend
index 0cd5be831f5e..75daedb469e0 100644
--- a/usr.sbin/praliases/Makefile.depend
+++ b/usr.sbin/praliases/Makefile.depend
@@ -12,7 +12,6 @@ DIRDEPS = \
lib/libsm \
lib/libsmdb \
lib/libsmutil \
- lib/libutil \
.include <dirdeps.mk>