From owner-svn-src-all@FreeBSD.ORG  Tue Oct  4 22:23:01 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3ABF3106566B;
	Tue,  4 Oct 2011 22:23:01 +0000 (UTC)
	(envelope-from jilles@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 2B5428FC13;
	Tue,  4 Oct 2011 22:23:01 +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 p94MN1XQ082111;
	Tue, 4 Oct 2011 22:23:01 GMT (envelope-from jilles@svn.freebsd.org)
Received: (from jilles@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p94MN1ow082109;
	Tue, 4 Oct 2011 22:23:01 GMT (envelope-from jilles@svn.freebsd.org)
Message-Id: <201110042223.p94MN1ow082109@svn.freebsd.org>
From: Jilles Tjoelker <jilles@FreeBSD.org>
Date: Tue, 4 Oct 2011 22:23:01 +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: r226027 - head/share/mk
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
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: <http://lists.freebsd.org/mailman/listinfo/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: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 04 Oct 2011 22:23:01 -0000

Author: jilles
Date: Tue Oct  4 22:23:00 2011
New Revision: 226027
URL: http://svn.freebsd.org/changeset/base/226027

Log:
  Work around the autotools problem with the 10.0 version.
  
  With this, I can build various ports on a 10.0-CURRENT system without
  hacking or hiding the version number.
  
  This commit should be reverted when there is a cleaner fix in autotools
  and/or ports/Mk/bsd.port.mk.
  
  The original patch is from Ed Schouten but needed some additions.

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

Modified: head/share/mk/bsd.port.mk
==============================================================================
--- head/share/mk/bsd.port.mk	Tue Oct  4 21:40:25 2011	(r226026)
+++ head/share/mk/bsd.port.mk	Tue Oct  4 22:23:00 2011	(r226027)
@@ -14,3 +14,15 @@ _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:
+	find ${WRKSRC} -type f \( -name config.libpath -o \
+		-name config.rpath -o -name configure -o -name libtool.m4 \) \
+		-exec sed -i '' -e 's/freebsd1\*)/SHOULDNOTMATCHANYTHING1)/' \
+		-e 's/freebsd\[123\]\*)/SHOULDNOTMATCHANYTHING2)/' {} +
+
+.ORDER: run-autotools run-autotools-fixup do-configure
+do-configure: run-autotools-fixup
+.endif