[Lunar-commits] <moonbase> graphviz: version bump, a couple of more optional_depends, and a few other

[Dennis 'stumbles' Veatch]

commit 76bfe2fdafdb7ce1e707058e4ca94d4ed72f3d3c
Author: Dennis 'stumbles' Veatch <stumbles at lunar-linux.org>
Date:   Fri Jun 19 12:21:05 2009 -0400

    graphviz: version bump, a couple of more optional_depends, and a few other
    
    tweaks. The patch takes care of gv.pm and gv.so getting symlinked in /root because
    PERL_INSTALL_DIR was not getting set in the tclpkg/Makefile.
    
    The additions to BUILD fixes the relin that happens because libperl.so is not found.
    You will get the same kick off if you have R installed as well.
---
 graphics/graphviz/BUILD   |   16 ++++++++++++++--
 graphics/graphviz/DEPENDS |   18 +++++++++++++-----
 graphics/graphviz/DETAILS |   11 +++++++----
 3 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/graphics/graphviz/BUILD b/graphics/graphviz/BUILD
index 5b93a37..5232e77 100644
--- a/graphics/graphviz/BUILD
+++ b/graphics/graphviz/BUILD
@@ -1,7 +1,19 @@
 (
 
-  OPTS="--disable-perl --with-libgd --with-fontconfig"
+  patch_it $SOURCE_CACHE/$SOURCE2 0 &&
 
-  default_build 
+# This line takes care of the cannot find libperl.so rebuild that
+# happens on a lunar fix.
+  PERL_SO_PATH="`lvu from libperl.so | cut -c  6-57`"
+# If you have R installed you will get the same type rebuild kick off because
+# libR.so cannot be found. 
+  R_SO_PATH="/usr/lib/R/lib "
+# So lets put all that together.
+  LDFLAGS="$LDFLAGS -Wl,-rpath,${PERL_SO_PATH},-rpath,${R_SO_PATH}"
+# done
+
+  OPTS="--with-libgd --with-fontconfig"
+
+  default_build
 
 ) > $C_FIFO 2>&1
diff --git a/graphics/graphviz/DEPENDS b/graphics/graphviz/DEPENDS
index 2d99ebb..86d26d0 100644
--- a/graphics/graphviz/DEPENDS
+++ b/graphics/graphviz/DEPENDS
@@ -8,18 +8,26 @@ depends glib-2
 depends pkgconfig
 depends ghostscript
 
-optional_depends "glitz"     "--with-glitz" "--without-glitz" "OpenGL image compositing support"
+optional_depends "urw-fonts" "" "" "Extra fonts for XOrg X11"
+optional_depends "%JAVA_SDK" "" "" "for java support"
+
+optional_depends "perl"      "--enable-perl" "--disable-perl"  "perl support"
+optional_depends "R"         "--enable-r"    "--disable-r"     "for R language support"
+optional_depends "gts"       "--with-gts"    "--without-gts"   "for 3D surface support"
+optional_depends "glitz"     "--with-glitz"  "--without-glitz" "OpenGL image compositing support"
+
 optional_depends "cairo"     "" "" "For 2D vector graphics library"
 optional_depends "pango"     "" "" "For text layout/rendering library"
-optional_depends "urw-fonts" "" "" "Extra fonts for XOrg X11"
 optional_depends "zlib"      "" "" "For data compression library"
 optional_depends "tk"        "" "" "For building extra tcl/tk tools"
+
 optional_depends "ocaml"     "" "--disable-ocaml" "ocaml support"
 optional_depends "swig"      "" "--disable-swig"  "swig support"
 optional_depends "lua"       "" "--disable-lua"   "lua support"
+
 optional_depends "ruby"      "--enable-ruby" "--disable-ruby"   "for ruby support"
-optional_depends "ming"      "--with-ming" "--without-ming"     "for flash support"
+optional_depends "ming"      "--with-ming"   "--without-ming"   "for flash support"
 
-optional_depends "devil"     "--with-devil --with-devillibdir=/usr/lib   \
-                              --with-devilincludedir=/usr/include/IL" "" \
+optional_depends "devil"     "--with-devil --with-devillibdir=/usr/lib/   \
+                              --with-devilincludedir=/usr/include/IL/" "" \
                              "for additional graph file format support"
diff --git a/graphics/graphviz/DETAILS b/graphics/graphviz/DETAILS
index 889b3aa..91c8b4a 100644
--- a/graphics/graphviz/DETAILS
+++ b/graphics/graphviz/DETAILS
@@ -1,11 +1,14 @@
           MODULE=graphviz
-         VERSION=2.22.2
+         VERSION=2.24.0
           SOURCE=$MODULE-$VERSION.tar.gz
-      SOURCE_URL=http://www.graphviz.org/pub/$MODULE/ARCHIVE/
-      SOURCE_VFY=sha1:92b40b1fb596a6b3e880e74101921d7681f62c94
+         SOURCE2=graphviz-2.24.0.perl-gv-symlink.patch
+      SOURCE_URL=http://www.graphviz.org/pub/graphviz/stable/SOURCES/
+     SOURCE2_URL=$PATCH_URL
+      SOURCE_VFY=sha1:1d91b3a7d2c7fa15e5e718eb456210cd15731e14
+     SOURCE2_VFY=sha1:9b92601c13e183bdbcc867b719c8a6f6bc7aa4fa
         WEB_SITE=http://www.graphviz.org/
          ENTERED=20020529
-         UPDATED=20090511
+         UPDATED=20090619
            SHORT="Set of graph drawing tools"
 
 cat << EOF