From owner-svn-src-all@FreeBSD.ORG  Sat Oct  8 00:01:17 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 D3ED21065678;
	Sat,  8 Oct 2011 00:01:17 +0000 (UTC)
	(envelope-from stas@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C40918FC17;
	Sat,  8 Oct 2011 00:01:17 +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 p9801HNj033462;
	Sat, 8 Oct 2011 00:01:17 GMT (envelope-from stas@svn.freebsd.org)
Received: (from stas@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9801H3p033460;
	Sat, 8 Oct 2011 00:01:17 GMT (envelope-from stas@svn.freebsd.org)
Message-Id: <201110080001.p9801H3p033460@svn.freebsd.org>
From: Stanislav Sedov <stas@FreeBSD.org>
Date: Sat, 8 Oct 2011 00:01:17 +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: r226124 - 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: Sat, 08 Oct 2011 00:01:17 -0000

Author: stas
Date: Sat Oct  8 00:01:17 2011
New Revision: 226124
URL: http://svn.freebsd.org/changeset/base/226124

Log:
  - Add a couple of more sed subsitutions needed to get the correct
    libtool.m4.  With these fixes libtool will correctly indentify the
    system as ELF (and not a.out).
  - While here, change the substitutions so they're still correctly
    match freebsd1.x, freebsd2.x etc.

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

Modified: head/share/mk/bsd.port.mk
==============================================================================
--- head/share/mk/bsd.port.mk	Sat Oct  8 00:00:54 2011	(r226123)
+++ head/share/mk/bsd.port.mk	Sat Oct  8 00:01:17 2011	(r226124)
@@ -20,8 +20,12 @@ _WITHOUT_SRCCONF=
 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\*)/SHOULDNOTMATCHANYTHING1)/' \
-		-e 's/freebsd\[123\]\*)/SHOULDNOTMATCHANYTHING2)/' {} + || /usr/bin/true
+		-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