[Lunar-commits] <moonbase> R: A fix up with the BUILD and DEPENDS.

[Dennis 'stumbles' Veatch]

commit 355ded44c8c1debdb3bb88868a4cbb51f229fd0c
Author: Dennis 'stumbles' Veatch <stumbles at lunar-linux.org>
Date:   Thu Apr 16 23:23:35 2009 -0400

    R: A fix up with the BUILD and DEPENDS.
---
 science/R/BUILD        |   40 +++++++++++++++++++++++++++++++++-------
 science/R/BUILD.x86_64 |   25 -------------------------
 science/R/CONFIGURE    |    3 +++
 science/R/DEPENDS      |   13 ++++++++-----
 4 files changed, 44 insertions(+), 37 deletions(-)

diff --git a/science/R/BUILD b/science/R/BUILD
index 147456d..4062833 100644
--- a/science/R/BUILD
+++ b/science/R/BUILD
@@ -1,17 +1,43 @@
 (
 
-  OPTS="--enable-R-shlib $OPTS"
+  if [ -e /usr/lib64/R/doc ] ; then
+    rm -rf /usr/lib64/R/doc
+  fi &&
 
-  default_config &&
+  CFLAGS=`echo $CFLAGS | sed s/-ffast-math//` &&
+  CXXFLAGS=`echo $CXXFLAGS | sed s/-ffast-math//` &&
+
+  OPTS="--enable-R-shlib"
 
+  default_config &&
   make &&
   make check &&
-  prepare_install &&
 
-# It fumbles at this point because doc was created as file not dir
-  rm -rf /usr/lib/R &&
-  mkdir -p /usr/lib/R/doc /usr/lib/R/doc/html/search /usr/lib/R/doc/manual &&
+  if [[ "$DVI_DOCS" == "y" ]] ; then
+     make dvi
+  fi &&
+
+  if [[ "$PDF_DOCS" == "y" ]] ; then
+     make pdf
+  fi &&
+
+  if [[ "$INFO_DOCS" == "y" ]] ; then
+     make info
+  fi &&
+
+  prepare_install    &&
+  make install-strip &&
+
+  if [[ "$DVI_DOCS" == "y" ]] ; then
+     make install-dvi
+  fi &&
+
+  if [[ "$PDF_DOCS" == "y" ]] ; then
+     make install-pdf
+  fi &&
 
-  make install
+  if [[ "$INFO_DOCS" == "y" ]] ; then
+     make install-info
+  fi 
 
 ) > $C_FIFO 2>&1
diff --git a/science/R/BUILD.x86_64 b/science/R/BUILD.x86_64
deleted file mode 100644
index 4c25556..0000000
--- a/science/R/BUILD.x86_64
+++ /dev/null
@@ -1,25 +0,0 @@
-(
-
-  if [ -e /usr/lib64/R/doc ] ; then
-    rm -f /usr/lib64/R/doc
-  fi &&
-
-  CFLAGS=`echo $CFLAGS | sed s/-ffast-math//` &&
-  CXXFLAGS=`echo $CXXFLAGS | sed s/-ffast-math//` &&
-
-  OPTS="--enable-R-shlib $OPTS"
-
-  default_config &&
-  make &&
-  make check &&
-  #uncomment these lines to make documentation
-  #make dvi &&
-  #make pfd &&
-  #make info &&
-  prepare_install &&
-  make install
-  #make install-dvi &&
-  #make install-info &&
-  #make install-pdf
-
-) > $C_FIFO 2>&1
diff --git a/science/R/CONFIGURE b/science/R/CONFIGURE
new file mode 100644
index 0000000..6e5b2cc
--- /dev/null
+++ b/science/R/CONFIGURE
@@ -0,0 +1,3 @@
+mquery DVI_DOCS "Install DVI formatted documents?" n
+mquery PDF_DOCS "Install PDF formatted documents?" n
+mquery INFO_DOCS "Install INFO formatted documents?" n
diff --git a/science/R/DEPENDS b/science/R/DEPENDS
index 80394ca..0c91cca 100644
--- a/science/R/DEPENDS
+++ b/science/R/DEPENDS
@@ -1,6 +1,9 @@
-depends jpeg
-depends libpng
-
-optional_depends %X  "--with-x" "--without-x" "use the X Window System"
-optional_depends "tk" "--with-tcltk" "" "gui, recommended"
+optional_depends jpeg   "--with-jpeglib" "--without-jpeglib" "for jpeg graphics support"
+optional_depends libpng "--with-libpng"  "--without-libpng"  "for libpng support"
+optional_depends %X     "--with-x"       "--without-x"       "use the X Window System"
+optional_depends tk     "--with-tcltk"   "--without-tcltk"   "for gui, recommended"
+optional_depends icu4c  "--with-ICU"     "--without-ICU"     "for Unicode support"
 
+optional_depends pcre   "--with-system-pcre"  "--without-system-pcre"  "for pcre support"
+optional_depends bzip2  "--with-system-bzlib" "--without-system-bzlib" "for file compression support"
+optional_depends zlib   "--with-system-zlib"  "--without-system-zlib"  "for zlib support"