[Midnightbsd-cvs] mports: graphics/graphviz: Update graphviz.

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Thu Jul 10 13:54:42 EDT 2008


Log Message:
-----------
Update graphviz.  Newer versions don't seem to get out of configure.

Modified Files:
--------------
    mports/graphics/graphviz:
        Makefile (r1.3 -> r1.4)
        distinfo (r1.1 -> r1.2)
        pkg-plist (r1.2 -> r1.3)
    mports/graphics/graphviz/files:
        patch-configure (r1.1 -> r1.2)

Removed Files:
-------------
    mports/graphics/graphviz/files:
        patch-tools::sfio::sfhdr.h

-------------- next part --------------
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/graphics/graphviz/pkg-plist,v
retrieving revision 1.2
retrieving revision 1.3
diff -L graphics/graphviz/pkg-plist -L graphics/graphviz/pkg-plist -u -r1.2 -r1.3
--- graphics/graphviz/pkg-plist
+++ graphics/graphviz/pkg-plist
@@ -1,7 +1,7 @@
 bin/dot
 bin/dot2gxl
-bin/dot_static
 bin/circo
+bin/diffimg
 bin/fdp
 bin/gc
 bin/gvcolor
@@ -18,12 +18,16 @@
 bin/dijkstra
 bin/bcomps
 bin/gvpr
-bin/lefty
+%%WITH_XPM%%bin/lefty
 bin/lneato
 bin/dotty
 bin/prune
+%%WITH_SMYRNA%%bin/smyrna
 include/graphviz/ast_common.h
 include/graphviz/cdt.h
+include/graphviz/cgraph.h
+include/graphviz/demand_loading.c
+include/graphviz/dot_builtins.c
 include/graphviz/dthdr.h
 include/graphviz/graph.h
 include/graphviz/libgraph.h
@@ -33,107 +37,162 @@
 include/graphviz/aghdr.h
 include/graphviz/agraph.h
 include/graphviz/malloc.h
-include/graphviz/vmstub.h
-include/graphviz/grammar.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/gdhelpers.h
-include/graphviz/jisx0208.h
-include/graphviz/wbmp.h
-include/graphviz/gdfx.h
-include/graphviz/tri.h
-include/graphviz/entities.h
+include/graphviz/no_demand_loading.c
 include/graphviz/pathgeom.h
 include/graphviz/pathplan.h
 include/graphviz/pathutil.h
 include/graphviz/solvers.h
+include/graphviz/textpara.h
+include/graphviz/usershape.h
 include/graphviz/vis.h
 include/graphviz/vispath.h
 include/graphviz/logic.h
 include/graphviz/arith.h
+include/graphviz/vmstub.h
+include/graphviz/grammar.h
+include/graphviz/tri.h
 include/graphviz/geom.h
 include/graphviz/color.h
 include/graphviz/types.h
 include/graphviz/globals.h
 include/graphviz/gvc.h
 include/graphviz/gvcext.h
+include/graphviz/gvcommon.h
 include/graphviz/gvplugin.h
 include/graphviz/gvcjob.h
 include/graphviz/gvcint.h
 include/graphviz/gvplugin_render.h
 include/graphviz/gvplugin_layout.h
+include/graphviz/gvplugin_loadimage.h
 include/graphviz/gvplugin_textlayout.h
 include/graphviz/gvplugin_device.h
-include/graphviz/gvplugin_usershape.h
 include/graphviz/pack.h
-include/graphviz/exlib.h
-include/graphviz/exgram.h
-include/graphviz/expr.h
 include/graphviz/gv.i
 include/graphviz/gv.cpp
 lib/graphviz/libcdt.so
-lib/graphviz/libcdt.so.2
+lib/graphviz/libcdt.so.4
 lib/graphviz/libcdt.la
 lib/graphviz/libcdt.a
 lib/graphviz/libgraph.so
-lib/graphviz/libgraph.so.2
+lib/graphviz/libgraph.so.4
 lib/graphviz/libgraph.la
 lib/graphviz/libgraph.a
 lib/graphviz/libagraph.so
-lib/graphviz/libagraph.so.2
+lib/graphviz/libagraph.so.4
 lib/graphviz/libagraph.la
 lib/graphviz/libagraph.a
-lib/graphviz/libgvgd.so
-lib/graphviz/libgvgd.so.2
-lib/graphviz/libgvgd.la
-lib/graphviz/libgvgd.a
+lib/graphviz/libcgraph.so
+lib/graphviz/libcgraph.so.4
+lib/graphviz/libcgraph.la
+lib/graphviz/libcgraph.a
 lib/graphviz/libpathplan.so
-lib/graphviz/libpathplan.so.2
+lib/graphviz/libpathplan.so.4
 lib/graphviz/libpathplan.la
 lib/graphviz/libpathplan.a
 lib/graphviz/libgvc.so
-lib/graphviz/libgvc.so.2
+lib/graphviz/libgvc.so.4
 lib/graphviz/libgvc.la
 lib/graphviz/libgvc.a
-lib/graphviz/libgvc_builtins.so
-lib/graphviz/libgvc_builtins.so.2
-lib/graphviz/libgvc_builtins.la
-lib/graphviz/libgvc_builtins.a
-lib/graphviz/libpack.so
-lib/graphviz/libpack.so.2
-lib/graphviz/libpack.la
-lib/graphviz/libpack.a
-lib/graphviz/libexpr.so
-lib/graphviz/libexpr.so.2
-lib/graphviz/libexpr.la
-lib/graphviz/libexpr.a
-lib/graphviz/libgvplugin_neato_layout.so
-lib/graphviz/libgvplugin_neato_layout.so.2
-lib/graphviz/libgvplugin_neato_layout.la
-lib/graphviz/libgvplugin_neato_layout.a
+lib/graphviz/libgvplugin_core.so
+lib/graphviz/libgvplugin_core.so.5
+lib/graphviz/libgvplugin_core.la
+lib/graphviz/libgvplugin_core.a
 lib/graphviz/libgvplugin_dot_layout.so
-lib/graphviz/libgvplugin_dot_layout.so.2
+lib/graphviz/libgvplugin_dot_layout.so.5
 lib/graphviz/libgvplugin_dot_layout.la
 lib/graphviz/libgvplugin_dot_layout.a
