From 7f4494e3bff2bd744f653c0506896eab083f5a6c Mon Sep 17 00:00:00 2001 From: bdrewery Date: Tue, 24 Nov 2015 04:19:55 +0000 Subject: Remove unneeded libutil dependency for sendmail. It included libutil.h for setproctitle(3), which was moved from libutil to libc in r65353 in 2000. Reviewed by: gshapiro [sendmail change] Sponsored by: EMC / Isilon Storage Division Differential Revision: https://reviews.freebsd.org/D4261 --- bin/rmail/Makefile.depend | 1 - contrib/sendmail/include/sm/conf.h | 2 ++ lib/libmilter/Makefile.depend | 1 - lib/libsm/Makefile.depend | 1 - lib/libsmdb/Makefile.depend | 1 - lib/libsmutil/Makefile.depend | 1 - libexec/mail.local/Makefile.depend | 1 - libexec/smrsh/Makefile.depend | 1 - usr.bin/vacation/Makefile.depend | 1 - usr.sbin/editmap/Makefile.depend | 1 - usr.sbin/mailstats/Makefile.depend | 1 - usr.sbin/makemap/Makefile.depend | 1 - usr.sbin/praliases/Makefile.depend | 1 - 13 files changed, 2 insertions(+), 12 deletions(-) diff --git a/bin/rmail/Makefile.depend b/bin/rmail/Makefile.depend index 377032c..de5f45e 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 diff --git a/contrib/sendmail/include/sm/conf.h b/contrib/sendmail/include/sm/conf.h index 459eda4..761e01f 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 # if __FreeBSD_version >= 199512 /* 2.2-current when it appeared */ +# if __FreeBSD_version < 500012 # include +# 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 f78862e..d66a25b 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 5d2e4c0..661f59f 100644 --- a/lib/libsm/Makefile.depend +++ b/lib/libsm/Makefile.depend @@ -4,7 +4,6 @@ DIRDEPS = \ include \ include/xlocale \ - lib/libutil \ .include diff --git a/lib/libsmdb/Makefile.depend b/lib/libsmdb/Makefile.depend index 1ee0d0e..302046a 100644 --- a/lib/libsmdb/Makefile.depend +++ b/lib/libsmdb/Makefile.depend @@ -4,7 +4,6 @@ DIRDEPS = \ include \ include/xlocale \ - lib/libutil \ .include diff --git a/lib/libsmutil/Makefile.depend b/lib/libsmutil/Makefile.depend index d534e11..c3fe50f 100644 --- a/lib/libsmutil/Makefile.depend +++ b/lib/libsmutil/Makefile.depend @@ -5,7 +5,6 @@ DIRDEPS = \ include \ include/arpa \ include/xlocale \ - lib/libutil \ .include diff --git a/libexec/mail.local/Makefile.depend b/libexec/mail.local/Makefile.depend index 59b2994..9e38097 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 diff --git a/libexec/smrsh/Makefile.depend b/libexec/smrsh/Makefile.depend index 0d59811..518da5b 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 diff --git a/usr.bin/vacation/Makefile.depend b/usr.bin/vacation/Makefile.depend index 1b8e038..1636b07 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 diff --git a/usr.sbin/editmap/Makefile.depend b/usr.sbin/editmap/Makefile.depend index afbd086..bc24fb7 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 diff --git a/usr.sbin/mailstats/Makefile.depend b/usr.sbin/mailstats/Makefile.depend index 9bf3d52..0f94091 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 diff --git a/usr.sbin/makemap/Makefile.depend b/usr.sbin/makemap/Makefile.depend index f159c6f..3e7ef5e 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 diff --git a/usr.sbin/praliases/Makefile.depend b/usr.sbin/praliases/Makefile.depend index 0cd5be8..75daedb 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 -- cgit v1.1