[Lunar-commits] <moonbase> grass: A couple of more changes here. First, dunno why I opted for /opt/lunar

[Dennis `stumbles` Veatch]

commit 0286e250fec3286fb23ab0d36afe56d7ae1ec0b3
Author: Dennis `stumbles` Veatch <stumbles at lunar-linux.org>
Date:   Thu Sep 16 07:12:32 2010 -0400

    grass: A couple of more changes here. First, dunno why I opted for /opt/lunar
    
    but that is being changed to /usr. Qgis4 wants grass compiled with exceptions so
    making sure that is so. Lastly, it does not install its grass.pc so making sure
    that goes into /usr/lib/pkgconfig.
---
 science/grass/BUILD   |   15 ++++++---------
 science/grass/DETAILS |    3 +--
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/science/grass/BUILD b/science/grass/BUILD
index 38a4056..28a84de 100644
--- a/science/grass/BUILD
+++ b/science/grass/BUILD
@@ -1,5 +1,9 @@
 (
 
+  OPTS+=" --prefix=/usr --enable-shared --with-cxx --enable-largefile" &&
+  CFLAGS+=" $CFLAGS -fexceptions" &&
+  CXXFLAGS+=" $CXXFLAGS -fexceptions" &&
+
 # Please do not alter the `OPTS+=` to `OPTS=`. There is something goofy
 # going on with the grass configure script and it will not recognize
 # most of the options listed in the DEPENDS with `OPTS=`.
@@ -15,7 +19,7 @@
   fi &&
 
   if in_depends $MODULE freetype2 ; then
-     OPTS+="  --with-freetype-includes=/usr/include/freetype2"
+     OPTS+=" --with-freetype-includes=/usr/include/freetype2"
   fi &&
 
 #  if in_depends $MODULE readline ; then
@@ -34,15 +38,8 @@
      OPTS+=" --with-ffmpeg-includes=/usr/include/"           
   fi &&
 
-  OPTS+=" --prefix=$MODULE_PREFIX --enable-shared --with-cxx --enable-largefile" &&
-
   default_build &&
 
-  echo "export GRASS_INSTALL_DIR=\"${MODULE_PREFIX}\"" >> $SOURCE_DIRECTORY/grass.rc  &&
-  echo export PATH=\"'${PATH}':${MODULE_PREFIX}/bin\" >> $SOURCE_DIRECTORY/grass.rc  &&
-  echo export PKG_CONFIG_PATH=\"'${PKG_CONFIG_PATH}':/usr/lib/pkgconfig\" >> $SOURCE_DIRECTORY/grass.rc &&
-
-  install -m644 grass.rc /etc/profile.d/
+  install -m644 grass.pc /usr/lib/pkgconfig/
 
 ) > $C_FIFO 2>&1
-
diff --git a/science/grass/DETAILS b/science/grass/DETAILS
index 2b59e84..6a3c3c7 100644
--- a/science/grass/DETAILS
+++ b/science/grass/DETAILS
@@ -3,10 +3,9 @@
           SOURCE=$MODULE-$VERSION.tar.gz
       SOURCE_URL=http://grass.osgeo.org/grass64/source/
       SOURCE_VFY=sha1:c91e8501c7a756a94d2be47729f640d33b2a7468
-   MODULE_PREFIX=${GRASS_INSTALL_DIR:-/opt/lunar/grass}
         WEB_SITE=http://grass.itc.it/index.php
          ENTERED=20060804
-         UPDATED=20100912
+         UPDATED=20100916
            SHORT="geospatial data management and analysis"
 
 cat << EOF