-lib/graphviz/libgvplugin_usershape_gd.so
-lib/graphviz/libgvplugin_usershape_gd.so.2
-lib/graphviz/libgvplugin_usershape_gd.la
-lib/graphviz/libgvplugin_usershape_gd.a
-lib/graphviz/tcl/gv.so
-lib/graphviz/lua/gv.so
-lib/graphviz/perl/gv.so
-lib/graphviz/python/_gv.so
-lib/graphviz/ruby/gv.so
-lib/graphviz/pkgIndex.tcl
+lib/graphviz/libgvplugin_gd.so
+lib/graphviz/libgvplugin_gd.so.5
+lib/graphviz/libgvplugin_gd.la
+lib/graphviz/libgvplugin_gd.a
+%%WITH_GTK%%lib/graphviz/libgvplugin_gtk.a
+%%WITH_GTK%%lib/graphviz/libgvplugin_gtk.la
+%%WITH_GTK%%lib/graphviz/libgvplugin_gtk.so
+%%WITH_GTK%%lib/graphviz/libgvplugin_gtk.so.5
+%%WITH_PIXBUF%%lib/graphviz/libgvplugin_gdk_pixbuf.a
+%%WITH_PIXBUF%%lib/graphviz/libgvplugin_gdk_pixbuf.la
+%%WITH_PIXBUF%%lib/graphviz/libgvplugin_gdk_pixbuf.so
+%%WITH_PIXBUF%%lib/graphviz/libgvplugin_gdk_pixbuf.so.5
+lib/graphviz/libgvplugin_neato_layout.so
+lib/graphviz/libgvplugin_neato_layout.so.5
+lib/graphviz/libgvplugin_neato_layout.la
+lib/graphviz/libgvplugin_neato_layout.a
+%%WITH_PANGOCAIRO%%lib/graphviz/libgvplugin_pango.so
+%%WITH_PANGOCAIRO%%lib/graphviz/libgvplugin_pango.so.5
+%%WITH_PANGOCAIRO%%lib/graphviz/libgvplugin_pango.la
+%%WITH_PANGOCAIRO%%lib/graphviz/libgvplugin_pango.a
+%%WITH_PANGOCAIRO%%lib/graphviz/libgvplugin_xlib.a
+%%WITH_PANGOCAIRO%%lib/graphviz/libgvplugin_xlib.la
+%%WITH_PANGOCAIRO%%lib/graphviz/libgvplugin_xlib.so
+%%WITH_PANGOCAIRO%%lib/graphviz/libgvplugin_xlib.so.5
+%%WITH_GUILE%%lib/graphviz/guile/libgv_guile.a
+%%WITH_GUILE%%lib/graphviz/guile/libgv_guile.la
+%%WITH_GUILE%%lib/graphviz/guile/libgv_guile.so
+%%WITH_PHP%%lib/graphviz/php/gv.php
+%%WITH_PHP%%lib/graphviz/php/gv.so
+%%WITH_PHP%%lib/graphviz/php/libgv_php.a
+%%WITH_PHP%%lib/graphviz/php/libgv_php.la
+%%WITH_PHP%%lib/graphviz/php/libgv_php.so
+%%WITH_TCL%%lib/graphviz/tcl/libgdtclft.a
+%%WITH_TCL%%lib/graphviz/tcl/libgdtclft.la
+%%WITH_TCL%%lib/graphviz/tcl/libgdtclft.so
+%%WITH_TCL%%lib/graphviz/tcl/libgdtclft.so.0
+%%WITH_TCL%%lib/graphviz/tcl/libgv_tcl.a
+%%WITH_TCL%%lib/graphviz/tcl/libgv_tcl.la
+%%WITH_TCL%%lib/graphviz/tcl/libgv_tcl.so
+%%WITH_TCL%%lib/graphviz/tcl/libtcldot.a
+%%WITH_TCL%%lib/graphviz/tcl/libtcldot.la
+%%WITH_TCL%%lib/graphviz/tcl/libtcldot.so
+%%WITH_TCL%%lib/graphviz/tcl/libtcldot.so.0
+%%WITH_TCL%%lib/graphviz/tcl/libtcldot_builtin.a
+%%WITH_TCL%%lib/graphviz/tcl/libtcldot_builtin.la
+%%WITH_TCL%%lib/graphviz/tcl/libtcldot_builtin.so
+%%WITH_TCL%%lib/graphviz/tcl/libtcldot_builtin.so.0
+%%WITH_TCL%%lib/graphviz/tcl/libtclplan.a
+%%WITH_TCL%%lib/graphviz/tcl/libtclplan.la
+%%WITH_TCL%%lib/graphviz/tcl/libtclplan.so
+%%WITH_TCL%%lib/graphviz/tcl/libtclplan.so.0
+%%WITH_TCL%%lib/graphviz/tcl/pkgIndex.tcl
+%%WITH_TCL%%lib/tcl%%TCL_VER%%/graphviz
+%%WITH_TK%%lib/graphviz/tcl/libtkspline.a
+%%WITH_TK%%lib/graphviz/tcl/libtkspline.la
+%%WITH_TK%%lib/graphviz/tcl/libtkspline.so
+%%WITH_TK%%lib/graphviz/tcl/libtkspline.so.0
+%%WITH_LUA%%lib/graphviz/lua/gv.so
+%%WITH_LUA%%lib/graphviz/lua/libgv_lua.a
+%%WITH_LUA%%lib/graphviz/lua/libgv_lua.la
+%%WITH_LUA%%lib/graphviz/lua/libgv_lua.so
+%%WITH_PERL%%lib/graphviz/perl/gv.so
+%%WITH_PERL%%lib/graphviz/perl/gv.pm
+%%WITH_PERL%%lib/graphviz/perl/libgv_perl.a
+%%WITH_PERL%%lib/graphviz/perl/libgv_perl.la
+%%WITH_PERL%%lib/graphviz/perl/libgv_perl.so
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/gv.pm
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/gv.so
+%%WITH_PYTHON%%lib/graphviz/python/_gv.so
+%%WITH_PYTHON%%lib/graphviz/python/gv.py
+%%WITH_PYTHON%%lib/graphviz/python/libgv_python.a
+%%WITH_PYTHON%%lib/graphviz/python/libgv_python.la
+%%WITH_PYTHON%%lib/graphviz/python/libgv_python.so
+%%WITH_PYTHON%%%%PYTHON_LIBDIR%%/site-packages/_gv.so
+%%WITH_PYTHON%%%%PYTHON_LIBDIR%%/site-packages/gv.py
+%%WITH_RUBY%%lib/graphviz/ruby/gv.so
+%%WITH_RUBY%%lib/graphviz/ruby/libgv_ruby.a
+%%WITH_RUBY%%lib/graphviz/ruby/libgv_ruby.la
+%%WITH_RUBY%%lib/graphviz/ruby/libgv_ruby.so
+%%WITH_RUBY%%%%RUBY_SITEARCHLIBDIR%%/gv.so
+%%WITH_RSVG%%lib/graphviz/libgvplugin_rsvg.a
+%%WITH_RSVG%%lib/graphviz/libgvplugin_rsvg.la
+%%WITH_RSVG%%lib/graphviz/libgvplugin_rsvg.so
+%%WITH_RSVG%%lib/graphviz/libgvplugin_rsvg.so.5
+%%WITH_DEVIL%%lib/graphviz/libgvplugin_devil.a
+%%WITH_DEVIL%%lib/graphviz/libgvplugin_devil.la
+%%WITH_DEVIL%%lib/graphviz/libgvplugin_devil.so
+%%WITH_DEVIL%%lib/graphviz/libgvplugin_devil.so.5
 libdata/pkgconfig/libcdt.pc
 libdata/pkgconfig/libgraph.pc
 libdata/pkgconfig/libagraph.pc
+libdata/pkgconfig/libcgraph.pc
 libdata/pkgconfig/libpathplan.pc
 libdata/pkgconfig/libgvc.pc
 %%PORTDOCS%%%%DOCSDIR%%/html/FAQ.html
