Update to 2.38.0:

April 13, 2014
	- Release 2.38.0
	- Resolves bugs: 2409, 2413, 2417, 2420, 2422, 2423, 2425
March 27, 2014
	- Enable packing for dot
	- Allow scaling to work for all non-dot layouts
March 9, 2014
	- Add overline text characteristic.
March 4, 2014
	- Fix bugs in gvpr and gv.cpp so edges can be created in subgraphs.
	- Add edgepaint program for coloring edges to make them easier to tell apart.
	- Modify neato to avoid unnecessary translations of output. This allows positions
	given on input to remain the same on output.
	- Fix swig java package to work and support gv.renderresult.
	- Fix test for the absence of layout (old test relied on statically allocated Agraphinfo_t).
	- HTML-like tables and cells can now specify which borders should be drawn.
	- The fixedsize attribute now takes the value "shape" which allows labels much larger than the
	node shape.

6 files changed, 39 insertions, 36 deletions

diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile
index 3b39ac9693a..6c724d5897a 100644
--- a/graphics/graphviz/Makefile
+++ b/graphics/graphviz/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.141 2014/05/05 00:47:57 ryoon Exp $
+# $NetBSD: Makefile,v 1.142 2014/05/06 09:33:13 wiz Exp $
 
-DISTNAME=	graphviz-2.36.0
-PKGREVISION=	2
+DISTNAME=	graphviz-2.38.0
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.graphviz.org/pub/graphviz/stable/SOURCES/
 
diff --git a/graphics/graphviz/PLIST b/graphics/graphviz/PLIST
index 46b9284a12c..e1bd9277b13 100644
--- a/graphics/graphviz/PLIST
+++ b/graphics/graphviz/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.46 2014/04/03 09:34:03 wiz Exp $
+@comment $NetBSD: PLIST,v 1.47 2014/05/06 09:33:13 wiz Exp $
 bin/acyclic
 bin/bcomps
 bin/ccomps
@@ -10,6 +10,7 @@ bin/dot
 bin/dot_builtins
 bin/dot2gxl
 ${PLIST.x11}bin/dotty
+bin/edgepaint
 bin/fdp
 bin/gc
 bin/gml2gv
@@ -127,6 +128,7 @@ man/man1/diffimg.1
 man/man1/dijkstra.1
 man/man1/dot.1
 ${PLIST.x11}man/man1/dotty.1
+man/man1/edgepaint.1
 man/man1/fdp.1
 man/man1/gc.1
 man/man1/gml2gv.1
@@ -378,6 +380,7 @@ share/graphviz/doc/html/info/trapezium.gif
 share/graphviz/doc/html/info/triangle.gif
 share/graphviz/doc/html/info/tripleoctagon.gif
 share/graphviz/doc/html/info/underline.gif
+share/graphviz/doc/html/internal_todo.html
 share/graphviz/doc/html/pspdf.png
 share/graphviz/doc/html/schema/arguments.xml
 share/graphviz/doc/html/schema/attributes.xml
@@ -400,6 +403,7 @@ share/graphviz/doc/pdf/dot.1.pdf
 share/graphviz/doc/pdf/dotguide.pdf
 ${PLIST.x11}share/graphviz/doc/pdf/dotty.1.pdf
 share/graphviz/doc/pdf/dottyguide.pdf
+share/graphviz/doc/pdf/edgepaint.1.pdf
 share/graphviz/doc/pdf/expr.3.pdf
 share/graphviz/doc/pdf/fdp.1.pdf
 share/graphviz/doc/pdf/gc.1.pdf
diff --git a/graphics/graphviz/distinfo b/graphics/graphviz/distinfo
index 2b004cf9201..04528463dc3 100644
--- a/graphics/graphviz/distinfo
+++ b/graphics/graphviz/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.50 2014/04/03 09:34:03 wiz Exp $
+$NetBSD: distinfo,v 1.51 2014/05/06 09:33:13 wiz Exp $
 
