summaryrefslogtreecommitdiff
path: root/graphics/graphviz
diff options
context:
space:
mode:
authordholland <dholland>2010-11-17 15:46:21 +0000
committerdholland <dholland>2010-11-17 15:46:21 +0000
commitf9fc1db0080a88ca5434477cd0488832e47362a6 (patch)
tree5036d012674ea44d5f2473286e2c47d5cddcded9 /graphics/graphviz
parentdeba74567a7ec3ba6e99721d68546b87cac10242 (diff)
downloadpkgsrc-f9fc1db0080a88ca5434477cd0488832e47362a6.tar.gz
Update graphviz to 2.26.3.
pkgsrc changes: fix a bit of pkglint. Todo: add an option to enable smyrna. Upstream changelog: January 26, 2010 - Release 2.26.3 - libcgraph.so version bumped from 4 to 5 due to API changes - Allow ranksep to specify multiple radial differences in twopi - Allow the user to specify all pairwise distances in neato with - Fixed bugs: 1280, 1409, 1567, 1583, 1624, 1631, 1655, 1708, 1709, 1727, 1784, 1792, 1798, 1800, 1813, 1814, 1830, 1831, 1833, 1836, 1839 December 10, 2009 - Release 2.26.0 - Core features: - added: "smyrna" - a new opengl-based viewer for large graphs - added: rudimentary "gml2gv", "gv2gml" converters - extended support for various image formats in node images - removed vestiges of codegens, now all putput formats supported through plugins. Dropped some output formats for which plugins have not been developed: -Tdia, -Tmif - gvpr converted to a library; additional array handling and text processing functions added; language extended to allow multiple BEG_G/N/E blocks. - allow background images specified via xdot - Fixed bugs: 1683, 1713, 1718, 1720, 1738, 1747, 1759, 1770, 1776, 1786, 1799, 1816, 1827
Diffstat (limited to 'graphics/graphviz')
-rw-r--r--graphics/graphviz/Makefile7
-rw-r--r--graphics/graphviz/PLIST25
-rw-r--r--graphics/graphviz/buildlink3.mk6
-rw-r--r--graphics/graphviz/distinfo16
-rw-r--r--graphics/graphviz/patches/patch-aa25
-rw-r--r--graphics/graphviz/patches/patch-ab29
-rw-r--r--graphics/graphviz/patches/patch-aj14
-rw-r--r--graphics/graphviz/patches/patch-ak17
8 files changed, 87 insertions, 52 deletions
diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile
index 910073d0ec8..864a5b64581 100644
--- a/graphics/graphviz/Makefile
+++ b/graphics/graphviz/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.86 2010/11/15 22:57:19 abs Exp $
+# $NetBSD: Makefile,v 1.87 2010/11/17 15:46:21 dholland Exp $
-DISTNAME= graphviz-2.24.0
-PKGREVISION= 8
+DISTNAME= graphviz-2.26.3
CATEGORIES= graphics
MASTER_SITES= http://www.graphviz.org/pub/graphviz/stable/SOURCES/
@@ -13,7 +12,7 @@ LICENSE= cpl-1.0
PKG_INSTALLATION_TYPES= overwrite pkgviews
PKG_DESTDIR_SUPPORT= user-destdir
-CHECK_FILES_SKIP= ${PREFIX}/lib/graphviz/config6
+CHECK_FILES_SKIP+= ${PREFIX}/lib/graphviz/config6
PRIVILEGED_STAGES+= clean
diff --git a/graphics/graphviz/PLIST b/graphics/graphviz/PLIST
index 5ca290451b6..72c9c7ff8c2 100644
--- a/graphics/graphviz/PLIST
+++ b/graphics/graphviz/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.36 2009/09/13 11:17:30 sno Exp $
+@comment $NetBSD: PLIST,v 1.37 2010/11/17 15:46:21 dholland Exp $
bin/acyclic
bin/bcomps
bin/ccomps
@@ -10,6 +10,7 @@ bin/dot2gxl
bin/dotty
bin/fdp
bin/gc
+bin/gml2gv
bin/gv2gxl
bin/gvcolor
bin/gvgen
@@ -25,6 +26,7 @@ bin/nop
bin/osage
bin/prune
bin/sccmap
+bin/sfdp
bin/tred
bin/twopi
bin/unflatten
@@ -49,12 +51,14 @@ include/graphviz/gvplugin_layout.h
include/graphviz/gvplugin_loadimage.h
include/graphviz/gvplugin_render.h
include/graphviz/gvplugin_textlayout.h
+include/graphviz/gvpr.h
include/graphviz/pack.h
include/graphviz/pathgeom.h
include/graphviz/pathplan.h
include/graphviz/textpara.h
include/graphviz/types.h
include/graphviz/usershape.h
+include/graphviz/xdot.h
${PLIST.guile}lib/graphviz/guile/libgv_guile.la
lib/graphviz/libgvplugin_core.la
lib/graphviz/libgvplugin_dot_layout.la
@@ -90,14 +94,18 @@ lib/libcdt.la
lib/libcgraph.la
lib/libgraph.la
lib/libgvc.la
+lib/libgvpr.la
lib/libpathplan.la
+lib/libxdot.la
${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/gv.pm
${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/gv.so
lib/pkgconfig/libcdt.pc
lib/pkgconfig/libcgraph.pc
lib/pkgconfig/libgraph.pc
lib/pkgconfig/libgvc.pc
+lib/pkgconfig/libgvpr.pc
lib/pkgconfig/libpathplan.pc
+lib/pkgconfig/libxdot.pc
man/man1/acyclic.1
man/man1/bcomps.1
man/man1/ccomps.1
@@ -107,6 +115,7 @@ man/man1/dot.1
man/man1/dotty.1
man/man1/fdp.1
man/man1/gc.1
+man/man1/gml2gv.1
man/man1/gv2gxl.1
man/man1/gvcolor.1
man/man1/gvgen.1
@@ -121,6 +130,8 @@ man/man1/nop.1
man/man1/osage.1
man/man1/prune.1
man/man1/sccmap.1
+man/man1/sfdp.1
+man/man1/smyrna.1
man/man1/tred.1
man/man1/twopi.1
man/man1/unflatten.1
@@ -137,6 +148,7 @@ man/man3/gvc.3
man/man3/pathplan.3
${PLIST.tcl}man/man3/tcldot.3tcl
${PLIST.tcl}man/man3/tkspline.3tk
+man/man3/xdot.3
man/man7/graphviz.7
${PLIST.tcl}share/graphviz/demo/doted.tcl
${PLIST.tcl}share/graphviz/demo/doted.tcl.README
@@ -260,12 +272,12 @@ share/graphviz/doc/html/info/forward.gif
share/graphviz/doc/html/info/hexagon.gif
share/graphviz/doc/html/info/house.gif
share/graphviz/doc/html/info/html1.gif
-share/graphviz/doc/html/info/html2.dot
share/graphviz/doc/html/info/html2.gif
-share/graphviz/doc/html/info/html3.dot
+share/graphviz/doc/html/info/html2.gv
share/graphviz/doc/html/info/html3.gif
-share/graphviz/doc/html/info/html4.dot
+share/graphviz/doc/html/info/html3.gv
share/graphviz/doc/html/info/html4.gif
+share/graphviz/doc/html/info/html4.gv
share/graphviz/doc/html/info/index.html
share/graphviz/doc/html/info/invhouse.gif
share/graphviz/doc/html/info/invtrapezium.gif
@@ -288,6 +300,7 @@ share/graphviz/doc/html/info/record2.gif
share/graphviz/doc/html/info/rect.gif
share/graphviz/doc/html/info/rectangle.gif
share/graphviz/doc/html/info/round.gif
+share/graphviz/doc/html/info/sdlshapes.jpg
share/graphviz/doc/html/info/sdlshapes.png
share/graphviz/doc/html/info/septagon.gif
share/graphviz/doc/html/info/shapes.html
@@ -317,6 +330,7 @@ share/graphviz/doc/pdf/dottyguide.pdf
share/graphviz/doc/pdf/fdp.1.pdf
share/graphviz/doc/pdf/gc.1.pdf
${PLIST.tcl}${PLIST.gd}share/graphviz/doc/pdf/gdtclft.3tcl.pdf
+share/graphviz/doc/pdf/gml2gv.1.pdf
share/graphviz/doc/pdf/graph.3.pdf
${PLIST.guile}share/graphviz/doc/pdf/gv.3guile.pdf
${PLIST.lua}share/graphviz/doc/pdf/gv.3lua.pdf
@@ -342,11 +356,14 @@ share/graphviz/doc/pdf/osage.1.pdf
share/graphviz/doc/pdf/pathplan.3.pdf
share/graphviz/doc/pdf/prune.pdf
share/graphviz/doc/pdf/sccmap.1.pdf
+share/graphviz/doc/pdf/sfdp.1.pdf
+share/graphviz/doc/pdf/smyrna.1.pdf
${PLIST.tcl}share/graphviz/doc/pdf/tcldot.3tcl.pdf
${PLIST.tcl}share/graphviz/doc/pdf/tkspline.3tk.pdf
share/graphviz/doc/pdf/tred.1.pdf
share/graphviz/doc/pdf/twopi.1.pdf
share/graphviz/doc/pdf/unflatten.1.pdf
+share/graphviz/doc/pdf/xdot.3.pdf
share/graphviz/graphs/directed/KW91.gv
share/graphviz/graphs/directed/Latin1.gv
share/graphviz/graphs/directed/NaN.gv
diff --git a/graphics/graphviz/buildlink3.mk b/graphics/graphviz/buildlink3.mk
index 3ae060d06f9..602bbd42d7c 100644
--- a/graphics/graphviz/buildlink3.mk
+++ b/graphics/graphviz/buildlink3.mk
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.17 2009/03/20 19:24:40 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2010/11/17 15:46:21 dholland Exp $
BUILDLINK_TREE+= graphviz
.if !defined(GRAPHVIZ_BUILDLINK3_MK)
GRAPHVIZ_BUILDLINK3_MK:=
-BUILDLINK_API_DEPENDS.graphviz+= graphviz>=1.12
-BUILDLINK_ABI_DEPENDS.graphviz+= graphviz>=2.6nb5
+BUILDLINK_API_DEPENDS.graphviz+= graphviz>=2.26.3
+BUILDLINK_ABI_DEPENDS.graphviz+= graphviz>=2.26.3
BUILDLINK_PKGSRCDIR.graphviz?= ../../graphics/graphviz
.include "../../converters/libiconv/buildlink3.mk"
diff --git a/graphics/graphviz/distinfo b/graphics/graphviz/distinfo
index d587f0c0ddf..3fab16dac61 100644
--- a/graphics/graphviz/distinfo
+++ b/graphics/graphviz/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.36 2009/09/24 15:53:12 tnn Exp $
+$NetBSD: distinfo,v 1.37 2010/11/17 15:46:21 dholland Exp $
-SHA1 (graphviz-2.24.0.tar.gz) = 1d91b3a7d2c7fa15e5e718eb456210cd15731e14
-RMD160 (graphviz-2.24.0.tar.gz) = d003cfa57e73c44fbb71ae8f8726ecc9c74735f9
-Size (graphviz-2.24.0.tar.gz) = 16746568 bytes
-SHA1 (patch-aa) = 6474c4820e8594259700fca68bc11f04b619f20f
-SHA1 (patch-ab) = d7f1fc601aa959db1da1def19cfeba15e8ef98d6
+SHA1 (graphviz-2.26.3.tar.gz) = 04503ac5a9eaa579859f0d017811fa245717edec
+RMD160 (graphviz-2.26.3.tar.gz) = b2fbaf03b2006b43ed70e2a710363d7efbcfda77
+Size (graphviz-2.26.3.tar.gz) = 17092429 bytes
+SHA1 (patch-aa) = 8013a17f63cc15e29badf6a3c14fbd740635d398
+SHA1 (patch-ab) = cbc12617a04bed611c44619ba14088c0c28de7ed
SHA1 (patch-ag) = 1eb3aab33f132b019a3faaa80bb68d44daa58f61
-SHA1 (patch-aj) = 743e72721f08e99661b09a49b867056dc1c97d3c
-SHA1 (patch-ak) = a70995383b63f51f7ddd3412ccf3867a61d3010d
+SHA1 (patch-aj) = af8c688a0beeabfc391dde7acc9c33afe9ac3546
+SHA1 (patch-ak) = d8b06e60be1014387f07ae5f00dce33a2096b855
SHA1 (patch-ap) = 946df77ed76b1da7de6789247079755a39e9aee3
diff --git a/graphics/graphviz/patches/patch-aa b/graphics/graphviz/patches/patch-aa
index 46f2f10651e..bb9242985f8 100644
--- a/graphics/graphviz/patches/patch-aa
+++ b/graphics/graphviz/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.12 2009/09/24 15:53:12 tnn Exp $
+$NetBSD: patch-aa,v 1.13 2010/11/17 15:46:21 dholland Exp $
---- configure.ac.orig 2009-06-17 01:24:18.000000000 +0200
+--- configure.ac.orig 2010-01-26 16:00:29.000000000 +0000
+++ configure.ac
@@ -83,13 +83,24 @@ AC_SUBST(GVPLUGIN_VERSION)
GRAPHVIZ_VERSION_BUILD=0
@@ -31,7 +31,7 @@ $NetBSD: patch-aa,v 1.12 2009/09/24 15:53:12 tnn Exp $
fi
;;
esac
-@@ -811,7 +822,7 @@ else
+@@ -802,7 +813,7 @@ else
LUA_VERSION=`$PKGCONFIG --modversion lua$l`
LUA_INCLUDES="$LUA_CFLAGS "`$PKGCONFIG --cflags lua$l`
LUA_LIBS="$LUA_LFLAGS "`$PKGCONFIG --libs lua$l`
@@ -40,7 +40,7 @@ $NetBSD: patch-aa,v 1.12 2009/09/24 15:53:12 tnn Exp $
pkgconfig_lualib_found=`$PKGCONFIG --exists lualib$l 2>/dev/null`
if test "x$?" = "x0"; then
-@@ -833,7 +844,7 @@ else
+@@ -824,7 +835,7 @@ else
LUA_INCLUDES=`$LUACONFIG --include`
LUA_LIBS=`$LUACONFIG --libs`
LUA_VERSION="5.0.x"
@@ -49,7 +49,7 @@ $NetBSD: patch-aa,v 1.12 2009/09/24 15:53:12 tnn Exp $
fi
fi
-@@ -923,8 +934,8 @@ else
+@@ -914,8 +925,8 @@ else
use_ocaml="No (ocaml not available)"
else
AC_CHECK_PROG(OCAML_OPT,ocamlopt,ocamlopt)
@@ -60,7 +60,7 @@ $NetBSD: patch-aa,v 1.12 2009/09/24 15:53:12 tnn Exp $
save_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $OCAML_INCLUDES"
AC_CHECK_HEADER(caml/mlvalues.h,[
-@@ -1010,13 +1021,13 @@ else
+@@ -1008,13 +1019,13 @@ else
if test "x$PHP" = "x"; then
use_php="No (php not available)"
else
@@ -79,7 +79,7 @@ $NetBSD: patch-aa,v 1.12 2009/09/24 15:53:12 tnn Exp $
PHP_LIBS=
save_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $PHP_INCLUDES"
-@@ -2324,7 +2335,7 @@ dnl INCLUDES and LIBS for PLATFORMSDK
+@@ -2325,7 +2336,7 @@ dnl INCLUDES and LIBS for PLATFORMSDK
AC_ARG_WITH(platformsdkincludedir,
[AS_HELP_STRING([--with-platformsdkincludedir=DIR],[use Platform SDK (Windows) includes from DIR])],
@@ -88,7 +88,7 @@ $NetBSD: patch-aa,v 1.12 2009/09/24 15:53:12 tnn Exp $
AC_ARG_WITH(platformsdklibdir,
[AS_HELP_STRING([--with-platformsdklibdir=DIR],[use Platform SDK (Windows) libraries from DIR])],
-@@ -2869,10 +2880,12 @@ AC_MSG_CHECKING(if have working sincos()
+@@ -2896,10 +2907,12 @@ AC_MSG_CHECKING(if have working sincos()
AC_RUN_IFELSE([AC_LANG_SOURCE([[
#include <stdio.h>
#include <assert.h>
@@ -101,3 +101,12 @@ $NetBSD: patch-aa,v 1.12 2009/09/24 15:53:12 tnn Exp $
sincos(PI/2.0,&sinx,&cosx);
assert(sinx>0.9999999);
assert(sinx<1.0000001);
+@@ -3158,7 +3171,7 @@ else
+ use_gv_tcl="Yes"
+ fi
+ if test "x$use_gd" != "xYes"; then
+- if test "x$use_gd" == "xYes (internal)"; then
++ if test "x$use_gd" = "xYes (internal)"; then
+ use_gdtclft="Yes"
+ else
+ use_gdtclft="No (gd not available)"
diff --git a/graphics/graphviz/patches/patch-ab b/graphics/graphviz/patches/patch-ab
index edd02f5b915..62dad745efe 100644
--- a/graphics/graphviz/patches/patch-ab
+++ b/graphics/graphviz/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.18 2009/09/24 15:53:12 tnn Exp $
+$NetBSD: patch-ab,v 1.19 2010/11/17 15:46:21 dholland Exp $
---- configure.orig 2009-06-17 01:24:55.000000000 +0200
+--- configure.orig 2010-01-26 16:01:10.000000000 +0000
+++ configure
-@@ -2797,11 +2797,18 @@ case "${host_os}" in
+@@ -2822,11 +2822,18 @@ 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
@@ -24,7 +24,7 @@ $NetBSD: patch-ab,v 1.18 2009/09/24 15:53:12 tnn Exp $
-@@ -6729,6 +6736,9 @@ test -n "$RC" || RC="false"
+@@ -6850,6 +6857,9 @@ test -n "$RC" || RC="false"
;;
*-sgi-irix* )
;;
@@ -34,7 +34,7 @@ $NetBSD: patch-ab,v 1.18 2009/09/24 15:53:12 tnn Exp $
esac
else
for ac_prog in windres
-@@ -26982,7 +26992,7 @@ $as_echo_n "checking for Lua headers and
+@@ -24867,7 +24877,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`
@@ -43,7 +43,7 @@ $NetBSD: patch-ab,v 1.18 2009/09/24 15:53:12 tnn Exp $
pkgconfig_lualib_found=`$PKGCONFIG --exists lualib$l 2>/dev/null`
if test "x$?" = "x0"; then
-@@ -27046,7 +27056,7 @@ $as_echo_n "checking for Lua headers and
+@@ -24931,7 +24941,7 @@ $as_echo_n "checking for Lua headers and
LUA_INCLUDES=`$LUACONFIG --include`
LUA_LIBS=`$LUACONFIG --libs`
LUA_VERSION="5.0.x"
@@ -52,7 +52,7 @@ $NetBSD: patch-ab,v 1.18 2009/09/24 15:53:12 tnn Exp $
fi
fi
-@@ -27650,8 +27660,8 @@ $as_echo "no" >&6; }
+@@ -25535,8 +25545,8 @@ $as_echo "no" >&6; }
fi
@@ -63,7 +63,7 @@ $NetBSD: patch-ab,v 1.18 2009/09/24 15:53:12 tnn Exp $
save_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $OCAML_INCLUDES"
if test "${ac_cv_header_caml_mlvalues_h+set}" = set; then
-@@ -28111,13 +28121,13 @@ fi
+@@ -26003,13 +26013,13 @@ fi
if test "x$PHP" = "x"; then
use_php="No (php not available)"
else
@@ -82,7 +82,7 @@ $NetBSD: patch-ab,v 1.18 2009/09/24 15:53:12 tnn Exp $
PHP_LIBS=
save_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $PHP_INCLUDES"
-@@ -34364,7 +34374,7 @@ fi
+@@ -32259,7 +32269,7 @@ fi
# Check whether --with-platformsdkincludedir was given.
if test "${with_platformsdkincludedir+set}" = set; then
@@ -91,7 +91,7 @@ $NetBSD: patch-ab,v 1.18 2009/09/24 15:53:12 tnn Exp $
fi
-@@ -36981,10 +36991,12 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -34907,10 +34917,12 @@ cat >>conftest.$ac_ext <<_ACEOF
#include <stdio.h>
#include <assert.h>
@@ -104,3 +104,12 @@ $NetBSD: patch-ab,v 1.18 2009/09/24 15:53:12 tnn Exp $
sincos(PI/2.0,&sinx,&cosx);
assert(sinx>0.9999999);
assert(sinx<1.0000001);
+@@ -38777,7 +38791,7 @@ else
+ use_gv_tcl="Yes"
+ fi
+ if test "x$use_gd" != "xYes"; then
+- if test "x$use_gd" == "xYes (internal)"; then
++ if test "x$use_gd" = "xYes (internal)"; then
+ use_gdtclft="Yes"
+ else
+ use_gdtclft="No (gd not available)"
diff --git a/graphics/graphviz/patches/patch-aj b/graphics/graphviz/patches/patch-aj
index 2a1ddb2eb52..55c8896a08c 100644
--- a/graphics/graphviz/patches/patch-aj
+++ b/graphics/graphviz/patches/patch-aj
@@ -1,20 +1,20 @@
-$NetBSD: patch-aj,v 1.11 2009/05/17 12:55:52 sno Exp $
+$NetBSD: patch-aj,v 1.12 2010/11/17 15:46:21 dholland Exp $
---- plugin/gd/Makefile.am.orig 2009-03-01 16:57:51.000000000 +0000
-+++ plugin/gd/Makefile.am 2009-04-25 18:09:16.000000000 +0000
-@@ -39,6 +39,7 @@
+--- plugin/gd/Makefile.am.orig 2009-09-10 23:18:32.000000000 +0000
++++ plugin/gd/Makefile.am
+@@ -39,6 +39,7 @@ libgvplugin_gd_la_LIBADD = \
$(top_builddir)/lib/gd/libgvgd_C.la \
$(top_builddir)/lib/gvc/libgvc.la \
$(top_builddir)/lib/$(GRAPH)/lib$(GRAPH).la \
+ $(top_builddir)/lib/pathplan/libpathplan.la \
$(top_builddir)/lib/cdt/libcdt.la \
- @ICONV_LIBS@ @FONTCONFIG_LIBS@ @FREETYPE2_LIBS@ @JPEG_LIBS@ @PNG_LIBS@ @EXPAT_LIBS@ @Z_LIBS@ @MATH_LIBS@
+ @PANGOCAIRO_LIBS@ @ICONV_LIBS@ @FONTCONFIG_LIBS@ @FREETYPE2_LIBS@ @JPEG_LIBS@ @PNG_LIBS@ @EXPAT_LIBS@ @Z_LIBS@ @MATH_LIBS@
AM_CPPFLAGS += -DNONDLL
-@@ -46,6 +47,7 @@
+@@ -46,6 +47,7 @@ else
libgvplugin_gd_la_LIBADD = \
$(top_builddir)/lib/gvc/libgvc.la \
$(top_builddir)/lib/$(GRAPH)/lib$(GRAPH).la \
+ $(top_builddir)/lib/pathplan/libpathplan.la \
- $(top_builddir)/lib/cdt/libcdt.la @GD_LIBS@ @MATH_LIBS@
+ $(top_builddir)/lib/cdt/libcdt.la @PANGOCAIRO_LIBS@ @GD_LIBS@ @MATH_LIBS@
endif
libgvplugin_gd_la_DEPENDENCIES = $(top_builddir)/lib/gvc/libgvc.la
diff --git a/graphics/graphviz/patches/patch-ak b/graphics/graphviz/patches/patch-ak
index 645eb00e818..5a51dd262c7 100644
--- a/graphics/graphviz/patches/patch-ak
+++ b/graphics/graphviz/patches/patch-ak
@@ -1,19 +1,20 @@
-$NetBSD: patch-ak,v 1.13 2009/05/17 12:55:52 sno Exp $
+$NetBSD: patch-ak,v 1.14 2010/11/17 15:46:21 dholland Exp $
---- plugin/gd/Makefile.in.orig 2009-03-13 18:19:20.000000000 +0000
-+++ plugin/gd/Makefile.in 2009-04-25 18:15:00.000000000 +0000
-@@ -410,12 +410,14 @@
+--- plugin/gd/Makefile.in.orig 2010-01-26 16:01:27.000000000 +0000
++++ plugin/gd/Makefile.in
+@@ -448,6 +448,7 @@ libgvplugin_gd_la_SOURCES = $(libgvplugi
@WITH_MYLIBGD_FALSE@libgvplugin_gd_la_LIBADD = \
@WITH_MYLIBGD_FALSE@ $(top_builddir)/lib/gvc/libgvc.la \
@WITH_MYLIBGD_FALSE@ $(top_builddir)/lib/$(GRAPH)/lib$(GRAPH).la \
+@WITH_MYLIBGD_FALSE@ $(top_builddir)/lib/pathplan/libpathplan.la \
@WITH_MYLIBGD_FALSE@ $(top_builddir)/lib/cdt/libcdt.la \
- @WITH_MYLIBGD_FALSE@ @GD_LIBS@ @MATH_LIBS@ $(am__append_3)
- @WITH_MYLIBGD_TRUE@libgvplugin_gd_la_LIBADD = \
+ @WITH_MYLIBGD_FALSE@ @PANGOCAIRO_LIBS@ @GD_LIBS@ @MATH_LIBS@ \
+ @WITH_MYLIBGD_FALSE@ $(am__append_3)
+@@ -455,6 +456,7 @@ libgvplugin_gd_la_SOURCES = $(libgvplugi
@WITH_MYLIBGD_TRUE@ $(top_builddir)/lib/gd/libgvgd_C.la \
@WITH_MYLIBGD_TRUE@ $(top_builddir)/lib/gvc/libgvc.la \
@WITH_MYLIBGD_TRUE@ $(top_builddir)/lib/$(GRAPH)/lib$(GRAPH).la \
+@WITH_MYLIBGD_TRUE@ $(top_builddir)/lib/pathplan/libpathplan.la \
@WITH_MYLIBGD_TRUE@ $(top_builddir)/lib/cdt/libcdt.la \
- @WITH_MYLIBGD_TRUE@ @ICONV_LIBS@ @FONTCONFIG_LIBS@ \
- @WITH_MYLIBGD_TRUE@ @FREETYPE2_LIBS@ @JPEG_LIBS@ @PNG_LIBS@ \
+ @WITH_MYLIBGD_TRUE@ @PANGOCAIRO_LIBS@ @ICONV_LIBS@ \
+ @WITH_MYLIBGD_TRUE@ @FONTCONFIG_LIBS@ @FREETYPE2_LIBS@ \
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-29 12:36:12 +0000