@@ -159,6 +218,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/a_forward.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/a_halfopen.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/box.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/box3d.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/a_inv.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/a_invdot.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/a_invempty.gif
@@ -211,6 +271,8 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/back.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/both.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/circle.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/colorlist.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/component.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/constraint.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/diamond.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/doublecircle.gif
@@ -218,16 +280,21 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/egg.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/ellipse.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/fill.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/folder.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/forward.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/hexagon.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/house.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/html1.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/html2.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/html3.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/html4.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/invhouse.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/invtrapezium.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/invtriangle.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/mrecord.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/nohead.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/none.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/note.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/octagon.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/parallelogram.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/pentagon.gif
@@ -239,6 +306,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/rectangle.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/round.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/septagon.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/tab.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/trapezium.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/triangle.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/tripleoctagon.gif
@@ -256,6 +324,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/pdf/ccomps.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/dijkstra.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/gc.pdf
+%%PORTDOCS%%%%DOCSDIR%%/pdf/gvc.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/gvcolor.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/gvpack.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/gxl2dot.pdf
@@ -266,9 +335,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/pdf/prune.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/agraph.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/cdt.pdf
-%%PORTDOCS%%%%DOCSDIR%%/pdf/expr.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/graph.pdf
-%%PORTDOCS%%%%DOCSDIR%%/pdf/pack.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/pathplan.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/gdtclft.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/tcldot.pdf
@@ -278,18 +345,19 @@
 %%PORTDOCS%%%%DOCSDIR%%/pdf/twopi.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/fdp.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/circo.pdf
+%%PORTDOCS%%%%DOCSDIR%%/pdf/cgraph.pdf
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/cpl1.0.txt
 %%PORTDOCS%%%%DOCSDIR%%/Dot.ref
 %%PORTDOCS%%%%DOCSDIR%%/latex_suggestions.txt
-%%EXAMPLESDIR%%/entities
-%%EXAMPLESDIR%%/entities.README
-%%EXAMPLESDIR%%/doted
-%%EXAMPLESDIR%%/doted.README
-%%EXAMPLESDIR%%/gcat
-%%EXAMPLESDIR%%/gcat.README
+%%EXAMPLESDIR%%/entities.tcl
+%%EXAMPLESDIR%%/entities.tcl.README
+%%EXAMPLESDIR%%/doted.tcl
+%%EXAMPLESDIR%%/doted.tcl.README
+%%EXAMPLESDIR%%/gcat.tcl
+%%EXAMPLESDIR%%/gcat.tcl.README
 %%EXAMPLESDIR%%/pathplan_data/boxes.dat
 %%EXAMPLESDIR%%/pathplan_data/dpd.dat
 %%EXAMPLESDIR%%/pathplan_data/funny.dat
@@ -302,10 +370,54 @@
 %%EXAMPLESDIR%%/pathplan_data/rotor.dat
 %%EXAMPLESDIR%%/pathplan_data/u.dat
 %%EXAMPLESDIR%%/pathplan_data/unknown.dat
-%%EXAMPLESDIR%%/pathplan
-%%EXAMPLESDIR%%/pathplan.README
-%%EXAMPLESDIR%%/spline
-%%EXAMPLESDIR%%/spline.README
+%%EXAMPLESDIR%%/pathplan.tcl
+%%EXAMPLESDIR%%/pathplan.tcl.README
+%%EXAMPLESDIR%%/spline.tcl
+%%EXAMPLESDIR%%/spline.tcl.README
+%%WITH_LUA%%%%DATADIR%%/demo/modgraph.lua
+%%WITH_PERL%%%%DATADIR%%/demo/modgraph.pl
+%%WITH_PHP%%%%DATADIR%%/demo/modgraph.php
+%%WITH_PYTHON%%%%DATADIR%%/demo/modgraph.py
+%%WITH_RUBY%%%%DATADIR%%/demo/modgraph.rb
+%%WITH_TCL%%%%DATADIR%%/demo/modgraph.tcl
+%%WITH_SMYRNA%%%%DATADIR%%/examples/4elt.dot
+%%WITH_SMYRNA%%%%DATADIR%%/examples/world.dot
+%%WITH_SMYRNA%%%%DATADIR%%/smyrna/AntiselectRect.png
+%%WITH_SMYRNA%%%%DATADIR%%/smyrna/AntiselectRectX.png
+%%WITH_SMYRNA%%%%DATADIR%%/smyrna/add_edge.png
+%%WITH_SMYRNA%%%%DATADIR%%/smyrna/arial.tga
+%%WITH_SMYRNA%%%%DATADIR%%/smyrna/attrs.txt
+%%WITH_SMYRNA%%%%DATADIR%%/smyrna/cursor.png
+%%WITH_SMYRNA%%%%DATADIR%%/smyrna/deletE_edge.png
+%%WITH_SMYRNA%%%%DATADIR%%/smyrna/delete_node.png
+%%WITH_SMYRNA%%%%DATADIR%%/smyrna/find_edge.png
+%%WITH_SMYRNA%%%%DATADIR%%/smyrna/find_node.png
+%%WITH_SMYRNA%%%%DATADIR%%/smyrna/fisheye.raw
+%%WITH_SMYRNA%%%%DATADIR%%/smyrna/fit_to_screen.png
+%%WITH_SMYRNA%%%%DATADIR%%/smyrna/hourglass.png
+%%WITH_SMYRNA%%%%DATADIR%%/smyrna/magifier_zoom_out.png
+%%WITH_SMYRNA%%%%DATADIR%%/smyrna/magnifier.png
+%%WITH_SMYRNA%%%%DATADIR%%/smyrna/magnifier_zoom_in.png
+%%WITH_SMYRNA%%%%DATADIR%%/smyrna/move.png
+%%WITH_SMYRNA%%%%DATADIR%%/smyrna/new_delete.png
+%%WITH_SMYRNA%%%%DATADIR%%/smyrna/new_node.png
+%%WITH_SMYRNA%%%%DATADIR%%/smyrna/newzoom.png
+%%WITH_SMYRNA%%%%DATADIR%%/smyrna/ok.raw
+%%WITH_SMYRNA%%%%DATADIR%%/smyrna/ok2.raw
+%%WITH_SMYRNA%%%%DATADIR%%/smyrna/ok3.raw
+%%WITH_SMYRNA%%%%DATADIR%%/smyrna/pan.png
+%%WITH_SMYRNA%%%%DATADIR%%/smyrna/pan.raw
+%%WITH_SMYRNA%%%%DATADIR%%/smyrna/rotate.raw
+%%WITH_SMYRNA%%%%DATADIR%%/smyrna/select.png
+%%WITH_SMYRNA%%%%DATADIR%%/smyrna/selectx.png
+%%WITH_SMYRNA%%%%DATADIR%%/smyrna/smyrna.glade
+%%WITH_SMYRNA%%%%DATADIR%%/smyrna/template.dot
+%%WITH_SMYRNA%%%%DATADIR%%/smyrna/zoom.png
+%%WITH_SMYRNA%%%%DATADIR%%/smyrna/zoom.raw
+%%WITH_SMYRNA%%%%DATADIR%%/smyrna/zoom_in.png
+%%WITH_SMYRNA%%%%DATADIR%%/smyrna/zoom_out.png
+%%WITH_SMYRNA%%%%DATADIR%%/smyrna/zoomminus.raw
+%%WITH_SMYRNA%%%%DATADIR%%/smyrna/zoomplus.raw
 %%DATADIR%%/lefty/box.lefty
 %%DATADIR%%/lefty/def.lefty
 %%DATADIR%%/lefty/fractal.lefty
