Date: Fri, 6 May 2016 08:53:25 +0000 (UTC) From: Garrett Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r299163 - in head: share/man/man8 tools/build/mk Message-ID: <201605060853.u468rPDu084297@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Fri May 6 08:53:24 2016 New Revision: 299163 URL: https://svnweb.freebsd.org/changeset/base/299163 Log: Fix r299162 share/man/man8/Makefile: - Add src.opts.mk so MK_NIS can be tested - Fix typo in MK_NIS conditional tools/build/mk/OptionalObsoleteFiles.inc: - Remove WIP diff from ^/user/ngie/detangle-rc MFC after: 1 week X-MFC with: r299162 Sponsored by: EMC / Isilon Storage Division Modified: head/share/man/man8/Makefile head/tools/build/mk/OptionalObsoleteFiles.inc Modified: head/share/man/man8/Makefile ============================================================================== --- head/share/man/man8/Makefile Fri May 6 08:42:33 2016 (r299162) +++ head/share/man/man8/Makefile Fri May 6 08:53:24 2016 (r299163) @@ -1,6 +1,8 @@ # @(#)Makefile 8.1 (Berkeley) 6/5/93 # $FreeBSD$ +.include <src.opts.mk> + PACKAGE=runtime-manuals MAN= crash.8 \ @@ -25,7 +27,7 @@ MLINKS= \ rc.8 rc.serial.8 \ rc.8 rc.shutdown.8 -.if ${MK_NIS!= "no" +.if ${MK_NIS} != "no" MAN+= yp.8 MLINKS+=yp.8 NIS.8 \ Modified: head/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- head/tools/build/mk/OptionalObsoleteFiles.inc Fri May 6 08:42:33 2016 (r299162) +++ head/tools/build/mk/OptionalObsoleteFiles.inc Fri May 6 08:53:24 2016 (r299163) @@ -5998,13 +5998,6 @@ OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-N .endif .if ${MK_NIS} == no -OLD_FILES+=etc/rc.d/nisdomain -OLD_FILES+=etc/rc.d/ypbind -OLD_FILES+=etc/rc.d/yppasswdd -OLD_FILES+=etc/rc.d/ypserv -OLD_FILES+=etc/rc.d/ypset -OLD_FILES+=etc/rc.d/ypupdated -OLD_FILES+=etc/rc.d/ypxfrd OLD_FILES+=usr/bin/ypcat OLD_FILES+=usr/bin/ypchfn OLD_FILES+=usr/bin/ypchpass
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201605060853.u468rPDu084297>