Sat Sep 7 18:48:43 2013 UTC ()
Add some comments (including upstream bug report URLs).


(wiz)
diff -r1.43 -r1.44 pkgsrc/graphics/graphviz/distinfo
diff -r1.1 -r1.2 pkgsrc/graphics/graphviz/patches/patch-config_config__perl.pl
diff -r1.1 -r1.2 pkgsrc/graphics/graphviz/patches/patch-configure
cvs diff -r1.43 -r1.44 pkgsrc/graphics/graphviz/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/graphviz/distinfo 2013/09/06 21:30:00 1.43
+++ pkgsrc/graphics/graphviz/distinfo 2013/09/07 18:48:43 1.44
@@ -1,11 +1,11 @@ @@ -1,11 +1,11 @@
1$NetBSD: distinfo,v 1.43 2013/09/06 21:30:00 wiz Exp $ 1$NetBSD: distinfo,v 1.44 2013/09/07 18:48:43 wiz Exp $
2 2
3SHA1 (graphviz-2.32.0.tar.gz) = a64f4a409012d13d18338ecb8bd7253083ebc35e 3SHA1 (graphviz-2.32.0.tar.gz) = a64f4a409012d13d18338ecb8bd7253083ebc35e
4RMD160 (graphviz-2.32.0.tar.gz) = b0a63b7466d88b1dc4cfccc19d632ca2c5440407 4RMD160 (graphviz-2.32.0.tar.gz) = b0a63b7466d88b1dc4cfccc19d632ca2c5440407
5Size (graphviz-2.32.0.tar.gz) = 23756717 bytes 5Size (graphviz-2.32.0.tar.gz) = 23756717 bytes
6SHA1 (patch-config_config__perl.pl) = cacf14b41c46b979ed57752fbd406480b54a1445 6SHA1 (patch-config_config__perl.pl) = 1ce416cb296c8566c6a5279d6f4193f7403fe6c3
7SHA1 (patch-configure) = 3da4f52cbe0e1522be23dab6661f7eb997565220 7SHA1 (patch-configure) = 6a1afc3fcff9dea3dd6caa70fbf1cbb2bada1c3f
8SHA1 (patch-configure.ac) = 250812ce53541373e101142200d109fd16da9ac9 8SHA1 (patch-configure.ac) = 250812ce53541373e101142200d109fd16da9ac9
9SHA1 (patch-lib_gvc_Makefile.in) = 44c514720a840574c9aa75f4c67798471138a642 9SHA1 (patch-lib_gvc_Makefile.in) = 44c514720a840574c9aa75f4c67798471138a642
10SHA1 (patch-plugin_gd_Makefile.am) = 81de41e7589eaf7682a21636155840123a7716ab 10SHA1 (patch-plugin_gd_Makefile.am) = 81de41e7589eaf7682a21636155840123a7716ab
11SHA1 (patch-plugin_gd_Makefile.in) = 0008791375bfcaf2f264d07ac59db0310905e5a0 11SHA1 (patch-plugin_gd_Makefile.in) = 0008791375bfcaf2f264d07ac59db0310905e5a0
cvs diff -r1.1 -r1.2 pkgsrc/graphics/graphviz/patches/patch-config_config__perl.pl (expand / switch to unified diff)

--- pkgsrc/graphics/graphviz/patches/patch-config_config__perl.pl 2013/09/06 21:30:00 1.1
+++ pkgsrc/graphics/graphviz/patches/patch-config_config__perl.pl 2013/09/07 18:48:43 1.2
@@ -1,14 +1,18 @@ @@ -1,14 +1,18 @@
1$NetBSD: patch-config_config__perl.pl,v 1.1 2013/09/06 21:30:00 wiz Exp $ 1$NetBSD: patch-config_config__perl.pl,v 1.2 2013/09/07 18:48:43 wiz Exp $
 2
 31. chunk: add rpath for pkgsrc
 42. chunk: perl-5.18 fix, see
 5http://www.graphviz.org/mantisbt/view.php?id=2359