@@ -374,31 +486,52 @@
 %%DATADIR%%/graphs/undirected/process.dot
 %%DATADIR%%/graphs/undirected/Heawood.dot
 %%DATADIR%%/graphs/undirected/Petersen.dot
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/pdf
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/pathplan_data
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+ at exec mkdir -p %D/lib/graphviz/R
 @exec mkdir -p %D/lib/graphviz/guile
+ at exec mkdir -p %D/lib/graphviz/io
+ at exec mkdir -p %D/lib/graphviz/lua
 @exec mkdir -p %D/lib/graphviz/java
 @exec mkdir -p %D/lib/graphviz/ocaml
+ at exec mkdir -p %D/lib/graphviz/perl
 @exec mkdir -p %D/lib/graphviz/php
+ at exec mkdir -p %D/lib/graphviz/python25
+ at exec mkdir -p %D/lib/graphviz/python24
+ at exec mkdir -p %D/lib/graphviz/python23
+ at exec mkdir -p %D/lib/graphviz/python
+ at exec mkdir -p %D/lib/graphviz/ruby
 @exec mkdir -p %D/lib/graphviz/sharp
+ at exec mkdir -p %D/lib/graphviz/tcl
+ at exec mkdir -p %D/%%DATADIR%%/demo
+ at exec mkdir -p %D/%%DATADIR%%/examples
+ at exec mkdir -p %D/%%DATADIR%%/smyrna
 @unexec rm -f %D/lib/graphviz/config
- at dirrm %%DATADIR%%/graphs/directed
- at dirrm %%DATADIR%%/graphs/undirected
- at dirrm %%DATADIR%%/graphs
- at dirrm %%DATADIR%%/lefty
- at dirrm %%DATADIR%%
+ at dirrm lib/graphviz/R
 @dirrm lib/graphviz/guile
+ at dirrm lib/graphviz/io
 @dirrm lib/graphviz/java
 @dirrm lib/graphviz/lua
 @dirrm lib/graphviz/ocaml
 @dirrm lib/graphviz/perl
 @dirrm lib/graphviz/php
+ at dirrm lib/graphviz/python25
+ at dirrm lib/graphviz/python24
+ at dirrm lib/graphviz/python23
 @dirrm lib/graphviz/python
 @dirrm lib/graphviz/ruby
 @dirrm lib/graphviz/sharp
 @dirrm lib/graphviz/tcl
 @dirrm lib/graphviz
 @dirrm include/graphviz
+ at dirrm %%DATADIR%%/demo
+ at dirrm %%DATADIR%%/examples
+ at dirrm %%DATADIR%%/graphs/directed
+ at dirrm %%DATADIR%%/graphs/undirected
+ at dirrm %%DATADIR%%/graphs
+ at dirrm %%DATADIR%%/lefty
+ at dirrm %%DATADIR%%/smyrna
+ at dirrm %%DATADIR%%
+ at dirrm %%EXAMPLESDIR%%/pathplan_data
+ at dirrm %%EXAMPLESDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/pdf
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/graphics/graphviz/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -L graphics/graphviz/Makefile -L graphics/graphviz/Makefile -u -r1.3 -r1.4
--- graphics/graphviz/Makefile
+++ graphics/graphviz/Makefile
@@ -3,131 +3,450 @@
 # Whom:			Thomas Gellekum <tg at FreeBSD.org>
 #
 # $MidnightBSD$
-# $FreeBSD: ports/graphics/graphviz/Makefile,v 1.71 2007/02/01 02:41:39 kris Exp $
+# $FreeBSD: ports/graphics/graphviz/Makefile,v 1.101 2008/06/25 14:24:20 dinoex Exp $
 #
 
 PORTNAME=	graphviz
-PORTVERSION=	2.8
+PORTVERSION=	2.20.0
 CATEGORIES=	graphics tk
 MASTER_SITES=	http://www.graphviz.org/pub/graphviz/ARCHIVE/ \
 		http://mirror.inerd.com/FreeBSD/distfiles/${PORTNAME}/
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	Graph Visualization Software from AT&T and Bell Labs
+LICENSE=	other
 
-LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg		\
-		png.5:${PORTSDIR}/graphics/png			\
-		freetype.9:${PORTSDIR}/print/freetype2		\
-		fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig	\
-		tk84.1:${PORTSDIR}/x11-toolkits/tk84		\
-		expat.6:${PORTSDIR}/textproc/expat2		\
+LIB_DEPENDS+=	jpeg.9:${PORTSDIR}/graphics/jpeg \
+		png.5:${PORTSDIR}/graphics/png \
+		freetype.9:${PORTSDIR}/print/freetype2 \
+		fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \
+		expat.6:${PORTSDIR}/textproc/expat2 \
 		gd.4:${PORTSDIR}/graphics/gd
 
-USE_TCL=	84
-USE_TK=		84
-USE_BISON=	yes
+USE_BISON=	build
 USE_GMAKE=	yes
-USE_ICONV=	yes
-USE_XPM=	yes
 USE_AUTOTOOLS=	libltdl:15 libtool:15
+WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include -I${TCL_INCLUDEDIR} -I${TK_INCLUDEDIR}" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"	\
-		TCLCONFIG=${TCL_LIBDIR}/tclConfig.sh		\
-		TKCONFIG=${TK_LIBDIR}/tkConfig.sh		\
-		MISSING=${TRUE}
-CONFIGURE_ARGS=	--program-transform-name="s/x/x/"		\
-		--enable-dependency-tracking			\
-		--with-iconvlibdir=${LOCALBASE}/lib		\
-		--with-tclsh=${TCLSH}				\
-		--with-wish=${WISH}				\
-		--with-fontconfigincludedir=${X11BASE}/include	\
-		--with-fontconfiglibdir=${X11BASE}/lib		\
-		--disable-swig --disable-sharp --disable-guile	\
-		--disable-io --disable-lua --disable-ocaml	\
-		--disable-perl --disable-php --disable-python	\
-		--disable-ruby 
-#		--build=${arch}-portbld-freebsd6.0 \
-#		--target=${arch}-portbld-freebsd6.0
+LDFLAGS+=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+PLIST_SUB=	PORTVERSION="${PORTVERSION}"
+
 MAKE_ENV=	EXPR_COMPAT=yes MISSING=${TRUE}
 SUB_FILES=	pkg-install
-
-MAN1=		acyclic.1 bcomps.1 ccomps.1 dijkstra.1 dot.1		 \
-		dotty.1 gc.1 gvcolor.1 gvpack.1 gvpr.1 gxl2dot.1 lefty.1 \
+MAN1=		acyclic.1 bcomps.1 ccomps.1 dijkstra.1 dot.1 \
+		dotty.1 gc.1 gvcolor.1 gvpack.1 gvpr.1 gxl2dot.1 \
 		lneato.1 nop.1 prune.1 sccmap.1 tred.1 unflatten.1
