From owner-svn-src-stable@freebsd.org Fri May 13 09:31:41 2016 Return-Path: Delivered-To: svn-src-stable@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 CA1B8B371D4; Fri, 13 May 2016 09:31:41 +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 7E58C1C8E; Fri, 13 May 2016 09:31:41 +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 u4D9Vetg084765; Fri, 13 May 2016 09:31:40 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4D9VeF9084683; Fri, 13 May 2016 09:31:40 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201605130931.u4D9VeF9084683@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Fri, 13 May 2016 09:31:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r299643 - in stable/10: share/man/man8 tools/build/mk X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 May 2016 09:31:41 -0000 Author: ngie Date: Fri May 13 09:31:40 2016 New Revision: 299643 URL: https://svnweb.freebsd.org/changeset/base/299643 Log: MFC r299162,r299163: r299162: Only install NIS section 8 manpages if MK_NIS != no r299163: 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 Modified: stable/10/share/man/man8/Makefile stable/10/tools/build/mk/OptionalObsoleteFiles.inc Directory Properties: stable/10/ (props changed) Modified: stable/10/share/man/man8/Makefile ============================================================================== --- stable/10/share/man/man8/Makefile Fri May 13 09:24:16 2016 (r299642) +++ stable/10/share/man/man8/Makefile Fri May 13 09:31:40 2016 (r299643) @@ -1,6 +1,8 @@ # @(#)Makefile 8.1 (Berkeley) 6/5/93 # $FreeBSD$ +.include + MAN= crash.8 \ diskless.8 \ intro.8 \ @@ -11,7 +13,6 @@ MAN= crash.8 \ rc.subr.8 \ rescue.8 \ ${_uefi.8} \ - yp.8 MLINKS= rc.8 rc.atm.8 \ rc.8 rc.d.8 \ @@ -21,9 +22,14 @@ MLINKS= rc.8 rc.atm.8 \ rc.8 rc.pccard.8 \ rc.8 rc.serial.8 \ rc.8 rc.shutdown.8 + +.if ${MK_NIS} != "no" +MAN+= yp.8 + MLINKS+=yp.8 NIS.8 \ yp.8 nis.8 \ yp.8 YP.8 +.endif .if ${MACHINE_CPUARCH} == "amd64" _uefi.8= uefi.8 Modified: stable/10/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- stable/10/tools/build/mk/OptionalObsoleteFiles.inc Fri May 13 09:24:16 2016 (r299642) +++ stable/10/tools/build/mk/OptionalObsoleteFiles.inc Fri May 13 09:31:40 2016 (r299643) @@ -3662,6 +3662,10 @@ OLD_FILES+=usr/share/man/man5/netid.5.gz OLD_FILES+=usr/share/man/man8/mknetid.8.gz OLD_FILES+=usr/share/man/man8/rpc.yppasswdd.8.gz OLD_FILES+=usr/share/man/man8/rpc.ypxfrd.8.gz +OLD_FILES+=usr/share/man/man8/NIS.8.gz +OLD_FILES+=usr/share/man/man8/YP.8.gz +OLD_FILES+=usr/share/man/man8/yp.8.gz +OLD_FILES+=usr/share/man/man8/nis.8.gz OLD_FILES+=usr/share/man/man8/yp_mkdb.8.gz OLD_FILES+=usr/share/man/man8/ypbind.8.gz OLD_FILES+=usr/share/man/man8/ypinit.8.gz