Index: head/bin/rmail/Makefile.depend =================================================================== --- head/bin/rmail/Makefile.depend +++ head/bin/rmail/Makefile.depend @@ -10,7 +10,6 @@ lib/libc \ lib/libcompiler_rt \ lib/libsm \ - lib/libutil \ .include Index: head/contrib/sendmail/include/sm/conf.h =================================================================== --- head/contrib/sendmail/include/sm/conf.h +++ head/contrib/sendmail/include/sm/conf.h @@ -1019,7 +1019,9 @@ # 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 */ Index: head/lib/libmilter/Makefile.depend =================================================================== --- head/lib/libmilter/Makefile.depend +++ head/lib/libmilter/Makefile.depend @@ -10,7 +10,6 @@ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ - lib/libutil \ usr.bin/xinstall.host \ Index: head/lib/libsm/Makefile.depend =================================================================== --- head/lib/libsm/Makefile.depend +++ head/lib/libsm/Makefile.depend @@ -4,7 +4,6 @@ DIRDEPS = \ include \ include/xlocale \ - lib/libutil \ .include Index: head/lib/libsmdb/Makefile.depend =================================================================== --- head/lib/libsmdb/Makefile.depend +++ head/lib/libsmdb/Makefile.depend @@ -4,7 +4,6 @@ DIRDEPS = \ include \ include/xlocale \ - lib/libutil \ .include Index: head/lib/libsmutil/Makefile.depend =================================================================== --- head/lib/libsmutil/Makefile.depend +++ head/lib/libsmutil/Makefile.depend @@ -5,7 +5,6 @@ include \ include/arpa \ include/xlocale \ - lib/libutil \ .include Index: head/libexec/mail.local/Makefile.depend =================================================================== --- head/libexec/mail.local/Makefile.depend +++ head/libexec/mail.local/Makefile.depend @@ -11,7 +11,6 @@ lib/libc \ lib/libcompiler_rt \ lib/libsm \ - lib/libutil \ .include Index: head/libexec/smrsh/Makefile.depend =================================================================== --- head/libexec/smrsh/Makefile.depend +++ head/libexec/smrsh/Makefile.depend @@ -10,7 +10,6 @@ lib/libc \ lib/libcompiler_rt \ lib/libsm \ - lib/libutil \ .include Index: head/usr.bin/vacation/Makefile.depend =================================================================== --- head/usr.bin/vacation/Makefile.depend +++ head/usr.bin/vacation/Makefile.depend @@ -12,7 +12,6 @@ lib/libsm \ lib/libsmdb \ lib/libsmutil \ - lib/libutil \ .include Index: head/usr.sbin/editmap/Makefile.depend =================================================================== --- head/usr.sbin/editmap/Makefile.depend +++ head/usr.sbin/editmap/Makefile.depend @@ -12,7 +12,6 @@ lib/libsm \ lib/libsmdb \ lib/libsmutil \ - lib/libutil \ .include Index: head/usr.sbin/mailstats/Makefile.depend =================================================================== --- head/usr.sbin/mailstats/Makefile.depend +++ head/usr.sbin/mailstats/Makefile.depend @@ -11,7 +11,6 @@ lib/libcompiler_rt \ lib/libsm \ lib/libsmutil \ - lib/libutil \ .include Index: head/usr.sbin/makemap/Makefile.depend =================================================================== --- head/usr.sbin/makemap/Makefile.depend +++ head/usr.sbin/makemap/Makefile.depend @@ -12,7 +12,6 @@ lib/libsm \ lib/libsmdb \ lib/libsmutil \ - lib/libutil \ .include Index: head/usr.sbin/praliases/Makefile.depend =================================================================== --- head/usr.sbin/praliases/Makefile.depend +++ head/usr.sbin/praliases/Makefile.depend @@ -12,7 +12,6 @@ lib/libsm \ lib/libsmdb \ lib/libsmutil \ - lib/libutil \ .include