-MAN3=		agraph.3 cdt.3 expr.3 graph.3 pack.3 pathplan.3
-MANN=		gdtclft.n tcldot.n tkspline.n
-MLINKS=		dot.1 circo.1		\
-		gxl2dot.1 dot2gxl.1	\
-		dot.1 fdp.1		\
-		dot.1 neato.1		\
+MAN3=		agraph.3 cdt.3 cgraph.3 graph.3 gvc.3 pathplan.3
+MAN7=		graphviz.7
+MLINKS=		dot.1 circo.1 \
+		gxl2dot.1 dot2gxl.1 \
+		dot.1 fdp.1 \
+		dot.1 neato.1 \
 		dot.1 twopi.1
+FIX_INCLUDE=	ast_common.h \
+		lib/cdt/dthdr.h \
+		lib/graph/libgraph.h lib/graph/triefa.h \
+		lib/graph/parser.h lib/graph/agxbuf.h \
+		lib/agraph/aghdr.h lib/agraph/agraph.h \
+		lib/agraph/malloc.h lib/agraph/vmstub.h \
+		lib/agraph/grammar.h \
+		lib/pathplan/tri.h lib/pathplan/pathplan.h \
+		lib/pathplan/pathutil.h lib/pathplan/solvers.h \
+		lib/pathplan/vis.h lib/pathplan/vispath.h \
+		lib/common/arith.h lib/common/logic.h \
+		lib/common/globals.h \
+		lib/gvc/gvcint.h
 
