CVS commit: pkgsrc/graphics/graphviz

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Fri Mar 13 15:16:01 UTC 2020

Modified Files:
        pkgsrc/graphics/graphviz: Makefile distinfo
Added Files:
        pkgsrc/graphics/graphviz/patches: patch-cmd_gvmap_gvmap.sh

Log Message:
graphviz: fix shell portability issues


To generate a diff of this commit:
cvs rdiff -u -r1.211 -r1.212 pkgsrc/graphics/graphviz/Makefile
cvs rdiff -u -r1.62 -r1.63 pkgsrc/graphics/graphviz/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/graphics/graphviz/patches/patch-cmd_gvmap_gvmap.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/graphviz/Makefile
diff -u pkgsrc/graphics/graphviz/Makefile:1.211 pkgsrc/graphics/graphviz/Makefile:1.212
--- pkgsrc/graphics/graphviz/Makefile:1.211     Tue Mar 10 22:10:08 2020
+++ pkgsrc/graphics/graphviz/Makefile   Fri Mar 13 15:16:00 2020
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.211 2020/03/10 22:10:08 wiz Exp $
+# $NetBSD: Makefile,v 1.212 2020/03/13 15:16:00 tnn Exp $
 
 DISTNAME=      graphviz-2.40.1
-PKGREVISION=   45
+PKGREVISION=   46
 CATEGORIES=    graphics
 MASTER_SITES=  http://www.graphviz.org/pub/graphviz/stable/SOURCES/
 
@@ -11,6 +11,7 @@ COMMENT=      Graph Drawing Programs from AT&
 LICENSE=       epl-v1.0
 
 CHECK_FILES_SKIP+=     ${PREFIX}/lib/graphviz/config6
+CHECK_PORTABILITY_SKIP+=windows/*
 
 PRIVILEGED_STAGES+=    clean
 

Index: pkgsrc/graphics/graphviz/distinfo
diff -u pkgsrc/graphics/graphviz/distinfo:1.62 pkgsrc/graphics/graphviz/distinfo:1.63
--- pkgsrc/graphics/graphviz/distinfo:1.62      Sat Aug 17 04:39:05 2019
+++ pkgsrc/graphics/graphviz/distinfo   Fri Mar 13 15:16:00 2020
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.62 2019/08/17 04:39:05 ryoon Exp $
+$NetBSD: distinfo,v 1.63 2020/03/13 15:16:00 tnn Exp $
 
 SHA1 (graphviz-2.40.1.tar.gz) = 8a44d19bcdb50df1bd8e649de472ebf868468888
 RMD160 (graphviz-2.40.1.tar.gz) = 8fc103fc519e07e9db522ec2f748838571c71acf
 SHA512 (graphviz-2.40.1.tar.gz) = a3f358a7050523a39b91a259563a95925b37853ffec799e571211af5b686d3af42457c937882954482785745d90416b1abd945caf05f8abb52b3876e07aa70f5
 Size (graphviz-2.40.1.tar.gz) = 25633455 bytes
+SHA1 (patch-cmd_gvmap_gvmap.sh) = a6047ffe825cf13271b556ba8c4f3c866d04f5c3
 SHA1 (patch-cmd_lefty_os_unix_io.c) = 48f91c79b97928b54ae24af59a9fea173f34dfe5
 SHA1 (patch-config_config__perl.pl) = 85d535282a819c1055386244f7b520387d0ddbb1
 SHA1 (patch-configure) = 2e541e065a594093f54e47d5a24972367405bec1

Added files:

Index: pkgsrc/graphics/graphviz/patches/patch-cmd_gvmap_gvmap.sh
diff -u /dev/null pkgsrc/graphics/graphviz/patches/patch-cmd_gvmap_gvmap.sh:1.1
--- /dev/null   Fri Mar 13 15:16:01 2020
+++ pkgsrc/graphics/graphviz/patches/patch-cmd_gvmap_gvmap.sh   Fri Mar 13 15:16:00 2020
@@ -0,0 +1,39 @@
+$NetBSD: patch-cmd_gvmap_gvmap.sh,v 1.1 2020/03/13 15:16:00 tnn Exp $
+
+shell portability issues
+
+--- cmd/gvmap/gvmap.sh.orig    2016-08-09 21:02:09.000000000 +0000
++++ cmd/gvmap/gvmap.sh
+@@ -64,7 +64,7 @@ do
+     exit 2
+     ;;
+   \? )
+-    if [[ "$OPTARG" == '?' ]]
++    if [ "$OPTARG" = '?' ]
+     then
+       getopts -a gvmap "$OPTSTR" x '-?'
+       exit 0
+@@ -76,9 +76,9 @@ do
+ done
+ shift $((OPTIND-1))
+ 
+-if [[ $# == 0 ]]
++if [ $# = 0 ]
+ then
+-  if [[ -n $VERBOSE ]]
++  if [ -n $VERBOSE ]
+   then
+     print -u 2 "$LAYOUT -Goverlap=prism $FLAGS1 | gvmap $FLAGS2 | neato -n2 $FLAGS3"
+   fi
+@@ -86,9 +86,9 @@ then
+ else
+   while (( $# > 0 ))
+   do
+-    if [[ -f $1 ]]
++    if [ -f $1 ]
+     then
+-      if [[ -n $VERBOSE ]]
++      if [ -n $VERBOSE ]
+       then
+         print -u 2 "$LAYOUT -Goverlap=prism $FLAGS1 $1 | gvmap $FLAGS2 | neato -n2 $FLAGS3"
+       fi