[Lunar-commits] <moonbase> grass: Version bump. For now readline in DEPENDS is commented out because for some

Dennis `stumbles` Veatch stumbles at lunar-linux.org
Sun Sep 12 18:49:49 CEST 2010


commit 6a0b5ba12dad335efd8263d221263e30e4ebbd0c
Author: Dennis `stumbles` Veatch <stumbles at lunar-linux.org>
Date:   Sun Sep 12 12:49:49 2010 -0400

    grass: Version bump. For now readline in DEPENDS is commented out because for some
    
    reason we compile readline --without-curses resulting in these type of failures;
    
    /lib/libreadline.so: undefined reference to `PC'
    /lib/libreadline.so: undefined reference to `tgetflag'
    /lib/libreadline.so: undefined reference to `tgetent'
    /lib/libreadline.so: undefined reference to `UP'
    /lib/libreadline.so: undefined reference to `tputs'
    /lib/libreadline.so: undefined reference to `tgoto'
    /lib/libreadline.so: undefined reference to `tgetnum'
    /lib/libreadline.so: undefined reference to `BC'
    /lib/libreadline.so: undefined reference to `tgetstr'
    
    Does anyone with a better memory than I remember why we omit ncurses from
    readline?
---
 science/grass/BUILD   |   57 +++++++++++++++++++++++++++++++++++++------------
 science/grass/DEPENDS |   26 +++++++++++++++-------
 science/grass/DETAILS |   20 ++++++++--------
 3 files changed, 71 insertions(+), 32 deletions(-)

diff --git a/science/grass/BUILD b/science/grass/BUILD
index be40929..38a4056 100644
--- a/science/grass/BUILD
+++ b/science/grass/BUILD
@@ -1,19 +1,48 @@
 (
 
-   ./configure  --prefix=/usr                    \
-                --bindir=/usr/bin                \
-                --libexecdir=/usr/libexec/grass  \
-                --sbindir=/usr/sbin              \
-                --sysconfdir=/etc/grass          \
-                --libdir=/usr/lib/grass          \
-                --sysconfdir=/etc                \
-                --mandir=/usr/share/man          \
-                --localstatedir=/var/grass       \
-                --enable-shared                  \
-                --with-x                         \
-                --with-cxx                      &&
-
-   default_make
+# 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=`.
+
+  if [ "`arch`" == "x86_64" ] ; then
+     OPTS+=" --enable-64bit --with-libs=/usr/lib64" 
+  fi &&
+
+  if in_depends $MODULE proj-4 ; then
+     export PROJINC="/usr/include" &&
+     export PROJLIB="/usr/lib"     &&
+     sedit "s:/usr/local/share/proj:/usr/share/proj:" configure
+  fi &&
+
+  if in_depends $MODULE freetype2 ; then
+     OPTS+="  --with-freetype-includes=/usr/include/freetype2"
+  fi &&
+
+#  if in_depends $MODULE readline ; then
+#     OPTS+=" --with-readline-includes=/usr/include/readline --with-readline-libs=/lib"
+#  fi &&
+
+  if in_depends $MODULE mysql ; then
+     OPTS+=" --with-mysql-includes=/usr/include/mysql"
+  fi &&
+
+  if in_depends $MODULE ffmpeg ; then
+     sedit "s:avcodec.h:libavcodec/avcodec.h:g" configure    &&
+     sedit "s:avformat.h:libavformat/avformat.h:g" configure &&
+     sedit "s:swscale.h:libswscale/swscale.h:g" configure    &&
+     sedit "s:<avformat.h>:<libavformat/avformat.h>:" lib/ogsf/gsd_img_mpeg.c &&
+     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/
 
 ) > $C_FIFO 2>&1
 
diff --git a/science/grass/DEPENDS b/science/grass/DEPENDS
index f59a518..5388e31 100644
--- a/science/grass/DEPENDS
+++ b/science/grass/DEPENDS
@@ -1,14 +1,24 @@
 depends  bison
 depends  flex
-depends  proj-4
 depends  gdal
 depends  fftw
 depends  tk
 
-optional_depends "ffmpeg"    "--with-ffmpeg"   "--without-ffmpeg"   "audio support"
-optional_depends "unixODBC"  "--with-odbc"     "--without-odbc"     "additional database support"
-optional_depends "freetype2" "--with-freetype" "--without-freetype" "additional text support"
-optional_depends "readline"  "--with-readline" "--without-readline" "for readline support"
-optional_depends "Python"    "--with-python"   "--without-python"   "for Python support"
-optional_depends "mysql"     "--with-mysql"    "--without-mysql"    "for database support"
-optional_depends "sqlite"    "--with-sqlite"   "--without-sqlite"   "for database support"
+optional_depends "proj-4"    "" "" "for external proj-4 support"
+
+#optional_depends "readline"   "--with-readline"  "--without-readline"  "for readline support"
+optional_depends "ncurses"    "--with-curses"    "--without-ncurses"   "for ncurses support"
+optional_depends "jpeg"       "--with-jpeg"      "--without-jpeg"      "for jpeg graphics support"
+optional_depends "tiff"       "--with-tiff"      "--without-tiff"      "for tiff graphics support"
+optional_depends "libpng"     "--with-png"       "--without-png"       "for png graphics support"
+optional_depends "cairo"      "--with-cairo"     "--without-cairo"     "for cairo functionality"
+optional_depends "ffmpeg"     "--with-ffmpeg"    "--without-ffmpeg"    "audio support"
+optional_depends "unixODBC"   "--with-odbc"      "--without-odbc"      "additional database support"
+optional_depends "freetype2"  "--with-freetype"  "--without-freetype"  "additional text support"
+optional_depends "Python"     "--with-python"    "--without-python"    "for Python support"
+optional_depends "mysql"      "--with-mysql"     "--without-mysql"     "for database support"
+optional_depends "sqlite"     "--with-sqlite"    "--without-sqlite"    "for database support"
+optional_depends "openMotif"  "--with-motif"     "--without-motif"     "for motif graphics support"
+optional_depends "postgresql" "--with-postgres"  "--without-postgres"  "for postgresql database support"
+optional_depends "wxGTK"      "--with-wxwidgets" "--without-wxwidgets" "for wxWidgets graphics support"
+optional_depends "lapack"     "--with-lapack"    "--without-lapack"    "for lapack functionality"
diff --git a/science/grass/DETAILS b/science/grass/DETAILS
index 8407c4f..2b59e84 100644
--- a/science/grass/DETAILS
+++ b/science/grass/DETAILS
@@ -1,13 +1,13 @@
-       MODULE=grass
-      VERSION=6.2.3
-       SOURCE=$MODULE-$VERSION.tar.gz
-   SOURCE_URL=http://grass.itc.it/grass62/source
-   SOURCE_VFY=sha1:ea5301f541cd05077f55fcc65ac19568b8e6fba5
-     WEB_SITE=http://grass.itc.it/index.php
-      ENTERED=20060804
-      UPDATED=20080917
-        SHORT="geospatial data management and analysis"
-        PSAFE=no
+          MODULE=grass
+         VERSION=6.4.0
+          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
+           SHORT="geospatial data management and analysis"
 
 cat << EOF
 Commonly referred to as GRASS, this is a Geographic Information


More information about the Lunar-commits mailing list