[Lunar-commits] <moonbase> R: Several things here.

[Dennis `stumbles` Veatch]

commit ac6e9241c9c725499a0fd8f5ba9a7ff6d240e50c
Author: Dennis `stumbles` Veatch <stumbles at lunar-linux.org>
Date:   Thu Mar 1 03:01:39 2012 -0500

    R: Several things here.
    
    First - the make statements in CONFIGURE confuses the configure script into thinking "make"
    is a machine, so moving those to their respective spots in the BUILD.
    
    Second - The recent pcre bump breaks the make stage with;
    /lib64/libpcre.so.1  doesnt not contain _pcre_valid_utf8
    
    Adjusting the BUILD to use utf. See here;
    
    https://bugs.gentoo.org/show_bug.cgi?id=402373
---
 science/R/BUILD     |   15 +++++++--------
 science/R/CONFIGURE |    6 +++---
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/science/R/BUILD b/science/R/BUILD
index 6daeeea..f4f6467 100644
--- a/science/R/BUILD
+++ b/science/R/BUILD
@@ -1,29 +1,28 @@
 (
 
-  CFLAGS=`echo $CFLAGS | sed s/-ffast-math//` &&
-  CXXFLAGS=`echo $CXXFLAGS | sed s/-ffast-math//` &&
-
   if [ -e /usr/lib64/R/doc ] ; then
     rm -rf /usr/lib64/R/doc
   fi &&
 
-  OPTS+=" --prefix=/usr --enable-R-shlib" &&
+# A temp fix to the breakage caused by the recent pcre bump.
+  sedit "s:_pcre_valid_utf8:_pcre_valid_utf:g" src/main/util.c &&
 
-  default_config &&
-  make &&
+  OPTS+=" --prefix=/usr --enable-R-shlib" &&
 
-  prepare_install    &&
-  make install-strip &&
+  default_build &&
 
   if [[ "$DVI_DOCS" == "y" ]] ; then
+     make dvi &&
      make install-dvi
   fi &&
 
   if [[ "$PDF_DOCS" == "y" ]] ; then
+     make pdf &&
      make install-pdf
   fi &&
 
   if [[ "$INFO_DOCS" == "y" ]] ; then
+     make info &&
      make install-info
   fi 
 
diff --git a/science/R/CONFIGURE b/science/R/CONFIGURE
index 2772e4f..7cf98ec 100644
--- a/science/R/CONFIGURE
+++ b/science/R/CONFIGURE
@@ -1,3 +1,3 @@
-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"
+mquery DVI_DOCS "Install DVI formatted documents?" n 
+mquery PDF_DOCS "Install PDF formatted documents?" n 
+mquery INFO_DOCS "Install INFO formatted documents?" n