Hi,
The recent pthread changes fixed the last of my issues with the graphviz
update (thanks to brad for pointing this out).
Here is a diff which tidies and updates our graphviz port to 2.28.0 and
emulates the functionality of the existing in-tree port (which means the
graphviz core and then tcl, perl and guile bindings. Rather an arbitrary
choice, but thats what we have). In Budapest sebastia@ helped me fix the tcl
bindings, so thanks to him for that.
Since the examples in ${WRKSRC}/tclpkg/demo require a checkout of the
linux kernel sources (they draw a graph of linux module dependencies), I
have made a small example for each enabled binding and put them in the
tests/ directory of the port. Each test renders a simple graph to an
xlib canvas. Simple, but enough to show the bindings work.
Later when I find more time, I will enable some more bindings and
subpackage each binding (I personally would like to enable Python and
Ocaml), but first I would like to put this update in, since it emulates
the in-tree functionality and unbreaks crashes for large graphs.
Does anyone have any tweaks they want to suggest? OK?
diff -urNa old/Makefile new/Makefile
--- old/Makefile Sat Aug 18 21:46:00 2012
+++ new/Makefile Sat Aug 18 21:45:33 2012
@@ -2,10 +2,12 @@
COMMENT-main= graph drawing software
-DISTNAME= graphviz-2.12
+DISTNAME= graphviz-2.28.0
PKGNAME-main= ${DISTNAME}
-REVISION-main= 16
CATEGORIES= math devel graphics
+
+# there is only one multi-package due to legacy, but maybe more
+# will appear in the form of language bindings.
MULTI_PACKAGES= -main
# to let update-patches work in a simpler way
@@ -13,40 +15,28 @@
MASTER_SITES= ${HOMEPAGE}pub/graphviz/ARCHIVE/
-SHARED_LIBS += gvplugin_core 0.0 # .3.0
-SHARED_LIBS += gvplugin_gd 0.0 # .3.0
-SHARED_LIBS += gvplugin_pango 0.0 # .3.0
-SHARED_LIBS += gvplugin_dot_layout 0.0 # .3.0
-SHARED_LIBS += gvplugin_neato_layout 0.0 # .3.0
-SHARED_LIBS += gvplugin_xlib 0.0 # .3.0
-SHARED_LIBS += gvplugin_gtk 0.0 # .3.0
-SHARED_LIBS += gvplugin_dot_layout 0.0 # .3.0
-SHARED_LIBS += gvplugin_neato_layout 0.0 # .3.0
+SHARED_LIBS += gvplugin_core 1.0 # 6.0
+SHARED_LIBS += gvplugin_gd 1.0 # 6.0
+SHARED_LIBS += gvplugin_pango 1.0 # 6.0
+SHARED_LIBS += gvplugin_dot_layout 1.0 # 6.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 += cdt 0.0 # .3.0
-SHARED_LIBS += graph 1.0 # .3.0
-SHARED_LIBS += agraph 0.1 # .3.0
-SHARED_LIBS += pathplan 1.0 # .3.0
-SHARED_LIBS += gvc 0.0 # .3.0
-SHARED_LIBS += gvc_builtins 0.0 # .3.0
-SHARED_LIBS += expr 0.0 # .3.0
-SHARED_LIBS += gdtclft 1.0 # .0.0
-SHARED_LIBS += tcldot 1.0 # .0.0
-SHARED_LIBS += tcldot_builtin 1.0 # .0.0
-SHARED_LIBS += tclplan 1.0 # .0.0
-SHARED_LIBS += tkspline 1.0 # .0.0
-SHARED_LIBS += gv_guile 0.0 # .0.0
-SHARED_LIBS += gv_perl 0.0 # .0.0
-SHARED_LIBS += gv_tcl 0.0 # .0.0
-SHARED_LIBS += graph 1.0 # .3.0
-SHARED_LIBS += agraph 0.1 # .3.0
-SHARED_LIBS += gvc 0.0 # .3.0
-SHARED_LIBS += gvc_builtins 0.0 # .3.0
-SHARED_LIBS += tcldot 1.0 # .0.0
-SHARED_LIBS += tclplan 1.0 # .0.0
-SHARED_LIBS += gv_guile 0.0 # .0.0
-SHARED_LIBS += gv_perl 0.0 # .0.0
-SHARED_LIBS += gv_tcl 0.0 # .0.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
HOMEPAGE= http://www.graphviz.org/
@@ -58,68 +48,67 @@
PERMIT_PACKAGE_FTP= Yes
PERMIT_PACKAGE_CDROM= Yes
-WANTLIB= ICE SM X11 Xau Xaw Xcomposite Xcursor Xdamage Xdmcp \
- Xext Xfixes Xi Xinerama Xmu Xpm Xrandr Xrender Xt \
- c dbus-1 dbus-glib-1 expat fontconfig freetype m pcre \
- pthread-stubs util xcb z jpeg tk84 gd ffi \
- png ltdl pthread stdc++ xcb-render GL Xxf86vm drm xcb-shm
-
-MODULES= devel/gettext
+MODULES= devel/gettext \
+ x11/tk \
+ perl
LIB_DEPENDS= graphics/jpeg \
graphics/png \
devel/libtool,-ltdl \
- tk->=8.4,<8.5:x11/tk/8.4 \
- graphics/gd>=2.0.34
+ graphics/gd>=2.0.34 \
+ x11/gnome/libgnomeui \
+ x11/gtk+2 \
+ www/libcroco \
+ x11/gnome/librsvg \
+ ${MODTK_LIB_DEPENDS}
+RUN_DEPENDS= lang/guile
+BUILD_DEPENDS= devel/swig
-# cairo stuff
-LIB_DEPENDS+= x11/gtk+2
+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 += 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 tk85 Xft Xss perl util
-WANTLIB+= cairo>=5 pango-1.0 pangocairo-1.0 pangoft2-1.0 \
- gmodule-2.0 glib-2.0 gobject-2.0 pixman-1 gdk_pixbuf-2.0 \
- gdk-x11-2.0 gtk-x11-2.0
-
-# gnome stuff
-LIB_DEPENDS+= x11/gnome/libgnomeui
-
-WANTLIB+= atk-1.0 crypto gthread-2.0 ssl gio-2.0 \
- ORBit-2 ORBitCosNaming-2 art_lgpl_2 bonobo-2 \
- bonobo-activation bonoboui-2 gconf-2 gnome-2 \
- gnome-keyring gnomecanvas-2 gnomevfs-2 popt xml2 gailutil \
- gnomeui-2 canberra gcrypt gpg-error vorbis vorbisfile ogg
-
-RUN_DEPENDS= tk->=8.4,<8.5:x11/tk/8.4 \
- tcl->=8.4.7p5,<8.5:lang/tcl/8.4 \
- lang/guile
-BUILD_DEPENDS= ${RUN_DEPENDS} \
- devel/swig
-
USE_LIBTOOL= Yes
+USE_GMAKE = Yes
USE_GROFF = Yes
-AUTOCONF_VERSION=2.59
CONFIGURE_STYLE=gnu
CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
+ --enable-tcl=yes \
+ --enable-perl \
+ --enable-guile \
+ --with-tcl=${MODTCL_BIN} \
--disable-lua \
--disable-io \
--disable-java \
--disable-ocaml \
--disable-php \
- --disable-perl \
--disable-python \
--disable-ruby \
--disable-rpath \
+ --disable-sharp \
+ --disable-R \
+ --disable-gts \
+ --without-ghostscript \
+ --without-devil \
+ --without-lasi \
+ --without-qt \
+ --without-glut \
--with-gd
CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib" \
- TCLCONFIG=${LOCALBASE}/lib/tcl/tcl8.4/tclConfig.sh \
- TKCONFIG=${LOCALBASE}/lib/tcl/tk8.4/tkConfig.sh \
- PKG_CONFIG=/usr/bin/pkg-config
+ TCLCONFIG=${MODTCL_CONFIG} \
+ TKCONFIG=${MODTK_CONFIG}
DOCBASE= ${PREFIX}/share/doc/graphviz
EXBASE= ${PREFIX}/share/examples/graphviz
-MAKE_FLAGS= TCL_STUB_LIB_SPEC='-L${LOCALBASE}/lib -ltclstub84_pic' \
- TK_STUB_LIB_SPEC='-L${LOCALBASE}/lib -ltkstub84_pic'
+MAKE_FLAGS= TCL_STUB_LIB_SPEC='-L${LOCALBASE}/lib -ltclstub85_pic' \
+ TK_STUB_LIB_SPEC='-L${LOCALBASE}/lib -ltkstub85_pic'
FAKE_FLAGS= htmldir="${DOCBASE}/html" \
pdfdir="${DOCBASE}/pdf" \
@@ -129,7 +118,11 @@
leftydir="${EXBASE}/lefty" \
pathplanexampledir="${EXBASE}/demo/pathplan_data" \
undirecteddir="${EXBASE}/graphs/undirected" \
+ pkgtcldir="${MODTCL_TCLDIR}/graphviz"
+pre-configure:
+ ${MODTCL_TCLSH_ADJ} ${WRKDIST}/tclpkg/gv/gv_doc_writer.tcl
+
post-build:
.for CMD in dotty lneato
echo "#! /bin/ksh" >${WRKBUILD}/cmd/${CMD}/${CMD}
@@ -137,11 +130,5 @@
echo 'export LEFTYPATH' >>${WRKBUILD}/cmd/${CMD}/${CMD}
cat ${WRKBUILD}/cmd/${CMD}/${CMD}.ksh >>${WRKBUILD}/cmd/${CMD}/${CMD}
.endfor
-
-post-install:
- cd ${PREFIX}/share/examples/graphviz/demo && \
- perl -pi -e 's/^exec tclsh/exec tclsh8.4/' entities gcat
- cd ${PREFIX}/share/examples/graphviz/demo && \
- perl -pi -e 's/^exec wish/exec wish8.4/' doted pathplan spline
.include <bsd.port.mk>
diff -urNa old/distinfo new/distinfo
--- old/distinfo Sat Aug 18 21:46:00 2012
+++ new/distinfo Sat Aug 18 21:45:33 2012
@@ -1,5 +1,5 @@
-MD5 (graphviz-2.12.tar.gz) = 5VR7wOxHlDxy9cPitd/1jw==
-RMD160 (graphviz-2.12.tar.gz) = aNVRds1c4OaiXJC0Q1KXR+c41cY=
-SHA1 (graphviz-2.12.tar.gz) = qkipJjlaV8bH4edVuUMqKUYVOOM=
-SHA256 (graphviz-2.12.tar.gz) = UZGJLXlQwodUZZ9wMjT3iI8TJECgSfDTlvKHsgL5438=
-SIZE (graphviz-2.12.tar.gz) = 4607023
+MD5 (graphviz-2.28.0.tar.gz) = jSbBFx8wyjsdwbQp95N+WA==
+RMD160 (graphviz-2.28.0.tar.gz) = Wl+ufLESjU6GO5VL7l8kkf8jraA=
+SHA1 (graphviz-2.28.0.tar.gz) = RyXYihPgce4i5jLeVR1KVcoI7n0=
+SHA256 (graphviz-2.28.0.tar.gz) = 06p5c8V4yuTMJtnWSYxX7QZoDKuaTpQNA1ejxlJ6/HY=
+SIZE (graphviz-2.28.0.tar.gz) = 19620087
diff -urNa old/patches/patch-Makefile_in new/patches/patch-Makefile_in
--- old/patches/patch-Makefile_in Thu Jan 1 01:00:00 1970
+++ new/patches/patch-Makefile_in Sat Aug 18 21:45:33 2012
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+A construction that is not compatible with BSD grep.
+
+--- 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:
+ find $(distdir) -name CVS -type d -prune -exec rm -rf {} \;
+
+ graphviz_version.h: config.h
+- $(GREP) 'PACKAGE\|VERSION\|GVPLUGIN' config.h > graphviz_version.h
++ $(GREP) -e 'PACKAGE' -e 'VERSION' -e 'GVPLUGIN' config.h >
graphviz_version.h
+
+ .PHONY: rpm
+ rpm: dist
diff -urNa old/patches/patch-cmd_dot_Makefile_in
new/patches/patch-cmd_dot_Makefile_in
--- old/patches/patch-cmd_dot_Makefile_in Sat Aug 18 21:46:00 2012
+++ new/patches/patch-cmd_dot_Makefile_in Sat Aug 18 21:45:33 2012
@@ -1,16 +1,15 @@
$OpenBSD: patch-cmd_dot_Makefile_in,v 1.1 2010/08/09 08:55:43 espie Exp $
---- cmd/dot/Makefile.in.orig2 Mon Aug 9 10:42:30 2010
-+++ cmd/dot/Makefile.in Mon Aug 9 10:42:46 2010
-@@ -519,10 +519,10 @@ clean-binPROGRAMS:
- done
- dot$(EXEEXT): $(dot_OBJECTS) $(dot_DEPENDENCIES)
- @rm -f dot$(EXEEXT)
-- $(LINK) $(dot_LDFLAGS) $(dot_OBJECTS) $(dot_LDADD) $(LIBS)
-+ $(LINK) $(dot_LDFLAGS) $(dot_OBJECTS) $(dot_LDADD) $(LIBS) -pthread
- dot_static$(EXEEXT): $(dot_static_OBJECTS) $(dot_static_DEPENDENCIES)
- @rm -f dot_static$(EXEEXT)
-- $(LINK) $(dot_static_LDFLAGS) $(dot_static_OBJECTS) $(dot_static_LDADD)
$(LIBS)
-+ $(LINK) $(dot_static_LDFLAGS) $(dot_static_OBJECTS) $(dot_static_LDADD)
$(LIBS) -pthread
-
- mostlyclean-compile:
- -rm -f *.$(OBJEXT)
+
+Add pthread linkage or lazy binding will fail
+
+--- 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
+ 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_static_SOURCES = dot.c dot_builtins.c
+ dot_static_CPPFLAGS = $(AM_CPPFLAGS) -DDEMAND_LOADING=0
+ dot_static_LDADD = \
diff -urNa old/patches/patch-cmd_lefty_ws_x11_libfilereq_Draw_c
new/patches/patch-cmd_lefty_ws_x11_libfilereq_Draw_c
--- old/patches/patch-cmd_lefty_ws_x11_libfilereq_Draw_c Sat Aug 18
21:46:00 2012
+++ new/patches/patch-cmd_lefty_ws_x11_libfilereq_Draw_c Thu Jan 1
01:00:00 1970
@@ -1,21 +0,0 @@
-$OpenBSD: patch-cmd_lefty_ws_x11_libfilereq_Draw_c,v 1.1 2007/02/20 11:47:07
espie Exp $
---- cmd/lefty/ws/x11/libfilereq/Draw.c.orig2 Sun Nov 13 02:35:10 2005
-+++ cmd/lefty/ws/x11/libfilereq/Draw.c Tue Jan 30 13:55:51 2007
-@@ -43,12 +43,17 @@
- * e...@sra.co.jp
- */
-
-+#include "config.h"
- #include <stdio.h>
- #include "SFinternal.h"
- #include "xstat.h"
- #include <X11/StringDefs.h>
- #include <X11/Xaw/Scrollbar.h>
- #include <X11/Xaw/Cardinals.h>
-+
-+#ifdef HAVE_STDINT_H
-+#include <stdint.h>
-+#endif
-
- #include "SFDecls.h"
-
diff -urNa old/patches/patch-config_config_perl_pl
new/patches/patch-config_config_perl_pl
--- old/patches/patch-config_config_perl_pl Thu Jan 1 01:00:00 1970
+++ new/patches/patch-config_config_perl_pl Sat Aug 18 21:45:33 2012
@@ -0,0 +1,13 @@
+$OpenBSD$
+
+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") {
+ print "-I$archlib/CORE";
+ }
+ if ($ARGV[0] eq "PERL_INSTALL_DIR") {
+- print "$Config{vendorarch}"
++ print "$Config{installsitearch}"
+ }
diff -urNa old/patches/patch-contrib_diffimg_Makefile_in
new/patches/patch-contrib_diffimg_Makefile_in
--- old/patches/patch-contrib_diffimg_Makefile_in Sat Aug 18 21:46:00 2012
+++ new/patches/patch-contrib_diffimg_Makefile_in Thu Jan 1 01:00:00 1970
@@ -1,27 +0,0 @@
-$OpenBSD: patch-contrib_diffimg_Makefile_in,v 1.1 2007/02/20 11:47:07 espie
Exp $
---- contrib/diffimg/Makefile.in.orig2 Sun Feb 18 23:49:11 2007
-+++ contrib/diffimg/Makefile.in Sun Feb 18 23:49:42 2007
-@@ -54,8 +54,8 @@ CONFIG_CLEAN_FILES =
- PROGRAMS = $(noinst_PROGRAMS)
- am_diffimg_OBJECTS = diffimg.$(OBJEXT)
- diffimg_OBJECTS = $(am_diffimg_OBJECTS)
--@WITH_LIBGD_TRUE@diffimg_DEPENDENCIES = \
--@WITH_LIBGD_TRUE@ $(top_builddir)/lib/gd/libgvgd_C.la
-+@WITH_MYLIBGD_TRUE@diffimg_DEPENDENCIES = \
-+@WITH_MYLIBGD_TRUE@ $(top_builddir)/lib/gd/libgvgd_C.la
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/config/depcomp
- am__depfiles_maybe = depfiles
-@@ -367,9 +367,9 @@ sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- AM_CPPFLAGS = @GD_INCLUDES@
- diffimg_SOURCES = diffimg.c
--@WITH_LIBGD_FALSE@diffimg_LDADD = @GD_LIBS@
--@WITH_LIBGD_TRUE@diffimg_LDADD = $(top_builddir)/lib/gd/libgvgd_C.la \
--@WITH_LIBGD_TRUE@ @FC_LIBS@ @FT_LIBS@ @JPEG_LIBS@ @PNG_LIBS@ @Z_LIBS@
@MATH_LIBS@
-+@WITH_MYLIBGD_FALSE@diffimg_LDADD = @GD_LIBS@
-+@WITH_MYLIBGD_TRUE@diffimg_LDADD = $(top_builddir)/lib/gd/libgvgd_C.la \
-+@WITH_MYLIBGD_TRUE@ @FC_LIBS@ @FT_LIBS@ @JPEG_LIBS@ @PNG_LIBS@ @Z_LIBS@
@MATH_LIBS@
-
- GRAPH = "digraph G { hello -> world }"
- CLEANFILES = *.png
diff -urNa old/patches/patch-lib_gd_gd_gif_in_c
new/patches/patch-lib_gd_gd_gif_in_c
--- old/patches/patch-lib_gd_gd_gif_in_c Sat Aug 18 21:46:00 2012
+++ new/patches/patch-lib_gd_gd_gif_in_c Thu Jan 1 01:00:00 1970
@@ -1,62 +0,0 @@
-$OpenBSD: patch-lib_gd_gd_gif_in_c,v 1.2 2010/08/09 08:55:43 espie Exp $
---- lib/gd/gd_gif_in.c.orig2 Mon Mar 14 19:41:54 2005
-+++ lib/gd/gd_gif_in.c Mon Aug 9 10:26:48 2010
-@@ -122,6 +122,7 @@ BGD_DECLARE(gdImagePtr) gdImageCreateFromGifCtx(gdIOCt
- char version[4];
- /* 2.0.28: threadsafe storage */
- int ZeroDataBlock = FALSE;
-+ int maxcount = 1024;
-
- gdImagePtr im = 0;
- if (! ReadOK(fd,buf,6)) {
-@@ -168,6 +169,8 @@ BGD_DECLARE(gdImagePtr) gdImageCreateFromGifCtx(gdIOCt
- }
-
- if (c != ',') { /* Not a valid start character */
-+ if (--maxcount < 0)
-+ goto terminated; /* Looping */
- continue;
- }
-
-@@ -246,6 +249,7 @@ static int
- DoExtension(gdIOCtx *fd, int label, int *Transparent, int *ZeroDataBlockP)
- {
- static unsigned char buf[256];
-+ int maxcount = 1024;
-
- switch (label) {
- case 0xf9: /* Graphic Control Extension */
-@@ -258,13 +262,13 @@ DoExtension(gdIOCtx *fd, int label, int *Transparent,
- if ((buf[0] & 0x1) != 0)
- *Transparent = buf[3];
-
-- while (GetDataBlock(fd, (unsigned char*) buf, ZeroDataBlockP)
!= 0)
-+ while (GetDataBlock(fd, (unsigned char*) buf, ZeroDataBlockP)
!= 0 && --maxcount >= 0)
- ;
- return FALSE;
- default:
- break;
- }
-- while (GetDataBlock(fd, (unsigned char*) buf, ZeroDataBlockP) != 0)
-+ while (GetDataBlock(fd, (unsigned char*) buf, ZeroDataBlockP) != 0 &&
--maxcount >= 0)
- ;
-
- return FALSE;
-@@ -423,14 +427,15 @@ LWZReadByte_(gdIOCtx *fd, int flag, int input_code_siz
- } else if (code == end_code) {
- int count;
- unsigned char buf[260];
-+ int maxcount = 1024;
-
- if (*ZeroDataBlockP)
- return -2;
-
-- while ((count = GetDataBlock(fd, buf, ZeroDataBlockP))
> 0)
-+ while ((count = GetDataBlock(fd, buf, ZeroDataBlockP))
> 0 && --maxcount >= 0)
- ;
-
-- if (count != 0)
-+ if (count != 0 || maxcount < 0)
- return -2;
- }
-
diff -urNa old/patches/patch-lib_gvc_gvconfig_c
new/patches/patch-lib_gvc_gvconfig_c
--- old/patches/patch-lib_gvc_gvconfig_c Sat Aug 18 21:46:00 2012
+++ new/patches/patch-lib_gvc_gvconfig_c Sat Aug 18 21:45:33 2012
@@ -1,18 +1,15 @@
-$OpenBSD: patch-lib_gvc_gvconfig_c,v 1.2 2010/08/09 08:55:43 espie Exp $
---- lib/gvc/gvconfig.c.orig2 Tue Sep 26 20:40:55 2006
-+++ lib/gvc/gvconfig.c Mon Aug 9 10:26:48 2010
-@@ -312,10 +312,14 @@ static void config_rescan(GVC_t *gvc, char *config_pat
- libdir = gvconfig_libdir();
+$OpenBSD$
+
+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
- config_re = gmalloc(strlen(plugin_re_beg) + 20 + strlen(plugin_re_end) +
1);
-+#ifdef __OpenBSD__
-+ sprintf(config_re, "%s", "\\.so\\.0\\.0$");
-+#else
- #ifdef GVPLUGIN_VERSION
+ #if defined(WIN32) && !defined(__MINGW32__) && !defined(__CYGWIN__)
+ sprintf(config_re,"%s%s", plugin_re_beg, plugin_re_end);
++#elif defined(__OpenBSD__)
++ sprintf(config_re,"%s[0-9]\\.[0-9]%s", plugin_re_beg, plugin_re_end);
+ #elif defined(GVPLUGIN_VERSION)
sprintf(config_re,"%s%d%s", plugin_re_beg, GVPLUGIN_VERSION,
plugin_re_end);
#else
- sprintf(config_re,"%s[0-9]+%s", plugin_re_beg, plugin_re_end);
-+#endif
- #endif
-
- if (regcomp(&re, config_re, REG_EXTENDED|REG_NOSUB) != 0) {
diff -urNa old/patches/patch-plugin_xlib_gvdevice_xlib_c
new/patches/patch-plugin_xlib_gvdevice_xlib_c
--- old/patches/patch-plugin_xlib_gvdevice_xlib_c Sat Aug 18 21:46:00 2012
+++ new/patches/patch-plugin_xlib_gvdevice_xlib_c Thu Jan 1 01:00:00 1970
@@ -1,17 +0,0 @@
-$OpenBSD: patch-plugin_xlib_gvdevice_xlib_c,v 1.2 2010/08/09 08:55:43 espie
Exp $
---- plugin/xlib/gvdevice_xlib.c.orig2 Fri Aug 11 15:50:34 2006
-+++ plugin/xlib/gvdevice_xlib.c Mon Aug 9 10:26:48 2010
-@@ -493,11 +493,13 @@ static void finalize_xlib(GVJ_t *firstjob)
- bool watching_p = FALSE;
- static char *dir;
- char *p, *cwd = NULL;
-+#endif
-
- dpy = (Display *)(firstjob->display);
- scr = firstjob->screen;
- keycodes = firstjob->keycodes;
-
-+#ifdef HAVE_SYS_INOTIFY_H
- inotify_fd = inotify_init();
- if (inotify_fd < 0) {
- fprintf(stderr,"inotify_init() failed\n");
diff -urNa old/patches/patch-tclpkg_gv_Makefile_am
new/patches/patch-tclpkg_gv_Makefile_am
--- old/patches/patch-tclpkg_gv_Makefile_am Sat Aug 18 21:46:00 2012
+++ new/patches/patch-tclpkg_gv_Makefile_am Thu Jan 1 01:00:00 1970
@@ -1,12 +0,0 @@
-$OpenBSD: patch-tclpkg_gv_Makefile_am,v 1.1 2007/02/20 11:47:07 espie Exp $
---- tclpkg/gv/Makefile.am.orig2 Tue Jan 30 17:18:04 2007
-+++ tclpkg/gv/Makefile.am Tue Jan 30 17:18:14 2007
-@@ -184,7 +184,7 @@ endif
- gv_sharp.man gv_guile.man gv_io.man gv_java.man gv_lua.man \
- gv_ocaml.man gv_perl.man gv_php.man gv_python.man gv_ruby.man \
- gv_tcl.man: gv.i gv_doc_writer.tcl gv_doc_template.tcl gv_doc_langs.tcl
-- tclsh $(srcdir)/gv_doc_writer.tcl "$(srcdir)"
-+ $(TCLSH) $(srcdir)/gv_doc_writer.tcl "$(srcdir)"
-
- install-data-hook:
- (cd $(DESTDIR)$(pkgluadir); rm -f gv.so; $(LN_S) libgv_lua.so
gv.so;)
diff -urNa old/patches/patch-tclpkg_gv_Makefile_in
new/patches/patch-tclpkg_gv_Makefile_in
--- old/patches/patch-tclpkg_gv_Makefile_in Sat Aug 18 21:46:00 2012
+++ new/patches/patch-tclpkg_gv_Makefile_in Sat Aug 18 21:45:33 2012
@@ -1,12 +1,12 @@
-$OpenBSD: patch-tclpkg_gv_Makefile_in,v 1.1 2007/02/20 11:47:07 espie Exp $
---- tclpkg/gv/Makefile.in.orig2 Tue Jan 30 17:14:32 2007
-+++ tclpkg/gv/Makefile.in Tue Jan 30 17:14:42 2007
-@@ -1623,7 +1623,7 @@ gv_tcl.cpp $(TCL_hdr): gv.i
- gv_sharp.man gv_guile.man gv_io.man gv_java.man gv_lua.man \
- gv_ocaml.man gv_perl.man gv_php.man gv_python.man gv_ruby.man \
- gv_tcl.man: gv.i gv_doc_writer.tcl gv_doc_template.tcl gv_doc_langs.tcl
-- tclsh $(srcdir)/gv_doc_writer.tcl "$(srcdir)"
-+ $(TCLSH) $(srcdir)/gv_doc_writer.tcl "$(srcdir)"
-
- install-data-hook:
- (cd $(DESTDIR)$(pkgluadir); rm -f gv.so; $(LN_S) libgv_lua.so
gv.so;)
+$OpenBSD$
+--- tclpkg/gv/Makefile.in.orig2 Sat May 7 04:27:54 2011
++++ tclpkg/gv/Makefile.in Sat Aug 18 14:53:38 2012
+@@ -249,7 +249,7 @@ libgv_perl_la_OBJECTS = $(am_libgv_perl_la_OBJECTS) \
+ libgv_perl_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
+ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(libgv_perl_la_LDFLAGS) $(LDFLAGS) \
+- -o $@
++ -pthread -o $@
+ @WITH_PERL_TRUE@@WITH_SWIG_TRUE@am_libgv_perl_la_rpath = -rpath \
+ @WITH_PERL_TRUE@@WITH_SWIG_TRUE@ $(pkgperldir)
+ libgv_php_la_DEPENDENCIES = $(BASELIBS) $(am__DEPENDENCIES_1)
diff -urNa old/patches/patch-tclpkg_tclstubs_Makefile_in
new/patches/patch-tclpkg_tclstubs_Makefile_in
--- old/patches/patch-tclpkg_tclstubs_Makefile_in Sat Aug 18 21:46:00 2012
+++ new/patches/patch-tclpkg_tclstubs_Makefile_in Sat Aug 18 21:45:33 2012
@@ -1,12 +1,12 @@
$OpenBSD: patch-tclpkg_tclstubs_Makefile_in,v 1.1 2007/02/20 11:47:07 espie
Exp $
---- tclpkg/tclstubs/Makefile.in.orig2 Wed Jan 31 18:07:44 2007
-+++ tclpkg/tclstubs/Makefile.in Wed Jan 31 18:08:04 2007
-@@ -172,7 +172,7 @@ LIBICONV = @LIBICONV@
- LIBLTDL = @LIBLTDL@
+--- 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@
+ LIBLTDL_LDFLAGS = @LIBLTDL_LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBPNG_CONFIG = @LIBPNG_CONFIG@
-LIBS = @TCL_STUB_LIB_SPEC@
+LIBS = $(TCL_STUB_LIB_SPEC)
LIBTOOL = @LIBTOOL@
+ LIPO = @LIPO@
LN_S = @LN_S@
- LTLIBICONV = @LTLIBICONV@
diff -urNa old/patches/patch-tclpkg_tkstubs_Makefile_in
new/patches/patch-tclpkg_tkstubs_Makefile_in
--- old/patches/patch-tclpkg_tkstubs_Makefile_in Sat Aug 18 21:46:00 2012
+++ new/patches/patch-tclpkg_tkstubs_Makefile_in Sat Aug 18 21:45:33 2012
@@ -1,12 +1,12 @@
$OpenBSD: patch-tclpkg_tkstubs_Makefile_in,v 1.1 2007/02/20 11:47:07 espie Exp
$
---- tclpkg/tkstubs/Makefile.in.orig2 Wed Jan 31 18:08:13 2007
-+++ tclpkg/tkstubs/Makefile.in Wed Jan 31 18:08:21 2007
-@@ -173,7 +173,7 @@ LIBICONV = @LIBICONV@
- LIBLTDL = @LIBLTDL@
+--- 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@
+ LIBLTDL_LDFLAGS = @LIBLTDL_LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBPNG_CONFIG = @LIBPNG_CONFIG@
-LIBS = @TK_STUB_LIB_SPEC@
+LIBS = $(TK_STUB_LIB_SPEC)
LIBTOOL = @LIBTOOL@
+ LIPO = @LIPO@
LN_S = @LN_S@
- LTLIBICONV = @LTLIBICONV@
diff -urNa old/pkg/PFRAG.shared-main new/pkg/PFRAG.shared-main
--- old/pkg/PFRAG.shared-main Sat Aug 18 21:46:00 2012
+++ new/pkg/PFRAG.shared-main Sat Aug 18 21:45:33 2012
@@ -1,22 +1,27 @@
@comment $OpenBSD: PFRAG.shared-main,v 1.1 2007/02/20 11:47:07 espie Exp $
-@lib lib/graphviz/guile/libgv_guile.so.${LIBgv_guile_VERSION}
+lib/graphviz/guile/libgv_guile.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_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_rsvg.so.${LIBgvplugin_rsvg_VERSION}
@lib lib/graphviz/libgvplugin_xlib.so.${LIBgvplugin_xlib_VERSION}
-@lib lib/graphviz/tcl/libgdtclft.so.${LIBgdtclft_VERSION}
-@lib lib/graphviz/tcl/libgv_tcl.so.${LIBgv_tcl_VERSION}
-@lib lib/graphviz/tcl/libtcldot.so.${LIBtcldot_VERSION}
-@lib lib/graphviz/tcl/libtcldot_builtin.so.${LIBtcldot_builtin_VERSION}
-@lib lib/graphviz/tcl/libtclplan.so.${LIBtclplan_VERSION}
-@lib lib/graphviz/tcl/libtkspline.so.${LIBtkspline_VERSION}
-@lib lib/libagraph.so.${LIBagraph_VERSION}
+lib/graphviz/perl/gv.so
+lib/graphviz/perl/libgv_perl.so
@lib lib/libcdt.so.${LIBcdt_VERSION}
-@lib lib/libexpr.so.${LIBexpr_VERSION}
+@lib lib/libcgraph.so.${LIBcgraph_VERSION}
@lib lib/libgraph.so.${LIBgraph_VERSION}
@lib lib/libgvc.so.${LIBgvc_VERSION}
-@lib lib/libgvc_builtins.so.${LIBgvc_builtins_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
diff -urNa old/pkg/PLIST-main new/pkg/PLIST-main
--- old/pkg/PLIST-main Sat Aug 18 21:46:00 2012
+++ new/pkg/PLIST-main Sat Aug 18 21:45:33 2012
@@ -1,81 +1,76 @@
@comment $OpenBSD: PLIST-main,v 1.3 2011/05/11 07:45:52 ajacoutot Exp $
-@unexec rm -f %D/lib/graphviz/config
%%SHARED%%
@bin bin/acyclic
@bin bin/bcomps
@bin bin/ccomps
bin/circo
+@bin bin/cluster
+@bin bin/diffimg
@bin bin/dijkstra
@bin bin/dot
bin/dot2gxl
+@bin bin/dot_builtins
bin/dotty
bin/fdp
@bin bin/gc
+@bin bin/gml2gv
+bin/gv2gxl
@bin bin/gvcolor
+@bin bin/gvgen
+@bin bin/gvmap
+bin/gvmap.sh
@bin bin/gvpack
@bin bin/gvpr
-@bin bin/gxl2dot
+bin/gxl2dot
+@bin bin/gxl2gv
@bin bin/lefty
bin/lneato
+@bin bin/mm2gv
bin/neato
@bin bin/nop
+bin/osage
+bin/patchwork
@bin bin/prune
@bin bin/sccmap
+bin/sfdp
@bin bin/tred
bin/twopi
@bin bin/unflatten
+bin/vimdot
include/graphviz/
-include/graphviz/aghdr.h
-include/graphviz/agraph.h
-include/graphviz/agxbuf.h
include/graphviz/arith.h
-include/graphviz/ast_common.h
include/graphviz/cdt.h
+include/graphviz/cgraph.h
include/graphviz/color.h
-include/graphviz/demand_loading.c
-include/graphviz/dot_builtins.c
-include/graphviz/dthdr.h
-include/graphviz/exgram.h
-include/graphviz/exlib.h
-include/graphviz/expr.h
include/graphviz/geom.h
-include/graphviz/globals.h
-include/graphviz/grammar.h
include/graphviz/graph.h
+include/graphviz/graphviz_version.h
include/graphviz/gv.cpp
include/graphviz/gv.i
include/graphviz/gvc.h
include/graphviz/gvcext.h
-include/graphviz/gvcint.h
include/graphviz/gvcjob.h
include/graphviz/gvcommon.h
+include/graphviz/gvconfig.h
include/graphviz/gvplugin.h
include/graphviz/gvplugin_device.h
include/graphviz/gvplugin_layout.h
include/graphviz/gvplugin_loadimage.h
include/graphviz/gvplugin_render.h
include/graphviz/gvplugin_textlayout.h
-include/graphviz/libgraph.h
-include/graphviz/logic.h
-include/graphviz/malloc.h
-include/graphviz/no_demand_loading.c
+include/graphviz/gvpr.h
include/graphviz/pack.h
-include/graphviz/parser.h
include/graphviz/pathgeom.h
include/graphviz/pathplan.h
-include/graphviz/pathutil.h
-include/graphviz/solvers.h
include/graphviz/textpara.h
-include/graphviz/tri.h
-include/graphviz/triefa.h
include/graphviz/types.h
include/graphviz/usershape.h
-include/graphviz/vis.h
-include/graphviz/vispath.h
-include/graphviz/vmstub.h
+include/graphviz/xdot.h
lib/graphviz/
+lib/graphviz/R/
+lib/graphviz/go/
lib/graphviz/guile/
-lib/graphviz/guile/gv_guile.man
+@comment
lib/graphviz/guile/libgv_guile.a
lib/graphviz/guile/libgv_guile.la
lib/graphviz/io/
@@ -86,103 +81,138 @@
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_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_rsvg.a
+lib/graphviz/libgvplugin_rsvg.la
lib/graphviz/libgvplugin_xlib.a
lib/graphviz/libgvplugin_xlib.la
lib/graphviz/lua/
-lib/graphviz/lua/gv.so
lib/graphviz/ocaml/
lib/graphviz/perl/
-lib/graphviz/perl/gv.so
+lib/graphviz/perl/gv.pm
+@comment
+lib/graphviz/perl/libgv_perl.a
+lib/graphviz/perl/libgv_perl.la
lib/graphviz/php/
-lib/graphviz/pkgIndex.tcl
lib/graphviz/python/
-lib/graphviz/python/_gv.so
+lib/graphviz/python23/
+lib/graphviz/python24/
+lib/graphviz/python25/
+lib/graphviz/python26/
+lib/graphviz/python27/
lib/graphviz/ruby/
-lib/graphviz/ruby/gv.so
lib/graphviz/sharp/
-lib/graphviz/tcl/
-lib/graphviz/tcl/gv.so
-lib/graphviz/tcl/gv_tcl.man
-lib/graphviz/tcl/libgdtclft.a
-lib/graphviz/tcl/libgdtclft.la
-lib/graphviz/tcl/libgv_tcl.a
-lib/graphviz/tcl/libgv_tcl.la
-lib/graphviz/tcl/libtcldot.a
-lib/graphviz/tcl/libtcldot.la
-lib/graphviz/tcl/libtcldot_builtin.a
-lib/graphviz/tcl/libtcldot_builtin.la
-lib/graphviz/tcl/libtclplan.a
-lib/graphviz/tcl/libtclplan.la
-lib/graphviz/tcl/libtkspline.a
-lib/graphviz/tcl/libtkspline.la
-lib/libagraph.a
-lib/libagraph.la
lib/libcdt.a
lib/libcdt.la
-lib/libexpr.a
-lib/libexpr.la
+lib/libcgraph.a
+lib/libcgraph.la
lib/libgraph.a
lib/libgraph.la
lib/libgvc.a
lib/libgvc.la
-lib/libgvc_builtins.a
-lib/libgvc_builtins.la
+lib/libgvpr.a
+lib/libgvpr.la
lib/libpathplan.a
lib/libpathplan.la
-lib/pkgconfig/libagraph.pc
+lib/libxdot.a
+lib/libxdot.la
lib/pkgconfig/libcdt.pc
-lib/pkgconfig/libexpr.pc
+lib/pkgconfig/libcgraph.pc
lib/pkgconfig/libgraph.pc
lib/pkgconfig/libgvc.pc
-lib/pkgconfig/libgvc_builtins.pc
+lib/pkgconfig/libgvpr.pc
lib/pkgconfig/libpathplan.pc
+lib/pkgconfig/libxdot.pc
+lib/tcl/
+lib/tcl/graphviz/
+lib/tcl/graphviz/libgdtclft.a
+lib/tcl/graphviz/libgdtclft.la
+@comment
+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
+lib/tcl/graphviz/libtcldot_builtin.la
+lib/tcl/graphviz/libtclplan.a
+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
+${P5ARCH}/
+${P5ARCH}/gv.pm
@man man/man1/acyclic.1
@man man/man1/bcomps.1
@man man/man1/ccomps.1
@man man/man1/circo.1
+@man man/man1/cluster.1
+@man man/man1/diffimg.1
@man man/man1/dijkstra.1
@man man/man1/dot.1
-@man man/man1/dot2gxl.1
@man man/man1/dotty.1
@man man/man1/fdp.1
@man man/man1/gc.1
+@man man/man1/gml2gv.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
@man man/man1/gvpack.1
@man man/man1/gvpr.1
-@man man/man1/gxl2dot.1
+@man man/man1/gxl2gv.1
@man man/man1/lefty.1
@man man/man1/lneato.1
+@man man/man1/mm2gv.1
@man man/man1/neato.1
@man man/man1/nop.1
+@man man/man1/osage.1
+@man man/man1/patchwork.1
@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
-@man man/man3/agraph.3
+@man man/man1/vimdot.1
@man man/man3/cdt.3
+@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/pack.3
@man man/man3/pathplan.3
-@man man/mann/gdtclft.n
-@man man/mann/tcldot.n
-@man man/mann/tkspline.n
+man/man3/tcldot.3tcl
+man/man3/tkspline.3tk
+@man man/man3/xdot.3
+@man man/man7/graphviz.7
share/doc/graphviz/
share/doc/graphviz/AUTHORS
share/doc/graphviz/COPYING
share/doc/graphviz/ChangeLog
share/doc/graphviz/Dot.ref
share/doc/graphviz/NEWS
+share/doc/graphviz/addingLayout.txt
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
@@ -243,14 +273,19 @@
share/doc/graphviz/html/aa_rvee.gif
share/doc/graphviz/html/aa_tee.gif
share/doc/graphviz/html/aa_vee.gif
+share/doc/graphviz/html/arrows.html
share/doc/graphviz/html/attrs.html
share/doc/graphviz/html/back.gif
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/char.html
share/doc/graphviz/html/circle.gif
+share/doc/graphviz/html/colorlist.gif
share/doc/graphviz/html/colors.html
share/doc/graphviz/html/command.html
+share/doc/graphviz/html/component.gif
share/doc/graphviz/html/constraint.gif
share/doc/graphviz/html/diamond.gif
share/doc/graphviz/html/doublecircle.gif
@@ -258,14 +293,17 @@
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/grammar.html
share/doc/graphviz/html/hexagon.gif
share/doc/graphviz/html/house.gif
share/doc/graphviz/html/html1.gif
share/doc/graphviz/html/html2.gif
+share/doc/graphviz/html/html2.gv
share/doc/graphviz/html/html3.gif
+share/doc/graphviz/html/html3.gv
share/doc/graphviz/html/html4.gif
+share/doc/graphviz/html/html4.gv
share/doc/graphviz/html/index.html
share/doc/graphviz/html/invhouse.gif
share/doc/graphviz/html/invtrapezium.gif
@@ -274,75 +312,102 @@
share/doc/graphviz/html/mrecord.gif
share/doc/graphviz/html/nohead.gif
share/doc/graphviz/html/none.gif
+share/doc/graphviz/html/note.gif
share/doc/graphviz/html/octagon.gif
share/doc/graphviz/html/output.html
share/doc/graphviz/html/parallelogram.gif
share/doc/graphviz/html/pentagon.gif
share/doc/graphviz/html/plaintext.gif
+share/doc/graphviz/html/plugins.png
share/doc/graphviz/html/point.gif
share/doc/graphviz/html/polygon.gif
share/doc/graphviz/html/pspdf.png
share/doc/graphviz/html/record.gif
+share/doc/graphviz/html/record2.gif
share/doc/graphviz/html/rect.gif
share/doc/graphviz/html/rectangle.gif
share/doc/graphviz/html/round.gif
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/square.gif
+share/doc/graphviz/html/tab.gif
share/doc/graphviz/html/tcldot.html
+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/winbuild.html
share/doc/graphviz/latex_suggestions.txt
share/doc/graphviz/pdf/
-share/doc/graphviz/pdf/acyclic.pdf
-share/doc/graphviz/pdf/agraph.pdf
-share/doc/graphviz/pdf/bcomps.pdf
-share/doc/graphviz/pdf/ccomps.pdf
-share/doc/graphviz/pdf/cdt.pdf
-share/doc/graphviz/pdf/circo.pdf
-share/doc/graphviz/pdf/dijkstra.pdf
-share/doc/graphviz/pdf/dot.pdf
-share/doc/graphviz/pdf/dot2gxl.pdf
+share/doc/graphviz/pdf/acyclic.1.pdf
+share/doc/graphviz/pdf/bcomps.1.pdf
+share/doc/graphviz/pdf/ccomps.1.pdf
+share/doc/graphviz/pdf/cdt.3.pdf
+share/doc/graphviz/pdf/cgraph.3.pdf
+share/doc/graphviz/pdf/circo.1.pdf
+share/doc/graphviz/pdf/cluster.1.pdf
+share/doc/graphviz/pdf/diffimg.1.pdf
+share/doc/graphviz/pdf/dijkstra.1.pdf
+share/doc/graphviz/pdf/dot.1.pdf
share/doc/graphviz/pdf/dotguide.pdf
-share/doc/graphviz/pdf/dotty.pdf
+share/doc/graphviz/pdf/dotty.1.pdf
share/doc/graphviz/pdf/dottyguide.pdf
-share/doc/graphviz/pdf/expr.pdf
-share/doc/graphviz/pdf/fdp.pdf
-share/doc/graphviz/pdf/gc.pdf
-share/doc/graphviz/pdf/gdtclft.pdf
-share/doc/graphviz/pdf/graph.pdf
-share/doc/graphviz/pdf/gvc.pdf
-share/doc/graphviz/pdf/gvcolor.pdf
-share/doc/graphviz/pdf/gvpack.pdf
-share/doc/graphviz/pdf/gvpr.pdf
-share/doc/graphviz/pdf/gxl2dot.pdf
-share/doc/graphviz/pdf/lefty.pdf
+share/doc/graphviz/pdf/expr.3.pdf
+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/gv.3guile.pdf
+share/doc/graphviz/pdf/gv.3perl.pdf
+share/doc/graphviz/pdf/gv.3tcl.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/gxl2gv.1.pdf
+share/doc/graphviz/pdf/lefty.1.pdf
share/doc/graphviz/pdf/leftyguide.pdf
-share/doc/graphviz/pdf/lneato.pdf
-share/doc/graphviz/pdf/neato.pdf
+share/doc/graphviz/pdf/libguide.pdf
+share/doc/graphviz/pdf/lneato.1.pdf
+share/doc/graphviz/pdf/mm2gv.1.pdf
+share/doc/graphviz/pdf/neato.1.pdf
share/doc/graphviz/pdf/neatoguide.pdf
-share/doc/graphviz/pdf/nop.pdf
-share/doc/graphviz/pdf/pathplan.pdf
+share/doc/graphviz/pdf/nop.1.pdf
+share/doc/graphviz/pdf/osage.1.pdf
+share/doc/graphviz/pdf/pack.3.pdf
+share/doc/graphviz/pdf/patchwork.1.pdf
+share/doc/graphviz/pdf/pathplan.3.pdf
share/doc/graphviz/pdf/prune.pdf
-share/doc/graphviz/pdf/sccmap.pdf
-share/doc/graphviz/pdf/tcldot.pdf
-share/doc/graphviz/pdf/tkspline.pdf
-share/doc/graphviz/pdf/tred.pdf
-share/doc/graphviz/pdf/twopi.pdf
-share/doc/graphviz/pdf/unflatten.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
+share/doc/graphviz/pdf/tred.1.pdf
+share/doc/graphviz/pdf/twopi.1.pdf
+share/doc/graphviz/pdf/unflatten.1.pdf
+share/doc/graphviz/pdf/vimdot.1.pdf
+share/doc/graphviz/pdf/xdot.3.pdf
share/examples/graphviz/
share/examples/graphviz/demo/
-share/examples/graphviz/demo/doted
-share/examples/graphviz/demo/doted.README
-share/examples/graphviz/demo/entities
-share/examples/graphviz/demo/entities.README
-share/examples/graphviz/demo/entities.html
-share/examples/graphviz/demo/gcat
-share/examples/graphviz/demo/gcat.README
-share/examples/graphviz/demo/pathplan
-share/examples/graphviz/demo/pathplan.README
+share/examples/graphviz/demo/doted.tcl
+share/examples/graphviz/demo/doted.tcl.README
+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
+share/examples/graphviz/demo/pathplan.tcl.README
share/examples/graphviz/demo/pathplan_data/
share/examples/graphviz/demo/pathplan_data/boxes.dat
share/examples/graphviz/demo/pathplan_data/dpd.dat
@@ -356,67 +421,70 @@
share/examples/graphviz/demo/pathplan_data/rotor.dat
share/examples/graphviz/demo/pathplan_data/u.dat
share/examples/graphviz/demo/pathplan_data/unknown.dat
-share/examples/graphviz/demo/spline
-share/examples/graphviz/demo/spline.README
+share/examples/graphviz/demo/spline.tcl
+share/examples/graphviz/demo/spline.tcl.README
share/examples/graphviz/graphs/
share/examples/graphviz/graphs/directed/
-share/examples/graphviz/graphs/directed/KW91.dot
-share/examples/graphviz/graphs/directed/Latin1.dot
-share/examples/graphviz/graphs/directed/NaN.dot
-share/examples/graphviz/graphs/directed/abstract.dot
-share/examples/graphviz/graphs/directed/alf.dot
-share/examples/graphviz/graphs/directed/arrows.dot
-share/examples/graphviz/graphs/directed/awilliams.dot
-share/examples/graphviz/graphs/directed/clust.dot
-share/examples/graphviz/graphs/directed/clust1.dot
-share/examples/graphviz/graphs/directed/clust2.dot
-share/examples/graphviz/graphs/directed/clust3.dot
-share/examples/graphviz/graphs/directed/clust4.dot
-share/examples/graphviz/graphs/directed/clust5.dot
-share/examples/graphviz/graphs/directed/crazy.dot
-share/examples/graphviz/graphs/directed/ctext.dot
-share/examples/graphviz/graphs/directed/dfa.dot
-share/examples/graphviz/graphs/directed/fig6.dot
-share/examples/graphviz/graphs/directed/fsm.dot
-share/examples/graphviz/graphs/directed/grammar.dot
-share/examples/graphviz/graphs/directed/hashtable.dot
-share/examples/graphviz/graphs/directed/honda-tokoro.dot
-share/examples/graphviz/graphs/directed/jcctree.dot
-share/examples/graphviz/graphs/directed/jsort.dot
-share/examples/graphviz/graphs/directed/ldbxtried.dot
-share/examples/graphviz/graphs/directed/longflat.dot
-share/examples/graphviz/graphs/directed/mike.dot
-share/examples/graphviz/graphs/directed/nhg.dot
-share/examples/graphviz/graphs/directed/oldarrows.dot
-share/examples/graphviz/graphs/directed/pgram.dot
-share/examples/graphviz/graphs/directed/pm2way.dot
-share/examples/graphviz/graphs/directed/pmpipe.dot
-share/examples/graphviz/graphs/directed/polypoly.dot
-share/examples/graphviz/graphs/directed/proc3d.dot
-share/examples/graphviz/graphs/directed/record2.dot
-share/examples/graphviz/graphs/directed/records.dot
-share/examples/graphviz/graphs/directed/rowe.dot
-share/examples/graphviz/graphs/directed/sdh.dot
-share/examples/graphviz/graphs/directed/shells.dot
-share/examples/graphviz/graphs/directed/states.dot
-share/examples/graphviz/graphs/directed/structs.dot
-share/examples/graphviz/graphs/directed/switch.dot
-share/examples/graphviz/graphs/directed/table.dot
-share/examples/graphviz/graphs/directed/train11.dot
-share/examples/graphviz/graphs/directed/trapeziumlr.dot
-share/examples/graphviz/graphs/directed/tree.dot
-share/examples/graphviz/graphs/directed/triedds.dot
-share/examples/graphviz/graphs/directed/try.dot
-share/examples/graphviz/graphs/directed/unix.dot
-share/examples/graphviz/graphs/directed/unix2.dot
-share/examples/graphviz/graphs/directed/viewfile.dot
-share/examples/graphviz/graphs/directed/world.dot
+share/examples/graphviz/graphs/directed/KW91.gv
+share/examples/graphviz/graphs/directed/Latin1.gv
+share/examples/graphviz/graphs/directed/NaN.gv
+share/examples/graphviz/graphs/directed/abstract.gv
+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/clust.gv
+share/examples/graphviz/graphs/directed/clust1.gv
+share/examples/graphviz/graphs/directed/clust2.gv
+share/examples/graphviz/graphs/directed/clust3.gv
+share/examples/graphviz/graphs/directed/clust4.gv
+share/examples/graphviz/graphs/directed/clust5.gv
+share/examples/graphviz/graphs/directed/crazy.gv
+share/examples/graphviz/graphs/directed/ctext.gv
+share/examples/graphviz/graphs/directed/dfa.gv
+share/examples/graphviz/graphs/directed/fig6.gv
+share/examples/graphviz/graphs/directed/fsm.gv
+share/examples/graphviz/graphs/directed/grammar.gv
+share/examples/graphviz/graphs/directed/hashtable.gv
+share/examples/graphviz/graphs/directed/honda-tokoro.gv
+share/examples/graphviz/graphs/directed/japanese.gv
+share/examples/graphviz/graphs/directed/jcctree.gv
+share/examples/graphviz/graphs/directed/jsort.gv
+share/examples/graphviz/graphs/directed/ldbxtried.gv
+share/examples/graphviz/graphs/directed/longflat.gv
+share/examples/graphviz/graphs/directed/mike.gv
+share/examples/graphviz/graphs/directed/nhg.gv
+share/examples/graphviz/graphs/directed/oldarrows.gv
+share/examples/graphviz/graphs/directed/pgram.gv
+share/examples/graphviz/graphs/directed/pm2way.gv
+share/examples/graphviz/graphs/directed/pmpipe.gv
+share/examples/graphviz/graphs/directed/polypoly.gv
+share/examples/graphviz/graphs/directed/proc3d.gv
+share/examples/graphviz/graphs/directed/psfonttest.gv
+share/examples/graphviz/graphs/directed/record2.gv
+share/examples/graphviz/graphs/directed/records.gv
+share/examples/graphviz/graphs/directed/rowe.gv
+share/examples/graphviz/graphs/directed/russian.gv
+share/examples/graphviz/graphs/directed/sdh.gv
+share/examples/graphviz/graphs/directed/shells.gv
+share/examples/graphviz/graphs/directed/states.gv
+share/examples/graphviz/graphs/directed/structs.gv
+share/examples/graphviz/graphs/directed/switch.gv
+share/examples/graphviz/graphs/directed/table.gv
+share/examples/graphviz/graphs/directed/train11.gv
+share/examples/graphviz/graphs/directed/trapeziumlr.gv
+share/examples/graphviz/graphs/directed/tree.gv
+share/examples/graphviz/graphs/directed/triedds.gv
+share/examples/graphviz/graphs/directed/try.gv
+share/examples/graphviz/graphs/directed/unix.gv
+share/examples/graphviz/graphs/directed/unix2.gv
+share/examples/graphviz/graphs/directed/viewfile.gv
+share/examples/graphviz/graphs/directed/world.gv
share/examples/graphviz/graphs/undirected/
-share/examples/graphviz/graphs/undirected/ER.dot
-share/examples/graphviz/graphs/undirected/Heawood.dot
-share/examples/graphviz/graphs/undirected/Petersen.dot
-share/examples/graphviz/graphs/undirected/ngk10_4.dot
-share/examples/graphviz/graphs/undirected/process.dot
+share/examples/graphviz/graphs/undirected/ER.gv
+share/examples/graphviz/graphs/undirected/Heawood.gv
+share/examples/graphviz/graphs/undirected/Petersen.gv
+share/examples/graphviz/graphs/undirected/ngk10_4.gv
+share/examples/graphviz/graphs/undirected/process.gv
share/examples/graphviz/lefty/
share/examples/graphviz/lefty/box.lefty
share/examples/graphviz/lefty/def.lefty
@@ -431,3 +499,16 @@
share/examples/graphviz/lefty/slides.lefty
share/examples/graphviz/lefty/tree.lefty
@exec %D/bin/dot -c
+share/graphviz/
+share/graphviz/demo/
+share/graphviz/demo/modgraph.pl
+share/graphviz/demo/modgraph.tcl
+share/graphviz/doc/
+share/graphviz/doc/html/
+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/
diff -urNa old/tests/guile-test.scm new/tests/guile-test.scm
--- old/tests/guile-test.scm Thu Jan 1 01:00:00 1970
+++ new/tests/guile-test.scm Sat Aug 18 21:45:33 2012
@@ -0,0 +1,14 @@
+(load-extension "/usr/local/lib/graphviz/guile/libgv_guile.so" "SWIG_init");
+(define g (digraph "g"));
+
+(define n1 (node g "a"));
+(define n2 (node g "b"));
+(define n3 (node g "c"));
+
+(define e1 (edge n1 n2));
+(define e2 (edge n2 n3));
+(define e3 (edge n3 n1));
+
+(layout g "dot");
+(render g "xlib");
+
diff -urNa old/tests/perl-test.pl new/tests/perl-test.pl
--- old/tests/perl-test.pl Thu Jan 1 01:00:00 1970
+++ new/tests/perl-test.pl Sat Aug 18 21:45:33 2012
@@ -0,0 +1,15 @@
+#!/usr/bin/perl
+use gv;
+
+my $g = gv::graph("test");
+
+my $n1 = gv::node($g, "a") ;
+my $n2 = gv::node($g, "b") ;
+my $n3 = gv::node($g, "c") ;
+
+gv::edge($n1, $n2) ;
+gv::edge($n2, $n3) ;
+gv::edge($n3, $n1) ;
+
+gv::layout($g, 'dot');
+gv::render($g, 'xlib' );
diff -urNa old/tests/tcl-test.tcl new/tests/tcl-test.tcl
--- old/tests/tcl-test.tcl Thu Jan 1 01:00:00 1970
+++ new/tests/tcl-test.tcl Sat Aug 18 21:45:33 2012
@@ -0,0 +1,20 @@
+#!/usr/bin/tclsh
+
+# display the kernel module dependencies
+
+# author: John Ellson <ell...@research.att.com>
+
+package require gv
+
+set G [gv::digraph G]
+
+set N1 [gv::node $G "a"]
+set N2 [gv::node $G "b"]
+set N3 [gv::node $G "c"]
+
+set E1 [gv::edge $N1 $N2]
+set E2 [gv::edge $N2 $N3]
+set E3 [gv::edge $N3 $N1]
+
+gv::layout $G dot
+gv::render $G xlib
--
Best Regards
Edd Barrett
http://www.theunixzoo.co.uk
