Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv20142
Modified Files:
graphviz.info graphviz.patch
Log Message:
Update from tracker
https://sourceforge.net/tracker/index.php?func=detail&aid=2217827&group_id=17203&atid=414256
Tested on 10.5.5/Intel
Index: graphviz.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/graphviz.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- graphviz.patch 15 Jul 2008 23:05:58 -0000 1.4
+++ graphviz.patch 7 Dec 2008 18:39:47 -0000 1.5
@@ -1,3 +1,14 @@
+--- graphviz-2.18-orig/configure 2008-03-25 16:13:30.000000000 -0400
++++ graphviz-2.18/configure 2008-03-25 16:16:32.000000000 -0400
+@@ -28337,6 +28337,8 @@
+
+ if test "x$RUBY" != "x"; then
+ RUBY_INCLUDES="-I`$RUBY $srcdir/config/config_ruby.rb INCLUDES`"
++ # hack for powerpc-darwin8 (10.4)
++ RUBY_INCLUDES=`echo $RUBY_INCLUDES | sed 's/powerpc/universal/'`
+ RUBY_LIBS="-L`$RUBY $srcdir/config/config_ruby.rb lib` `$RUBY -rrbconfig -e
\"puts Config::CONFIG['LIBRUBYARG_SHARED']\"`"
+ RUBY_INSTALL_DIR="`$RUBY $srcdir/config/config_ruby.rb archsitelib`"
+ save_CPPFLAGS=$CPPFLAGS
--- graphviz-2.18-orig/tclpkg/gv/Makefile.in 2007-12-06 03:54:16.000000000
-0500
+++ graphviz-2.18/tclpkg/gv/Makefile.in 2007-12-06 03:57:16.000000000
-0500
@@ -1934,6 +1934,9 @@
Index: graphviz.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/graphviz.info,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- graphviz.info 20 Jul 2008 20:23:27 -0000 1.11
+++ graphviz.info 7 Dec 2008 18:39:47 -0000 1.12
@@ -1,6 +1,6 @@
Package: graphviz
Version: 2.18
-Revision: 2
+Revision: 3
License: BSD
Maintainer: Matthias Neeracher <[EMAIL PROTECTED]>
# Maintainer: David Fang <[EMAIL PROTECTED]>
@@ -26,59 +26,33 @@
pkgconfig (>= 0.20-1),
tcltk-dev,
x11-dev,
- atk1 (>= 1.20.0-1),
- avahi-dev,
- dbus-dev (>= 1.0.2-1),
- fontconfig2-dev (>= 2.4.1-1),
- freetype219 (>= 2.3.5-1),
- gail18,
- giflib,
- gmp,
- glib2-dev (>= 2.14.0-1),
- glitz,
- gtkglext1 (>= 1.0.6-1007),
+ fontconfig2-dev (>= 2.3.95-1),
+ freetype219 (>= 2.1.10-1),
+ glib2-dev (>= 2.11.1-1),
+ gtkglext1,
guile18,
guile18-dev,
libpng3 (>= 1.2.10-1),
libjpeg,
- librsvg2 (>= 2.20.0-1),
libiconv-dev,
libgettext3-dev (>= 0.14.5-1),
gettext-tools,
- libavahi-glib1-dev,
- libgnome2-dev (>= 2.20.0-1),
- libgnomecanvas2-dev (>= 2.20.0-1),
- libgnomeui2-dev (>= 2.20.0-1),
- popt,
libtool14,
+ libgnomeui2-dev,
lua51-dev,
lua51,
expat1 (>= 2.0.0-1),
- gd2 (>= 2.0.35-4),
- gd2-bin (>= 2.0.35-4),
+ gd2,
+ gd2-bin (>= 2.0.34-1),
+ gdk-pixbuf,
gawk (>= 3.1.2-12),
- cairo (>= 1.6.4-2),
- pixman (>= 0.10.0-1),
+ cairo (>= 1.1.10-1000),
ocaml,
ruby18-dev,
ruby18,
- swig (>= 1.3.29-1),
- gtk+2-dev (>= 2.12.0-1),
- gnome-keyring-dev (>= 0.8.1-1),
- gnome-vfs2-unified-dev (>= 1:2.20.0-1),
- libbonobo2-dev (>= 2.20.0-1),
- libbonoboui2-dev (>= 2.20.0-1),
- gconf2-dev (>= 2.20.0-1),
- orbit2-dev (>= 2.14.10-1),
- libgsf1.114-dev (>= 1.14.8-2),
- libcroco3,
- libart2 (>= 2.3.16-1),
- libxml2 (>= 2.6.30-1),
- pango1-xft2-ft219-dev (>= 1.18.4-4),
- libglade2 (>= 2.6.2-2),
- libming-dev
+ swig (>= 1.3.29-1)
<<
-ConfigureParams: --mandir=%p/share/man --with-extraincludedir=%p/include
--with-extralibdir=%p/lib --with-tcl=%p --with-tk=%p --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
RUBY=%p/bin/ruby1.8
PKG_CONFIG_PATH="%p/lib/pango-ft219/lib/pkgconfig:%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:$PKG_CONFIG_PATH"
+ConfigureParams: --mandir=%p/share/man --with-extraincludedir=%p/include
--with-extralibdir=%p/lib --with-tcl=%p --with-tk=%p --with-x
--x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib --disable-r
FREETYPE2_CFLAGS=-I%p/lib/freetype219/include/freetype2
FREETYPE2_LIBS=-L%p/lib/freetype219/lib GUILE=guile-1.8
# --with-freetypeincludedir=/usr/X11R6/include/freetype2
CompileScript: <<
#!/bin/sh -ev
@@ -101,12 +75,12 @@
make DESTDIR=%d install
# remove links in /usr
rm -rf %d/usr
- #rm -rf %d/Library
- #rm -rf %d/Network
- #mkdir -p %i/lib/perl5/darwin-thread-multi-2level/%n
- #ln -s %p/lib/%n/perl/gv.pm %i/lib/perl5/darwin-thread-multi-2level/%n
- mkdir -p %i/share/doc/%n
- mv %i/share/%n/doc/* %i/share/doc/%n
+ rm -rf %d/Library
+ rm -rf %d/Network
+ mkdir -p %i/lib/perl5/darwin-thread-multi-2level/%n
+ ln -s %p/lib/%n/perl/gv.pm %i/lib/perl5/darwin-thread-multi-2level/%n
+ mkdir -p %i/share/doc
+ mv %i/share/%n/doc %i/share/doc/%n
mv %i/share/%n/{demo,examples,graphs} %i/share/doc/%n
rm -rf %i/share/%n/doc
# mkdir -p %i/lib/ruby/1.8/%n
@@ -117,52 +91,45 @@
SplitOff: <<
Package: %N-shlibs
Depends: <<
- glib2-shlibs (>= 2.14.0-1),
+ glib2-shlibs,
gtkglext1-shlibs,
guile18-shlibs,
tcltk,
x11,
- fontconfig2-shlibs (>= 2.4.1-1),
- freetype219-shlibs (>= 2.3.5-1),
- giflib-shlibs,
- libcroco3-shlibs,
+ fontconfig2-shlibs,
+ freetype219-shlibs,
libpng3-shlibs,
libjpeg-shlibs,
libiconv,
- librsvg2-shlibs (>= 2.20.0-1),
libgettext3-shlibs,
- libgsf1.114-shlibs (>= 1.14.8-2),
libtool14-shlibs,
- libgnomeui2-shlibs (>= 2.20.0-1),
+ libgnomeui2-shlibs,
lua51-shlibs,
expat1-shlibs,
- gd2-shlibs (>= 2.0.35-4),
+ gd2-shlibs,
+ gdk-pixbuf-shlibs,
ruby18-shlibs,
- cairo-shlibs (>= 1.6.4-2),
- libming0-shlibs
+ cairo-shlibs
<<
Files: <<
- lib/graphviz/*.*.dylib
+ lib/graphviz/*.dylib
lib/graphviz/guile/*.so
lib/graphviz/lua/*.so
+ lib/graphviz/perl/*.so
lib/graphviz/php/*.so
+ lib/graphviz/python/*.so
lib/graphviz/ruby/*.so
lib/graphviz/tcl/*.so
- lib/graphviz/tcl/*.*.dylib
+ lib/graphviz/tcl/*.dylib
lib/graphviz/tcl/pkgIndex.tcl
- lib/*.*.dylib
+ 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/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)
@@ -181,27 +148,25 @@
at package-time: R/ io/ java/ ocaml/ python{23,24,25}/ sharp/.
Don't know what these are about...
<<
- DocFiles: AUTHORS COPYING ChangeLog INSTALL NEWS README
<<
SplitOff2: <<
Package: %N-dev
BuildDependsOnly: true
Depends: %N-shlibs (= %v-%r)
- Replaces: %N (<< 2.18-2)
Description: development files for graphviz
Files: <<
- include
+ include/graphviz
lib/graphviz/*.la
lib/graphviz/guile/*.la
lib/graphviz/lua/*.la
+ lib/graphviz/perl/*.la
lib/graphviz/php/*.la
+ lib/graphviz/python/*.la
lib/graphviz/ruby/*.la
lib/graphviz/tcl/*.la
- lib/pkgconfig
- lib/*.dylib
+ lib/pkgconfig/*.pc
lib/*.la
<<
- DocFiles: AUTHORS COPYING ChangeLog INSTALL NEWS README
<<
PostInstScript: %p/bin/dot -c
DocFiles: AUTHORS COPYING ChangeLog INSTALL NEWS README
@@ -223,16 +188,17 @@
Former maintainer(s): Thomas Kotzian <[EMAIL PROTECTED]>
<<
DescPackaging: <<
-Use libiconv from fink
+configure doesn't find gtkgl+: "desktop features will not be built" for now.
+Use libiconv from fink or system?
postinstall 'dot -c' updates config file with list of built plugins.
-Links with libtool14's libltdl.dylib, therefore need build-depend on libtool14
-even though libltdl/ already includes ltdl.h
-Blindly added deps for guile, lua, ocaml, ruby, libgnomeui2,
+Links with libtool14's libltdl.dylib, but need not build-depend on libtool14
+because libltdl already includes ltdl.h (but added bdep for safety).
+Blindly added deps for guile, lua, ocaml, ruby, libgnomeui2, gdk-pixbuf,
gettext-tools because they are checked in configure,
though some may result in optional plug-ins.
Not sure what to do about perl/python yet...
- --dmacks disabled because they would need to be lang-versioned
Other deps not listed: zlib-1.2.3 (system's)
+Missing deps: pango1-1.14.9+ (according to configure.ac)
Optional: lua (>= 5.0)
also checked in configure: pangocairo, gtkgl+
<<
------------------------------------------------------------------------------
SF.Net email is Sponsored by MIX09, March 18-20, 2009 in Las Vegas, Nevada.
The future of the web can't happen without you. Join us at MIX09 to help
pave the way to the Next Web now. Learn more and register at
http://ad.doubleclick.net/clk;208669438;13503038;i?http://2009.visitmix.com/
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