-SHA1 (graphviz-2.36.0.tar.gz) = a41e9f1cbcc9a24651e14dd15a4cda3d912d7d19
-RMD160 (graphviz-2.36.0.tar.gz) = 91a6ea69c787578bf54bebc6eb5d2d8be8070744
-Size (graphviz-2.36.0.tar.gz) = 23846318 bytes
+SHA1 (graphviz-2.38.0.tar.gz) = 053c771278909160916ca5464a0a98ebf034c6ef
+RMD160 (graphviz-2.38.0.tar.gz) = a80c2fa6b9955444b2103a99167d7020b23e4c4e
+Size (graphviz-2.38.0.tar.gz) = 25848858 bytes
 SHA1 (patch-config_config__perl.pl) = 85d535282a819c1055386244f7b520387d0ddbb1
-SHA1 (patch-configure) = 8f45d8cbaf9798a01216d7850c5c1dbe9dfd9106
-SHA1 (patch-configure.ac) = 02ab80dfe182586e78b49d91a8cde69d1d266d4e
-SHA1 (patch-lib_gvc_Makefile.in) = a0c4cbd30712b3933ca0ce48897d8670bf1ceab5
+SHA1 (patch-configure) = f772bedfac63c3b473ebae1621b72982a13fe5a3
+SHA1 (patch-configure.ac) = ec844ae85b6be9cf095ec800df6983b061d62b5d
+SHA1 (patch-lib_gvc_Makefile.in) = 985ffe3efb0e7f876ece14dc0d2a719ec06357e2
diff --git a/graphics/graphviz/patches/patch-configure b/graphics/graphviz/patches/patch-configure
index 6589255e445..7b0a1967ee4 100644
--- a/graphics/graphviz/patches/patch-configure
+++ b/graphics/graphviz/patches/patch-configure
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure,v 1.5 2013/11/20 07:17:22 richard Exp $
+$NetBSD: patch-configure,v 1.6 2014/05/06 09:33:13 wiz Exp $
 
 1. chunk: fix
 ./configure.lineno: 1: Syntax error: Bad substitution
@@ -10,9 +10,9 @@ last chunk: fix
 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.orig	2014-04-13 20:41:48.000000000 +0000
 +++ configure
-@@ -3504,8 +3504,15 @@ case "${host_os}" in
+@@ -3521,8 +3521,15 @@ case "${host_os}" in
  	# For the build number: months since Jan 2000, day of month from the timestamp
  	# For the revision number: hour, minute from the timestamp
  	if test $GRAPHVIZ_VERSION_MICRO != "0"; then
@@ -30,10 +30,10 @@ last last chunk: fix sed expression not to use + which is not in BRE (guile)
  	fi
  	;;
  esac
-@@ -3519,14 +3526,12 @@ if test -z "$LIBPOSTFIX"; then
+@@ -3536,14 +3543,12 @@ if test -z "$LIBPOSTFIX"; then
      *linux* )
        case "${host_cpu}" in
-         aarch64 | powerpc64 | s390x | x86_64 | sparc64 )
+         aarch64 | powerpc64 | powerpc64le | s390x | x86_64 | sparc64 )
 -          LIBPOSTFIX="64"
            ;;
        esac
@@ -45,7 +45,7 @@ last last chunk: fix sed expression not to use + which is not in BRE (guile)
            ;;
        esac
        ;;
-@@ -21094,7 +21099,7 @@ done
+@@ -21101,7 +21106,7 @@ done
        if test "x$GUILE" = "x"; then
          use_guile="No (guile not available)"
        else
@@ -54,7 +54,7 @@ last last chunk: fix sed expression not to use + which is not in BRE (guile)
          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
+@@ -21733,7 +21738,7 @@ $as_echo_n "checking for Lua headers and
  		        LUA_VERSION=`$PKGCONFIG --modversion lua$l`
                          LUA_INCLUDES="$LUA_CFLAGS "`$PKGCONFIG --cflags lua$l`
                          LUA_LIBS="$LUA_LFLAGS "`$PKGCONFIG --libs lua$l`
@@ -63,7 +63,7 @@ last last chunk: fix sed expression not to use + which is not in BRE (guile)
  
  		        pkgconfig_lualib_found=`$PKGCONFIG --exists lualib$l 2>/dev/null`
  		        if test  "x$?" = "x0"; then
