From owner-svn-src-head@FreeBSD.ORG  Thu Aug 29 15:58:21 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id A84D052C;
 Thu, 29 Aug 2013 15:58:21 +0000 (UTC)
 (envelope-from antoine@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 969382352;
 Thu, 29 Aug 2013 15:58:21 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7TFwLWg019986;
 Thu, 29 Aug 2013 15:58:21 GMT (envelope-from antoine@svn.freebsd.org)
Received: (from antoine@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7TFwLHN019984;
 Thu, 29 Aug 2013 15:58:21 GMT (envelope-from antoine@svn.freebsd.org)
Message-Id: <201308291558.r7TFwLHN019984@svn.freebsd.org>
From: Antoine Brodin <antoine@FreeBSD.org>
Date: Thu, 29 Aug 2013 15:58:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r255029 - in head: . share/man/man5
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 29 Aug 2013 15:58:21 -0000

Author: antoine
Date: Thu Aug 29 15:58:20 2013
New Revision: 255029
URL: http://svnweb.freebsd.org/changeset/base/255029

Log:
  Fix after r255014

Modified:
  head/ObsoleteFiles.inc
  head/share/man/man5/src.conf.5

Modified: head/ObsoleteFiles.inc
==============================================================================
--- head/ObsoleteFiles.inc	Thu Aug 29 15:49:05 2013	(r255028)
+++ head/ObsoleteFiles.inc	Thu Aug 29 15:58:20 2013	(r255029)
@@ -38,6 +38,9 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20130829: bsdpatch is patch unconditionally
+OLD_FILES+=usr/bin/bsdpatch
+OLD_FILES+=usr/share/man/man1/bsdpatch.1.gz
 # 20130822: bind 9.9.3-P2 import
 OLD_LIBS+=usr/lib/liblwres.so.80
 # 20130814: vm_page_busy(9)

Modified: head/share/man/man5/src.conf.5
==============================================================================
--- head/share/man/man5/src.conf.5	Thu Aug 29 15:49:05 2013	(r255028)
+++ head/share/man/man5/src.conf.5	Thu Aug 29 15:58:20 2013	(r255029)
@@ -1,7 +1,7 @@
 .\" DO NOT EDIT-- this file is automatically generated.
 .\" from FreeBSD: head/tools/build/options/makeman 253304 2013-07-12 23:08:44Z bapt
 .\" $FreeBSD$
-.Dd August 28, 2013
+.Dd August 29, 2013
 .Dt SRC.CONF 5
 .Os
 .Sh NAME
@@ -500,9 +500,6 @@ When set, it also enforces the following
 .It
 .Va WITHOUT_GNU_SUPPORT
 .El
-.It Va WITH_GNU_PATCH
-.\" from FreeBSD: head/tools/build/options/WITH_GNU_PATCH 253689 2013-07-26 21:25:18Z pfg
-Install GNU-licensed patch as 'patch' instead of BSD patch.
 .It Va WITHOUT_GNU_SUPPORT
 .\" from FreeBSD: head/tools/build/options/WITHOUT_GNU_SUPPORT 156932 2006-03-21 07:50:50Z ru
 Set to build some programs without optional GNU support.