From owner-svn-src-all@freebsd.org  Wed Jun  7 23:42:38 2017
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 7213AD7FB00;
 Wed,  7 Jun 2017 23:42:38 +0000 (UTC)
 (envelope-from bapt@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 402EA3E04;
 Wed,  7 Jun 2017 23:42:38 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v57NgbtY060533;
 Wed, 7 Jun 2017 23:42:37 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v57NgbA5060532;
 Wed, 7 Jun 2017 23:42:37 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201706072342.v57NgbA5060532@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bapt set sender to
 bapt@FreeBSD.org using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Wed, 7 Jun 2017 23:42:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r319667 - head/tools/build/options
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.23
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: Wed, 07 Jun 2017 23:42:38 -0000

Author: bapt
Date: Wed Jun  7 23:42:37 2017
New Revision: 319667
URL: https://svnweb.freebsd.org/changeset/base/319667

Log:
  Remove some workaround for an option that does not exists anymore.

Modified:
  head/tools/build/options/makeman

Modified: head/tools/build/options/makeman
==============================================================================
--- head/tools/build/options/makeman	Wed Jun  7 23:41:33 2017	(r319666)
+++ head/tools/build/options/makeman	Wed Jun  7 23:42:37 2017	(r319667)
@@ -279,14 +279,6 @@ EOF
 		comm -13 $t/config_default $t/config_${opt} | sed -n "/^${opt}$/!p" |
 		comm -13 $t/deps - > $t/deps2
 
-		# Work around BIND_UTILS=no being the default when every WITH_
-		# option is enabled.
-		if [ "$(cat $t/deps2)" = WITHOUT_BIND_UTILS ]; then
-			sort $t/deps $t/deps2 > $t/_deps
-			mv $t/_deps $t/deps
-			:> $t/deps2
-		fi
-
 		havedeps=0
 		if [ -s $t/deps ] ; then
 			havedeps=1