[pkgsrc/trunk]: pkgsrc/graphics/graphviz Fix guile support by repairing sed e...

[gdt <gdt%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3a83602db93d
branches:  trunk
changeset: 626264:3a83602db93d
user:      gdt <gdt%pkgsrc.org@localhost>
date:      Wed Nov 06 00:50:47 2013 +0000

description:
Fix guile support by repairing sed expression.

At configure time, guile --version is parsed to see if guile is new
enough, and our guile 1.8 is new enough.  But the sed expression,
documented to use BREs, wrongly uses \+ which is a modern RE
construct.  gsed interprets \+, and is hereby awarded a "test =="
badge of shame.  To fix this, change \+ to *.

diffstat:

 graphics/graphviz/Makefile                |   4 ++--
 graphics/graphviz/distinfo                |   4 ++--
 graphics/graphviz/patches/patch-configure |  12 +++++++++++-
 3 files changed, 15 insertions(+), 5 deletions(-)

diffs (62 lines):

diff -r 4458ad562925 -r 3a83602db93d graphics/graphviz/Makefile
--- a/graphics/graphviz/Makefile        Wed Nov 06 00:40:15 2013 +0000
+++ b/graphics/graphviz/Makefile        Wed Nov 06 00:50:47 2013 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.132 2013/10/30 06:49:54 dholland Exp $
+# $NetBSD: Makefile,v 1.133 2013/11/06 00:50:47 gdt Exp $
 
 DISTNAME=      graphviz-2.34.0
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    graphics
 MASTER_SITES=  http://www.graphviz.org/pub/graphviz/stable/SOURCES/
 
diff -r 4458ad562925 -r 3a83602db93d graphics/graphviz/distinfo
--- a/graphics/graphviz/distinfo        Wed Nov 06 00:40:15 2013 +0000
+++ b/graphics/graphviz/distinfo        Wed Nov 06 00:50:47 2013 +0000
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.45 2013/09/09 20:35:07 wiz Exp $
+$NetBSD: distinfo,v 1.46 2013/11/06 00:50:47 gdt Exp $
 
 SHA1 (graphviz-2.34.0.tar.gz) = 5a0c00bebe7f4c7a04523db21f40966dc9f0d441
 RMD160 (graphviz-2.34.0.tar.gz) = 583a2332bcf0f9c8d24d19044415cd768be51745
 Size (graphviz-2.34.0.tar.gz) = 23921350 bytes
 SHA1 (patch-config_config__perl.pl) = 85d535282a819c1055386244f7b520387d0ddbb1
-SHA1 (patch-configure) = 19b1f2778bc18cf50d5b1d678afc67a8591e69ec
+SHA1 (patch-configure) = c3510ba9be6f2cc964c3b221f958a0b52b3a388b
 SHA1 (patch-configure.ac) = 02ab80dfe182586e78b49d91a8cde69d1d266d4e
 SHA1 (patch-lib_gvc_Makefile.in) = 44c514720a840574c9aa75f4c67798471138a642
 SHA1 (patch-plugin_gd_Makefile.am) = 81de41e7589eaf7682a21636155840123a7716ab
diff -r 4458ad562925 -r 3a83602db93d graphics/graphviz/patches/patch-configure
--- a/graphics/graphviz/patches/patch-configure Wed Nov 06 00:40:15 2013 +0000
+++ b/graphics/graphviz/patches/patch-configure Wed Nov 06 00:50:47 2013 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure,v 1.3 2013/09/09 20:35:07 wiz Exp $
+$NetBSD: patch-configure,v 1.4 2013/11/06 00:50:47 gdt Exp $
 
 1. chunk: fix
 ./configure.lineno: 1: Syntax error: Bad substitution
@@ -8,6 +8,7 @@
 last chunk: fix
 ./configure.lineno: 27203: Syntax error: ")" unexpected (expecting "fi")
 http://www.graphviz.org/mantisbt/view.php?id=2362
+last last chunk: fix sed expression not to use + which is not in BRE (guile)
 
 --- configure.orig     2013-09-07 01:11:08.000000000 +0000
 +++ configure
@@ -44,6 +45,15 @@
            ;;
        esac
        ;;
+@@ -21094,7 +21099,7 @@ done
+       if test "x$GUILE" = "x"; then
+         use_guile="No (guile not available)"
+       else
+-        GUILE_VERSION=`$GUILE --version | sed -n '1 s/^.* \+\([0-9\.]\+\)$/\1/ p'`
++        GUILE_VERSION=`$GUILE --version | sed -n '1 s/^.* *\([0-9\.]*\)$/\1/ p'`
+         GUILE_VERSION_MAJOR=`echo $GUILE_VERSION | cut -d '.' -f 1`
+         GUILE_VERSION_MINOR=`echo $GUILE_VERSION | cut -d '.' -f 2`
+         if test 0$GUILE_VERSION_MAJOR -lt 2; then
 @@ -21726,7 +21731,7 @@ $as_echo_n "checking for Lua headers and
                        LUA_VERSION=`$PKGCONFIG --modversion lua$l`
                          LUA_INCLUDES="$LUA_CFLAGS "`$PKGCONFIG --cflags lua$l`