From owner-svn-ports-all@FreeBSD.ORG  Mon Mar  3 14:42:55 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@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 ESMTPS id B6986B04;
 Mon,  3 Mar 2014 14:42:55 +0000 (UTC)
Received: from mailrelay004.isp.belgacom.be (mailrelay004.isp.belgacom.be
 [195.238.6.170]) by mx1.freebsd.org (Postfix) with ESMTP id 067C7FD0;
 Mon,  3 Mar 2014 14:42:54 +0000 (UTC)
X-Belgacom-Dynamic: yes
X-IronPort-Anti-Spam-Filtered: true
X-IronPort-Anti-Spam-Result: AlUGAImTFFNR8alZ/2dsb2JhbABagwY7wSeBIBd0giUBAQU6HB4FEAsOBgQJJQ8qHgYch3QBCMxfF44mMweEOASYO4EzkHmDLjs
Received: from 89.169-241-81.adsl-dyn.isp.belgacom.be (HELO
 kalimero.tijl.coosemans.org) ([81.241.169.89])
 by relay.skynet.be with ESMTP; 03 Mar 2014 15:42:46 +0100
Received: from kalimero.tijl.coosemans.org (kalimero.tijl.coosemans.org
 [127.0.0.1])
 by kalimero.tijl.coosemans.org (8.14.8/8.14.8) with ESMTP id s23EgjGe045267;
 Mon, 3 Mar 2014 15:42:45 +0100 (CET) (envelope-from tijl@FreeBSD.org)
Date: Mon, 3 Mar 2014 15:42:44 +0100
From: Tijl Coosemans <tijl@FreeBSD.org>
To: Koop Mast <kwm@rainbow-runner.nl>
Subject: Re: svn commit: r346763 - head/Mk/Uses
Message-ID: <20140303154244.7f9f52e1@kalimero.tijl.coosemans.org>
In-Reply-To: <53143FA2.2040509@rainbow-runner.nl>
References: <201403021314.s22DE7UH078623@svn.freebsd.org>
 <53143FA2.2040509@rainbow-runner.nl>
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org,
 ports-committers@freebsd.org
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 03 Mar 2014 14:42:55 -0000

On Mon, 03 Mar 2014 09:38:58 +0100 Koop Mast wrote:
> On 2-3-2014 14:14, Tijl Coosemans wrote:
>> Author: tijl
>> Date: Sun Mar  2 13:14:07 2014
>> New Revision: 346763
>> URL: http://svnweb.freebsd.org/changeset/ports/346763
>> QAT: https://qat.redports.org/buildarchive/r346763/
>>
>> Log:
>>    In libtool.mk, let the regexp for DragonFly BSD support match both
>>    "freebsd*)" and "freebsd* ", and add "dragonfly*" only if it isn't there
>>    already.
>>    
>>    Approved by:	bapt
>>
>> Modified:
>>    head/Mk/Uses/libtool.mk
>>
>> Modified: head/Mk/Uses/libtool.mk
>> ==============================================================================
>> --- head/Mk/Uses/libtool.mk	Sun Mar  2 13:13:27 2014	(r346762)
>> +++ head/Mk/Uses/libtool.mk	Sun Mar  2 13:14:07 2014	(r346763)
>> @@ -19,10 +19,10 @@ _INCLUDE_USES_LIBTOOL_POST_MK=	yes
>>   patch-libtool:
>>   	@${FIND} ${WRKDIR} \( -name configure -or -name ltconfig \)	\
>>   		-type f | ${XARGS} ${REINPLACE_CMD}			\
>> +		-e '/dragonfly\*/!s/freebsd\*[ )]/dragonfly* | &/'	\
>>   		-e '/gcc_dir=\\`/s/gcc /$$CC /'				\
>>   		-e '/gcc_ver=\\`/s/gcc /$$CC /'				\
>>   		-e '/link_all_deplibs[0-9A-Z_]*=/s/=unknown/=no/'	\
>> -		-e 's,freebsd\*),freebsd\*|dragonfly\*),g'		\
>>   		-e '/objformat=/s/echo aout/echo elf/'			\
>>   		-e "/freebsd-elf\\*)/,/;;/ {				\
>>   		    /deplibs_check_method=/s/=.*/=pass_all/; }"	
>
> Hi,
> this seems to break sysutils/hal configure stage, could you take a look 
> at the following PR? It also has a proposed patch for the problem.
> http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/187208

I've committed a small fix now, but I'm not entirely happy with it.
Ideally, all these sed commands would be enclosed by /begin/,/end/ { ... }
where /begin/ and /end/ mark the libtool section of a configure script.
It looks like /file_magic_test_file=$/ could be used for /begin/, but
I can't find one for /end/.