2 6
3--- config/config_perl.pl.orig 2013-08-01 17:35:15.000000000 +0000 7--- config/config_perl.pl.orig 2013-08-01 17:35:15.000000000 +0000
4+++ config/config_perl.pl 8+++ config/config_perl.pl
5@@ -4,7 +4,7 @@ if ($ARGV[0] eq "PERL_LIBS") { 9@@ -4,7 +4,7 @@ if ($ARGV[0] eq "PERL_LIBS") {
6 $archlib = $Config{archlib}; 10 $archlib = $Config{archlib};
7 $libperl = $Config{libperl}; 11 $libperl = $Config{libperl};
8 $libperl =~ s/lib([^\.]+).*/$1/; 12 $libperl =~ s/lib([^\.]+).*/$1/;
9- print "-L$archlib/CORE -l$libperl"; 13- print "-L$archlib/CORE -l$libperl";
10+ print "-Wl,-rpath,$archlib/CORE -L$archlib/CORE -l$libperl"; 14+ print "-Wl,-rpath,$archlib/CORE -L$archlib/CORE -l$libperl";
11 } 15 }
12 if ($ARGV[0] eq "PERL_INCLUDES") { 16 if ($ARGV[0] eq "PERL_INCLUDES") {
13 $archlib = $Config{archlib}; 17 $archlib = $Config{archlib};
14@@ -14,7 +14,7 @@ if ($ARGV[0] eq "PERL_INSTALL_DIR") { 18@@ -14,7 +14,7 @@ if ($ARGV[0] eq "PERL_INSTALL_DIR") {
cvs diff -r1.1 -r1.2 pkgsrc/graphics/graphviz/patches/Attic/patch-configure (expand / switch to unified diff)

--- pkgsrc/graphics/graphviz/patches/Attic/patch-configure 2013/09/06 21:30:00 1.1
+++ pkgsrc/graphics/graphviz/patches/Attic/patch-configure 2013/09/07 18:48:43 1.2
@@ -1,14 +1,19 @@ @@ -1,14 +1,19 @@
1$NetBSD: patch-configure,v 1.1 2013/09/06 21:30:00 wiz Exp $ 1$NetBSD: patch-configure,v 1.2 2013/09/07 18:48:43 wiz Exp $
 2
 31. chunk: undocumented
 42. chunk: use the same path for all platforms in pkgsrc
 5most other chunks: fix 'use unportable test(1) construct, see:
 6http://www.graphviz.org/mantisbt/view.php?id=2357
2 7
3--- configure.orig 2013-08-01 17:39:03.000000000 +0000 8--- configure.orig 2013-08-01 17:39:03.000000000 +0000
4+++ configure 9+++ configure
5@@ -3466,11 +3466,18 @@ case "${host_os}" in 10@@ -3466,11 +3466,18 @@ case "${host_os}" in
6 # For the build number: months since Jan 2000, day of month from the timestamp 11 # For the build number: months since Jan 2000, day of month from the timestamp
7 # For the revision number: hour, minute from the timestamp 12 # For the revision number: hour, minute from the timestamp
8 if test $GRAPHVIZ_VERSION_MICRO != "0"; then 13 if test $GRAPHVIZ_VERSION_MICRO != "0"; then
9- GRAPHVIZ_VERSION_BUILD=`expr \( ${GRAPHVIZ_VERSION_MICRO:0:4} - 2000 \) \* 12 + ${GRAPHVIZ_VERSION_MICRO:4:2}`${GRAPHVIZ_VERSION_MICRO:6:2} 14- GRAPHVIZ_VERSION_BUILD=`expr \( ${GRAPHVIZ_VERSION_MICRO:0:4} - 2000 \) \* 12 + ${GRAPHVIZ_VERSION_MICRO:4:2}`${GRAPHVIZ_VERSION_MICRO:6:2}
10- GRAPHVIZ_VERSION_REVISION=${GRAPHVIZ_VERSION_MICRO:9:4} 15- GRAPHVIZ_VERSION_REVISION=${GRAPHVIZ_VERSION_MICRO:9:4}
11+ # JR: patch from Michael van Elst: 16+ # JR: patch from Michael van Elst:
12+ # if we have a shellm we should have a working awk, too 17+ # if we have a shellm we should have a working awk, too
13+ eval `echo "$GRAPHVIZ_VERSION_MICRO" | awk '{ 18+ eval `echo "$GRAPHVIZ_VERSION_MICRO" | awk '{
14+ print "GRAPHVIZ_VERSION_BUILD=" \ 19+ print "GRAPHVIZ_VERSION_BUILD=" \