-@@ -21790,7 +21795,7 @@ $as_echo_n "checking for Lua headers and
+@@ -21797,7 +21802,7 @@ $as_echo_n "checking for Lua headers and
                  LUA_INCLUDES=`$LUACONFIG --include`
                  LUA_LIBS=`$LUACONFIG --libs`
  	        LUA_VERSION="5.0.x"
@@ -72,7 +72,7 @@ last last chunk: fix sed expression not to use + which is not in BRE (guile)
              fi
          fi
  
-@@ -22068,8 +22073,8 @@ $as_echo "no" >&6; }
+@@ -22075,8 +22080,8 @@ $as_echo "no" >&6; }
  fi
  
  
@@ -83,7 +83,7 @@ last last chunk: fix sed expression not to use + which is not in BRE (guile)
          save_CPPFLAGS=$CPPFLAGS
          CPPFLAGS="$CPPFLAGS $OCAML_INCLUDES"
          ac_fn_c_check_header_mongrel "$LINENO" "caml/mlvalues.h" "ac_cv_header_caml_mlvalues_h" "$ac_includes_default"
-@@ -22279,13 +22284,13 @@ done
+@@ -22291,13 +22296,13 @@ done
        if test "x$PHP" = "x"; then
          use_php="No (php not available)"
        else
@@ -102,7 +102,7 @@ last last chunk: fix sed expression not to use + which is not in BRE (guile)
          PHP_LIBS=
          save_CPPFLAGS=$CPPFLAGS
          CPPFLAGS="$CPPFLAGS $PHP_INCLUDES"
-@@ -27212,10 +27217,6 @@ fi
+@@ -27347,10 +27352,6 @@ fi
  
  
  
diff --git a/graphics/graphviz/patches/patch-configure.ac b/graphics/graphviz/patches/patch-configure.ac
index 5ef33c6afd3..88d751d086d 100644
--- a/graphics/graphviz/patches/patch-configure.ac
+++ b/graphics/graphviz/patches/patch-configure.ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-configure.ac,v 1.2 2013/09/09 20:35:07 wiz Exp $
+$NetBSD: patch-configure.ac,v 1.3 2014/05/06 09:33:13 wiz Exp $
 
---- configure.ac.orig	2013-09-07 01:07:52.000000000 +0000
+--- configure.ac.orig	2014-04-13 20:40:25.000000000 +0000
 +++ configure.ac
-@@ -87,9 +87,20 @@ case "${host_os}" in
+@@ -92,9 +92,20 @@ case "${host_os}" in
  	# Windows version numbers
  	# For the build number: months since Jan 2000, day of month from the timestamp
  	# For the revision number: hour, minute from the timestamp
@@ -26,10 +26,10 @@ $NetBSD: patch-configure.ac,v 1.2 2013/09/09 20:35:07 wiz Exp $
  	fi
  	;;
  esac
-@@ -103,14 +114,12 @@ if test -z "$LIBPOSTFIX"; then
+@@ -108,14 +119,12 @@ if test -z "$LIBPOSTFIX"; then
      *linux* )
        case "${host_cpu}" in
-         aarch64 | powerpc64 | s390x | x86_64 | sparc64 )
+         aarch64 | powerpc64 | powerpc64le | s390x | x86_64 | sparc64 )
 -          LIBPOSTFIX="64"
            ;;
        esac
@@ -41,7 +41,7 @@ $NetBSD: patch-configure.ac,v 1.2 2013/09/09 20:35:07 wiz Exp $
            ;;
        esac
        ;;
-@@ -889,7 +898,7 @@ else
+@@ -894,7 +903,7 @@ else
  		        LUA_VERSION=`$PKGCONFIG --modversion lua$l`
                          LUA_INCLUDES="$LUA_CFLAGS "`$PKGCONFIG --cflags lua$l`
                          LUA_LIBS="$LUA_LFLAGS "`$PKGCONFIG --libs lua$l`
@@ -50,7 +50,7 @@ $NetBSD: patch-configure.ac,v 1.2 2013/09/09 20:35:07 wiz Exp $
      
  		        pkgconfig_lualib_found=`$PKGCONFIG --exists lualib$l 2>/dev/null`
  		        if test  "x$?" = "x0"; then
