[pkgsrc/trunk]: pkgsrc/graphics/graphviz Changes 2.6:

[adam <adam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/31532ee8ddde
branches:  trunk
changeset: 500431:31532ee8ddde
user:      adam <adam%pkgsrc.org@localhost>
date:      Sat Oct 08 08:11:10 2005 +0000

description:
Changes 2.6:
        - experimentally moved source code management from CVS to GIT
        - added iterator functions to script bindings
        - more C-API tuning
        - add "-c" switch to dot to explicitly generate plugin "config" file
                instead of generating it as a side-effect of "dot -V"
        - better support for binary relocation.
        - plugin versioning and version checking
        - clean up of header files
        - provide statically linked "dot_static" (not incl. in rpms)
        - additional "event" support for GUIs (e.g. "DotEdit" graphviz-cairo)
        - add some information about plugins to "dot -v" output.
        - lefty/dotty fixes
        - fix bugs

diffstat:

 graphics/graphviz/MESSAGE          |    4 +-
 graphics/graphviz/Makefile         |   28 +-
 graphics/graphviz/PLIST            |  576 ++++++++++++++++++------------------
 graphics/graphviz/buildlink3.mk    |    9 +-
 graphics/graphviz/distinfo         |   82 +-----
 graphics/graphviz/patches/patch-ab |  216 -------------
 graphics/graphviz/patches/patch-ac |  499 --------------------------------
 graphics/graphviz/patches/patch-ad |   21 -
 graphics/graphviz/patches/patch-ae |  135 --------
 graphics/graphviz/patches/patch-af |   12 -
 graphics/graphviz/patches/patch-ag |   29 -
 graphics/graphviz/patches/patch-ah |   22 -
 graphics/graphviz/patches/patch-ai |  142 ---------
 graphics/graphviz/patches/patch-aj |   12 -
 graphics/graphviz/patches/patch-ak |   29 -
 graphics/graphviz/patches/patch-al |   19 -
 graphics/graphviz/patches/patch-am |  144 ---------
 graphics/graphviz/patches/patch-an |   13 -
 graphics/graphviz/patches/patch-ao |   29 -
 graphics/graphviz/patches/patch-ap |   13 -
 graphics/graphviz/patches/patch-aq |   29 -
 graphics/graphviz/patches/patch-ar |   37 --
 graphics/graphviz/patches/patch-as |  152 ---------
 graphics/graphviz/patches/patch-at |   12 -
 graphics/graphviz/patches/patch-au |   29 -
 graphics/graphviz/patches/patch-av |   17 -
 graphics/graphviz/patches/patch-aw |   33 --
 graphics/graphviz/patches/patch-ax |   12 -
 graphics/graphviz/patches/patch-ay |   29 -
 graphics/graphviz/patches/patch-az |   21 -
 graphics/graphviz/patches/patch-ba |  135 --------
 graphics/graphviz/patches/patch-bb |   15 -
 graphics/graphviz/patches/patch-bc |  136 --------
 graphics/graphviz/patches/patch-bd |   17 -
 graphics/graphviz/patches/patch-be |  135 --------
 graphics/graphviz/patches/patch-bf |   21 -
 graphics/graphviz/patches/patch-bg |  135 --------
 graphics/graphviz/patches/patch-bh |   20 -
 graphics/graphviz/patches/patch-bi |  139 --------
 graphics/graphviz/patches/patch-bj |   17 -
 graphics/graphviz/patches/patch-bk |  138 --------
 graphics/graphviz/patches/patch-bl |   21 -
 graphics/graphviz/patches/patch-bm |  135 --------
 graphics/graphviz/patches/patch-bn |   22 -
 graphics/graphviz/patches/patch-bo |  164 ----------
 graphics/graphviz/patches/patch-bp |   20 -
 graphics/graphviz/patches/patch-bq |  140 --------
 graphics/graphviz/patches/patch-br |   19 -
 graphics/graphviz/patches/patch-bs |  134 --------
 graphics/graphviz/patches/patch-bt |   19 -
 graphics/graphviz/patches/patch-bu |  143 ---------
 graphics/graphviz/patches/patch-bv |   32 --
 graphics/graphviz/patches/patch-bw |  153 ---------
 graphics/graphviz/patches/patch-bx |   13 -
 graphics/graphviz/patches/patch-by |   42 --
 graphics/graphviz/patches/patch-bz |   21 -
 graphics/graphviz/patches/patch-ca |  136 --------
 graphics/graphviz/patches/patch-cb |   13 -
 graphics/graphviz/patches/patch-cc |   29 -
 graphics/graphviz/patches/patch-cd |   13 -
 graphics/graphviz/patches/patch-ce |   29 -
 graphics/graphviz/patches/patch-cf |   20 -
 graphics/graphviz/patches/patch-cg |  146 ---------
 graphics/graphviz/patches/patch-ch |   12 -
 graphics/graphviz/patches/patch-ci |   29 -
 graphics/graphviz/patches/patch-cj |   12 -
 graphics/graphviz/patches/patch-ck |   29 -
 graphics/graphviz/patches/patch-cl |   12 -
 graphics/graphviz/patches/patch-cm |   29 -
 graphics/graphviz/patches/patch-cn |   12 -
 graphics/graphviz/patches/patch-co |   29 -
 graphics/graphviz/patches/patch-cp |   12 -
 graphics/graphviz/patches/patch-cq |   29 -
 graphics/graphviz/patches/patch-cr |   12 -
 graphics/graphviz/patches/patch-cs |   29 -
 graphics/graphviz/patches/patch-ct |   12 -
 graphics/graphviz/patches/patch-cu |   29 -
 graphics/graphviz/patches/patch-cv |   12 -
 graphics/graphviz/patches/patch-cw |   29 -
 79 files changed, 307 insertions(+), 4798 deletions(-)

diffs (truncated from 5553 to 300 lines):

diff -r 672bf82ae70d -r 31532ee8ddde graphics/graphviz/MESSAGE
--- a/graphics/graphviz/MESSAGE Sat Oct 08 06:33:04 2005 +0000
+++ b/graphics/graphviz/MESSAGE Sat Oct 08 08:11:10 2005 +0000
@@ -1,8 +1,8 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.3 2004/12/24 18:26:56 seb Exp $
+$NetBSD: MESSAGE,v 1.4 2005/10/08 08:11:10 adam Exp $
 
 Please read graphviz license terms in:
 
-${PREFIX}/share/doc/graphviz/COPYING
+${PREFIX}/share/graphviz/doc/COPYING
 
 ===========================================================================
diff -r 672bf82ae70d -r 31532ee8ddde graphics/graphviz/Makefile
--- a/graphics/graphviz/Makefile        Sat Oct 08 06:33:04 2005 +0000
+++ b/graphics/graphviz/Makefile        Sat Oct 08 08:11:10 2005 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.39 2005/08/10 20:56:18 jlam Exp $
-#
+# $NetBSD: Makefile,v 1.40 2005/10/08 08:11:10 adam Exp $
 
-DISTNAME=      graphviz-2.2.1
+DISTNAME=      graphviz-2.6
 CATEGORIES=    graphics
 MASTER_SITES=  http://www.graphviz.org/pub/graphviz/ARCHIVE/
 
@@ -11,16 +10,17 @@
 
 BUILDLINK_DEPENDS.gd+= gd>=2.0.33nb1
 
-DIST_SUBDIR=   ${PKGNAME_NOREV}
-
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
 
+USE_LIBTOOL=           yes
 USE_TOOLS+=            pkg-config
 GNU_CONFIGURE=         yes
-USE_LIBTOOL=           yes
 XAW_TYPE=              standard
-PKGCONFIG_OVERRIDE=    */*.pc */*/*.pc
-PKGCONFIG_OVERRIDE_STAGE=      post-build
+PKGCONFIG_OVERRIDE=    lib/agraph/libagraph.pc.in
+PKGCONFIG_OVERRIDE+=   lib/cdt/libcdt.pc.in
+PKGCONFIG_OVERRIDE+=   lib/graph/libgraph.pc.in
+PKGCONFIG_OVERRIDE+=   lib/gvc/libgvc.pc.in
+PKGCONFIG_OVERRIDE+=   lib/pathplan/libpathplan.pc.in
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -28,26 +28,18 @@
 CONFIGURE_ENV+=                TKCONFIG=${TKCONFIG_SH}
 CONFIGURE_ENV+=                X11PREFIX=${X11PREFIX} X11BASE=${X11BASE}
 
-# Dynagraph is left out for now
-#UNLIMIT_RESOURCES=    datasize stacksize memorysize
-CONFIGURE_ARGS+=       --without-dynagraph
-
-# the upstream tarball still contains *.orig files
-post-extract:
-       ${FIND} ${WRKSRC} -name "*.orig" -print | ${XARGS} ${RM} -f
-
 # prevent another config.status run
 pre-build:
        ${TOUCH} ${WRKSRC}/Makefile
 
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
+.include "../../devel/libltdl/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/gd/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
-.include "../../mk/xaw.buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../x11/tk/buildlink3.mk"
+.include "../../mk/xaw.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 672bf82ae70d -r 31532ee8ddde graphics/graphviz/PLIST
--- a/graphics/graphviz/PLIST   Sat Oct 08 06:33:04 2005 +0000
+++ b/graphics/graphviz/PLIST   Sat Oct 08 08:11:10 2005 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2005/03/19 09:13:57 seb Exp $
+@comment $NetBSD: PLIST,v 1.12 2005/10/08 08:11:10 adam Exp $
 bin/acyclic
 bin/bcomps
 bin/ccomps
@@ -6,7 +6,7 @@
 bin/dijkstra
 bin/dot
 bin/dot2gxl
-bin/dotneato-config
+bin/dot_static
 bin/dotty
 bin/fdp
 bin/gc
@@ -23,125 +23,85 @@
 bin/tred
 bin/twopi
 bin/unflatten
-include/graphviz/adjust.h
 include/graphviz/aghdr.h
 include/graphviz/agraph.h
 include/graphviz/agxbuf.h
+include/graphviz/arith.h
 include/graphviz/ast_common.h
-include/graphviz/bfs.h
-include/graphviz/block.h
-include/graphviz/blockpath.h
-include/graphviz/blocktree.h
-include/graphviz/cairogen-png.h
-include/graphviz/cairogen-ps.h
-include/graphviz/cairogen-win.h
 include/graphviz/cdt.h
-include/graphviz/circle.h
-include/graphviz/circo.h
-include/graphviz/circpos.h
-include/graphviz/circular.h
-include/graphviz/closest.h
-include/graphviz/clusteredges.h
-include/graphviz/colortbl.h
-include/graphviz/comp.h
-include/graphviz/conjgrad.h
-include/graphviz/const.h
-include/graphviz/dbg.h
-include/graphviz/defs.h
-include/graphviz/deglist.h
-include/graphviz/dijkstra.h
-include/graphviz/dot.h
-include/graphviz/dotneato.h
-include/graphviz/dotprocs.h
+include/graphviz/color.h
 include/graphviz/dthdr.h
-include/graphviz/edgelist.h
-include/graphviz/edges.h
-include/graphviz/embed_graph.h
+include/graphviz/entities.h
 include/graphviz/exgram.h
 include/graphviz/exlib.h
 include/graphviz/expr.h
-include/graphviz/fdp.h
-include/graphviz/geometry.h
+include/graphviz/gd.h
+include/graphviz/gd_io.h
+include/graphviz/gdcache.h
+include/graphviz/gdfontg.h
+include/graphviz/gdfontl.h
+include/graphviz/gdfontmb.h
+include/graphviz/gdfonts.h
+include/graphviz/gdfontt.h
+include/graphviz/gdfx.h
+include/graphviz/gdhelpers.h
+include/graphviz/geom.h
 include/graphviz/globals.h
 include/graphviz/grammar.h
 include/graphviz/graph.h
-include/graphviz/grid.h
-include/graphviz/gvre.h
-include/graphviz/gvrender.h
-include/graphviz/gvrenderint.h
-include/graphviz/heap.h
-include/graphviz/hedges.h
-include/graphviz/htmllex.h
-include/graphviz/htmltable.h
-include/graphviz/info.h
-include/graphviz/kkutils.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/gvplugin.h
+include/graphviz/gvplugin_device.h
+include/graphviz/gvplugin_layout.h
+include/graphviz/gvplugin_render.h
+include/graphviz/gvplugin_textlayout.h
+include/graphviz/gvplugin_usershape.h
+include/graphviz/jisx0208.h
 include/graphviz/libgraph.h
-include/graphviz/macros.h
+include/graphviz/logic.h
 include/graphviz/malloc.h
-include/graphviz/matrix_ops.h
-include/graphviz/mem.h
-include/graphviz/neato.h
-include/graphviz/neatoprocs.h
-include/graphviz/nodelist.h
-include/graphviz/nodeset.h
-include/graphviz/options.h
 include/graphviz/pack.h
 include/graphviz/parser.h
 include/graphviz/pathgeom.h
 include/graphviz/pathplan.h
 include/graphviz/pathutil.h
-include/graphviz/pca.h
-include/graphviz/pointset.h
-include/graphviz/poly.h
-include/graphviz/render.h
-include/graphviz/renderprocs.h
-include/graphviz/simple.h
-include/graphviz/site.h
 include/graphviz/solvers.h
-include/graphviz/stack.h
-include/graphviz/stress.h
-include/graphviz/tlayout.h
 include/graphviz/tri.h
 include/graphviz/triefa.h
 include/graphviz/types.h
-include/graphviz/utils.h
 include/graphviz/vis.h
 include/graphviz/vispath.h
 include/graphviz/vmstub.h
-include/graphviz/voronoi.h
-include/graphviz/xlayout.h
+include/graphviz/wbmp.h
+lib/graphviz/config
 lib/graphviz/libagraph.la
 lib/graphviz/libcdt.la
-lib/graphviz/libcircogen.la
-lib/graphviz/libcommon.la
-lib/graphviz/libdotgen.la
-lib/graphviz/libdotneato.la
 lib/graphviz/libexpr.la
-lib/graphviz/libfdpgen.la
 lib/graphviz/libgdtclft.la
 lib/graphviz/libgraph.la
-lib/graphviz/libgvrender.la
-lib/graphviz/libneatogen.la
+lib/graphviz/libgv_tcl.la
+lib/graphviz/libgvc.la
+lib/graphviz/libgvc_builtins.la
+lib/graphviz/libgvgd.la
+lib/graphviz/libgvplugin_dot_layout.la
+lib/graphviz/libgvplugin_neato_layout.la
+lib/graphviz/libgvplugin_usershape_gd.la
 lib/graphviz/libpack.la
 lib/graphviz/libpathplan.la
 lib/graphviz/libtcldot.la
 lib/graphviz/libtclplan.la
 lib/graphviz/libtkspline.la
-lib/graphviz/libtwopigen.la
 lib/graphviz/pkgIndex.tcl
 lib/pkgconfig/libagraph.pc
 lib/pkgconfig/libcdt.pc
-lib/pkgconfig/libcircogen.pc
-lib/pkgconfig/libcommon.pc
-lib/pkgconfig/libdotgen.pc
-lib/pkgconfig/libdotneato.pc
-lib/pkgconfig/libfdpgen.pc
 lib/pkgconfig/libgraph.pc
-lib/pkgconfig/libgvrender.pc
-lib/pkgconfig/libneatogen.pc
-lib/pkgconfig/libpack.pc
+lib/pkgconfig/libgvc.pc
 lib/pkgconfig/libpathplan.pc
-lib/pkgconfig/libtwopigen.pc
 man/man1/acyclic.1
 man/man1/bcomps.1
 man/man1/ccomps.1
@@ -149,7 +109,6 @@
 man/man1/dijkstra.1
 man/man1/dot.1
 man/man1/dot2gxl.1
-man/man1/dotneato-config.1
 man/man1/dotty.1
 man/man1/fdp.1
 man/man1/gc.1
@@ -175,223 +134,258 @@
 man/mann/gdtclft.n
 man/mann/tcldot.n
 man/mann/tkspline.n
-share/doc/graphviz/AUTHORS
-share/doc/graphviz/COPYING
-share/doc/graphviz/ChangeLog
-share/doc/graphviz/Dot.ref
-share/doc/graphviz/NEWS
-share/doc/graphviz/cpl1.0.txt
-share/doc/graphviz/latex_suggestions.txt
-share/doc/graphviz/pdf/dotguide.pdf
-share/doc/graphviz/pdf/dottyguide.pdf
-share/doc/graphviz/pdf/leftyguide.pdf
-share/doc/graphviz/pdf/neatoguide.pdf
-share/doc/html/graphviz/FAQ.html
-share/doc/html/graphviz/Mcircle.gif
-share/doc/html/graphviz/Mdiamond.gif
-share/doc/html/graphviz/Msquare.gif
-share/doc/html/graphviz/a_box.gif
-share/doc/html/graphviz/a_crow.gif
-share/doc/html/graphviz/a_diamond.gif
-share/doc/html/graphviz/a_dot.gif
-share/doc/html/graphviz/a_ediamond.gif
-share/doc/html/graphviz/a_empty.gif
-share/doc/html/graphviz/a_forward.gif
-share/doc/html/graphviz/a_halfopen.gif
-share/doc/html/graphviz/a_inv.gif
-share/doc/html/graphviz/a_invdot.gif
-share/doc/html/graphviz/a_invempty.gif
-share/doc/html/graphviz/a_invodot.gif