[Lunar-commits] <moonbase-other> graphviz: A little clean up in isle graphviz. The issue of a relin on perl and R has been

[Dennis Veatch]

commit c36c22d6f2651e18cbdd3619f757cd2577080b15
Author: Dennis Veatch <dennisveatch at bellsouth.net>
Date: Thu, 04 Sep 2014 12:33:44 -0400
URL: https://github.com/lunar-linux/moonbase-other/commit/c36c22d6f2651e18cbdd3619f757cd2577080b15

graphviz: A little clean up in isle graphviz. The issue of a relin on perl and R has been
resolved over the prior versions. It has trouble finding some java hearders if enabled.
---
  graphics/graphviz/BUILD   | +5/-18    
  graphics/graphviz/DEPENDS | +2/-3     
  2 files changed, 7 insertions(+), 21 deletions(-)

--- a/graphics/graphviz/BUILD
+++ b/graphics/graphviz/BUILD
@@ -1,22 +1,9 @@
 
-  # fix swig generation with current ocaml
-  sedit "3364 s:\(^.*$\):\1; sed -i \"/int caml_array_length/ d\" gv_ocaml.cpp:" tclpkg/gv/Makefile.in &&
-
-# This line takes care of the cannot find libperl.so rebuild that
-# happens on a lunar fix.
-  PERL_MAJ_VER="`lvu version perl |cut -c 1`" &&
-  PERL_VER="`lvu version perl`" &&
-  PERL_SO_PATH="/usr/lib/perl$PERL_MAJ_VER/$PERL_VER/`arch`-linux-thread-multi/CORE/" &&
-# 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
+  if in_depends $MODULE %JAVA_SDK ; then
+    CFLAGS+=" -I/usr/java/latest/include/ -I/usr/java/latest/include/linux/" &&
+    CPPFLAGS+=" -I/usr/java/latest/include/ -I/usr/java/latest/include/linux/"
+  fi &&
 
   OPTS+=" --with-libgd --with-fontconfig --without-cgraph" &&
 
-  default_build &&
-
-  # create the default config-files
-  dot -c
+  default_build
--- a/graphics/graphviz/DEPENDS
+++ b/graphics/graphviz/DEPENDS
@@ -10,7 +10,7 @@ depends pkgconfig
 optional_depends "ghostscript" "--with-ghostscript" "--without-ghostscript" "for Postscript support"
 
 optional_depends "urw-fonts" "" "" "Extra fonts for XOrg X11"
-optional_depends "%JAVA_SDK" "" "" "for java support"
+optional_depends "%JAVA_SDK" "--enable-java" "--disable-java" "for java support"
 
 optional_depends "perl"      "--enable-perl" "--disable-perl"  "perl support"
 optional_depends "R"         "--enable-r"    "--disable-r"     "for R language support"
@@ -22,13 +22,12 @@ optional_depends "cairo"     "" "" "for 2D vector graphics library"
 optional_depends "pango"     "" "" "for text layout/rendering library"
 optional_depends "zlib"      "" "" "for data compression library"
 optional_depends "tk"        "" "" "for building extra tcl/tk tools"
-
 optional_depends "ocaml"     "" "--disable-ocaml" "for ocaml support"
 optional_depends "swig"      "" "--disable-swig"  "for swig support"
 optional_depends "lua"       "" "--disable-lua"   "for lua support"
 optional_depends "guile"     "" "--disable-guile" "for guile support"
 optional_depends "mono"      "" "--disable-sharp" "for C# support"
-optional_depends "%JAVA_SDK" "" "--disable-java"  "for java support"
+optional_depends "librsvg"   "--with-rsvg" "--without-rsvg" "for rsvg graphics support"
 
 optional_depends "%PHP"      "--enable-php"  "--disable-php"  "for php support"
 optional_depends "ruby"      "--enable-ruby" "--disable-ruby" "for ruby support"