From owner-freebsd-ports@FreeBSD.ORG  Sun Oct  2 16:23:32 2011
Return-Path: <owner-freebsd-ports@FreeBSD.ORG>
Delivered-To: freebsd-ports@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 87622106566C;
	Sun,  2 Oct 2011 16:23:32 +0000 (UTC) (envelope-from jilles@stack.nl)
Received: from mx1.stack.nl (relay04.stack.nl [IPv6:2001:610:1108:5010::107])
	by mx1.freebsd.org (Postfix) with ESMTP id 237618FC0A;
	Sun,  2 Oct 2011 16:23:32 +0000 (UTC)
Received: from turtle.stack.nl (turtle.stack.nl [IPv6:2001:610:1108:5010::132])
	by mx1.stack.nl (Postfix) with ESMTP id 656521DD634;
	Sun,  2 Oct 2011 18:23:31 +0200 (CEST)
Received: by turtle.stack.nl (Postfix, from userid 1677)
	id 4BDB51753C; Sun,  2 Oct 2011 18:23:31 +0200 (CEST)
Date: Sun, 2 Oct 2011 18:23:31 +0200
From: Jilles Tjoelker <jilles@stack.nl>
To: freebsd-ports@freebsd.org
Message-ID: <20111002162331.GA3282@stack.nl>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.5.21 (2010-09-15)
Cc: stas@freebsd.org, ed@freebsd.org
Subject: Re: Instafix for FreeBSD ports brokenness on 10.0?
X-BeenThere: freebsd-ports@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Porting software to FreeBSD <freebsd-ports.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports>,
	<mailto:freebsd-ports-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-ports>
List-Post: <mailto:freebsd-ports@freebsd.org>
List-Help: <mailto:freebsd-ports-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports>,
	<mailto:freebsd-ports-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 02 Oct 2011 16:23:32 -0000

Thanks for the patch, but it does not work properly. There is also a
freebsd[123]* a.out detector which needs to be disabled as well,
otherwise only (for example) a libiconv.so.3.0 appears, no libiconv.so.3
or libiconv.so symlink.

In addition, the below patch is for bsd.port.mk in the src repository,
so it only affects 10.x.

With this, I can build things like libiconv and gettext on a
10.0-CURRENT system without needing even more horrible hacks like faking
uname. Please test as some additional tweaks may be necessary.

The proper fix is indeed in autotools, but I think it is inappropriate
to keep head effectively frozen until this problem can be fixed
properly.

Index: share/mk/bsd.port.mk
===================================================================
--- share/mk/bsd.port.mk	(revision 225917)
+++ share/mk/bsd.port.mk	(working copy)
@@ -14,3 +14,15 @@
 
 .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

(Sorry for the messed up threading, I am not subscribed to ports@.)

-- 
Jilles Tjoelker