pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/graphics/graphviz Updating graphics/graphviz from 2.22...
details: https://anonhg.NetBSD.org/pkgsrc/rev/8a41b229d2ec
branches: trunk
changeset: 399105:8a41b229d2ec
user: sno <sno%pkgsrc.org@localhost>
date: Sun Sep 13 11:17:30 2009 +0000
description:
Updating graphics/graphviz from 2.22.2 to 2.24.0
pkgsrc changes:
- Adding support for ghostscript
- Removing option for swig - it's used automatically now when a
language binding is choosen
- Removing rsvg and guile from suggested options to reduce default
dependencies
Upstream changes:
June 16, 2009
- Release 2.24.0
- Core:
- add new layout engine for large graphs: sfdp
- Fixed bugs:
1515, 1590, 1598, 1601, 1605, 1607, 1609, 1610, 1611,
1614, 1615, 1617, 1625, 1628, 1634, 1635, 1640, 1641,
1642, 1646, 1649, 1651, 1652
diffstat:
graphics/graphviz/Makefile | 5 +-
graphics/graphviz/PLIST | 8 +++-
graphics/graphviz/distinfo | 8 ++--
graphics/graphviz/options.mk | 76 +++++++++++++++++++++++++++++++------------
4 files changed, 67 insertions(+), 30 deletions(-)
diffs (251 lines):
diff -r 6d9d7c34a548 -r 8a41b229d2ec graphics/graphviz/Makefile
--- a/graphics/graphviz/Makefile Sun Sep 13 10:53:40 2009 +0000
+++ b/graphics/graphviz/Makefile Sun Sep 13 11:17:30 2009 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.75 2009/08/26 19:57:43 sno Exp $
+# $NetBSD: Makefile,v 1.76 2009/09/13 11:17:30 sno Exp $
-DISTNAME= graphviz-2.22.2
-PKGREVISION= 1
+DISTNAME= graphviz-2.24.0
CATEGORIES= graphics
MASTER_SITES= http://www.graphviz.org/pub/graphviz/stable/SOURCES/
diff -r 6d9d7c34a548 -r 8a41b229d2ec graphics/graphviz/PLIST
--- a/graphics/graphviz/PLIST Sun Sep 13 10:53:40 2009 +0000
+++ b/graphics/graphviz/PLIST Sun Sep 13 11:17:30 2009 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.35 2009/07/05 10:15:02 obache Exp $
+@comment $NetBSD: PLIST,v 1.36 2009/09/13 11:17:30 sno Exp $
bin/acyclic
bin/bcomps
bin/ccomps
@@ -22,6 +22,7 @@
bin/mm2gv
bin/neato
bin/nop
+bin/osage
bin/prune
bin/sccmap
bin/tred
@@ -34,6 +35,7 @@
include/graphviz/color.h
include/graphviz/geom.h
include/graphviz/graph.h
+include/graphviz/graphviz_version.h
include/graphviz/gv.cpp
include/graphviz/gv.i
include/graphviz/gvc.h
@@ -59,6 +61,7 @@
lib/graphviz/libgvplugin_gd.la
${PLIST.gtk}lib/graphviz/libgvplugin_gdk_pixbuf.la
${PLIST.gtk}lib/graphviz/libgvplugin_gtk.la
+${PLIST.ghostscript}lib/graphviz/libgvplugin_gs.la
lib/graphviz/libgvplugin_neato_layout.la
${PLIST.pangocairo}lib/graphviz/libgvplugin_pango.la
${PLIST.rsvg}lib/graphviz/libgvplugin_rsvg.la
@@ -115,6 +118,7 @@
man/man1/mm2gv.1
man/man1/neato.1
man/man1/nop.1
+man/man1/osage.1
man/man1/prune.1
man/man1/sccmap.1
man/man1/tred.1
@@ -253,7 +257,6 @@
share/graphviz/doc/html/info/fill.gif
share/graphviz/doc/html/info/folder.gif
share/graphviz/doc/html/info/forward.gif
-share/graphviz/doc/html/info/grammar.html
share/graphviz/doc/html/info/hexagon.gif
share/graphviz/doc/html/info/house.gif
share/graphviz/doc/html/info/html1.gif
@@ -335,6 +338,7 @@
share/graphviz/doc/pdf/neato.1.pdf
share/graphviz/doc/pdf/neatoguide.pdf
share/graphviz/doc/pdf/nop.1.pdf
+share/graphviz/doc/pdf/osage.1.pdf
share/graphviz/doc/pdf/pathplan.3.pdf
share/graphviz/doc/pdf/prune.pdf
share/graphviz/doc/pdf/sccmap.1.pdf
diff -r 6d9d7c34a548 -r 8a41b229d2ec graphics/graphviz/distinfo
--- a/graphics/graphviz/distinfo Sun Sep 13 10:53:40 2009 +0000
+++ b/graphics/graphviz/distinfo Sun Sep 13 11:17:30 2009 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.34 2009/05/17 12:55:52 sno Exp $
+$NetBSD: distinfo,v 1.35 2009/09/13 11:17:30 sno Exp $
-SHA1 (graphviz-2.22.2.tar.gz) = 92b40b1fb596a6b3e880e74101921d7681f62c94
-RMD160 (graphviz-2.22.2.tar.gz) = 546eebc1a0b97ffdc431a986102c9e25d1ea216e
-Size (graphviz-2.22.2.tar.gz) = 16674049 bytes
+SHA1 (graphviz-2.24.0.tar.gz) = 1d91b3a7d2c7fa15e5e718eb456210cd15731e14
+RMD160 (graphviz-2.24.0.tar.gz) = d003cfa57e73c44fbb71ae8f8726ecc9c74735f9
+Size (graphviz-2.24.0.tar.gz) = 16746568 bytes
SHA1 (patch-aa) = c9942207526b60caa90406a5204737be1207b71f
SHA1 (patch-ab) = 01aae00529da57b9d5dd5ee27c2b9bbef3809d5d
SHA1 (patch-ag) = 1eb3aab33f132b019a3faaa80bb68d44daa58f61
diff -r 6d9d7c34a548 -r 8a41b229d2ec graphics/graphviz/options.mk
--- a/graphics/graphviz/options.mk Sun Sep 13 10:53:40 2009 +0000
+++ b/graphics/graphviz/options.mk Sun Sep 13 11:17:30 2009 +0000
@@ -1,23 +1,23 @@
-# $NetBSD: options.mk,v 1.9 2009/08/24 11:53:42 gdt Exp $
+# $NetBSD: options.mk,v 1.10 2009/09/13 11:17:30 sno Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.graphviz
-PKG_SUPPORTED_OPTIONS= gd x11 pangocairo gtk rsvg swig guile lua ocaml tcl perl
-PKG_SUGGESTED_OPTIONS= gd x11 pangocairo gtk rsvg swig lua tcl perl
+PKG_SUPPORTED_OPTIONS= gd ghostscript x11 pangocairo gtk rsvg guile lua ocaml tcl perl
+PKG_SUGGESTED_OPTIONS= gd x11 pangocairo gtk lua tcl perl
# Explanation of consquence of options, to help those trying to slim down:
-# swig: build-time only, needed for any of the languages. Silently
-# forces off language options.
-# ocaml lua tcl perl: extension language support
-# x11: Omits all linking with x11. Silently forces off pangocairo, gtk
-# and rsvg.
-# pangocairo: [need explanation]. Silently forces off gtk.
-# gtk: [need explanation]
-# rsvg: Omitting loses svg support. librsvg has large dependencies
+# guild ocaml lua tcl perl: extension language support
+# x11: Omits all linking with x11, which means x11 graphics supports as
+# well as x11 frontend support.
+# pangocairo: basic ps/pdf support.
+# gtk: basic graphic format support (in addition to gd, which isn't maintained
+# anymore)
+# rsvg: Omitting loses svg support. librsvg has large dependencies
# including some Gnome libs.
-# gd: [need explanation] (seems small)
+# gd: basic graphic format support, especially gif
+# ghostscript: provides better ps/pdf-support, plus eps
.include "../../mk/bsd.options.mk"
-PLIST_VARS+= gd x11 pangocairo rsvg gtk guile lua ocaml tcl perl
+PLIST_VARS+= gd ghostscript x11 pangocairo rsvg gtk guile lua ocaml tcl perl
.if !empty(PKG_OPTIONS:Mx11)
.include "../../x11/libXp/buildlink3.mk"
@@ -30,6 +30,13 @@
.include "../../graphics/cairo/buildlink3.mk"
PLIST.pangocairo= yes
+.if !empty(PKG_OPTIONS:Mghostscript)
+.include "../../print/ghostscript/buildlink3.mk"
+PLIST.ghostscript= yes
+.else
+CONFIGURE_ARGS+= --without-ghostscript
+.endif
+
.if !empty(PKG_OPTIONS:Mgtk)
.include "../../x11/gtk2/buildlink3.mk"
PLIST.gtk= yes
@@ -49,22 +56,47 @@
.else
CONFIGURE_ARGS+= --without-pangocairo
+.if !empty(PKG_OPTIONS:Mghostscript)
+PKG_FAIL_REASON+= "option ghostscript needs option pangocairo"
+.endif
+CONFIGURE_ARGS+= --without-ghostscript
+
+.if !empty(PKG_OPTIONS:Mgtk)
+PKG_FAIL_REASON+= "option gtk needs option pangocairo"
+.endif
CONFIGURE_ARGS+= --without-gdk-pixbuf
CONFIGURE_ARGS+= --without-gtk
CONFIGURE_ARGS+= --without-gnomeui
+.if !empty(PKG_OPTIONS:Mrsvg)
+PKG_FAIL_REASON+= "option rsvg needs option pangocairo"
+.endif
CONFIGURE_ARGS+= --without-rsvg
.endif
.else
CONFIGURE_ARGS+= --without-x
+.if !empty(PKG_OPTIONS:Mpangocairo)
+PKG_FAIL_REASON+= "option pangocairo needs option x11"
+.endif
CONFIGURE_ARGS+= --without-pangocairo
+.if !empty(PKG_OPTIONS:Mghostscript)
+PKG_FAIL_REASON+= "option ghostscript needs option pangocairo and x11"
+.endif
+CONFIGURE_ARGS+= --without-ghostscript
+
+.if !empty(PKG_OPTIONS:Mgtk)
+PKG_FAIL_REASON+= "option gtk needs option pangocairo and x11"
+.endif
CONFIGURE_ARGS+= --without-gdk-pixbuf
CONFIGURE_ARGS+= --without-gtk
CONFIGURE_ARGS+= --without-gnomeui
+.if !empty(PKG_OPTIONS:Mrsvg)
+PKG_FAIL_REASON+= "option rsvg needs option pangocairo and x11"
+.endif
CONFIGURE_ARGS+= --without-rsvg
.endif
@@ -73,19 +105,21 @@
PLIST.gd= yes
.else
CONFIGURE_ARGS+= --without-libgd
+CONFIGURE_ARGS+= --without-mylibgd
.endif
-.if !empty(PKG_OPTIONS:Mswig)
-.include "../../devel/swig/buildlink3.mk"
-
.if !empty(PKG_OPTIONS:Mlua)
+USING_SWIG= yes
.include "../../lang/lua/buildlink3.mk"
PLIST.lua= yes
.else
CONFIGURE_ARGS+= --disable-lua
.endif
+USING_SWIG= no
+
.if !empty(PKG_OPTIONS:Mocaml)
+USING_SWIG= yes
.include "../../lang/ocaml/buildlink3.mk"
PLIST.ocaml= yes
.else
@@ -93,6 +127,7 @@
.endif
.if !empty(PKG_OPTIONS:Mtcl)
+USING_SWIG= yes
.include "../../x11/tk/buildlink3.mk"
CONFIGURE_ENV+= TCLCONFIG=${TCLCONFIG_SH:Q}
CONFIGURE_ENV+= TKCONFIG=${TKCONFIG_SH:Q}
@@ -102,6 +137,7 @@
.endif
.if !empty(PKG_OPTIONS:Mguile)
+USING_SWIG= yes
.include "../../lang/guile/buildlink3.mk"
CONFIGURE_ARGS+= --enable-guile
PLIST.guile= yes
@@ -110,6 +146,7 @@
.endif
.if !empty(PKG_OPTIONS:Mperl)
+USING_SWIG= yes
.include "../../lang/perl5/buildlink3.mk"
CONFIGURE_ARGS+= --enable-perl
PLIST.perl= yes
@@ -118,11 +155,8 @@
CONFIGURE_ARGS+= --disable-perl
.endif
+.if !empty(USING_SWIG:Myes)
+.include "../../devel/swig/buildlink3.mk"
.else
CONFIGURE_ARGS+= --disable-swig
-CONFIGURE_ARGS+= --disable-tcl
-CONFIGURE_ARGS+= --disable-ocaml
-CONFIGURE_ARGS+= --disable-lua
-CONFIGURE_ARGS+= --disable-guile
-CONFIGURE_ARGS+= --disable-perl
.endif
Home |
Main Index |
Thread Index |
Old Index