pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/graphics/graphviz Changes 2.12:
details: https://anonhg.NetBSD.org/pkgsrc/rev/ec72db623610
branches: trunk
changeset: 523468:ec72db623610
user: adam <adam%pkgsrc.org@localhost>
date: Mon Jan 08 11:29:47 2007 +0000
description:
Changes 2.12:
- Bug fix release for 2.10
- The gd plugin for font handlers was not being used at all if the build
did not use fontconfig, e.g., on Windows. In addition, the code had
dropped the name mapping to Windows font names.
- PostScript output had an extraneous '%' character on the first line,
which would cause printing to fail.
- Text handling, during both sizing and layout, incorrectly handled
empty lines such as label="\nabc".
- HTML-like tables had been changed to use too much vertical space,
to possibly use the wrong font in calculating the height of a line,
and to use the wrong offset when moving the baseline from one line to
the next.
diffstat:
graphics/graphviz/Makefile | 40 +++++++++-------
graphics/graphviz/PLIST | 88 +++++++++++++++++++++++--------------
graphics/graphviz/buildlink3.mk | 17 +++----
graphics/graphviz/distinfo | 15 +++---
graphics/graphviz/patches/patch-aa | 22 ++++----
graphics/graphviz/patches/patch-ab | 12 ++--
graphics/graphviz/patches/patch-ac | 25 ++++------
graphics/graphviz/patches/patch-ae | 28 ------------
8 files changed, 118 insertions(+), 129 deletions(-)
diffs (truncated from 469 to 300 lines):
diff -r 74a254fd24ad -r ec72db623610 graphics/graphviz/Makefile
--- a/graphics/graphviz/Makefile Mon Jan 08 11:06:44 2007 +0000
+++ b/graphics/graphviz/Makefile Mon Jan 08 11:29:47 2007 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.51 2006/05/11 21:51:40 jmc Exp $
+# $NetBSD: Makefile,v 1.52 2007/01/08 11:29:47 adam Exp $
-DISTNAME= graphviz-2.6
-PKGREVISION= 5
+DISTNAME= graphviz-2.12
CATEGORIES= graphics
MASTER_SITES= http://www.graphviz.org/pub/graphviz/ARCHIVE/
@@ -11,16 +10,28 @@
PKG_INSTALLATION_TYPES= overwrite pkgviews
+USE_LANGUAGES= c c++
USE_LIBTOOL= yes
-USE_LANGUAGES= c c++
USE_TOOLS+= pkg-config
GNU_CONFIGURE= yes
-XAW_TYPE= standard
+# ltdl enabled makes 'dot' crash
+CONFIGURE_ARGS+= --disable-ltdl
+CONFIGURE_ARGS+= --without-gtk
+CONFIGURE_ENV+= TCLCONFIG=${TCLCONFIG_SH:Q}
+CONFIGURE_ENV+= TKCONFIG=${TKCONFIG_SH:Q}
+CONFIGURE_ENV+= X11PREFIX=${X11PREFIX:Q} X11BASE=${X11BASE:Q}
+# build fails when PHP and/or Ruby are also installed
+CONFIGURE_ENV+= ac_cv_prog_PHP=
+CONFIGURE_ENV+= ac_cv_prog_RUBY=
+CPPFLAGS+= -DNO_POSTSCRIPT_ALIAS=1
PKGCONFIG_OVERRIDE= lib/agraph/libagraph.pc.in
PKGCONFIG_OVERRIDE+= lib/cdt/libcdt.pc.in
+PKGCONFIG_OVERRIDE+= lib/expr/libexpr.pc.in
PKGCONFIG_OVERRIDE+= lib/graph/libgraph.pc.in
PKGCONFIG_OVERRIDE+= lib/gvc/libgvc.pc.in
+PKGCONFIG_OVERRIDE+= lib/gvc/libgvc_builtins.pc.in
PKGCONFIG_OVERRIDE+= lib/pathplan/libpathplan.pc.in
+XAW_TYPE= standard
.include "../../mk/bsd.prefs.mk"
@@ -29,23 +40,16 @@
BUILDLINK_TRANSFORM+= rm:-Wno-unused-parameter
.endif
-CONFIGURE_ENV+= TCLCONFIG=${TCLCONFIG_SH:Q}
-CONFIGURE_ENV+= TKCONFIG=${TKCONFIG_SH:Q}
-CONFIGURE_ENV+= X11PREFIX=${X11PREFIX:Q} X11BASE=${X11BASE:Q}
-# build fails when PHP and/or Ruby are also installed
-CONFIGURE_ENV+= ac_cv_prog_PHP=
-CONFIGURE_ENV+= ac_cv_prog_RUBY=
-
-CPPFLAGS+= -DNO_POSTSCRIPT_ALIAS=1
-
# prevent another config.status run
pre-build:
- ${TOUCH} ${WRKSRC}/Makefile
+ touch ${WRKSRC}/Makefile
+.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/libltdl/buildlink3.mk"
-.include "../../fonts/fontconfig/buildlink3.mk"
-.include "../../graphics/freetype2/buildlink3.mk"
+.include "../../devel/libltdl/convenience.mk"
+.include "../../devel/pango/buildlink3.mk"
+.include "../../devel/swig/buildlink3.mk"
+.include "../../lang/lua/buildlink3.mk"
# The configure script requires gd>=2.0.34, which was never released.
# Uncomment the following when graphics/gd is updated to 2.0.34
#.include "../../graphics/gd/buildlink3.mk"
diff -r 74a254fd24ad -r ec72db623610 graphics/graphviz/PLIST
--- a/graphics/graphviz/PLIST Mon Jan 08 11:06:44 2007 +0000
+++ b/graphics/graphviz/PLIST Mon Jan 08 11:29:47 2007 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2005/10/08 08:11:10 adam Exp $
+@comment $NetBSD: PLIST,v 1.13 2007/01/08 11:29:47 adam Exp $
bin/acyclic
bin/bcomps
bin/ccomps
@@ -6,7 +6,6 @@
bin/dijkstra
bin/dot
bin/dot2gxl
-bin/dot_static
bin/dotty
bin/fdp
bin/gc
@@ -30,21 +29,12 @@
include/graphviz/ast_common.h
include/graphviz/cdt.h
include/graphviz/color.h
+include/graphviz/demand_loading.c
+include/graphviz/dot_builtins.c
include/graphviz/dthdr.h
-include/graphviz/entities.h
include/graphviz/exgram.h
include/graphviz/exlib.h
include/graphviz/expr.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
@@ -55,52 +45,65 @@
include/graphviz/gvcext.h
include/graphviz/gvcint.h
include/graphviz/gvcjob.h
+include/graphviz/gvcommon.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/gvplugin_usershape.h
-include/graphviz/jisx0208.h
include/graphviz/libgraph.h
include/graphviz/logic.h
include/graphviz/malloc.h
+include/graphviz/no_demand_loading.c
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/wbmp.h
-lib/graphviz/config
-lib/graphviz/libagraph.la
-lib/graphviz/libcdt.la
-lib/graphviz/libexpr.la
-lib/graphviz/libgdtclft.la
-lib/graphviz/libgraph.la
-lib/graphviz/libgv_tcl.la
-lib/graphviz/libgvc.la
-lib/graphviz/libgvc_builtins.la
-lib/graphviz/libgvgd.la
+lib/graphviz/libgvplugin_core.la
lib/graphviz/libgvplugin_dot_layout.la
+lib/graphviz/libgvplugin_gd.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/libgvplugin_pango.la
+lib/graphviz/libgvplugin_xlib.la
+lib/graphviz/lua/gv.so
+lib/graphviz/lua/gv_lua.man
+lib/graphviz/lua/libgv_lua.la
+lib/graphviz/perl/gv.so
lib/graphviz/pkgIndex.tcl
+lib/graphviz/python/_gv.so
+lib/graphviz/ruby/gv.so
+lib/graphviz/tcl/gv.so
+lib/graphviz/tcl/gv_tcl.man
+lib/graphviz/tcl/libgdtclft.la
+lib/graphviz/tcl/libgv_tcl.la
+lib/graphviz/tcl/libtcldot.la
+lib/graphviz/tcl/libtcldot_builtin.la
+lib/graphviz/tcl/libtclplan.la
+lib/graphviz/tcl/libtkspline.la
+lib/libagraph.la
+lib/libcdt.la
+lib/libexpr.la
+lib/libgraph.la
+lib/libgvc.la
+lib/libgvc_builtins.la
+lib/libpathplan.la
lib/pkgconfig/libagraph.pc
lib/pkgconfig/libcdt.pc
+lib/pkgconfig/libexpr.pc
lib/pkgconfig/libgraph.pc
lib/pkgconfig/libgvc.pc
+lib/pkgconfig/libgvc_builtins.pc
lib/pkgconfig/libpathplan.pc
man/man1/acyclic.1
man/man1/bcomps.1
@@ -129,7 +132,7 @@
man/man3/cdt.3
man/man3/expr.3
man/man3/graph.3
-man/man3/pack.3
+man/man3/gvc.3
man/man3/pathplan.3
man/mann/gdtclft.n
man/mann/tcldot.n
@@ -247,6 +250,8 @@
share/graphviz/doc/html/info/house.gif
share/graphviz/doc/html/info/html1.gif
share/graphviz/doc/html/info/html2.gif
+share/graphviz/doc/html/info/html3.gif
+share/graphviz/doc/html/info/html4.gif
share/graphviz/doc/html/info/index.html
share/graphviz/doc/html/info/invhouse.gif
share/graphviz/doc/html/info/invtrapezium.gif
@@ -254,6 +259,7 @@
share/graphviz/doc/html/info/lang.html
share/graphviz/doc/html/info/mrecord.gif
share/graphviz/doc/html/info/nohead.gif
+share/graphviz/doc/html/info/none.gif
share/graphviz/doc/html/info/octagon.gif
share/graphviz/doc/html/info/output.html
share/graphviz/doc/html/info/parallelogram.gif
@@ -265,12 +271,15 @@
share/graphviz/doc/html/info/rect.gif
share/graphviz/doc/html/info/rectangle.gif
share/graphviz/doc/html/info/round.gif
+share/graphviz/doc/html/info/sdlshapes.jpg
share/graphviz/doc/html/info/septagon.gif
share/graphviz/doc/html/info/shapes.html
share/graphviz/doc/html/info/trapezium.gif
share/graphviz/doc/html/info/triangle.gif
share/graphviz/doc/html/info/tripleoctagon.gif
+share/graphviz/doc/html/pspdf.png
share/graphviz/doc/html/tcldot.html
+share/graphviz/doc/html/winbuild.html
share/graphviz/doc/latex_suggestions.txt
share/graphviz/doc/pdf/acyclic.pdf
share/graphviz/doc/pdf/agraph.pdf
@@ -289,6 +298,7 @@
share/graphviz/doc/pdf/gc.pdf
share/graphviz/doc/pdf/gdtclft.pdf
share/graphviz/doc/pdf/graph.pdf
+share/graphviz/doc/pdf/gvc.pdf
share/graphviz/doc/pdf/gvcolor.pdf
share/graphviz/doc/pdf/gvpack.pdf
share/graphviz/doc/pdf/gvpr.pdf
@@ -299,7 +309,6 @@
share/graphviz/doc/pdf/neato.pdf
share/graphviz/doc/pdf/neatoguide.pdf
share/graphviz/doc/pdf/nop.pdf
-share/graphviz/doc/pdf/pack.pdf
share/graphviz/doc/pdf/pathplan.pdf
share/graphviz/doc/pdf/prune.pdf
share/graphviz/doc/pdf/sccmap.pdf
@@ -387,5 +396,16 @@
@dirrm share/graphviz/demo/pathplan_data
@dirrm share/graphviz/demo
@dirrm share/graphviz
+@dirrm lib/graphviz/tcl
+@dirrm lib/graphviz/sharp
+@dirrm lib/graphviz/ruby
+@dirrm lib/graphviz/python
+@dirrm lib/graphviz/php
+@dirrm lib/graphviz/perl
+@dirrm lib/graphviz/ocaml
+@dirrm lib/graphviz/lua
+@dirrm lib/graphviz/java
+@dirrm lib/graphviz/io
+@dirrm lib/graphviz/guile
@dirrm lib/graphviz
@dirrm include/graphviz
diff -r 74a254fd24ad -r ec72db623610 graphics/graphviz/buildlink3.mk
--- a/graphics/graphviz/buildlink3.mk Mon Jan 08 11:06:44 2007 +0000
+++ b/graphics/graphviz/buildlink3.mk Mon Jan 08 11:29:47 2007 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/07/16 15:02:43 seb Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2007/01/08 11:29:47 adam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GRAPHVIZ_BUILDLINK3_MK:= ${GRAPHVIZ_BUILDLINK3_MK}+
-.if !empty(BUILDLINK_DEPTH:M+)
+.if ${BUILDLINK_DEPTH} == "+"
BUILDLINK_DEPENDS+= graphviz
.endif
@@ -11,19 +11,16 @@
BUILDLINK_PACKAGES+= graphviz
BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}graphviz
-.if !empty(GRAPHVIZ_BUILDLINK3_MK:M+)
+.if ${GRAPHVIZ_BUILDLINK3_MK} == "+"
BUILDLINK_API_DEPENDS.graphviz+= graphviz>=1.12
BUILDLINK_ABI_DEPENDS.graphviz+= graphviz>=2.6nb5
BUILDLINK_PKGSRCDIR.graphviz?= ../../graphics/graphviz
.endif # GRAPHVIZ_BUILDLINK3_MK
Home |
Main Index |
Thread Index |
Old Index