From owner-svn-ports-head@freebsd.org Sun Oct 11 19:44:55 2015 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 19D77A11CBE; Sun, 11 Oct 2015 19:44:55 +0000 (UTC) (envelope-from kwm@rainbow-runner.nl) Received: from fep36.mx.upcmail.net (fep36.mx.upcmail.net [62.179.121.54]) by mx1.freebsd.org (Postfix) with ESMTP id EAFC9117E; Sun, 11 Oct 2015 19:44:53 +0000 (UTC) (envelope-from kwm@rainbow-runner.nl) Received: from edge03.upcmail.net ([192.168.13.238]) by viefep32-int.chello.at (InterMail vM.8.01.05.18 201-2260-151-151-20140610) with ESMTP id <20151011185726.XEV20166.viefep32-int.chello.at@edge03.upcmail.net>; Sun, 11 Oct 2015 20:57:26 +0200 Received: from [127.0.0.1] ([178.84.134.112]) by edge03.upcmail.net with edge id TuxQ1r00P2Rg3Ey01uxQhL; Sun, 11 Oct 2015 20:57:25 +0200 X-SourceIP: 178.84.134.112 Subject: Re: svn commit: r399021 - in head: graphics/dri graphics/libGL lang/clover To: Wolfgang Jenkner References: <201510102104.t9AL4iur039809@repo.freebsd.org> <857fmtjxqo.fsf@iznogoud.viz> Cc: marino@FreeBSD.org, ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org From: Koop Mast Message-ID: <561AB113.7000101@rainbow-runner.nl> Date: Sun, 11 Oct 2015 20:57:23 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:38.0) Gecko/20100101 Thunderbird/38.3.0 MIME-Version: 1.0 In-Reply-To: <857fmtjxqo.fsf@iznogoud.viz> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit X-Antivirus: avast! (VPS 151011-0, 11/10/2015), Outbound message X-Antivirus-Status: Clean X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 Oct 2015 19:44:55 -0000 On 11/10/2015 16:14, Wolfgang Jenkner wrote: > On Sat, Oct 10 2015, Koop Mast wrote: > >> * Sed on 11 and 10 supports \< and \> however sed on 9.x and dragonfly do not, >> replace the sed keywords with some magic to get the intended results. [2] >> > [...] >> Modified: head/graphics/libGL/Makefile.targets >> ============================================================================== >> --- head/graphics/libGL/Makefile.targets Sat Oct 10 20:53:34 2015 (r399020) >> +++ head/graphics/libGL/Makefile.targets Sat Oct 10 21:04:44 2015 (r399021) >> @@ -3,7 +3,9 @@ >> # this file holds common targets >> >> post-patch: >> +# Sed on 9.x and dragonfly don't support \< or \> >> @${REINPLACE_CMD} -e 's|-ffast-math|${FAST_MATH}|' -e 's|x86_64|amd64|' \ >> + -e "/\>\/\// s|/-|/ -|; s|\\\>||" \ >> -e 's|python2 python|python2disabled pythondisabled|g' \ >> ${WRKSRC}/configure >> @${REINPLACE_CMD} -e 's|/etc/|${PREFIX}/etc/|g' \ >> > This "magic" is not quite correct nor is it needed: > > After `make patch', `diff -u configure.orig configure' contains the > following hunk > > @@ -13036,8 +13045,8 @@ > libname=conftest > lt_save_allow_undefined_flag=$allow_undefined_flag > allow_undefined_flag= > - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5 > - (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 > + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5 > + (eval $archive_cmds 2\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 > ac_status=$? > $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 > test $ac_status = 0; } > > So the redirection 2>&1 has been mangled (due to the fact that the > address in the sed command was probably meant to have a grouping > '{ ... }' around the following two substitutions). There's another > similar case between 9071-9080. > > However, I think the following patch should work for all versions of BSD > sed, see re_format(7). Committed thanks! -Koop > > -- >8 -- > Subject: [PATCH] Use standard BSD word-end anchor in sed regexp. > > --- > graphics/libGL/Makefile.targets | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/graphics/libGL/Makefile.targets b/graphics/libGL/Makefile.targets > index 43dbc91..ed79b5d 100644 > --- a/graphics/libGL/Makefile.targets > +++ b/graphics/libGL/Makefile.targets > @@ -5,7 +5,7 @@ > post-patch: > # Sed on 9.x and dragonfly don't support \< or \> > @${REINPLACE_CMD} -e 's|-ffast-math|${FAST_MATH}|' -e 's|x86_64|amd64|' \ > - -e "/\>\/\// s|/-|/ -|; s|\\\>||" \ > + -e 's|\\>//|[[:>:]]//|' \ > -e 's|python2 python|python2disabled pythondisabled|g' \ > ${WRKSRC}/configure > @${REINPLACE_CMD} -e 's|/etc/|${PREFIX}/etc/|g' \