[Lunar-commits] <moonbase> R: Some more adjustments.

[Dennis `stumbles` Veatch]

commit 2e352b8e74fb6abd9ed4c682369a51fb7f7e1f94
Author: Dennis `stumbles` Veatch <stumbles at lunar-linux.org>
Date:   Thu Feb 3 08:15:41 2011 -0500

    R: Some more adjustments.
---
 science/R/BUILD     |   16 ++--------------
 science/R/CONFIGURE |    6 +++---
 science/R/DEPENDS   |    2 ++
 3 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/science/R/BUILD b/science/R/BUILD
index d9fa5ef..6daeeea 100644
--- a/science/R/BUILD
+++ b/science/R/BUILD
@@ -3,27 +3,15 @@
   CFLAGS=`echo $CFLAGS | sed s/-ffast-math//` &&
   CXXFLAGS=`echo $CXXFLAGS | sed s/-ffast-math//` &&
 
-  OPTS+=" --enable-R-shlib" &&
-
   if [ -e /usr/lib64/R/doc ] ; then
     rm -rf /usr/lib64/R/doc
   fi &&
 
+  OPTS+=" --prefix=/usr --enable-R-shlib" &&
+
   default_config &&
   make &&
 
-  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 &&
 
diff --git a/science/R/CONFIGURE b/science/R/CONFIGURE
index 6e5b2cc..2772e4f 100644
--- a/science/R/CONFIGURE
+++ b/science/R/CONFIGURE
@@ -1,3 +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
+mquery DVI_DOCS "Install DVI formatted documents?" n "make dvi"
+mquery PDF_DOCS "Install PDF formatted documents?" n "make pdf"
+mquery INFO_DOCS "Install INFO formatted documents?" n "make info"
diff --git a/science/R/DEPENDS b/science/R/DEPENDS
index a6ab724..efe12a2 100644
--- a/science/R/DEPENDS
+++ b/science/R/DEPENDS
@@ -3,6 +3,8 @@ 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 cairo  "--with-cairo"   "--without-cairo"   "for cairo (and pango) support"
+optional_depends lapack "--with-lapack"  "--without-lapack"  "If y, use system lapack"
 
 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"