Date: Tue, 7 Jun 2016 16:31:04 +0000 (UTC) From: Kurt Lidl <lidl@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r301553 - in head: etc etc/rc.d lib libexec tools/build/mk usr.sbin Message-ID: <201606071631.u57GV4pc045668@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: lidl Date: Tue Jun 7 16:31:03 2016 New Revision: 301553 URL: https://svnweb.freebsd.org/changeset/base/301553 Log: Separate BLACKLIST vs BLACKLIST_SUPPORT properly Sponsored by: The FreeBSD Foundation Modified: head/etc/Makefile head/etc/rc.d/Makefile head/lib/Makefile head/libexec/Makefile head/tools/build/mk/OptionalObsoleteFiles.inc head/usr.sbin/Makefile Modified: head/etc/Makefile ============================================================================== --- head/etc/Makefile Tue Jun 7 16:26:34 2016 (r301552) +++ head/etc/Makefile Tue Jun 7 16:31:03 2016 (r301553) @@ -86,7 +86,7 @@ BIN1+= apmd.conf BIN1+= auto_master .endif -.if ${MK_BLACKLIST_SUPPORT} != "no" +.if ${MK_BLACKLIST} != "no" BIN1+= blacklistd.conf .endif Modified: head/etc/rc.d/Makefile ============================================================================== --- head/etc/rc.d/Makefile Tue Jun 7 16:26:34 2016 (r301552) +++ head/etc/rc.d/Makefile Tue Jun 7 16:31:03 2016 (r301553) @@ -170,7 +170,7 @@ FILES+= automountd FILES+= autounmountd .endif -.if ${MK_BLACKLIST_SUPPORT} != "no" +.if ${MK_BLACKLIST} != "no" _blacklistd+= blacklistd .endif Modified: head/lib/Makefile ============================================================================== --- head/lib/Makefile Tue Jun 7 16:26:34 2016 (r301552) +++ head/lib/Makefile Tue Jun 7 16:31:03 2016 (r301553) @@ -161,7 +161,7 @@ SUBDIR_DEPEND_liblzma= ${_libthr} _libngatm= libngatm .endif -.if ${MK_BLACKLIST_SUPPORT} != "no" +.if ${MK_BLACKLIST} != "no" _libblacklist= libblacklist .endif Modified: head/libexec/Makefile ============================================================================== --- head/libexec/Makefile Tue Jun 7 16:26:34 2016 (r301552) +++ head/libexec/Makefile Tue Jun 7 16:31:03 2016 (r301553) @@ -34,7 +34,7 @@ SUBDIR= ${_atf} \ _atrun= atrun .endif -.if ${MK_BLACKLIST_SUPPORT} != "no" +.if ${MK_BLACKLIST} != "no" _blacklistd-helper+= blacklistd-helper .endif Modified: head/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- head/tools/build/mk/OptionalObsoleteFiles.inc Tue Jun 7 16:26:34 2016 (r301552) +++ head/tools/build/mk/OptionalObsoleteFiles.inc Tue Jun 7 16:31:03 2016 (r301553) @@ -431,7 +431,7 @@ OLD_FILES+=usr/share/man/man7/ldint.7.gz OLD_FILES+=usr/share/man/man7/binutils.7.gz .endif -.if ${MK_BLACKLIST_SUPPORT} == no +.if ${MK_BLACKLIST} == no OLD_FILES+=etc/rc.d/blacklistd OLD_FILES+=usr/include/blacklist.h OLD_FILES+=usr/lib/libblacklist.a Modified: head/usr.sbin/Makefile ============================================================================== --- head/usr.sbin/Makefile Tue Jun 7 16:26:34 2016 (r301552) +++ head/usr.sbin/Makefile Tue Jun 7 16:31:03 2016 (r301553) @@ -113,9 +113,9 @@ SUBDIR.${MK_AUDIT}+= auditreduce SUBDIR.${MK_AUDIT}+= praudit SUBDIR.${MK_AUTHPF}+= authpf SUBDIR.${MK_AUTOFS}+= autofs -.if ${MK_BLACKLIST_SUPPORT} != "no" -SUBDIR.${MK_BLACKLIST_SUPPORT}+= blacklistctl -SUBDIR.${MK_BLACKLIST_SUPPORT}+= blacklistd +.if ${MK_BLACKLIST} != "no" +SUBDIR.${MK_BLACKLIST}+= blacklistctl +SUBDIR.${MK_BLACKLIST}+= blacklistd .endif SUBDIR.${MK_BLUETOOTH}+= bluetooth SUBDIR.${MK_BOOTPARAMD}+= bootparamd
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201606071631.u57GV4pc045668>