graphviz, 2.26.3-3

3 files changed, 20 insertions, 23 deletions

diff --git a/extra/graphviz/.footprint.i686 b/extra/graphviz/.footprint.i686
index 0b54b1243..5854769d6 100644
--- a/extra/graphviz/.footprint.i686
+++ b/extra/graphviz/.footprint.i686
@@ -177,6 +177,8 @@ drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/libgvpr.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/libpathplan.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/libxdot.pc
+drwxr-xr-x	root/root	usr/lib/tcl8.5/
+lrwxrwxrwx	root/root	usr/lib/tcl8.5/graphviz -> /usr/lib/graphviz/tcl
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/graphviz/
 drwxr-xr-x	root/root	usr/share/graphviz/examples/
diff --git a/extra/graphviz/.footprint.x86_64 b/extra/graphviz/.footprint.x86_64
index 765ee5cae..5854769d6 100644
--- a/extra/graphviz/.footprint.x86_64
+++ b/extra/graphviz/.footprint.x86_64
@@ -1,5 +1,3 @@
-lrwxrwxrwx	root/root	gv.pm -> /usr/lib/graphviz/perl/gv.pm
-lrwxrwxrwx	root/root	gv.so -> /usr/lib/graphviz/perl/libgv_perl.so
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/acyclic
@@ -113,10 +111,6 @@ lrwxrwxrwx	root/root	usr/lib/graphviz/libgvplugin_xlib.so.6 -> libgvplugin_xlib.
 drwxr-xr-x	root/root	usr/lib/graphviz/lua/
 drwxr-xr-x	root/root	usr/lib/graphviz/ocaml/
 drwxr-xr-x	root/root	usr/lib/graphviz/perl/
--rw-r--r--	root/root	usr/lib/graphviz/perl/gv.pm
-lrwxrwxrwx	root/root	usr/lib/graphviz/perl/gv.so -> libgv_perl.so
--rwxr-xr-x	root/root	usr/lib/graphviz/perl/libgv_perl.la
--rwxr-xr-x	root/root	usr/lib/graphviz/perl/libgv_perl.so
 drwxr-xr-x	root/root	usr/lib/graphviz/php/
 drwxr-xr-x	root/root	usr/lib/graphviz/python/
 drwxr-xr-x	root/root	usr/lib/graphviz/python23/
@@ -130,8 +124,6 @@ drwxr-xr-x	root/root	usr/lib/graphviz/tcl/
 lrwxrwxrwx	root/root	usr/lib/graphviz/tcl/libgdtclft.so -> libgdtclft.so.0.0.0
 lrwxrwxrwx	root/root	usr/lib/graphviz/tcl/libgdtclft.so.0 -> libgdtclft.so.0.0.0
 -rwxr-xr-x	root/root	usr/lib/graphviz/tcl/libgdtclft.so.0.0.0
--rwxr-xr-x	root/root	usr/lib/graphviz/tcl/libgv_tcl.la
--rwxr-xr-x	root/root	usr/lib/graphviz/tcl/libgv_tcl.so
 -rwxr-xr-x	root/root	usr/lib/graphviz/tcl/libtcldot.la
 lrwxrwxrwx	root/root	usr/lib/graphviz/tcl/libtcldot.so -> libtcldot.so.0.0.0
 lrwxrwxrwx	root/root	usr/lib/graphviz/tcl/libtcldot.so.0 -> libtcldot.so.0.0.0
@@ -185,6 +177,8 @@ drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/libgvpr.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/libpathplan.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/libxdot.pc
+drwxr-xr-x	root/root	usr/lib/tcl8.5/
+lrwxrwxrwx	root/root	usr/lib/tcl8.5/graphviz -> /usr/lib/graphviz/tcl
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/graphviz/
 drwxr-xr-x	root/root	usr/share/graphviz/examples/
@@ -299,8 +293,6 @@ drwxr-xr-x	root/root	usr/share/man/man3/
 -rw-r--r--	root/root	usr/share/man/man3/cgraph.3.gz
 -rw-r--r--	root/root	usr/share/man/man3/gdtclft.3tcl.gz
 -rw-r--r--	root/root	usr/share/man/man3/graph.3.gz
--rw-r--r--	root/root	usr/share/man/man3/gv.3perl.gz
--rw-r--r--	root/root	usr/share/man/man3/gv.3tcl.gz
 -rw-r--r--	root/root	usr/share/man/man3/gvc.3.gz
 -rw-r--r--	root/root	usr/share/man/man3/pathplan.3.gz
 -rw-r--r--	root/root	usr/share/man/man3/tcldot.3tcl.gz
diff --git a/extra/graphviz/Pkgfile b/extra/graphviz/Pkgfile
index 678fbf37f..1bb277488 100644
--- a/extra/graphviz/Pkgfile
+++ b/extra/graphviz/Pkgfile
@@ -2,7 +2,8 @@
 # URL: http://www.graphviz.org/
 # Maintainer: NuTyX core team
 # Packager: thierryn1 at hispeed dot ch
-# Depends on: expat, libpng, libjpeg, freetype, fontconfig, pango, gtk, libglade, tcl, tk, librsvg, libgd, xorg-libxaw, ghostscript
+# Depends on: ruby, expat, libpng, libjpeg, freetype, fontconfig, pango, gtk, libglade, tcl, tk, librsvg, libgd, xorg-libxaw, ghostscript
+
 # Run on: expat,libpng,libjpeg,freetype,fontconfig,pango,gtk,libglade,tcl,tk,librsvg,libgd
 
 name=graphviz
@@ -11,19 +12,21 @@ release=3
 source=(http://www.graphviz.org/pub/graphviz/ARCHIVE/$name-$version.tar.gz)
 
 build () {
-  cd $name-$version
-  
-  ./configure --prefix=/usr --without-gnomeui --docdir=/usr/share/doc/gvkp \
-    	--disable-sharp --disable-ruby \
-    	--disable-lua --disable-guile 
-  make
-  make DESTDIR=$PKG install
+  	cd $name-$version
+
+	sed -i "/RUBY_INCLUDES=\"/s|\"$| `eval echo -I/usr/include/ruby-1.9.1/{$CARCH-linux,ruby/backward,}`\"|" configure
+	sed -i '/LIBPOSTFIX="64"/d' configure
+	export PYTHON=python2
+
+  	./configure --prefix=/usr 
+  	make
+  	make DESTDIR=$PKG install
 
-  #Fix a wrong file location for x86_64
-  rm -rf $PKG/usr/lib64
+  	#Fix a wrong file location for x86_64
+  	rm -rf $PKG/usr/lib64
 
-  # pas de code de démo, ni de documentation
-  rm -rf $PKG/usr/share/$name/demo \
-  $PKG/usr/man/man/ $PKG/usr/share/$name/doc
+ 	# pas de code de démo, ni de documentation
+  	rm -rf $PKG/usr/share/$name/demo \
+  	$PKG/usr/man/man/ $PKG/usr/share/$name/doc
 }