From owner-svn-src-all@freebsd.org  Fri May  6 08:53:26 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 22424B30F93;
 Fri,  6 May 2016 08:53:26 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id E12361DD6;
 Fri,  6 May 2016 08:53:25 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u468rPIY084299;
 Fri, 6 May 2016 08:53:25 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u468rPDu084297;
 Fri, 6 May 2016 08:53:25 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201605060853.u468rPDu084297@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
 ngie@FreeBSD.org using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Fri, 6 May 2016 08:53:25 +0000 (UTC)
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
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 06 May 2016 08:53:26 -0000

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