From owner-svn-src-stable@freebsd.org Thu Jun 1 06:37:54 2017 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 91A14B7C82E; Thu, 1 Jun 2017 06:37:54 +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 5FE8866148; Thu, 1 Jun 2017 06:37:54 +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 v516br6i077173; Thu, 1 Jun 2017 06:37:53 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v516br9Q077171; Thu, 1 Jun 2017 06:37:53 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201706010637.v516br9Q077171@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Thu, 1 Jun 2017 06:37:53 +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: r319381 - in stable/10: share/man/man4 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.23 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: Thu, 01 Jun 2017 06:37:54 -0000 Author: ngie Date: Thu Jun 1 06:37:53 2017 New Revision: 319381 URL: https://svnweb.freebsd.org/changeset/base/319381 Log: MFC r318177: Unconditionally install udp(4) and udplite(4) again I added this to the MK_USB != no block in error in r278202. Modified: stable/10/share/man/man4/Makefile stable/10/tools/build/mk/OptionalObsoleteFiles.inc Directory Properties: stable/10/ (props changed) Modified: stable/10/share/man/man4/Makefile ============================================================================== --- stable/10/share/man/man4/Makefile Thu Jun 1 06:36:40 2017 (r319380) +++ stable/10/share/man/man4/Makefile Thu Jun 1 06:37:53 2017 (r319381) @@ -517,6 +517,8 @@ MAN= aac.4 \ tws.4 \ tx.4 \ txp.4 \ + udp.4 \ + udplite.4 \ vale.4 \ vga.4 \ vge.4 \ @@ -894,8 +896,6 @@ MAN+= u3g.4 \ ucycom.4 \ udav.4 \ udbp.4 \ - udp.4 \ - udplite.4 \ uep.4 \ ufm.4 \ ufoma.4 \ Modified: stable/10/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- stable/10/tools/build/mk/OptionalObsoleteFiles.inc Thu Jun 1 06:36:40 2017 (r319380) +++ stable/10/tools/build/mk/OptionalObsoleteFiles.inc Thu Jun 1 06:37:53 2017 (r319381) @@ -5596,8 +5596,6 @@ OLD_FILES+=usr/share/man/man4/ucom.4.gz OLD_FILES+=usr/share/man/man4/ucycom.4.gz OLD_FILES+=usr/share/man/man4/udav.4.gz OLD_FILES+=usr/share/man/man4/udbp.4.gz -OLD_FILES+=usr/share/man/man4/udp.4.gz -OLD_FILES+=usr/share/man/man4/udplite.4.gz OLD_FILES+=usr/share/man/man4/uep.4.gz OLD_FILES+=usr/share/man/man4/ufm.4.gz OLD_FILES+=usr/share/man/man4/ufoma.4.gz