From owner-svn-src-head@FreeBSD.ORG  Sat Oct  8 18:25:02 2011
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:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6ED32106564A;
	Sat,  8 Oct 2011 18:25:02 +0000 (UTC)
	(envelope-from crees@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 4AEAE8FC12;
	Sat,  8 Oct 2011 18:25:02 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p98IP2GW073562;
	Sat, 8 Oct 2011 18:25:02 GMT (envelope-from crees@svn.freebsd.org)
Received: (from crees@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p98IP22D073560;
	Sat, 8 Oct 2011 18:25:02 GMT (envelope-from crees@svn.freebsd.org)
Message-Id: <201110081825.p98IP22D073560@svn.freebsd.org>
From: Chris Rees <crees@FreeBSD.org>
Date: Sat, 8 Oct 2011 18:25:02 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r226162 - head/share/mk
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Sat, 08 Oct 2011 18:25:02 -0000

Author: crees (ports committer)
Date: Sat Oct  8 18:25:01 2011
New Revision: 226162
URL: http://svn.freebsd.org/changeset/base/226162

Log:
  Revert unapproved commit to bsd.port.mk.
  
  This would have had more discussion, but it was explicitly rejected at submission by portmgr:
  
  http://lists.freebsd.org/pipermail/freebsd-ports/2011-September/070591.html

Modified:
  head/share/mk/bsd.port.mk

Modified: head/share/mk/bsd.port.mk
==============================================================================
--- head/share/mk/bsd.port.mk	Sat Oct  8 16:45:03 2011	(r226161)
+++ head/share/mk/bsd.port.mk	Sat Oct  8 18:25:01 2011	(r226162)
@@ -14,19 +14,3 @@ _WITHOUT_SRCCONF=
 
 .include <bsd.own.mk>
 .include "${BSDPORTMK}"
-
-.if !defined(BEFOREPORTMK) && !defined(INOPTIONSMK)
-# Work around an issue where FreeBSD 10.0 is detected as FreeBSD 1.x.
-run-autotools-fixup:
-	test -d ${WRKSRC} && find ${WRKSRC} -type f \( -name config.libpath -o \
-		-name config.rpath -o -name configure -o -name libtool.m4 \) \
-		-exec sed -i '' -e 's|freebsd1\*)|freebsd1.\*)|g' \
-		-e 's|freebsd\[12\]\*)|freebsd[12].*)|g' \
-		-e 's|freebsd\[123\]\*)|freebsd[123].*)|g' \
-		-e 's|freebsd\[\[12\]\]\*)|freebsd[[12]].*)|g' \
-		-e 's|freebsd\[\[123\]\]\*)|freebsd[[123]].*)|g' \
-		{} + || /usr/bin/true
-
-.ORDER: run-autotools run-autotools-fixup do-configure
-do-configure: run-autotools-fixup
-.endif