Hi,
As pointed out by Sebastian Trahm, the version of graphviz in-tree has
security issues:
http://www.debian.org/security/2014/dsa-2843
So here is an update to the newest version. OK?
Index: Makefile
===================================================================
RCS file: /home/edd/cvsync/cvs/ports/math/graphviz/Makefile,v
retrieving revision 1.54
diff -u -p -r1.54 Makefile
--- Makefile 7 Jan 2014 10:01:47 -0000 1.54
+++ Makefile 4 Feb 2014 21:45:32 -0000
@@ -2,7 +2,7 @@
COMMENT-main= graph drawing software
-DISTNAME= graphviz-2.28.0
+DISTNAME= graphviz-2.36.0
PKGNAME-main= ${DISTNAME}
CATEGORIES= math devel graphics
@@ -22,21 +22,21 @@ SHARED_LIBS += gvplugin_dot_layout 1.0 #
SHARED_LIBS += gvplugin_neato_layout 1.0 # 6.0
SHARED_LIBS += gvplugin_xlib 1.0 # 6.0
SHARED_LIBS += gvplugin_gtk 1.0 # 6.0
-SHARED_LIBS += gvplugin_gdk_pixbuf 0.0 # 6.0
SHARED_LIBS += gvplugin_rsvg 0.0 # 6.0
+SHARED_LIBS += gvplugin_gdk 0.0 # 6.0
+SHARED_LIBS += gvplugin_poppler 0.0 # 6.0
SHARED_LIBS += cdt 1.0 # 5.0
-SHARED_LIBS += graph 2.0 # 5.0
SHARED_LIBS += pathplan 2.0 # 4.0
SHARED_LIBS += gvc 1.0 # 6.0
SHARED_LIBS += cgraph 0.0 # 6.0
SHARED_LIBS += gvpr 0.0 # 2.0
SHARED_LIBS += xdot 0.0 # 4.0
-SHARED_LIBS += gdtclft 2.0 # unknown
-SHARED_LIBS += tcldot 2.0 # unknown
-SHARED_LIBS += tcldot_builtin 2.0 # unknown
-SHARED_LIBS += tclplan 2.0 # unknown
-SHARED_LIBS += tkspline 2.0 # unknown
+SHARED_LIBS += gdtclft 3.0 # unknown
+SHARED_LIBS += tcldot 3.0 # unknown
+SHARED_LIBS += tcldot_builtin 3.0 # unknown
+SHARED_LIBS += tclplan 3.0 # unknown
+SHARED_LIBS += tkspline 3.0 # unknown
HOMEPAGE= http://www.graphviz.org/
@@ -48,27 +48,31 @@ PERMIT_PACKAGE_CDROM= Yes
MODULES= devel/gettext \
x11/tk \
perl
-LIB_DEPENDS= graphics/jpeg \
+LIB_DEPENDS = graphics/jpeg \
graphics/png \
devel/libtool,-ltdl \
graphics/gd>=2.0.34 \
x11/gtk+2 \
www/libcroco \
x11/gnome/librsvg \
- ${_MODTK_SPEC}:x11/tk/${MODTK_VERSION}
+ graphics/graphite2 \
+ devel/harfbuzz \
+ print/poppler \
+ ${MODTK_LIB_DEPENDS}
RUN_DEPENDS= lang/guile
BUILD_DEPENDS= devel/swig \
lang/guile
-TEST_DEPENDS=math/graphviz
+TEST_DEPENDS = ${FULLPKGNAME}:math/graphviz
-WANTLIB += GL ICE SM X11 Xau Xaw Xcomposite Xcursor Xdamage Xdmcp
-WANTLIB += Xext Xfixes Xi Xinerama Xmu Xpm Xrandr Xrender Xt Xxf86vm
-WANTLIB += atk-1.0 c cairo croco-0.6 drm expat ffi fontconfig
+WANTLIB += ICE SM X11 Xau Xaw Xcomposite Xcursor Xdamage Xdmcp
+WANTLIB += Xext Xfixes Xft Xi Xinerama Xmu Xpm Xrandr Xrender
+WANTLIB += Xss Xt atk-1.0 c cairo croco-0.6 expat ffi fontconfig
WANTLIB += freetype gd gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0
-WANTLIB += gmodule-2.0 gobject-2.0 gthread-2.0 gtk-x11-2.0 jpeg
-WANTLIB += ltdl m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1
-WANTLIB += png pthread pthread-stubs rsvg-2 stdc++ xcb xcb-render
-WANTLIB += xcb-shm xml2 z ${MODTK_LIB} Xft Xss perl util
+WANTLIB += gmodule-2.0 gmp gobject-2.0 graphite2 gthread-2.0 gtk-x11-2.0
+WANTLIB += guile harfbuzz jpeg lcms2 ltdl m openjpeg pango-1.0
+WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre perl pixman-1 png
+WANTLIB += poppler poppler-glib pthread pthread-stubs rsvg-2 stdc++
+WANTLIB += tiff tk85 util xcb xcb-render xcb-shm xml2 z
USE_GMAKE = Yes
USE_GROFF = Yes
@@ -130,9 +134,16 @@ post-build:
.endfor
post-install:
- @# install pre-generated config6 to avoid @exec/@unexec-delete
+# install pre-generated config6 to avoid @exec/@unexec-delete
${SUBST_CMD} -c ${FILESDIR}/config6 ${PREFIX}/lib/graphviz/config6
chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/lib/graphviz/config6
+# Once upon a time, graphviz used to install the symlink:
+# ${PREFIX}/lib/tcl${MODTCL_VERSION}/graphviz -> ${PREFIX}/lib/tcl/graphviz
+# Now it installs a copy of the dir, however, 'pkg_add -u' can't update a
+# symlink to a dir, so we manually hack back the old symlink.
+ rm -Rf ${PREFIX}/lib/tcl${MODTCL_VERSION}/graphviz
+ ln -s ${TRUEPREFIX}/lib/tcl/graphviz \
+ ${PREFIX}/lib/tcl${MODTCL_VERSION}/graphviz
# Local tests for OpenBSD
# Can't run built in tests, as requires ksh93 (some specific arguments
Index: distinfo
===================================================================
RCS file: /home/edd/cvsync/cvs/ports/math/graphviz/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo 22 Aug 2012 09:55:01 -0000 1.6
+++ distinfo 4 Feb 2014 21:45:32 -0000
@@ -1,2 +1,2 @@
-SHA256 (graphviz-2.28.0.tar.gz) = 06p5c8V4yuTMJtnWSYxX7QZoDKuaTpQNA1ejxlJ6/HY=
-SIZE (graphviz-2.28.0.tar.gz) = 19620087
+SHA256 (graphviz-2.36.0.tar.gz) = N/1m2N7xWFdcdcT22/U2g55O5GiqWTFOtHLRrssHY2E=
+SIZE (graphviz-2.36.0.tar.gz) = 23846318
Index: files/config6
===================================================================
RCS file: /home/edd/cvsync/cvs/ports/math/graphviz/files/config6,v
retrieving revision 1.1
diff -u -p -r1.1 config6
--- files/config6 22 Aug 2012 09:55:01 -0000 1.1
+++ files/config6 4 Feb 2014 21:45:32 -0000
@@ -1,4 +1,3 @@
-# $OpenBSD: config6,v 1.1 2012/08/22 09:55:01 edd Exp $
# This file was generated by "dot -c" at time of install.
# You may temporarily disable a plugin by removing or commenting out
@@ -7,6 +6,125 @@
# Manual edits to this file **will be lost** on upgrade.
+libgvplugin_gd.so.${LIBgvplugin_gd_VERSION} gd {
+ render {
+ gd 1
+ }
+ render {
+ vrml 1
+ }
+ textlayout {
+ textlayout 2
+ }
+ loadimage {
+ gd:gd 1
+ gd2:gd 1
+ gif:gd 1
+ jpeg:gd 1
+ jpe:gd 1
+ jpg:gd 1
+ png:gd 1
+ gd:ps 1
+#FAILS gd:lasi 1
+ gd2:ps 1
+#FAILS gd2:lasi 1
+ gif:ps 1
+#FAILS gif:lasi 1
+ jpeg:ps 1
+ jpg:ps 1
+ jpe:ps 1
+#FAILS jpeg:lasi 1
+#FAILS jpg:lasi 1
+#FAILS jpe:lasi 1
+ png:ps 1
+#FAILS png:lasi 1
+ gd:cairo 1
+ gd2:cairo 1
+ gif:cairo 1
+ jpeg:cairo 1
+ jpg:cairo 1
+ jpe:cairo 1
+ png:cairo -1
+ }
+ device {
+ gif:cairo 10
+ wbmp:cairo 5
+ jpe:cairo 5
+ jpeg:cairo 5
+ jpg:cairo 5
+ png:cairo 5
+ gd:cairo 5
+ gd2:cairo 5
+ }
+ device {
+ gif:gd 1
+ wbmp:gd 1
+ jpe:gd 1
+ jpeg:gd 1
+ jpg:gd 1
+ png:gd 1
+ gd:gd 1
+ gd2:gd 1
+ }
+ device {
+ vrml:vrml 1
+ }
+}
+libgvplugin_gdk.so.${LIBgvplugin_gdk_VERSION} gdk {
+ device {
+ bmp:cairo 6
+ ico:cairo 6
+ jpe:cairo 6
+ jpeg:cairo 6
+ jpg:cairo 6
+ png:cairo 6
+ tif:cairo 6
+ tiff:cairo 6
+ }
+ loadimage {
+ bmp:cairo 1
+ jpe:cairo 2
+ jpg:cairo 2
+ jpeg:cairo 2
+ png:cairo -1
+ ico:cairo 1
+ }
+}
+libgvplugin_gtk.so.${LIBgvplugin_gtk_VERSION} gtk {
+ device {
+ gtk:cairo 0
+ }
+}
+libgvplugin_pango.so.${LIBgvplugin_pango_VERSION} cairo {
+ render {
+ cairo 10
+ }
+ textlayout {
+ textlayout 10
+ }
+ loadimage {
+ png:cairo 1
+#FAILS png:lasi 2
+ png:ps 2
+ }
+ device {
+ png:cairo 10
+ ps:cairo -10
+ pdf:cairo 10
+ svg:cairo -10
+ }
+}
+libgvplugin_poppler.so.${LIBgvplugin_poppler_VERSION} poppler {
+ loadimage {
+ pdf:cairo 1
+ }
+}
+libgvplugin_xlib.so.${LIBgvplugin_xlib_VERSION} xlib {
+ device {
+ xlib:cairo 0
+ x11:cairo 0
+ }
+}
libgvplugin_core.so.${LIBgvplugin_core_VERSION} core {
device {
dot:dot 1
@@ -15,6 +133,8 @@ libgvplugin_core.so.${LIBgvplugin_core_V
plain:dot 1
plain-ext:dot 1
xdot:xdot 1
+ xdot1.2:xdot 1
+ xdot1.4:xdot 1
}
device {
fig:fig 1
@@ -43,6 +163,12 @@ libgvplugin_core.so.${LIBgvplugin_core_V
vml:vml 1
vmlz:vml 1
}
+ device {
+ pic:pic -1
+ }
+ device {
+ pov:pov 1
+ }
render {
dot 1
xdot 1
@@ -65,6 +191,12 @@ libgvplugin_core.so.${LIBgvplugin_core_V
render {
vml 1
}
+ render {
+ pic -1
+ }
+ render {
+ pov 1
+ }
loadimage {
png:svg 1
gif:svg 1
@@ -82,9 +214,7 @@ libgvplugin_core.so.${LIBgvplugin_core_V
jpe:vrml 1
jpg:vrml 1
eps:ps 1
-#FAILS eps:lasi 1
ps:ps 1
-#FAILS ps:lasi 1
(lib):ps 1
png:map 1
gif:map 1
@@ -116,6 +246,7 @@ libgvplugin_core.so.${LIBgvplugin_core_V
jpeg:vml 1
jpe:vml 1
jpg:vml 1
+ gif:tk 1
}
}
libgvplugin_dot_layout.so.${LIBgvplugin_dot_layout_VERSION} dot_layout {
@@ -123,87 +254,6 @@ libgvplugin_dot_layout.so.${LIBgvplugin_
dot 0
}
}
-libgvplugin_gd.so.${LIBgvplugin_gd_VERSION} gd {
- render {
- gd 1
- }
- render {
- vrml 1
- }
- textlayout {
- textlayout 2
- }
- loadimage {
- gd:gd 1
- gd2:gd 1
- gif:gd 1
- jpeg:gd 1
- jpe:gd 1
- jpg:gd 1
- png:gd 1
- gd:ps 1
-#FAILS gd:lasi 1
- gd2:ps 1
-#FAILS gd2:lasi 1
- gif:ps 1
-#FAILS gif:lasi 1
- jpeg:ps 1
- jpg:ps 1
- jpe:ps 1
-#FAILS jpeg:lasi 1
-#FAILS jpg:lasi 1
-#FAILS jpe:lasi 1
- png:ps 1
-#FAILS png:lasi 1
- gd:cairo 1
- gd2:cairo 1
- gif:cairo 1
- jpeg:cairo 1
- jpg:cairo 1
- jpe:cairo 1
- png:cairo -1
- }
- device {
- gif:cairo 10
- wbmp:cairo 5
- jpe:cairo 5
- jpeg:cairo 5
- jpg:cairo 5
- png:cairo 5
- gd:cairo 5
- gd2:cairo 5
- }
- device {
- gif:gd 1
- wbmp:gd 1
- jpe:gd 1
- jpeg:gd 1
- jpg:gd 1
- png:gd 1
- gd:gd 1
- gd2:gd 1
- }
- device {
- vrml:vrml 1
- }
-}
-libgvplugin_gdk_pixbuf.so.${LIBgvplugin_gdk_pixbuf_VERSION} gdk_pixbuf {
- device {
- bmp:cairo 4
- ico:cairo 4
- jpe:cairo 4
- jpeg:cairo 4
- jpg:cairo 4
- png:cairo 4
- tif:cairo 4
- tiff:cairo 4
- }
-}
-libgvplugin_gtk.so.${LIBgvplugin_gtk_VERSION} gtk {
- device {
- gtk:cairo 0
- }
-}
libgvplugin_neato_layout.so.${LIBgvplugin_neato_layout_VERSION} neato_layout {
layout {
neato 0
@@ -218,33 +268,8 @@ libgvplugin_neato_layout.so.${LIBgvplugi
nop2 0
}
}
-libgvplugin_pango.so.${LIBgvplugin_pango_VERSION} cairo {
- render {
- cairo 10
- }
- textlayout {
- textlayout 10
- }
- loadimage {
- png:cairo 1
-#FAILS png:lasi 2
- png:ps 2
- }
- device {
- png:cairo 10
- ps:cairo -10
- pdf:cairo 10
- svg:cairo -10
- }
-}
libgvplugin_rsvg.so.${LIBgvplugin_rsvg_VERSION} rsvg {
loadimage {
svg:cairo 1
- }
-}
-libgvplugin_xlib.so.${LIBgvplugin_xlib_VERSION} xlib {
- device {
- xlib:cairo 0
- x11:cairo 0
}
}
Index: files/tests/dot-test.dot.expect
===================================================================
RCS file:
/home/edd/cvsync/cvs/ports/math/graphviz/files/tests/dot-test.dot.expect,v
retrieving revision 1.1
diff -u -p -r1.1 dot-test.dot.expect
--- files/tests/dot-test.dot.expect 31 Aug 2012 19:50:01 -0000 1.1
+++ files/tests/dot-test.dot.expect 4 Feb 2014 21:45:32 -0000
@@ -1,11 +1,17 @@
digraph g {
- node [label="\N"];
graph [bb="0,0,81,180"];
- a [pos="54,162", width="0.75", height="0.5"];
- b [pos="27,90", width="0.75", height="0.5"];
- c [pos="54,18", width="0.75", height="0.5"];
- a -> b [pos="e,33.54,107.96 47.601,144.41 44.486,136.34 40.666,126.43
37.165,117.35"];
- b -> c [pos="e,47.46,35.956 33.399,72.411 36.514,64.335 40.334,54.431
43.835,45.355"];
- c -> a [pos="e,57.654,143.91 57.654,36.092 59.676,46.431 61.981,59.91
63,72 64.344,87.943 64.344,92.057 63,108 62.283,116.5 60.931,125.69 59.488\
-,133.99"];
+ node [label="\N"];
+ a [height=0.5,
+ pos="54,162",
+ width=0.75];
+ b [height=0.5,
+ pos="27,90",
+ width=0.75];
+ a -> b [pos="e,33.54,107.96 47.601,144.41 44.486,136.34 40.666,126.43
37.165,117.35"];
+ c [height=0.5,
+ pos="54,18",
+ width=0.75];
+ b -> c [pos="e,47.46,35.956 33.399,72.411 36.514,64.335 40.334,54.431
43.835,45.355"];
+ c -> a [pos="e,57.654,143.91 57.654,36.092 59.676,46.431 61.981,59.91
63,72 64.344,87.943 64.344,92.057 63,108 62.283,116.5 60.931,125.69 59.488,\
+133.99"];
}
Index: files/tests/guile-test.scm.expect
===================================================================
RCS file:
/home/edd/cvsync/cvs/ports/math/graphviz/files/tests/guile-test.scm.expect,v
retrieving revision 1.1
diff -u -p -r1.1 guile-test.scm.expect
--- files/tests/guile-test.scm.expect 31 Aug 2012 19:50:01 -0000 1.1
+++ files/tests/guile-test.scm.expect 4 Feb 2014 21:45:32 -0000
@@ -1,11 +1,17 @@
digraph g {
- node [label="\N"];
graph [bb="0,0,81,180"];
- a [pos="54,162", width="0.75", height="0.5"];
- b [pos="27,90", width="0.75", height="0.5"];
- c [pos="54,18", width="0.75", height="0.5"];
- a -> b [pos="e,33.54,107.96 47.601,144.41 44.486,136.34 40.666,126.43
37.165,117.35"];
- b -> c [pos="e,47.46,35.956 33.399,72.411 36.514,64.335 40.334,54.431
43.835,45.355"];
- c -> a [pos="e,57.654,143.91 57.654,36.092 59.676,46.431 61.981,59.91
63,72 64.344,87.943 64.344,92.057 63,108 62.283,116.5 60.931,125.69 59.488\
-,133.99"];
+ node [label="\N"];
+ a [height=0.5,
+ pos="54,162",
+ width=0.75];
+ b [height=0.5,
+ pos="27,90",
+ width=0.75];
+ a -> b [pos="e,33.54,107.96 47.601,144.41 44.486,136.34 40.666,126.43
37.165,117.35"];
+ c [height=0.5,
+ pos="54,18",
+ width=0.75];
+ b -> c [pos="e,47.46,35.956 33.399,72.411 36.514,64.335 40.334,54.431
43.835,45.355"];
+ c -> a [pos="e,57.654,143.91 57.654,36.092 59.676,46.431 61.981,59.91
63,72 64.344,87.943 64.344,92.057 63,108 62.283,116.5 60.931,125.69 59.488,\
+133.99"];
}
Index: files/tests/neato-test.nto.expect
===================================================================
RCS file:
/home/edd/cvsync/cvs/ports/math/graphviz/files/tests/neato-test.nto.expect,v
retrieving revision 1.1
diff -u -p -r1.1 neato-test.nto.expect
--- files/tests/neato-test.nto.expect 31 Aug 2012 19:50:01 -0000 1.1
+++ files/tests/neato-test.nto.expect 4 Feb 2014 21:45:32 -0000
@@ -1,14 +1,24 @@
graph g {
- node [label="\N"];
graph [bb="0,0,176.35,163.87"];
- 1 [pos="41.352,25.566", width="0.75", height="0.5"];
- 2 [pos="108.39,18", width="0.75", height="0.5"];
- 3 [pos="82.599,90.149", width="0.75", height="0.5"];
- 4 [pos="27,145.87", width="0.75", height="0.5"];
- 5 [pos="149.35,131.88", width="0.75", height="0.5"];
- 1 -- 2 [pos="68.233,22.532 72.604,22.039 77.133,21.528 81.504,21.034"];
- 2 -- 3 [pos="102.02,35.835 98.018,47.018 92.885,61.375 88.901,72.52"];
- 4 -- 3 [pos="42.193,130.65 50.038,122.78 59.582,113.22 67.425,105.36"];
- 5 -- 3 [pos="129.32,119.36 120.88,114.08 111.06,107.94 102.61,102.66"];
- 3 -- 1 [pos="71.977,73.517 65.866,63.95 58.21,51.962 52.081,42.366"];
+ node [label="\N"];
+ 1 [height=0.5,
+ pos="41.352,25.566",
+ width=0.75];
+ 2 [height=0.5,
+ pos="108.39,18",
+ width=0.75];
+ 1 -- 2 [pos="68.233,22.532 72.604,22.039 77.133,21.528
81.504,21.034"];
+ 3 [height=0.5,
+ pos="82.599,90.149",
+ width=0.75];
+ 2 -- 3 [pos="102.02,35.835 98.018,47.018 92.885,61.375 88.901,72.52"];
+ 3 -- 1 [pos="71.977,73.517 65.866,63.95 58.21,51.962 52.081,42.366"];
+ 4 [height=0.5,
+ pos="27,145.87",
+ width=0.75];
+ 4 -- 3 [pos="42.193,130.65 50.038,122.78 59.582,113.22
67.425,105.36"];
+ 5 [height=0.5,
+ pos="149.35,131.88",
+ width=0.75];
+ 5 -- 3 [pos="129.32,119.36 120.88,114.08 111.06,107.94
102.61,102.66"];
}
Index: files/tests/perl-test.pl.expect
===================================================================
RCS file:
/home/edd/cvsync/cvs/ports/math/graphviz/files/tests/perl-test.pl.expect,v
retrieving revision 1.1
diff -u -p -r1.1 perl-test.pl.expect
--- files/tests/perl-test.pl.expect 31 Aug 2012 19:50:01 -0000 1.1
+++ files/tests/perl-test.pl.expect 4 Feb 2014 21:45:32 -0000
@@ -1,10 +1,16 @@
graph test {
- node [label="\N"];
graph [bb="0,0,81,180"];
- a [pos="54,162", width="0.75", height="0.5"];
- b [pos="27,90", width="0.75", height="0.5"];
- c [pos="54,18", width="0.75", height="0.5"];
- a -- b [pos="47.601,144.41 43.36,133.41 37.811,119.03 33.54,107.96"];
- b -- c [pos="33.399,72.411 37.64,61.414 43.189,47.027 47.46,35.956"];
- c -- a [pos="57.654,36.092 59.676,46.431 61.981,59.91 63,72
64.344,87.943 64.344,92.057 63,108 61.981,120.09 59.676,133.57 57.654,143.91"];
+ node [label="\N"];
+ a [height=0.5,
+ pos="54,162",
+ width=0.75];
+ b [height=0.5,
+ pos="27,90",
+ width=0.75];
+ a -- b [pos="47.601,144.41 43.36,133.41 37.811,119.03 33.54,107.96"];
+ c [height=0.5,
+ pos="54,18",
+ width=0.75];
+ b -- c [pos="33.399,72.411 37.64,61.414 43.189,47.027 47.46,35.956"];
+ c -- a [pos="57.654,36.092 59.676,46.431 61.981,59.91 63,72
64.344,87.943 64.344,92.057 63,108 61.981,120.09 59.676,133.57 57.654,143.91"];
}
Index: files/tests/tcl-test.tcl.expect
===================================================================
RCS file:
/home/edd/cvsync/cvs/ports/math/graphviz/files/tests/tcl-test.tcl.expect,v
retrieving revision 1.1
diff -u -p -r1.1 tcl-test.tcl.expect
--- files/tests/tcl-test.tcl.expect 31 Aug 2012 19:50:01 -0000 1.1
+++ files/tests/tcl-test.tcl.expect 4 Feb 2014 21:45:32 -0000
@@ -1,11 +1,17 @@
digraph G {
- node [label="\N"];
graph [bb="0,0,81,180"];
- a [pos="54,162", width="0.75", height="0.5"];
- b [pos="27,90", width="0.75", height="0.5"];
- c [pos="54,18", width="0.75", height="0.5"];
- a -> b [pos="e,33.54,107.96 47.601,144.41 44.486,136.34 40.666,126.43
37.165,117.35"];
- b -> c [pos="e,47.46,35.956 33.399,72.411 36.514,64.335 40.334,54.431
43.835,45.355"];
- c -> a [pos="e,57.654,143.91 57.654,36.092 59.676,46.431 61.981,59.91
63,72 64.344,87.943 64.344,92.057 63,108 62.283,116.5 60.931,125.69 59.488\
-,133.99"];
+ node [label="\N"];
+ a [height=0.5,
+ pos="54,162",
+ width=0.75];
+ b [height=0.5,
+ pos="27,90",
+ width=0.75];
+ a -> b [pos="e,33.54,107.96 47.601,144.41 44.486,136.34 40.666,126.43
37.165,117.35"];
+ c [height=0.5,
+ pos="54,18",
+ width=0.75];
+ b -> c [pos="e,47.46,35.956 33.399,72.411 36.514,64.335 40.334,54.431
43.835,45.355"];
+ c -> a [pos="e,57.654,143.91 57.654,36.092 59.676,46.431 61.981,59.91
63,72 64.344,87.943 64.344,92.057 63,108 62.283,116.5 60.931,125.69 59.488,\
+133.99"];
}
Index: patches/patch-Makefile_in
===================================================================
RCS file: /home/edd/cvsync/cvs/ports/math/graphviz/patches/patch-Makefile_in,v
retrieving revision 1.1
diff -u -p -r1.1 patch-Makefile_in
--- patches/patch-Makefile_in 22 Aug 2012 09:55:01 -0000 1.1
+++ patches/patch-Makefile_in 4 Feb 2014 21:45:32 -0000
@@ -1,14 +1,14 @@
-$OpenBSD: patch-Makefile_in,v 1.1 2012/08/22 09:55:01 edd Exp $
+$OpenBSD$
-A construction that is not compatible with BSD grep.
+Fix grep syntax.
---- Makefile.in.orig2 Sun Jun 17 22:55:39 2012
-+++ Makefile.in Sun Jun 17 22:56:39 2012
-@@ -1179,7 +1179,7 @@ dist-hook:
+--- Makefile.in.orig2 Sun Feb 2 17:33:01 2014
++++ Makefile.in Sun Feb 2 17:33:08 2014
+@@ -1246,7 +1246,7 @@ dist-hook:
find $(distdir) -name CVS -type d -prune -exec rm -rf {} \;
- graphviz_version.h: config.h
-- $(GREP) 'PACKAGE\|VERSION\|GVPLUGIN' config.h > graphviz_version.h
+ $(top_builddir)/graphviz_version.h: config.h
+- $(GREP) 'PACKAGE\|VERSION\|GVPLUGIN' config.h >
$(top_builddir)/graphviz_version.h
+ $(GREP) -E '(PACKAGE|VERSION|GVPLUGIN)' config.h > graphviz_version.h
.PHONY: rpm
Index: patches/patch-cmd_dot_Makefile_in
===================================================================
RCS file:
/home/edd/cvsync/cvs/ports/math/graphviz/patches/patch-cmd_dot_Makefile_in,v
retrieving revision 1.2
diff -u -p -r1.2 patch-cmd_dot_Makefile_in
--- patches/patch-cmd_dot_Makefile_in 22 Aug 2012 09:55:01 -0000 1.2
+++ patches/patch-cmd_dot_Makefile_in 4 Feb 2014 21:45:32 -0000
@@ -1,17 +1,18 @@
-$OpenBSD: patch-cmd_dot_Makefile_in,v 1.2 2012/08/22 09:55:01 edd Exp $
+$OpenBSD$
Add pthread linkage or '@exec dot -c' will fail with "file not found"
when trying to dlopen(). Not because the file is missing, but because
there is a linker error. Sigh, obvious isn't it?
---- cmd/dot/Makefile.in.orig2 Sat May 7 04:27:39 2011
-+++ cmd/dot/Makefile.in Mon Jun 18 12:39:40 2012
-@@ -570,7 +570,7 @@ man_MANS = dot.1 osage.1 patchwork.1
- pdf_DATA = dot.1.pdf osage.1.pdf patchwork.1.pdf
- dot_SOURCES = dot.c no_builtins.c
+--- cmd/dot/Makefile.in.orig2 Sun Feb 2 23:23:31 2014
++++ cmd/dot/Makefile.in Sun Feb 2 23:24:22 2014
+@@ -615,7 +615,8 @@ dot_SOURCES = dot.c no_builtins.c
dot_CPPFLAGS = $(AM_CPPFLAGS) -DDEMAND_LOADING=1
--dot_LDADD = $(top_builddir)/lib/gvc/libgvc.la
-+dot_LDADD = $(top_builddir)/lib/gvc/libgvc.la -pthread
+ dot_LDADD = \
+ $(top_builddir)/lib/gvc/libgvc.la \
+- $(top_builddir)/lib/cgraph/libcgraph.la
++ $(top_builddir)/lib/cgraph/libcgraph.la \
++ -pthread
+
dot_static_SOURCES = dot.c dot_builtins.c
dot_static_CPPFLAGS = $(AM_CPPFLAGS) -DDEMAND_LOADING=0
- dot_static_LDADD = \
Index: patches/patch-cmd_lefty_os_unix_io_c
===================================================================
RCS file: patches/patch-cmd_lefty_os_unix_io_c
diff -N patches/patch-cmd_lefty_os_unix_io_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-cmd_lefty_os_unix_io_c 4 Feb 2014 21:45:32 -0000
@@ -0,0 +1,18 @@
+$OpenBSD$
+
+We have no AI_ADDRCONFIG.
+
+--- cmd/lefty/os/unix/io.c.orig2 Sun Feb 2 17:56:51 2014
++++ cmd/lefty/os/unix/io.c Sun Feb 2 17:58:03 2014
+@@ -13,6 +13,11 @@
+
+ /* Lefteris Koutsofios - AT&T Labs Research */
+
++/* The BSDs do not support the addrinfo AI_ADDRCONFIG flag */
++#if defined(__OpenBSD__)
++#define AI_ADDRCONFIG 0
++#endif
++
+ #include "common.h"
+ #include "io.h"
+ #ifdef FEATURE_CS
Index: patches/patch-config_config_perl_pl
===================================================================
RCS file:
/home/edd/cvsync/cvs/ports/math/graphviz/patches/patch-config_config_perl_pl,v
retrieving revision 1.1
diff -u -p -r1.1 patch-config_config_perl_pl
--- patches/patch-config_config_perl_pl 22 Aug 2012 09:55:01 -0000 1.1
+++ patches/patch-config_config_perl_pl 4 Feb 2014 21:45:32 -0000
@@ -2,12 +2,21 @@ $OpenBSD: patch-config_config_perl_pl,v
Correctly detect install directory
---- config/config_perl.pl.orig2 Wed Jun 20 10:54:19 2012
-+++ config/config_perl.pl Wed Jun 20 10:55:28 2012
-@@ -11,5 +11,5 @@ if ($ARGV[0] eq "PERL_INCLUDES") {
+--- config/config_perl.pl.orig2 Sat Jan 11 22:59:44 2014
++++ config/config_perl.pl Mon Feb 3 10:19:35 2014
+@@ -11,14 +11,5 @@ if ($ARGV[0] eq "PERL_INCLUDES") {
print "-I$archlib/CORE";
}
if ($ARGV[0] eq "PERL_INSTALL_DIR") {
-- print "$Config{vendorarch}"
-+ print "$Config{installsitearch}"
+-
+- my $d;
+-
+- foreach $d (qw(installvendorarch vendorarch installsitearch sitearch)) {
+- if (exists($Config{$d}) and defined($Config{$d}) and
+- ($Config{$d} ne '') ) {
+- print "$Config{$d}";
+- last;
+- }
+- }
++ print "$Config{installsitearch}";
}
Index: patches/patch-configure
===================================================================
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-configure 4 Feb 2014 21:45:32 -0000
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+Fix regex in guile detection.
+
+--- configure.orig2 Mon Feb 3 00:54:59 2014
++++ configure Mon Feb 3 00:56:04 2014
+@@ -21100,7 +21100,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/^Guile
\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][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
Index: patches/patch-lib_gvc_gvconfig_c
===================================================================
RCS file:
/home/edd/cvsync/cvs/ports/math/graphviz/patches/patch-lib_gvc_gvconfig_c,v
retrieving revision 1.3
diff -u -p -r1.3 patch-lib_gvc_gvconfig_c
--- patches/patch-lib_gvc_gvconfig_c 22 Aug 2012 09:55:01 -0000 1.3
+++ patches/patch-lib_gvc_gvconfig_c 4 Feb 2014 21:45:32 -0000
@@ -2,9 +2,9 @@ $OpenBSD: patch-lib_gvc_gvconfig_c,v 1.3
Plugin scanner fails to find our libs because we overide lib version.
---- lib/gvc/gvconfig.c.orig2 Mon Jun 18 11:57:45 2012
-+++ lib/gvc/gvconfig.c Mon Jun 18 11:59:53 2012
-@@ -385,6 +385,8 @@ static void config_rescan(GVC_t *gvc, char *config_pat
+--- lib/gvc/gvconfig.c.orig2 Sat Jan 11 22:59:44 2014
++++ lib/gvc/gvconfig.c Sun Feb 2 17:23:25 2014
+@@ -421,6 +421,8 @@ static void config_rescan(GVC_t *gvc, char *config_pat
#if defined(WIN32) && !defined(__MINGW32__) && !defined(__CYGWIN__)
sprintf(config_re,"%s%s", plugin_re_beg, plugin_re_end);
Index: patches/patch-tclpkg_tclstubs_Makefile_in
===================================================================
RCS file:
/home/edd/cvsync/cvs/ports/math/graphviz/patches/patch-tclpkg_tclstubs_Makefile_in,v
retrieving revision 1.2
diff -u -p -r1.2 patch-tclpkg_tclstubs_Makefile_in
--- patches/patch-tclpkg_tclstubs_Makefile_in 22 Aug 2012 09:55:01 -0000
1.2
+++ patches/patch-tclpkg_tclstubs_Makefile_in 4 Feb 2014 21:45:32 -0000
@@ -1,10 +1,10 @@
-$OpenBSD: patch-tclpkg_tclstubs_Makefile_in,v 1.2 2012/08/22 09:55:01 edd Exp $
---- tclpkg/tclstubs/Makefile.in.orig2 Sat May 7 05:27:56 2011
-+++ tclpkg/tclstubs/Makefile.in Thu Jul 12 11:30:55 2012
-@@ -217,7 +217,7 @@ LIBLTDL = @LIBLTDL@
+$OpenBSD$
+--- tclpkg/tclstubs/Makefile.in.orig2 Sun Feb 2 23:24:57 2014
++++ tclpkg/tclstubs/Makefile.in Sun Feb 2 23:25:20 2014
+@@ -249,7 +249,7 @@ LIBLTDL = @LIBLTDL@
LIBLTDL_LDFLAGS = @LIBLTDL_LDFLAGS@
LIBOBJS = @LIBOBJS@
- LIBPNG_CONFIG = @LIBPNG_CONFIG@
+ LIBPOSTFIX = @LIBPOSTFIX@
-LIBS = @TCL_STUB_LIB_SPEC@
+LIBS = $(TCL_STUB_LIB_SPEC)
LIBTOOL = @LIBTOOL@
Index: patches/patch-tclpkg_tkstubs_Makefile_in
===================================================================
RCS file:
/home/edd/cvsync/cvs/ports/math/graphviz/patches/patch-tclpkg_tkstubs_Makefile_in,v
retrieving revision 1.2
diff -u -p -r1.2 patch-tclpkg_tkstubs_Makefile_in
--- patches/patch-tclpkg_tkstubs_Makefile_in 22 Aug 2012 09:55:01 -0000
1.2
+++ patches/patch-tclpkg_tkstubs_Makefile_in 4 Feb 2014 21:45:32 -0000
@@ -1,10 +1,10 @@
-$OpenBSD: patch-tclpkg_tkstubs_Makefile_in,v 1.2 2012/08/22 09:55:01 edd Exp $
---- tclpkg/tkstubs/Makefile.in.orig2 Sat May 7 05:27:56 2011
-+++ tclpkg/tkstubs/Makefile.in Thu Jul 12 11:30:55 2012
-@@ -218,7 +218,7 @@ LIBLTDL = @LIBLTDL@
+$OpenBSD$
+--- tclpkg/tkstubs/Makefile.in.orig2 Sun Feb 2 23:25:32 2014
++++ tclpkg/tkstubs/Makefile.in Sun Feb 2 23:25:49 2014
+@@ -250,7 +250,7 @@ LIBLTDL = @LIBLTDL@
LIBLTDL_LDFLAGS = @LIBLTDL_LDFLAGS@
LIBOBJS = @LIBOBJS@
- LIBPNG_CONFIG = @LIBPNG_CONFIG@
+ LIBPOSTFIX = @LIBPOSTFIX@
-LIBS = @TK_STUB_LIB_SPEC@
+LIBS = $(TK_STUB_LIB_SPEC)
LIBTOOL = @LIBTOOL@
Index: pkg/PFRAG.shared-main
===================================================================
RCS file: /home/edd/cvsync/cvs/ports/math/graphviz/pkg/PFRAG.shared-main,v
retrieving revision 1.2
diff -u -p -r1.2 PFRAG.shared-main
--- pkg/PFRAG.shared-main 22 Aug 2012 09:55:01 -0000 1.2
+++ pkg/PFRAG.shared-main 4 Feb 2014 21:45:32 -0000
@@ -1,27 +1,27 @@
-@comment $OpenBSD: PFRAG.shared-main,v 1.2 2012/08/22 09:55:01 edd Exp $
+@comment $OpenBSD$
lib/graphviz/guile/libgv_guile.so
+lib/graphviz/perl/gv.so
+lib/graphviz/perl/libgv_perl.so
+lib/tcl/graphviz/libgv_tcl.so
+${P5ARCH}/gv.so
@lib lib/graphviz/libgvplugin_core.so.${LIBgvplugin_core_VERSION}
@lib lib/graphviz/libgvplugin_dot_layout.so.${LIBgvplugin_dot_layout_VERSION}
@lib lib/graphviz/libgvplugin_gd.so.${LIBgvplugin_gd_VERSION}
-@lib lib/graphviz/libgvplugin_gdk_pixbuf.so.${LIBgvplugin_gdk_pixbuf_VERSION}
+@lib lib/graphviz/libgvplugin_gdk.so.${LIBgvplugin_gdk_VERSION}
@lib lib/graphviz/libgvplugin_gtk.so.${LIBgvplugin_gtk_VERSION}
@lib
lib/graphviz/libgvplugin_neato_layout.so.${LIBgvplugin_neato_layout_VERSION}
@lib lib/graphviz/libgvplugin_pango.so.${LIBgvplugin_pango_VERSION}
+@lib lib/graphviz/libgvplugin_poppler.so.${LIBgvplugin_poppler_VERSION}
@lib lib/graphviz/libgvplugin_rsvg.so.${LIBgvplugin_rsvg_VERSION}
@lib lib/graphviz/libgvplugin_xlib.so.${LIBgvplugin_xlib_VERSION}
-lib/graphviz/perl/gv.so
-lib/graphviz/perl/libgv_perl.so
@lib lib/libcdt.so.${LIBcdt_VERSION}
@lib lib/libcgraph.so.${LIBcgraph_VERSION}
-@lib lib/libgraph.so.${LIBgraph_VERSION}
@lib lib/libgvc.so.${LIBgvc_VERSION}
@lib lib/libgvpr.so.${LIBgvpr_VERSION}
@lib lib/libpathplan.so.${LIBpathplan_VERSION}
@lib lib/libxdot.so.${LIBxdot_VERSION}
@lib lib/tcl/graphviz/libgdtclft.so.${LIBgdtclft_VERSION}
-lib/tcl/graphviz/libgv_tcl.so
@lib lib/tcl/graphviz/libtcldot.so.${LIBtcldot_VERSION}
@lib lib/tcl/graphviz/libtcldot_builtin.so.${LIBtcldot_builtin_VERSION}
@lib lib/tcl/graphviz/libtclplan.so.${LIBtclplan_VERSION}
@lib lib/tcl/graphviz/libtkspline.so.${LIBtkspline_VERSION}
-${P5ARCH}/gv.so
Index: pkg/PLIST-main
===================================================================
RCS file: /home/edd/cvsync/cvs/ports/math/graphviz/pkg/PLIST-main,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST-main
--- pkg/PLIST-main 22 Aug 2012 09:55:01 -0000 1.4
+++ pkg/PLIST-main 4 Feb 2014 21:45:32 -0000
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-main,v 1.4 2012/08/22 09:55:01 edd Exp $
+@comment $OpenBSD$
%%SHARED%%
@bin bin/acyclic
@bin bin/bcomps
@@ -14,6 +14,8 @@ bin/dotty
bin/fdp
@bin bin/gc
@bin bin/gml2gv
+@bin bin/graphml2gv
+@bin bin/gv2gml
bin/gv2gxl
@bin bin/gvcolor
@bin bin/gvgen
@@ -43,7 +45,6 @@ include/graphviz/cdt.h
include/graphviz/cgraph.h
include/graphviz/color.h
include/graphviz/geom.h
-include/graphviz/graph.h
include/graphviz/graphviz_version.h
include/graphviz/gv.cpp
include/graphviz/gv.i
@@ -62,58 +63,43 @@ include/graphviz/gvpr.h
include/graphviz/pack.h
include/graphviz/pathgeom.h
include/graphviz/pathplan.h
-include/graphviz/textpara.h
+include/graphviz/textspan.h
include/graphviz/types.h
include/graphviz/usershape.h
include/graphviz/xdot.h
lib/graphviz/
-lib/graphviz/R/
lib/graphviz/config6
-lib/graphviz/go/
lib/graphviz/guile/
-@comment lib/graphviz/guile/libgv_guile.a
-@comment lib/graphviz/guile/libgv_guile.la
-lib/graphviz/io/
-lib/graphviz/java/
+lib/graphviz/guile/libgv_guile.a
+lib/graphviz/guile/libgv_guile.la
lib/graphviz/libgvplugin_core.a
lib/graphviz/libgvplugin_core.la
lib/graphviz/libgvplugin_dot_layout.a
lib/graphviz/libgvplugin_dot_layout.la
lib/graphviz/libgvplugin_gd.a
lib/graphviz/libgvplugin_gd.la
-lib/graphviz/libgvplugin_gdk_pixbuf.a
-lib/graphviz/libgvplugin_gdk_pixbuf.la
+lib/graphviz/libgvplugin_gdk.a
+lib/graphviz/libgvplugin_gdk.la
lib/graphviz/libgvplugin_gtk.a
lib/graphviz/libgvplugin_gtk.la
lib/graphviz/libgvplugin_neato_layout.a
lib/graphviz/libgvplugin_neato_layout.la
lib/graphviz/libgvplugin_pango.a
lib/graphviz/libgvplugin_pango.la
+lib/graphviz/libgvplugin_poppler.a
+lib/graphviz/libgvplugin_poppler.la
lib/graphviz/libgvplugin_rsvg.a
lib/graphviz/libgvplugin_rsvg.la
lib/graphviz/libgvplugin_xlib.a
lib/graphviz/libgvplugin_xlib.la
-lib/graphviz/lua/
-lib/graphviz/ocaml/
lib/graphviz/perl/
lib/graphviz/perl/gv.pm
-@comment lib/graphviz/perl/libgv_perl.a
-@comment lib/graphviz/perl/libgv_perl.la
-lib/graphviz/php/
-lib/graphviz/python/
-lib/graphviz/python23/
-lib/graphviz/python24/
-lib/graphviz/python25/
-lib/graphviz/python26/
-lib/graphviz/python27/
-lib/graphviz/ruby/
-lib/graphviz/sharp/
+lib/graphviz/perl/libgv_perl.a
+lib/graphviz/perl/libgv_perl.la
lib/libcdt.a
lib/libcdt.la
lib/libcgraph.a
lib/libcgraph.la
-lib/libgraph.a
-lib/libgraph.la
lib/libgvc.a
lib/libgvc.la
lib/libgvpr.a
@@ -124,7 +110,6 @@ lib/libxdot.a
lib/libxdot.la
lib/pkgconfig/libcdt.pc
lib/pkgconfig/libcgraph.pc
-lib/pkgconfig/libgraph.pc
lib/pkgconfig/libgvc.pc
lib/pkgconfig/libgvpr.pc
lib/pkgconfig/libpathplan.pc
@@ -133,8 +118,8 @@ lib/tcl/
lib/tcl/graphviz/
lib/tcl/graphviz/libgdtclft.a
lib/tcl/graphviz/libgdtclft.la
-@comment lib/tcl/graphviz/libgv_tcl.a
-@comment lib/tcl/graphviz/libgv_tcl.la
+lib/tcl/graphviz/libgv_tcl.a
+lib/tcl/graphviz/libgv_tcl.la
lib/tcl/graphviz/libtcldot.a
lib/tcl/graphviz/libtcldot.la
lib/tcl/graphviz/libtcldot_builtin.a
@@ -144,8 +129,8 @@ lib/tcl/graphviz/libtclplan.la
lib/tcl/graphviz/libtkspline.a
lib/tcl/graphviz/libtkspline.la
lib/tcl/graphviz/pkgIndex.tcl
-lib/tcl${MODTCL_VERSION}/
-lib/tcl${MODTCL_VERSION}/graphviz
+lib/tcl${MODTK_VERSION}/
+lib/tcl${MODTK_VERSION}/graphviz
${P5ARCH}/
${P5ARCH}/gv.pm
@man man/man1/acyclic.1
@@ -160,9 +145,10 @@ ${P5ARCH}/gv.pm
@man man/man1/fdp.1
@man man/man1/gc.1
@man man/man1/gml2gv.1
+@man man/man1/graphml2gv.1
+@man man/man1/gv2gml.1
@man man/man1/gv2gxl.1
@man man/man1/gvcolor.1
-@man man/man1/gvedit.1
@man man/man1/gvgen.1
@man man/man1/gvmap.1
@man man/man1/gvmap.sh.1
@@ -179,7 +165,6 @@ ${P5ARCH}/gv.pm
@man man/man1/prune.1
@man man/man1/sccmap.1
@man man/man1/sfdp.1
-@man man/man1/smyrna.1
@man man/man1/tred.1
@man man/man1/twopi.1
@man man/man1/unflatten.1
@@ -188,11 +173,11 @@ ${P5ARCH}/gv.pm
@man man/man3/cgraph.3
@man man/man3/expr.3
man/man3/gdtclft.3tcl
-@man man/man3/graph.3
man/man3/gv.3guile
man/man3/gv.3perl
man/man3/gv.3tcl
@man man/man3/gvc.3
+@man man/man3/gvpr.3
@man man/man3/pack.3
@man man/man3/pathplan.3
man/man3/tcldot.3tcl
@@ -210,7 +195,6 @@ share/doc/graphviz/cpl1.0.txt
share/doc/graphviz/fontfaq.txt
share/doc/graphviz/html/
share/doc/graphviz/html/FAQ.html
-share/doc/graphviz/html/Gdtclft2.2.5.example.png
share/doc/graphviz/html/Mcircle.gif
share/doc/graphviz/html/Mdiamond.gif
share/doc/graphviz/html/Msquare.gif
@@ -278,6 +262,13 @@ share/doc/graphviz/html/both.gif
share/doc/graphviz/html/box.gif
share/doc/graphviz/html/box3d.gif
share/doc/graphviz/html/build.html
+share/doc/graphviz/html/c_bold.png
+share/doc/graphviz/html/c_dashed.png
+share/doc/graphviz/html/c_dotted.png
+share/doc/graphviz/html/c_filled.png
+share/doc/graphviz/html/c_rounded.png
+share/doc/graphviz/html/c_solid.png
+share/doc/graphviz/html/c_striped.png
share/doc/graphviz/html/char.html
share/doc/graphviz/html/circle.gif
share/doc/graphviz/html/colorlist.gif
@@ -288,11 +279,28 @@ share/doc/graphviz/html/constraint.gif
share/doc/graphviz/html/diamond.gif
share/doc/graphviz/html/doublecircle.gif
share/doc/graphviz/html/doubleoctagon.gif
+share/doc/graphviz/html/e_bold.png
+share/doc/graphviz/html/e_dashed.png
+share/doc/graphviz/html/e_dotted.png
+share/doc/graphviz/html/e_solid.png
share/doc/graphviz/html/egg.gif
share/doc/graphviz/html/ellipse.gif
share/doc/graphviz/html/fill.gif
share/doc/graphviz/html/folder.gif
share/doc/graphviz/html/forward.gif
+share/doc/graphviz/html/g_lin0.png
+share/doc/graphviz/html/g_lin180.png
+share/doc/graphviz/html/g_lin270.png
+share/doc/graphviz/html/g_lin360.png
+share/doc/graphviz/html/g_lin45.png
+share/doc/graphviz/html/g_lin90.png
+share/doc/graphviz/html/g_rad0.png
+share/doc/graphviz/html/g_rad180.png
+share/doc/graphviz/html/g_rad270.png
+share/doc/graphviz/html/g_rad360.png
+share/doc/graphviz/html/g_rad45.png
+share/doc/graphviz/html/g_rad90.png
+share/doc/graphviz/html/gdtclft.entities.example.png
share/doc/graphviz/html/hexagon.gif
share/doc/graphviz/html/house.gif
share/doc/graphviz/html/html1.gif
@@ -308,11 +316,29 @@ share/doc/graphviz/html/invtrapezium.gif
share/doc/graphviz/html/invtriangle.gif
share/doc/graphviz/html/lang.html
share/doc/graphviz/html/mrecord.gif
+share/doc/graphviz/html/n_bold.png
+share/doc/graphviz/html/n_dashed.png
+share/doc/graphviz/html/n_diagonals.png
+share/doc/graphviz/html/n_dotted.png
+share/doc/graphviz/html/n_filled.png
+share/doc/graphviz/html/n_rounded.png
+share/doc/graphviz/html/n_solid.png
+share/doc/graphviz/html/n_striped.png
+share/doc/graphviz/html/n_wedged.png
share/doc/graphviz/html/nohead.gif
share/doc/graphviz/html/none.gif
+share/doc/graphviz/html/none_back.png
+share/doc/graphviz/html/none_both.png
+share/doc/graphviz/html/none_forward.png
+share/doc/graphviz/html/none_none.png
+share/doc/graphviz/html/normal_back.png
+share/doc/graphviz/html/normal_both.png
+share/doc/graphviz/html/normal_forward.png
+share/doc/graphviz/html/normal_none.png
share/doc/graphviz/html/note.gif
share/doc/graphviz/html/octagon.gif
share/doc/graphviz/html/output.html
+share/doc/graphviz/html/oval.gif
share/doc/graphviz/html/parallelogram.gif
share/doc/graphviz/html/pentagon.gif
share/doc/graphviz/html/plaintext.gif
@@ -329,6 +355,12 @@ share/doc/graphviz/html/sdlshapes.jpg
share/doc/graphviz/html/sdlshapes.png
share/doc/graphviz/html/septagon.gif
share/doc/graphviz/html/shapes.html
+share/doc/graphviz/html/spline_curved.png
+share/doc/graphviz/html/spline_line.png
+share/doc/graphviz/html/spline_none.png
+share/doc/graphviz/html/spline_ortho.png
+share/doc/graphviz/html/spline_polyline.png
+share/doc/graphviz/html/spline_spline.png
share/doc/graphviz/html/square.gif
share/doc/graphviz/html/tab.gif
share/doc/graphviz/html/tcldot.html
@@ -336,9 +368,11 @@ share/doc/graphviz/html/todo.html
share/doc/graphviz/html/trapezium.gif
share/doc/graphviz/html/triangle.gif
share/doc/graphviz/html/tripleoctagon.gif
+share/doc/graphviz/html/underline.gif
share/doc/graphviz/html/winbuild.html
share/doc/graphviz/latex_suggestions.txt
share/doc/graphviz/pdf/
+share/doc/graphviz/pdf/Agraph.pdf
share/doc/graphviz/pdf/acyclic.1.pdf
share/doc/graphviz/pdf/bcomps.1.pdf
share/doc/graphviz/pdf/ccomps.1.pdf
@@ -357,19 +391,20 @@ share/doc/graphviz/pdf/fdp.1.pdf
share/doc/graphviz/pdf/gc.1.pdf
share/doc/graphviz/pdf/gdtclft.3tcl.pdf
share/doc/graphviz/pdf/gml2gv.1.pdf
-share/doc/graphviz/pdf/graph.3.pdf
+share/doc/graphviz/pdf/graphml2gv.1.pdf
share/doc/graphviz/pdf/gv.3guile.pdf
share/doc/graphviz/pdf/gv.3perl.pdf
share/doc/graphviz/pdf/gv.3tcl.pdf
+share/doc/graphviz/pdf/gv2gml.1.pdf
share/doc/graphviz/pdf/gv2gxl.1.pdf
share/doc/graphviz/pdf/gvc.3.pdf
share/doc/graphviz/pdf/gvcolor.1.pdf
-share/doc/graphviz/pdf/gvedit.1.pdf
share/doc/graphviz/pdf/gvgen.1.pdf
share/doc/graphviz/pdf/gvmap.1.pdf
share/doc/graphviz/pdf/gvmap.sh.1.pdf
share/doc/graphviz/pdf/gvpack.1.pdf
share/doc/graphviz/pdf/gvpr.1.pdf
+share/doc/graphviz/pdf/gvpr.3.pdf
share/doc/graphviz/pdf/gxl2gv.1.pdf
share/doc/graphviz/pdf/lefty.1.pdf
share/doc/graphviz/pdf/leftyguide.pdf
@@ -386,7 +421,6 @@ share/doc/graphviz/pdf/pathplan.3.pdf
share/doc/graphviz/pdf/prune.pdf
share/doc/graphviz/pdf/sccmap.1.pdf
share/doc/graphviz/pdf/sfdp.1.pdf
-share/doc/graphviz/pdf/smyrna.1.pdf
share/doc/graphviz/pdf/smyrna.pdf
share/doc/graphviz/pdf/tcldot.3tcl.pdf
share/doc/graphviz/pdf/tkspline.3tk.pdf
@@ -400,9 +434,9 @@ share/examples/graphviz/
share/examples/graphviz/demo/
share/examples/graphviz/demo/doted.tcl
share/examples/graphviz/demo/doted.tcl.README
+share/examples/graphviz/demo/entities.html
share/examples/graphviz/demo/entities.tcl
share/examples/graphviz/demo/entities.tcl.README
-share/examples/graphviz/demo/entities.tcl.html
share/examples/graphviz/demo/gcat.tcl
share/examples/graphviz/demo/gcat.tcl.README
share/examples/graphviz/demo/pathplan.tcl
@@ -431,6 +465,7 @@ share/examples/graphviz/graphs/directed/
share/examples/graphviz/graphs/directed/alf.gv
share/examples/graphviz/graphs/directed/arrows.gv
share/examples/graphviz/graphs/directed/awilliams.gv
+share/examples/graphviz/graphs/directed/biological.gv
share/examples/graphviz/graphs/directed/clust.gv
share/examples/graphviz/graphs/directed/clust1.gv
share/examples/graphviz/graphs/directed/clust2.gv
@@ -507,6 +542,36 @@ share/graphviz/doc/html/schema/
share/graphviz/doc/html/schema/arguments.xml
share/graphviz/doc/html/schema/attributes.xml
share/graphviz/doc/html/schema/attributes.xslt
-share/graphviz/examples/
-share/graphviz/gvedit/
-share/graphviz/smyrna/
+share/graphviz/gvpr/
+share/graphviz/gvpr/addranks
+share/graphviz/gvpr/addrings
+share/graphviz/gvpr/anon
+share/graphviz/gvpr/attr
+share/graphviz/gvpr/bb
+share/graphviz/gvpr/bbox
+share/graphviz/gvpr/chkclusters
+share/graphviz/gvpr/cliptree
+share/graphviz/gvpr/col
+share/graphviz/gvpr/collapse
+share/graphviz/gvpr/color
+share/graphviz/gvpr/cycle
+share/graphviz/gvpr/dechain
+share/graphviz/gvpr/deghist
+share/graphviz/gvpr/deledges
+share/graphviz/gvpr/delmulti
+share/graphviz/gvpr/delnodes
+share/graphviz/gvpr/depath
+share/graphviz/gvpr/dijkstra
+share/graphviz/gvpr/flatten
+share/graphviz/gvpr/get-layers-list
+share/graphviz/gvpr/group
+share/graphviz/gvpr/indent
+share/graphviz/gvpr/knbhd
+share/graphviz/gvpr/maxdeg
+share/graphviz/gvpr/path
+share/graphviz/gvpr/rotate
+share/graphviz/gvpr/scale
+share/graphviz/gvpr/scalexy
+share/graphviz/gvpr/span
+share/graphviz/gvpr/topon
+share/graphviz/gvpr/treetoclust
--
Best Regards
Edd Barrett
http://www.theunixzoo.co.uk
