From owner-svn-ports-head@freebsd.org Sun Oct 11 14:18:59 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 E3969A115AE for ; Sun, 11 Oct 2015 14:18:58 +0000 (UTC) (envelope-from xdsl0000474440@inode.at) Received: from b2bfep14.mx.upcmail.net (b2bfep14.mx.upcmail.net [62.179.121.59]) by mx1.freebsd.org (Postfix) with ESMTP id 4AB2C11EC for ; Sun, 11 Oct 2015 14:18:58 +0000 (UTC) (envelope-from xdsl0000474440@inode.at) Received: from edge11.upcmail.net ([192.168.13.81]) by b2bfep14.mx.upcmail.net (InterMail vM.8.01.05.18 201-2260-151-151-20140610) with ESMTP id <20151011141721.RVBB5552.b2bfep14-int.chello.at@edge11.upcmail.net> for ; Sun, 11 Oct 2015 16:17:21 +0200 Received: from iznogoud.viz ([91.119.136.189]) by edge11.upcmail.net with edge id TqHL1r00K45MU7v0BqHLaF; Sun, 11 Oct 2015 16:17:21 +0200 X-SourceIP: 91.119.136.189 Received: from wolfgang by iznogoud.viz with local (Exim 4.86 (FreeBSD)) (envelope-from ) id 1ZlHRA-000JaO-2o; Sun, 11 Oct 2015 16:17:20 +0200 From: Wolfgang Jenkner To: Koop Mast Cc: marino@FreeBSD.org, ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r399021 - in head: graphics/dri graphics/libGL lang/clover Date: Sun, 11 Oct 2015 16:14:05 +0200 References: <201510102104.t9AL4iur039809@repo.freebsd.org> Message-ID: <857fmtjxqo.fsf@iznogoud.viz> User-Agent: Gnus/5.130014 (Ma Gnus v0.14) Emacs/25.0.50 (berkeley-unix) MIME-Version: 1.0 Content-Type: text/plain 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 14:18:59 -0000 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). -- >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' \ -- 2.6.1