Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv32578
Modified Files:
graphviz.info graphviz.patch
Log Message:
Update from -submissions
https://sourceforge.net/tracker/?func=detail&aid=2335770&group_id=17203&atid=414256
Index: graphviz.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/graphviz.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- graphviz.patch 8 Jun 2009 01:22:58 -0000 1.7
+++ graphviz.patch 21 Jun 2009 19:26:34 -0000 1.8
@@ -1,39 +1,11 @@
---- graphviz-2.18-orig/tclpkg/gv/Makefile.in 2008-03-10 20:32:43.000000000
+0100
-+++ graphviz-2.18/tclpkg/gv/Makefile.in 2009-02-27 12:54:01.000000000
+0100
-@@ -2087,6 +2087,8 @@
- $(LUA_data): gv_lua.cpp
- gv_lua.cpp: gv.i
- $(SWIG) -c++ -lua -o gv_lua.cpp $(srcdir)/gv.i
-+ mv $@ [email protected]
-+ sed '/include/s/malloc\.h/cstdlib/' [email protected] > $@
- gv.ml gv.mli: gv_ocaml.cpp
- gv_ocaml.cpp: gv.i
- $(SWIG) -c++ -ocaml -o gv_ocaml.cpp $(srcdir)/gv.i
-@@ -2095,19 +2097,19 @@
- swig.ml:
- $(SWIG) -ocaml -co swig.ml
- swig.cmi: swig.mli
-- ocamlc -c swig.mli
-+ ocamlc.opt -verbose -annot -c $<
- swig.cmo: swig.ml swig.cmi
-- ocamlc -c swig.ml
-+ ocamlc.opt -verbose -annot -c $<
- gv.cmi: gv.mli swig.cmi
-- ocamlc -c gv.mli
-+ ocamlc.opt -verbose -annot -c $<
- gv.cmo: gv.ml gv.cmi
-- ocamlc -c gv.ml
-+ ocamlc.opt -verbose -annot -c $<
- gv.cma: swig.cmo gv.cmo
-- ocamlc -a -dllib dllgv.so -custom -o gv.cma swig.cmo gv.cmo
-+ ocamlc.opt -verbose -annot -a -dllib dllgv.so -custom -o $@ $<
- gv.cmx: gv.ml gv.cma
-- ocamlopt -c gv.ml
--gv.cmxa: gv.cma
-- ocamlopt -a -o gv.cmxa
-+ ocamlopt.opt -verbose -annot -c $<
-+gv.cmxa: gv.cmx
-+ ocamlopt.opt -verbose -annot -a -o $@ $<
- gv.a: gv.cmxa
- $(PERL_data): gv_perl.cpp
- gv_perl.cpp: gv.i
+--- graphviz-2.22.2/configure.orig 2009-06-13 18:32:40.000000000 -0700
++++ graphviz-2.22.2/configure 2009-06-13 18:33:24.000000000 -0700
+@@ -33283,7 +33283,7 @@
+
+ fi
+ fi
+- if test "x$use_min" = "xYes"; then
++ if test "x$use_ming" = "xYes"; then
+ WITH_MING_TRUE=
+ WITH_MING_FALSE='#'
+ else
Index: graphviz.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/graphviz.info,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- graphviz.info 8 Jun 2009 01:22:58 -0000 1.17
+++ graphviz.info 21 Jun 2009 19:26:34 -0000 1.18
@@ -1,6 +1,6 @@
Package: graphviz
-Version: 2.18
-Revision: 4
+Version: 2.22.2
+Revision: 1
License: OSI-Approved
# License: Common Public License 1.0
Maintainer: David Fang <[email protected]>
@@ -13,9 +13,9 @@
nam-US: http://www.graphviz.org/pub/graphviz
<<
SourceDirectory: %n-%v
-Source-MD5: 7df2705482c86fc7a9ee5f0446ed0b9e
+Source-MD5: 34510a76ee176c6e0e64b773174e0fdc
PatchFile: %n.patch
-PatchFile-MD5: 5a5ebef0d2db5fa0adc98e8a56ab1454
+PatchFile-MD5: 8a315909c5e5ed42855340ae8ad25f4b
# PatchScript: <<
# patch -p0 < %{PatchFile}
# <<
@@ -74,9 +74,10 @@
libxml2 (>= 2.6.30-1),
pango1-xft2-ft219-dev (>= 1.18.4-4),
libglade2 (>= 2.6.2-2),
- libming-dev
+ libming1-dev
<<
-ConfigureParams: --mandir=%p/share/man --with-extraincludedir=%p/include
--with-extralibdir=%p/lib --with-tcl=/usr/bin/tclsh --with-tclsh=/usr/bin/tclsh
--with-wish=/usr/bin/wish --with-x --x-includes=/usr/X11R6/include
--x-libraries=/usr/X11R6/lib --disable-r --disable-perl --disable-python
FREETYPE2_CFLAGS=-I%p/lib/freetype219/include/freetype2
FREETYPE2_LIBS=-L%p/lib/freetype219/lib GUILE=%p/bin/guile-1.8
PKG_CONFIG_PATH="%p/lib/pango-ft219/lib/pkgconfig:%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:$PKG_CONFIG_PATH"
RUBY=/usr/bin/ruby
CPPFLAGS="-I/System/Library/Frameworks/JavaVM.framework/Versions/A/Headers
-I%p/lib/ocaml -idirafter $system_ruby_include"
+# TODO: --with-quartz
+ConfigureParams: --mandir=%p/share/man --with-extraincludedir=%p/include
--with-extralibdir=%p/lib --with-tcl=/usr/bin/tclsh --with-tclsh=/usr/bin/tclsh
--with-wish=/usr/bin/wish --with-x --x-includes=/usr/X11R6/include
--x-libraries=/usr/X11R6/lib --with-ming -with-glitz --disable-r --disable-perl
--disable-python FREETYPE2_CFLAGS=-I%p/lib/freetype219/include/freetype2
FREETYPE2_LIBS=-L%p/lib/freetype219/lib GUILE=%p/bin/guile-1.8
PKG_CONFIG_PATH="%p/lib/pango-ft219/lib/pkgconfig:%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:$PKG_CONFIG_PATH"
RUBY=/usr/bin/ruby
CPPFLAGS="-I/System/Library/Frameworks/JavaVM.framework/Versions/A/Headers
-I%p/lib/ocaml -idirafter $system_ruby_include"
# --with-freetypeincludedir=/usr/X11R6/include/freetype2
LDFLAGS=-L%p/lib/ocaml OCAML_LIBS=-L%p/lib/ocaml
CompileScript: <<
#!/bin/sh -ev
@@ -130,6 +131,7 @@
fontconfig2-shlibs (>= 2.4.1-1),
freetype219-shlibs (>= 2.3.5-1),
giflib-shlibs,
+ glitz-shlibs,
libcroco3-shlibs,
libpng3-shlibs,
libjpeg-shlibs,
@@ -143,7 +145,7 @@
expat1-shlibs,
gd2-shlibs (>= 2.0.35-4),
cairo-shlibs (>= 1.6.4-2),
- libming0-shlibs
+ libming1-shlibs
<<
Files: <<
lib/graphviz/*.*.dylib
@@ -157,27 +159,26 @@
lib/*.*.dylib
<<
Shlibs: <<
- %p/lib/graphviz/libgvplugin_core.5.dylib 6.0.0 %n (>= 2.14-1)
- %p/lib/graphviz/libgvplugin_dot_layout.5.dylib 6.0.0 %n (>=
2.14-1)
- %p/lib/graphviz/libgvplugin_gd.5.dylib 6.0.0 %n (>= 2.14-1)
- %p/lib/graphviz/libgvplugin_gdk_pixbuf.5.dylib 6.0.0 %n (>=
2.18-2)
- %p/lib/graphviz/libgvplugin_gtk.5.dylib 6.0.0 %n (>= 2.18-2)
- %p/lib/graphviz/libgvplugin_ming.5.dylib 6.0.0 %n (>= 2.18-2)
- %p/lib/graphviz/libgvplugin_neato_layout.5.dylib 6.0.0 %n (>=
2.14-1)
- %p/lib/graphviz/libgvplugin_pango.5.dylib 6.0.0 %n (>= 2.18-2)
- %p/lib/graphviz/libgvplugin_rsvg.5.dylib 6.0.0 %n (>= 2.18-1)
- %p/lib/graphviz/libgvplugin_xlib.5.dylib 6.0.0 %n (>= 2.18-2)
+ %p/lib/graphviz/libgvplugin_core.6.dylib 7.0.0 %n (>= 2.14-1)
+ %p/lib/graphviz/libgvplugin_dot_layout.6.dylib 7.0.0 %n (>=
2.14-1)
+ %p/lib/graphviz/libgvplugin_gd.6.dylib 7.0.0 %n (>= 2.14-1)
+ %p/lib/graphviz/libgvplugin_gdk_pixbuf.6.dylib 7.0.0 %n (>=
2.18-2)
+ %p/lib/graphviz/libgvplugin_gtk.6.dylib 7.0.0 %n (>= 2.18-2)
+ %p/lib/graphviz/libgvplugin_glitz.6.dylib 7.0.0 %n (>= 2.22.2-1)
+ %p/lib/graphviz/libgvplugin_ming.6.dylib 7.0.0 %n (>= 2.18-2)
+ %p/lib/graphviz/libgvplugin_neato_layout.6.dylib 7.0.0 %n (>=
2.14-1)
+ %p/lib/graphviz/libgvplugin_pango.6.dylib 7.0.0 %n (>= 2.18-2)
+ %p/lib/graphviz/libgvplugin_rsvg.6.dylib 7.0.0 %n (>= 2.18-1)
+ %p/lib/graphviz/libgvplugin_xlib.6.dylib 7.0.0 %n (>= 2.18-2)
%p/lib/graphviz/tcl/libgdtclft.0.dylib 1.0.0 %n (>= 2.14-1)
%p/lib/graphviz/tcl/libtcldot.0.dylib 1.0.0 %n (>= 2.14-1)
%p/lib/graphviz/tcl/libtcldot_builtin.0.dylib 1.0.0 %n (>=
2.14-1)
%p/lib/graphviz/tcl/libtclplan.0.dylib 1.0.0 %n (>= 2.14-1)
%p/lib/graphviz/tcl/libtkspline.0.dylib 1.0.0 %n (>= 2.14-1)
- %p/lib/libagraph.4.dylib 5.0.0 %n (>= 2.14-1)
%p/lib/libcgraph.4.dylib 5.0.0 %n (>= 2.18-1)
%p/lib/libcdt.4.dylib 5.0.0 %n (>= 2.14-1)
%p/lib/libgraph.4.dylib 5.0.0 %n (>= 2.14-1)
- %p/lib/libgvc.4.dylib 5.0.0 %n (>= 2.14-1)
- !%p/lib/libgvc_builtins.4.dylib
+ %p/lib/libgvc.5.dylib 6.0.0 %n (>= 2.14-1)
%p/lib/libpathplan.4.dylib 5.0.0 %n (>= 2.14-1)
<<
DescPackaging: <<
@@ -247,4 +248,5 @@
and using the system's Tcl and Ruby.
Ruby headers are found in /usr/lib/ruby or /System/Library/Frameworks.
Prevent plug-in (.so) links from being installed in system paths outside of %p.
+Tried to get --with-quartz to work.
<<
------------------------------------------------------------------------------
Are you an open source citizen? Join us for the Open Source Bridge conference!
Portland, OR, June 17-19. Two days of sessions, one day of unconference: $250.
Need another reason to go? 24-hour hacker lounge. Register today!
http://ad.doubleclick.net/clk;215844324;13503038;v?http://opensourcebridge.org
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
