diff options
Diffstat (limited to 'graphics/graphviz')
| -rw-r--r-- | graphics/graphviz/Makefile | 26 | ||||
| -rw-r--r-- | graphics/graphviz/distinfo | 6 | ||||
| -rw-r--r-- | graphics/graphviz/files/patch-gvtextlayout_gd.c | 20 | ||||
| -rw-r--r-- | graphics/graphviz/pkg-plist | 54 |
4 files changed, 47 insertions, 59 deletions
diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile index 4c2007288a56..5bf514c40371 100644 --- a/graphics/graphviz/Makefile +++ b/graphics/graphviz/Makefile @@ -6,8 +6,7 @@ # PORTNAME= graphviz -PORTVERSION= 2.14.1 -PORTREVISION= 3 +PORTVERSION= 2.16 CATEGORIES= graphics tk84 MASTER_SITES= http://www.graphviz.org/pub/graphviz/ARCHIVE/ \ http://mirror.inerd.com/FreeBSD/distfiles/${PORTNAME}/ @@ -34,7 +33,7 @@ MAKE_ENV= EXPR_COMPAT=yes MISSING=${TRUE} 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 gvc.3 pathplan.3 +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 \ @@ -53,9 +52,7 @@ FIX_INCLUDE= ast_common.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 \ - lib/expr/exlib.h lib/expr/exgram.h \ - lib/expr/expr.h + lib/gvc/gvcint.h PATCH_TCL_SCRIPTS= tclpkg/gv/Makefile.in tclpkg/tcldot/demo/doted \ tclpkg/tclpathplan/demo/pathplan tclpkg/tkspline/demo/spline @@ -73,6 +70,7 @@ OPTIONS= TK "Build with TK support" on \ NLS "Build with gettext support" on \ PANGOCAIRO "build with pangocairo support" off \ GTK "build with gtk plugin" off \ + GDK_PIXBUF "build with gdk pixbuf support" off \ GNOMEUI "build with libgnomeui support" off \ DIGCOLA "DIGCOLA features in neato layout engine" off \ IPSEPCOLA "IPSEPCOLA features in neato layout engine" off \ @@ -158,10 +156,22 @@ USE_XORG+= sm ice xext xinerama xi xrandr xcursor xfixes IGNORE= option WITH_PANGOCAIRO is required for option WITH_GTK .endif .else -CONFIGURE_ARGS+= --without-gtk +CONFIGURE_ARGS+= --without-gtk --without-gdk-pixbuf=yes PLIST_SUB+= WITH_GTK="@comment " .endif +.if defined(WITH_GDK_PIXBUF) +CONFIGURE_ARGS+= --with-gdk-pixbuf=yes +PLIST_SUB+= WITH_PIXBUF="" +USE_GNOME+= gdkpixbuf +.if !defined(WITH_GTK) +IGNORE= option WITH_GTK is required for option WITH_GDK_PIXBUF +.endif +.else +CONFIGURE_ARGS+= --without-gdk-pixbuf=yes +PLIST_SUB+= WITH_PIXBUF="@comment " +.endif + .if defined(WITH_GNOMEUI) CONFIGURE_ARGS+= --with-gnomeui USE_GNOME+= libgnomeui @@ -327,6 +337,8 @@ post-install-script: .endif post-install: install-ldconfig-file + cd ${WRKSRC}/lib/expr && \ + ${MAKE} ${INSTALL_TARGET} cd ${WRKSRC} && \ ${INSTALL_DATA} ${FIX_INCLUDE} ${PREFIX}/include/graphviz/ .if !defined(NOPORTDOCS) diff --git a/graphics/graphviz/distinfo b/graphics/graphviz/distinfo index d8a88c1edb7a..7ba9bb853708 100644 --- a/graphics/graphviz/distinfo +++ b/graphics/graphviz/distinfo @@ -1,3 +1,3 @@ -MD5 (graphviz-2.14.1.tar.gz) = 0c56ba28d4e24f3ddd5e8fdb58deba70 -SHA256 (graphviz-2.14.1.tar.gz) = c7d16c42e016eddeea3bb53d87acc36755a8aaf15303fbd03db23b6993869597 -SIZE (graphviz-2.14.1.tar.gz) = 5064951 +MD5 (graphviz-2.16.tar.gz) = c8cac2c66a52e37a2be9290d4f38e525 +SHA256 (graphviz-2.16.tar.gz) = 5cacd8fdc3a8a63e85d6cdcb4376849742fcd36ea11258cbe13fc2f1224f0423 +SIZE (graphviz-2.16.tar.gz) = 8068186 diff --git a/graphics/graphviz/files/patch-gvtextlayout_gd.c b/graphics/graphviz/files/patch-gvtextlayout_gd.c deleted file mode 100644 index 0afaba234ecd..000000000000 --- a/graphics/graphviz/files/patch-gvtextlayout_gd.c +++ /dev/null @@ -1,20 +0,0 @@ ---- plugin/gd/gvtextlayout_gd.c.orig 2007-07-20 14:38:03.000000000 -0400 -+++ plugin/gd/gvtextlayout_gd.c 2007-09-12 13:20:12.000000000 -0400 -@@ -26,7 +26,7 @@ - #ifdef HAVE_LIBGD - #include "gd.h" - --#if defined(HAVE_LIBGD) && defined(HAVE_LIBFREETYPE) && defined(HAVE_GD_FREETYPE) -+#if defined(HAVE_LIBGD) && defined(HAVE_GD_FREETYPE) - - /* fontsize at which text is omitted entirely */ - #define FONTSIZE_MUCH_TOO_SMALL 0.15 -@@ -172,7 +172,7 @@ - #endif - - gvplugin_installed_t gvtextlayout_gd_types[] = { --#if defined(HAVE_LIBGD) && defined(HAVE_LIBFREETYPE) && defined(HAVE_GD_FREETYPE) -+#if defined(HAVE_LIBGD) && defined(HAVE_GD_FREETYPE) - {0, "textlayout", 2, &gd_textlayout_engine, NULL}, - #endif - {0, NULL, 0, NULL, NULL} diff --git a/graphics/graphviz/pkg-plist b/graphics/graphviz/pkg-plist index 9708609cb856..60698a79d2e6 100644 --- a/graphics/graphviz/pkg-plist +++ b/graphics/graphviz/pkg-plist @@ -1,6 +1,7 @@ bin/dot bin/dot2gxl bin/circo +bin/diffimg bin/fdp bin/gc bin/gvcolor @@ -23,6 +24,7 @@ bin/dotty bin/prune 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 @@ -64,9 +66,6 @@ include/graphviz/gvplugin_loadimage.h include/graphviz/gvplugin_textlayout.h include/graphviz/gvplugin_device.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/config @@ -82,6 +81,10 @@ lib/graphviz/libagraph.so lib/graphviz/libagraph.so.4 lib/graphviz/libagraph.la lib/graphviz/libagraph.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.4 lib/graphviz/libpathplan.la @@ -94,53 +97,45 @@ lib/graphviz/libgvc_builtins.so lib/graphviz/libgvc_builtins.so.4 lib/graphviz/libgvc_builtins.la lib/graphviz/libgvc_builtins.a -lib/graphviz/libexpr.so -lib/graphviz/libexpr.so.4 -lib/graphviz/libexpr.la -lib/graphviz/libexpr.a lib/graphviz/libgvplugin_core.so -lib/graphviz/libgvplugin_core.so.4 +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.4 +lib/graphviz/libgvplugin_dot_layout.so.5 lib/graphviz/libgvplugin_dot_layout.la lib/graphviz/libgvplugin_dot_layout.a lib/graphviz/libgvplugin_gd.so -lib/graphviz/libgvplugin_gd.so.4 +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.4 +%%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.4 +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.4 +%%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.4 +%%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_GUILE%%lib/graphviz/guile/libgv_guile.so.0 -%%WITH_MING%%lib/graphviz/Bitstream_Vera_Sans.fdb -%%WITH_MING%%lib/graphviz/Bitstream_Vera_Serif.fdb -%%WITH_MING%%lib/graphviz/libgvplugin_ming.a -%%WITH_MING%%lib/graphviz/libgvplugin_ming.la -%%WITH_MING%%lib/graphviz/libgvplugin_ming.so -%%WITH_MING%%lib/graphviz/libgvplugin_ming.so.4 %%WITH_PHP%%lib/graphviz/php/gv.php %%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_PHP%%lib/graphviz/php/libgv_php.so.0 %%WITH_PHP%%lib/graphviz/php/php_gv.h lib/graphviz/tcl/gv.so %%WITH_TCL%%lib/graphviz/tcl/libgdtclft.a @@ -150,7 +145,6 @@ lib/graphviz/tcl/gv.so %%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/libgv_tcl.so.0 %%WITH_TCL%%lib/graphviz/tcl/libtcldot.a %%WITH_TCL%%lib/graphviz/tcl/libtcldot.la %%WITH_TCL%%lib/graphviz/tcl/libtcldot.so @@ -171,32 +165,31 @@ 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_LUA%%lib/graphviz/lua/libgv_lua.so.0 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%%lib/graphviz/perl/libgv_perl.so.0 lib/graphviz/python/_gv.so +lib/graphviz/python23/_gv.so +lib/graphviz/python24/_gv.so +lib/graphviz/python25/_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%%lib/graphviz/python/libgv_python.so.0 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%%lib/graphviz/ruby/libgv_ruby.so.0 lib/graphviz/pkgIndex.tcl libdata/pkgconfig/libcdt.pc libdata/pkgconfig/libgraph.pc libdata/pkgconfig/libagraph.pc +libdata/pkgconfig/libcgraph.pc libdata/pkgconfig/libpathplan.pc libdata/pkgconfig/libgvc.pc libdata/pkgconfig/libgvc_builtins.pc -libdata/pkgconfig/libexpr.pc %%PORTDOCS%%%%DOCSDIR%%/html/FAQ.html %%PORTDOCS%%%%DOCSDIR%%/html/build.html %%PORTDOCS%%%%DOCSDIR%%/html/index.html @@ -331,7 +324,6 @@ libdata/pkgconfig/libexpr.pc %%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/pathplan.pdf %%PORTDOCS%%%%DOCSDIR%%/pdf/gdtclft.pdf @@ -342,6 +334,7 @@ libdata/pkgconfig/libexpr.pc %%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 @@ -459,6 +452,9 @@ libdata/pkgconfig/libexpr.pc @dirrm lib/graphviz/ocaml @dirrm lib/graphviz/perl @dirrm lib/graphviz/php +@dirrm lib/graphviz/python25 +@dirrm lib/graphviz/python24 +@dirrm lib/graphviz/python23 @dirrm lib/graphviz/python @dirrm lib/graphviz/ruby @dirrm lib/graphviz/sharp |