graphviz, maaj 2.26.3-2

2 files changed, 16 insertions, 23 deletions

diff --git a/extra/graphviz/.footprint b/extra/graphviz/.footprint
index d13be19c4..4e01b27c1 100644
--- a/extra/graphviz/.footprint
+++ b/extra/graphviz/.footprint
@@ -19,6 +19,7 @@ lrwxrwxrwx	root/root	usr/bin/gv2gxl -> gxl2gv
 -rwxr-xr-x	root/root	usr/bin/gvpr
 lrwxrwxrwx	root/root	usr/bin/gxl2dot -> gxl2gv
 -rwxr-xr-x	root/root	usr/bin/gxl2gv
+-rwxr-xr-x	root/root	usr/bin/lefty
 -rwxr-xr-x	root/root	usr/bin/lneato
 -rwxr-xr-x	root/root	usr/bin/mm2gv
 lrwxrwxrwx	root/root	usr/bin/neato -> dot
@@ -30,6 +31,7 @@ lrwxrwxrwx	root/root	usr/bin/sfdp -> dot
 -rwxr-xr-x	root/root	usr/bin/tred
 lrwxrwxrwx	root/root	usr/bin/twopi -> dot
 -rwxr-xr-x	root/root	usr/bin/unflatten
+-rwxr-xr-x	root/root	usr/bin/vimdot
 drwxr-xr-x	root/root	usr/include/
 drwxr-xr-x	root/root	usr/include/graphviz/
 -rw-r--r--	root/root	usr/include/graphviz/arith.h
@@ -82,10 +84,6 @@ lrwxrwxrwx	root/root	usr/lib/graphviz/libgvplugin_gd.so.6 -> libgvplugin_gd.so.6
 lrwxrwxrwx	root/root	usr/lib/graphviz/libgvplugin_gdk_pixbuf.so -> libgvplugin_gdk_pixbuf.so.6.0.0
 lrwxrwxrwx	root/root	usr/lib/graphviz/libgvplugin_gdk_pixbuf.so.6 -> libgvplugin_gdk_pixbuf.so.6.0.0
 -rwxr-xr-x	root/root	usr/lib/graphviz/libgvplugin_gdk_pixbuf.so.6.0.0
--rwxr-xr-x	root/root	usr/lib/graphviz/libgvplugin_gs.la
-lrwxrwxrwx	root/root	usr/lib/graphviz/libgvplugin_gs.so -> libgvplugin_gs.so.6.0.0
-lrwxrwxrwx	root/root	usr/lib/graphviz/libgvplugin_gs.so.6 -> libgvplugin_gs.so.6.0.0
--rwxr-xr-x	root/root	usr/lib/graphviz/libgvplugin_gs.so.6.0.0
 -rwxr-xr-x	root/root	usr/lib/graphviz/libgvplugin_gtk.la
 lrwxrwxrwx	root/root	usr/lib/graphviz/libgvplugin_gtk.so -> libgvplugin_gtk.so.6.0.0
 lrwxrwxrwx	root/root	usr/lib/graphviz/libgvplugin_gtk.so.6 -> libgvplugin_gtk.so.6.0.0
@@ -102,6 +100,10 @@ lrwxrwxrwx	root/root	usr/lib/graphviz/libgvplugin_pango.so.6 -> libgvplugin_pang
 lrwxrwxrwx	root/root	usr/lib/graphviz/libgvplugin_rsvg.so -> libgvplugin_rsvg.so.6.0.0
 lrwxrwxrwx	root/root	usr/lib/graphviz/libgvplugin_rsvg.so.6 -> libgvplugin_rsvg.so.6.0.0
 -rwxr-xr-x	root/root	usr/lib/graphviz/libgvplugin_rsvg.so.6.0.0
+-rwxr-xr-x	root/root	usr/lib/graphviz/libgvplugin_xlib.la
+lrwxrwxrwx	root/root	usr/lib/graphviz/libgvplugin_xlib.so -> libgvplugin_xlib.so.6.0.0
+lrwxrwxrwx	root/root	usr/lib/graphviz/libgvplugin_xlib.so.6 -> libgvplugin_xlib.so.6.0.0
+-rwxr-xr-x	root/root	usr/lib/graphviz/libgvplugin_xlib.so.6.0.0
 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/
@@ -171,9 +173,6 @@ 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/lib64/
-drwxr-xr-x	root/root	usr/lib64/tcl8.5/
-lrwxrwxrwx	root/root	usr/lib64/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/
@@ -270,6 +269,7 @@ lrwxrwxrwx	root/root	usr/share/man/man1/gv2gxl.1.gz -> gxl2gv.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/gvpack.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/gvpr.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/gxl2gv.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/lefty.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/lneato.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/mm2gv.1.gz
 lrwxrwxrwx	root/root	usr/share/man/man1/neato.1.gz -> dot.1.gz
diff --git a/extra/graphviz/Pkgfile b/extra/graphviz/Pkgfile
index 0e407953a..8bf1f5191 100644
--- a/extra/graphviz/Pkgfile
+++ b/extra/graphviz/Pkgfile
@@ -2,33 +2,26 @@
 # 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, python, librsvg, libgd
+# Depends on : expat, libpng, libjpeg, freetype, fontconfig, pango, gtk, libglade, tcl, tk, python, librsvg, libgd, xorg-libxaw, ghostscript
 # Run on: expat,libpng,libjpeg,freetype,fontconfig,pango,gtk,libglade,tcl,tk,python,librsvg,libgd
 
 name=graphviz
 version=2.26.3
-release=1
+release=2
 source=(http://www.graphviz.org/pub/graphviz/ARCHIVE/$name-$version.tar.gz)
 
 build () {
   cd $name-$version
-
-  export CPPFLAGS="$CPPFLAGS -I$JAVA_HOME/include -I$JAVA_HOME/include/linux"
-
-  # préparation puis compilation
-  ./configure --prefix=/usr \
-    --without-x --with-libgd --with-libpng \
-    --with-pngincludedir=/usr/include --with-pnglibdir=/usr/lib \
-    --disable-lua \
-    --disable-ocaml \
-    --disable-perl \
-    --disable-php \
-    --disable-ruby \
-    --disable-rpath
-
+  
+  ./configure --prefix=/usr --without-gnomeui --docdir=/usr/share/doc/gvkp \
+    	--disable-sharp --disable-ruby \
+    	--disable-lua --disable-guile 
   make
   make DESTDIR=$PKG install
 
+  #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