-@@ -911,7 +920,7 @@ else
+@@ -916,7 +925,7 @@ else
                  LUA_INCLUDES=`$LUACONFIG --include`
                  LUA_LIBS=`$LUACONFIG --libs`
  	        LUA_VERSION="5.0.x"
@@ -59,7 +59,7 @@ $NetBSD: patch-configure.ac,v 1.2 2013/09/09 20:35:07 wiz Exp $
              fi
          fi
      
-@@ -1001,8 +1010,8 @@ else
+@@ -1006,8 +1015,8 @@ else
          use_ocaml="No (ocaml not available)"
        else
          AC_CHECK_PROG(OCAML_OPT,ocamlopt,ocamlopt)
@@ -70,7 +70,7 @@ $NetBSD: patch-configure.ac,v 1.2 2013/09/09 20:35:07 wiz Exp $
          save_CPPFLAGS=$CPPFLAGS
          CPPFLAGS="$CPPFLAGS $OCAML_INCLUDES"
          AC_CHECK_HEADER(caml/mlvalues.h,[
-@@ -1095,13 +1104,13 @@ else
+@@ -1105,13 +1114,13 @@ else
        if test "x$PHP" = "x"; then
          use_php="No (php not available)"
        else
@@ -89,7 +89,7 @@ $NetBSD: patch-configure.ac,v 1.2 2013/09/09 20:35:07 wiz Exp $
          PHP_LIBS=
          save_CPPFLAGS=$CPPFLAGS
          CPPFLAGS="$CPPFLAGS $PHP_INCLUDES"
-@@ -2621,7 +2630,7 @@ dnl INCLUDES and LIBS for PLATFORMSDK
+@@ -2658,7 +2667,7 @@ dnl INCLUDES and LIBS for PLATFORMSDK
  
  AC_ARG_WITH(platformsdkincludedir,
    [AS_HELP_STRING([--with-platformsdkincludedir=DIR],[use Platform SDK (Windows) includes from DIR])],
diff --git a/graphics/graphviz/patches/patch-lib_gvc_Makefile.in b/graphics/graphviz/patches/patch-lib_gvc_Makefile.in
index a5ac3d85cc2..3a9da3af7d8 100644
--- a/graphics/graphviz/patches/patch-lib_gvc_Makefile.in
+++ b/graphics/graphviz/patches/patch-lib_gvc_Makefile.in
@@ -1,8 +1,8 @@
-$NetBSD: patch-lib_gvc_Makefile.in,v 1.2 2014/04/03 09:34:03 wiz Exp $
+$NetBSD: patch-lib_gvc_Makefile.in,v 1.3 2014/05/06 09:33:13 wiz Exp $
 
---- lib/gvc/Makefile.in.orig	2014-01-11 23:15:53.000000000 +0000
+--- lib/gvc/Makefile.in.orig	2014-04-13 20:41:55.000000000 +0000
 +++ lib/gvc/Makefile.in
-@@ -569,7 +569,7 @@ libgvc_la_LIBADD = $(libgvc_C_la_LIBADD)
+@@ -570,7 +570,7 @@ libgvc_la_LIBADD = $(libgvc_C_la_LIBADD)
  	$(top_builddir)/lib/cdt/libcdt.la \
  	$(top_builddir)/lib/cgraph/libcgraph.la \
  	$(top_builddir)/lib/pathplan/libpathplan.la \
@@ -10,4 +10,4 @@ $NetBSD: patch-lib_gvc_Makefile.in,v 1.2 2014/04/03 09:34:03 wiz Exp $
 +	$(EXPAT_LIBS) $(Z_LIBS) $(MATH_LIBS) ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
  
  libgvc_la_DEPENDENCIES = $(libgvc_C_la_DEPENDENCIES)
- EXTRA_DIST = $(man_MANS) $(pdf_DATA) Makefile.old regex_win32.h regex_win32.c gvc.vcproj
+ EXTRA_DIST = $(man_MANS) $(pdf_DATA) regex_win32.h regex_win32.c gvc.vcproj