-PATCH_TCL_SCRIPTS=	tclpkg/gv/Makefile.in tclpkg/tcldot/demo/doted \
-			tclpkg/tclpathplan/demo/pathplan tclpkg/tkspline/demo/spline
+PATCH_TCL_SCRIPTS=	tclpkg/gv/Makefile.in tclpkg/tcldot/demo/doted.tcl \
+			tclpkg/tclpathplan/demo/pathplan.tcl tclpkg/tkspline/demo/spline.tcl
 PATCH_TK_SCRIPTS=	${PATCH_TCL_SCRIPTS}
 
 PDOCS_TXT=	AUTHORS NEWS ChangeLog cpl1.0.txt doc/Dot.ref doc/latex_suggestions.txt
 PDOCS_PDF=	doc/*.pdf */*/*.pdf
 PDOCS_HTML=	doc/*.html doc/info/*.html doc/info/*.gif
 
-USE_LDCONFIG=	${PREFIX}/lib/${PORTNAME}
+OPTIONS=	ICONV "Build with ICONV support" on \
+		XPM "Build with XPM support" on \
+		DIGCOLA "DIGCOLA features in neato layout engine" on \
+		IPSEPCOLA "IPSEPCOLA features in neato layout engine" on \
+		SMYRNA "SMYRNA large graph viewer" off \
+		NLS "Build with gettext support" on \
+		TK "Build with TK support" off \
+		PANGOCAIRO "build with pangocairo support" off \
+		RSVG "build with rsvg library" off \
+		GTK "build with gtk plugin" off \
+		GDK_PIXBUF  "build with gdk pixbuf support" off \
+		GNOMEUI  "build with libgnomeui support" off \
+		MING "Build with ming plugin" off \
+		DEVIL "Build with devil plugin" off \
+		PERL "Perl bindings (swig)" off \
+		PHP "PHP bindings (swig)" off \
+		PYTHON "Python bindings (swig)" off \
+		RUBY "Ruby bindings (swig)" off \
+		LUA "Lua bindings (swig)" off \
+		TCL "TCL bindings (swig)" off \
+		GUILE "Guile bindings (swig)" off
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/misc/ldconfig_compat/bsd.ldconfig.mk"
 
-pre-patch:
-	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS}					\
-	  ${REINPLACE_CMD} -e 's|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|'	\
-	                   -e "s|\([^:]*:.*\) install-pdfDATA\(.*\)|\1\2|g"		\
-	                   -e "s|\([^:]*:.*\) install-htmlDATA\(.*\)|\1\2|g"		\
-	                   -e "s|\([^:]*:.*\) install-txtDATA\(.*\)|\1\2|g"		\
-	                   -e "s|\([^:]*:.*\) install-demoDATA\(.*\)|\1\2|g"		\
-	                   -e "s|\([^:]*:.*\) install-demoSCRIPTS\(.*\)|\1\2|g"		\
-	                   -e "s|\([^:]*:.*\) install-pathplanexampleDATA\(.*\)|\1\2|g" \
-	                   -e 's|demodir = $$(pkgdatadir)/demo|demodir = ${EXAMPLESDIR}|';
-
-	@${REINPLACE_CMD} -e 's|^\.SUFFIXES: \(.*\)\.1\(.*\)|.SUFFIXES: \1 \2|'	\
-	                  ${WRKSRC}/cmd/tools/Makefile.in			\
-	                  ${WRKSRC}/cmd/gvpr/Makefile.in
+CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd6.0 \
+			--host=${ARCH}-portbld-freebsd6.0
+
+CONFIGURE_ARGS+=	--program-transform-name="s/x/x/" \
+		--enable-dependency-tracking \
+		--enable-r=no \
+		--with-freetype2=yes \
+		--with-libgd \
+		--with-fontconfigincludedir=${LOCALBASE}/include \
+		--with-fontconfiglibdir=${LOCALBASE}/lib \
+		--disable-io --disable-ocaml --disable-java \
+		--disable-sharp
+
+CONFIGURE_ENV+=	CFLAGS="${CFLAGS}" \
+		CPPFLAGS="${CPPFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		MISSING=${TRUE}
 
+.if defined(WITH_TK)
+CPPFLAGS+=		-I${TK_INCLUDEDIR}
+USE_TK_BUILD=		84+
+CONFIGURE_ARGS+=	--with-wish=${WISH}
+CONFIGURE_ENV+=		TKCONFIG="${TK_LIBDIR}/tkConfig.sh"
+MANN+=			tkspline.n
+PLIST_SUB+=		WITH_TK=""
+.else
+PLIST_SUB+=		WITH_TK="@comment "
+.endif
+.if defined(WITH_TCL) || defined(WITH_TK)
+CPPFLAGS+=		-I${TCL_INCLUDEDIR}
+USE_TCL_BUILD=		84+
+.include "${PORTSDIR}/Mk/bsd.tcl.mk"
+CONFIGURE_ARGS+=	--with-tclsh=${TCLSH}
+CONFIGURE_ENV+=		TCLCONFIG="${TCL_LIBDIR}/tclConfig.sh"
+MANN+=			gdtclft.n tcldot.n
+PLIST_SUB+=		TCL_VER="${TCL_VER}"
+.endif
 
-post-install:
-	${INSTALL_MAN} ${WRKSRC}/tclpkg/gdtclft/gdtclft.n   ${MANNPREFIX}/man/mann
-	${INSTALL_MAN} ${WRKSRC}/tclpkg/tcldot/tcldot.n     ${MANNPREFIX}/man/mann
-	${INSTALL_MAN} ${WRKSRC}/tclpkg/tkspline/tkspline.n ${MANNPREFIX}/man/mann
+.if defined(WITHOUT_ICONV)
+CONFIGURE_ARGS+=	--without-libiconv-prefix
+.else
+USE_ICONV=		yes
+CONFIGURE_ARGS+=	--with-iconvlibdir=${LOCALBASE}/lib
+CONFIGURE_ARGS+=	--with-iconvincludedir=${LOCALBASE}/include
+.endif
+
+.if !defined(WITHOUT_XPM) || exists(${LOCALBASE}/lib/libXpm.so)
+USE_XORG+=		xaw8 xpm xmu xt sm ice xext x11 xau xdmcp xp
+MAN1+=			lefty.1
+PLIST_SUB+=		WITH_XPM=""
+.else
+PLIST_SUB+=		WITH_XPM="@comment "
+.endif
+
+.if defined(WITHOUT_NLS)
+CONFIGURE_ARGS+=	--disable-nls
+.else
+USE_GETTEXT=		yes
+.endif
+
+.if defined(WITH_PANGOCAIRO)
+CONFIGURE_ARGS+=	--with-pangocairo
+PLIST_SUB+=		WITH_PANGOCAIRO=""
+USE_GNOME=		pango
+USE_XORG+=		xrender x11 xau xdmcp
+.else
+CONFIGURE_ARGS+=	--without-pangocairo
+PLIST_SUB+=		WITH_PANGOCAIRO="@comment "
+.endif
+
+.if defined(WITH_RSVG)
+CONFIGURE_ARGS+=	--with-rsvg=yes
+PLIST_SUB+=		WITH_RSVG=""
+USE_GNOME+=		librsvg2
+USE_GL+=		gl glu
+.if !defined(WITH_PANGOCAIRO)
+IGNORE=			option WITH_PANGOCAIRO is required for option WITH_RSVG
+.endif
+.else
+CONFIGURE_ARGS+=	--without-rsvg
+PLIST_SUB+=		WITH_RSVG="@comment "
+.endif
+
+.if defined(WITH_GTK)
+CONFIGURE_ARGS+=	--with-gtk
+PLIST_SUB+=		WITH_GTK=""
+USE_GNOME+=		gtk20
+USE_XORG+=		sm ice xext xinerama xi xrandr xcursor xfixes
+.if !defined(WITH_PANGOCAIRO)
+IGNORE=			option WITH_PANGOCAIRO is required for option WITH_GTK
+.endif
+.else
+CONFIGURE_ARGS+=	--without-gtk --without-gdk-pixbuf
+PLIST_SUB+=		WITH_GTK="@comment "
+.endif
+
+.if defined(WITH_GDK_PIXBUF)
+CONFIGURE_ARGS+=	--with-gdk-pixbuf=yes
+PLIST_SUB+=		WITH_PIXBUF=""
+.if !defined(WITH_GTK)
+IGNORE=			option WITH_GTK is required for option WITH_GDK_PIXBUF
+.endif
+.else
+CONFIGURE_ARGS+=	--without-gdk-pixbuf
+PLIST_SUB+=		WITH_PIXBUF="@comment "
+.endif
+
+.if defined(WITH_GNOMEUI)
+CONFIGURE_ARGS+=	--with-gnomeui
+USE_GNOME+=		libgnomeui
+.if !defined(WITH_GTK)
+IGNORE=			option WITH_GTK is required for option WITH_GNOMEUI
+.endif
+.else
+CONFIGURE_ARGS+=	--without-gnomeui
+.endif
+
+.if defined(WITH_SMYRNA)
+CONFIGURE_ARGS+=	--with-glade=yes
+USE_GNOME+=		gnomelibs libglade2
+.else
+CONFIGURE_ARGS+=	--without-glade
+.endif
+
+.if defined(USE_GNOME)
+.include "${PORTSDIR}/Mk/bsd.gnome.mk"
+.endif
+.if defined(USE_XORG)
+.include "${PORTSDIR}/Mk/bsd.xorg.mk"
+.endif
+
+.if defined(WITH_SMYRNA)
+CONFIGURE_ARGS+=	 --with-gtkgl=yes
+LIB_DEPENDS+=		gtkgl-2.0.1:${PORTSDIR}/x11-toolkits/gtkglarea2
+.else
+CONFIGURE_ARGS+=	--without-gtkgl
+.endif
+
+.if defined(WITH_SMYRNA)
+CONFIGURE_ARGS+=	 --with-gtkglext=yes
+LIB_DEPENDS+=		gtkglext-x11-1.0:${PORTSDIR}/x11-toolkits/gtkglext
+.else
+CONFIGURE_ARGS+=	--without-gtkglext
+.endif
+
+.if defined(WITH_SMYRNA)
+CONFIGURE_ARGS+=	 --with-gts=yes
+LIB_DEPENDS+=		gts.5:${PORTSDIR}/graphics/gts
+.else
+CONFIGURE_ARGS+=	--without-gts
+.endif
+
+.if !defined(WITHOUT_DIGCOLA)
+CONFIGURE_ARGS+=	--with-digcola
+.else
+CONFIGURE_ARGS+=	--without-digcola
+.endif
+
+.if !defined(WITHOUT_IPSEPCOLA)
+CONFIGURE_ARGS+=	--with-ipsepcola
+.if defined(WITHOUT_DIGCOLA)
+IGNORE=			option WITH_DIGCOLA is required for option WITH_IPSEPCOLA
+.endif
+.else
+CONFIGURE_ARGS+=	--without-ipsepcola
+.endif
+
+.if defined(WITH_SMYRNA)
+CONFIGURE_ARGS+=	--with-smyrna=yes
+PLIST_SUB+=		WITH_SMYRNA=""
+.else
+PLIST_SUB+=		WITH_SMYRNA="@comment "
+CONFIGURE_ARGS+=	--without-smyrna
+.endif
+
+.if defined(WITH_MING)
+CONFIGURE_ARGS+=	--with-ming
+PLIST_SUB+=		WITH_MING=""
+LIB_DEPENDS+=		ming.4:${PORTSDIR}/graphics/ming
+.else
+CONFIGURE_ARGS+=	--without-ming
+PLIST_SUB+=		WITH_MING="@comment "
+.endif
+
+.if defined(WITH_DEVIL)
+CONFIGURE_ARGS+=	--with-devil
+PLIST_SUB+=		WITH_DEVIL=""
+LIB_DEPENDS+=		IL.1:${PORTSDIR}/graphics/devil
+.else
+CONFIGURE_ARGS+=	--without-devil
+PLIST_SUB+=		WITH_DEVIL="@comment "
+.endif
+
+.if defined(WITH_PERL) || defined(WITH_PHP) || defined(WITH_PYTHON) || \
+    defined(WITH_RUBY) || defined(WITH_LUA) || defined(WITH_TCL) || defined(WITH_GUILE)
+BUILD_DEPENDS+=		swig1.3:${PORTSDIR}/devel/swig13
+RUN_DEPENDS+=		swig1.3:${PORTSDIR}/devel/swig13
+CONFIGURE_ARGS+=	--enable-swig
+CONFIGURE_ENV+=		SWIG="${LOCALBASE}/bin/swig1.3"
+.else
+CONFIGURE_ARGS+=	--disable-swig
+CONFIGURE_ENV+=		SWIG="/nonexistent"
+.endif
+
+.if defined(WITH_PERL)
+CONFIGURE_ARGS+=	--enable-perl
+PLIST_SUB+=		WITH_PERL=""
+USE_PERL5=	yes
+MANN+=			gv_perl.n
+.else
+CONFIGURE_ARGS+=	--disable-perl
+PLIST_SUB+=		WITH_PERL="@comment "
+.endif
+
+.if defined(WITH_PHP)
+CONFIGURE_ARGS+=	--enable-php
+PLIST_SUB+=		WITH_PHP=""
+USE_PHP=	yes
+USE_PHP_BUILD=	yes
+CPPFLAGS+=		-I${LOCALBASE}/include/php/Zend
+MANN+=			gv_php.n
+.else
+CONFIGURE_ARGS+=	--disable-php
+PLIST_SUB+=		WITH_PHP="@comment "
+.endif
+
+.if defined(WITH_PYTHON)
+CONFIGURE_ARGS+=	--enable-python
+PLIST_SUB+=		WITH_PYTHON=""
+USE_PYTHON_BUILD=	yes
+.include "${PORTSDIR}/Mk/bsd.python.mk"
+LDFLAGS+=		"-L${PYTHON_LIBDIR}"
+MANN+=			gv_python.n
+.else
+CONFIGURE_ARGS+=	--disable-python
+PLIST_SUB+=		WITH_PYTHON="@comment "
+.endif
+
+.if defined(WITH_RUBY)
+CONFIGURE_ARGS+=	--enable-ruby
+PLIST_SUB+=		WITH_RUBY=""
+USE_RUBY=		yes
+.include "${PORTSDIR}/Mk/bsd.ruby.mk"
+MANN+=			gv_ruby.n
+.else
+CONFIGURE_ARGS+=	--disable-ruby
+PLIST_SUB+=		WITH_RUBY="@comment "
+.endif
+
+.if defined(WITH_LUA)
+CONFIGURE_ARGS+=	--enable-lua
+PLIST_SUB+=		WITH_LUA=""
+USE_LUA=		yes
+.include "${PORTSDIR}/Mk/bsd.lua.mk"
+CFLAGS+=		-I${LUA_INCDIR}
+LDFLAGS+=		-L${LUA_LIBDIR} -lm
+CONFIGURE_ENV+=		LUA="${LUA_BINDIR}/lua"
+MANN+=			gv_lua.n
+.else
+CONFIGURE_ARGS+=	--disable-lua
+PLIST_SUB+=		WITH_LUA="@comment "
+.endif
 
+.if defined(WITH_TCL)
+CONFIGURE_ARGS+=	--enable-tcl
+PLIST_SUB+=		WITH_TCL=""
+MANN+=			gv_tcl.n
+.else
+CONFIGURE_ARGS+=	--disable-tcl
+PLIST_SUB+=		WITH_TCL="@comment "
+.endif
+
+.if defined(WITH_GUILE)
+CONFIGURE_ARGS+=	--enable-guile
+PLIST_SUB+=		WITH_GUILE=""
+LIB_DEPENDS+=		guile.18:${PORTSDIR}/lang/guile
+MANN+=			gv_guile.n
+.else
+CONFIGURE_ARGS+=	--disable-guile
+PLIST_SUB+=		WITH_GUILE="@comment "
+.endif
+
+pre-patch:
+	@${FIND} ${WRKSRC} -name Makefile.in | \
+		${XARGS} ${REINPLACE_CMD} \
+		-e 's|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|' \
+		-e "s|\([^:]*:.*\) install-pdfDATA\(.*\)|\1\2|g" \
+		-e "s|\([^:]*:.*\) install-htmlDATA\(.*\)|\1\2|g" \
+		-e "s|\([^:]*:.*\) install-txtDATA\(.*\)|\1\2|g" \
+		-e "s|\([^:]*:.*\) install-demoDATA\(.*\)|\1\2|g" \
+		-e "s|\([^:]*:.*\) install-demoSCRIPTS\(.*\)|\1\2|g" \
+		-e "s|\([^:]*:.*\) install-pathplanexampleDATA\(.*\)|\1\2|g" \
+		-e 's|demodir = $$(pkgdatadir)/demo|demodir = ${EXAMPLESDIR}|';
+	@${REINPLACE_CMD} \
+		-e 's|^\.SUFFIXES: \(.*\)\.1\(.*\)|.SUFFIXES: \1 \2|' \
+		${WRKSRC}/cmd/tools/Makefile.in \
+		${WRKSRC}/cmd/gvpr/Makefile.in
+	@${FIND} ${WRKSRC}/lib -name 'Makefile.in' | \
+		${XARGS} ${REINPLACE_CMD} \
+		-e 's|pkglibdir = $$(libdir)/@PACKAGE@|pkglibdir = $$(libdir)|g' \
+		-e 's|libdir = @libdir@|libdir = @libdir@/@PACKAGE@|g';
+	@${FIND} ${WRKSRC}/lib -name '*.pc.in' | \
+		${XARGS} ${REINPLACE_CMD} \
+		-e 's|libdir=@libdir@|libdir=@libdir@/@PACKAGE@|';
+	@${REINPLACE_CMD} -e "s|/usr/include/php|${LOCALBASE}/include/php|g" \
+		-e "s|vendorarch|installsitearch|g" \
+		-e "s|-lruby|-lruby${RUBY_SUFFIX}|g" ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|#include "gui.h"|#include "gui/gui.h"|' \
+		${WRKSRC}/cmd/smyrna/tvnodes.h
+	@${REINPLACE_CMD} -e 's|#include "regex_win32.h"|#include <regex.h>|' \
+		${WRKSRC}/cmd/smyrna/btree.c
+
+.if defined(WITH_TK)
+post-install-script:
+	${INSTALL_MAN} \
+		${WRKSRC}/tclpkg/gdtclft/gdtclft.n \
+		${WRKSRC}/tclpkg/tcldot/tcldot.n \
+		${WRKSRC}/tclpkg/tkspline/tkspline.n \
+		${MANNPREFIX}/man/mann/
+.endif
+
+post-install:
+	cd ${WRKSRC}/lib/expr && \
+		${MAKE} ${INSTALL_TARGET}
+	cd ${WRKSRC} && \
+		${INSTALL_DATA} ${FIX_INCLUDE} ${PREFIX}/include/graphviz/
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}/html
 	@${MKDIR} ${DOCSDIR}/pdf
-	cd ${WRKSRC} && ${INSTALL_DATA} ${PDOCS_TXT} ${DOCSDIR}		\
-	             && ${INSTALL_DATA} ${PDOCS_PDF} ${DOCSDIR}/pdf	\
-	             && ${INSTALL_DATA} ${PDOCS_HTML} ${DOCSDIR}/html
-
+	cd ${WRKSRC} && \
+		${INSTALL_DATA} ${PDOCS_TXT} ${DOCSDIR}/ && \
+		${INSTALL_DATA} ${PDOCS_PDF} ${DOCSDIR}/pdf/ && \
+		${INSTALL_DATA} ${PDOCS_HTML} ${DOCSDIR}/html/
 .	for i in neato.pdf twopi.pdf fdp.pdf circo.pdf
 		cd ${DOCSDIR}/pdf && ${LN} -fs dot.pdf ${i}
 .	endfor
 	cd ${DOCSDIR}/pdf && ${LN} -fs gxl2dot.pdf dot2gxl.pdf
 .endif
-
 	@${ECHO_MSG} "Installing demo data..."
 	@${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_SCRIPT}  ${WRKSRC}/tclpkg/gdtclft/demo/entities        ${EXAMPLESDIR}
-	${INSTALL_DATA}    ${WRKSRC}/tclpkg/gdtclft/demo/entities.README ${EXAMPLESDIR}
-
-	${INSTALL_SCRIPT}  ${WRKSRC}/tclpkg/tcldot/demo/doted            ${EXAMPLESDIR}
-	${INSTALL_DATA}    ${WRKSRC}/tclpkg/tcldot/demo/doted.README     ${EXAMPLESDIR}
-
-	${INSTALL_SCRIPT}  ${WRKSRC}/tclpkg/tcldot/demo/gcat             ${EXAMPLESDIR}
-	${INSTALL_DATA}    ${WRKSRC}/tclpkg/tcldot/demo/gcat.README      ${EXAMPLESDIR}
-
+	${INSTALL_SCRIPT} \
+		${WRKSRC}/tclpkg/gdtclft/demo/entities.tcl \
+		${WRKSRC}/tclpkg/tcldot/demo/doted.tcl \
+		${WRKSRC}/tclpkg/tcldot/demo/gcat.tcl \
+		${WRKSRC}/tclpkg/tclpathplan/demo/pathplan.tcl \
+		${WRKSRC}/tclpkg/tkspline/demo/spline.tcl \
+		${EXAMPLESDIR}/
+	${INSTALL_DATA} \
+		${WRKSRC}/tclpkg/gdtclft/demo/entities.tcl.README \
+		${WRKSRC}/tclpkg/tcldot/demo/doted.tcl.README \
+		${WRKSRC}/tclpkg/tcldot/demo/gcat.tcl.README \
+		${WRKSRC}/tclpkg/tclpathplan/demo/pathplan.tcl.README \
+		${WRKSRC}/tclpkg/tkspline/demo/spline.tcl.README \
+		${EXAMPLESDIR}/
 	@${MKDIR} ${EXAMPLESDIR}/pathplan_data
-	${INSTALL_SCRIPT}  ${WRKSRC}/tclpkg/tclpathplan/demo/pathplan	 ${EXAMPLESDIR}
-	${INSTALL_DATA}    ${WRKSRC}/tclpkg/tclpathplan/demo/pathplan.README ${EXAMPLESDIR}
-	${INSTALL_DATA}    ${WRKSRC}/tclpkg/tclpathplan/demo/pathplan_data/*.dat \
-	                   ${EXAMPLESDIR}/pathplan_data
-
-	${INSTALL_SCRIPT}  ${WRKSRC}/tclpkg/tkspline/demo/spline	 ${EXAMPLESDIR}
-	${INSTALL_DATA}    ${WRKSRC}/tclpkg/tkspline/demo/spline.README	 ${EXAMPLESDIR}
+	${INSTALL_DATA} \
+		${WRKSRC}/tclpkg/tclpathplan/demo/pathplan_data/*.dat \
+		${EXAMPLESDIR}/pathplan_data/
 
 .include <bsd.port.post.mk>
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/graphics/graphviz/distinfo,v
retrieving revision 1.1
retrieving revision 1.2
diff -L graphics/graphviz/distinfo -L graphics/graphviz/distinfo -u -r1.1 -r1.2
--- graphics/graphviz/distinfo
+++ graphics/graphviz/distinfo
@@ -1,3 +1,3 @@
-MD5 (graphviz-2.8.tar.gz) = ca921b4a9bcd86da4a1092bb17a57d83
-SHA256 (graphviz-2.8.tar.gz) = be0c4b7e49f7c226c68d54bb47018f3b3bfb51bb992f5ad71da875cad13367ca
-SIZE (graphviz-2.8.tar.gz) = 4243130
+MD5 (graphviz-2.20.0.tar.gz) = 5b134ba53321caba3c9eaf51167b77ef
+SHA256 (graphviz-2.20.0.tar.gz) = 65190527185379b0dbd68d5873205ecfa68de59d24dae43cd3f871215cfc9115
+SIZE (graphviz-2.20.0.tar.gz) = 13334570
--- graphics/graphviz/files/patch-tools::sfio::sfhdr.h
+++ /dev/null
@@ -1,23 +0,0 @@
---- lib/sfio/sfhdr.h.orig	Fri Apr 27 04:17:42 2001
-+++ lib/sfio/sfhdr.h	Tue Feb 18 19:26:37 2003
-@@ -122,6 +122,10 @@
- #include	<errno.h>
- #include	<ctype.h>
- 
-+#ifndef va_copy
-+#define va_copy(to,fr) ((to)=(fr))
-+#endif
-+
- #if vt_threaded
- 
- /* initialization */
-@@ -230,7 +234,9 @@
- #endif
- 
- #if _hdr_values
-+#ifdef HAVE_VALUES_H
- #include	<values.h>
-+#endif
- #if !defined(SF_MAXDOUBLE) && defined(MAXDOUBLE)
- #define SF_MAXDOUBLE	MAXDOUBLE
- #endif
Index: patch-configure
===================================================================
RCS file: /home/cvs/mports/graphics/graphviz/files/patch-configure,v
retrieving revision 1.1
retrieving revision 1.2
diff -L graphics/graphviz/files/patch-configure -L graphics/graphviz/files/patch-configure -u -r1.1 -r1.2
--- graphics/graphviz/files/patch-configure
+++ graphics/graphviz/files/patch-configure
@@ -1,11 +1,11 @@
---- configure.orig	Fri Feb  3 22:33:33 2006
-+++ configure	Fri Feb 24 15:36:12 2006
-@@ -4724,7 +4724,7 @@
- 	        *-dec-osf* )
- 	            CFLAGS="${CFLAGS} -mieee -Wall"
- 	            ;;
--                *alpha*-*-linux* )
-+                *alpha*-*-* )
-                     CFLAGS="${CFLAGS} -mieee -Wall"
-                     ;;
- 	        *-apple-darwin* )
+--- configure.orig	2008-03-10 20:32:12.000000000 +0100
++++ configure	2008-04-03 17:38:34.000000000 +0200
+@@ -34060,7 +34060,7 @@
+ 
+ # Check whether --with-platformsdkincludedir was given.
+ if test "${with_platformsdkincludedir+set}" = set; then
+-  withval=$with_platformsdkincludedir; PLATFORMSDKINCLUDE=$withval; PLATFORMSDKINCLUDE_ESCAPED=${PLATFORMSDKINCLUDE//'\\'/\\\\}; PLATFORMSDKINCLUDE_ESCAPED=${PLATFORMSDKINCLUDE_ESCAPED// /\\ }
++  withval=$with_platformsdkincludedir; PLATFORMSDKINCLUDE=$withval; PLATFORMSDKINCLUDE_ESCAPED=${PLATFORMSDKINCLUDE}; PLATFORMSDKINCLUDE_ESCAPED=${PLATFORMSDKINCLUDE_ESCAPED}
+ fi
+ 
+ 


More information about the Midnightbsd-cvs mailing list