[67833] trunk/dports/gis/grass

takeshi at macports.org takeshi at macports.org
Wed May 19 01:56:33 PDT 2010 

Revision: 67833
          http://trac.macports.org/changeset/67833
Author:   takeshi at macports.org
Date:     2010-05-19 01:56:30 -0700 (Wed, 19 May 2010)
Log Message:
-----------
grass: updated to 6.4.0 RC6

Modified Paths:
--------------
    trunk/dports/gis/grass/Portfile
    trunk/dports/gis/grass/files/patch-Makefile.diff
    trunk/dports/gis/grass/files/patch-configure.diff
    trunk/dports/gis/grass/files/patch-macosx_Makefile.diff

Modified: trunk/dports/gis/grass/Portfile
===================================================================
--- trunk/dports/gis/grass/Portfile	2010-05-19 08:47:56 UTC (rev 67832)
+++ trunk/dports/gis/grass/Portfile	2010-05-19 08:56:30 UTC (rev 67833)
@@ -3,8 +3,7 @@
 PortSystem 1.0
 
 name              grass
-version           6.3.0
-revision          3
+version           6.4.0RC6
 maintainers       nomaintainer
 categories        gis
 platforms         darwin
@@ -14,20 +13,23 @@
                   geospatial data management and analysis.
 
 homepage          http://grass.osgeo.org
-master_sites      http://grass.osgeo.org/grass63/source/
+master_sites      http://grass.osgeo.org/grass64/source/
 
-checksums         md5 7dce50a076e2481733148ba34cbebc07
+checksums         md5     cbb98b579155f8e9864b4e98e4423568 \
+                  sha1    4e82d7211ac85dbefa15ff27397d896d1955db64 \
+                  rmd160  6c8a0cd56b72b11395cf97953bc74672939225f3
 
-depends_lib       port:fftw \
+depends_lib       port:fftw-3 \
                   port:freetype \
                   port:gdal \
                   port:geos \
                   port:jpeg \
                   port:libpng \
-                  port:mesa \
-                  port:openmotif \
+                  port:lesstif \
                   port:proj \
-                  port:tk
+                  port:tk \
+                  port:cairo \
+                  port:readline
 
 use_parallel_build yes
 
@@ -41,7 +43,7 @@
       ${worksrcpath}/configure
 }
 
-configure.ldflags -framework OpenGL
+configure.ldflags-append -framework OpenGL -framework Accelerate
 configure.args \
     --with-fftw-includes=${prefix}/include \
     --with-fftw-libs=${prefix}/lib \
@@ -64,7 +66,17 @@
     --with-cxx \
     --with-x \
     --without-postgres \
-    --enable-largefile
+    --enable-largefile \
+    --with-cairo \
+    --with-cairo-includes=${prefix}/include/cairo \
+    --with-cairo-libs=${prefix}/lib \
+    --with-blas \
+    --with-lapack \
+    --with-readline \
+    --with-readline-includes=${prefix}/include/readline \
+    --with-readline-libs=${prefix}/lib \
+    --with-regex-includes=/usr/include \
+    --with-regex-lib=/usr/lib
 
 build.target    default
 
@@ -94,3 +106,11 @@
     configure.args-append --with-sqlite-libs=${prefix}/lib
 }
 
+variant ffmpeg description {Install grass with ffmpeg suport} {
+    depends_lib-append    port:ffmpeg
+    configure.args-append --with-ffmpeg \
+                          --with-ffmpeg-includes=\"${prefix}/include/libavcodec  \
+                                                   ${prefix}/include/libavformat \
+                                                   ${prefix}/include/libswscale\" \
+                          --with-ffmpeglibs=${prefix}/lib
+}

Modified: trunk/dports/gis/grass/files/patch-Makefile.diff
===================================================================
--- trunk/dports/gis/grass/files/patch-Makefile.diff	2010-05-19 08:47:56 UTC (rev 67832)
+++ trunk/dports/gis/grass/files/patch-Makefile.diff	2010-05-19 08:56:30 UTC (rev 67833)
@@ -1,5 +1,5 @@
---- Makefile.orig	2008-03-21 07:22:26.000000000 -0600
-+++ Makefile	2008-11-17 00:38:11.000000000 -0700
+--- Makefile.orig	2010-02-19 06:16:35.000000000 +0900
++++ Makefile	2010-05-19 17:53:30.000000000 +0900
 @@ -24,7 +24,7 @@
  
  # Install directories
@@ -19,7 +19,7 @@
  
  DIRS = \
  	lib \
-@@ -250,7 +251,7 @@
+@@ -265,7 +266,7 @@
  	test -d ${INST_DIR} || ${MAKE_DIR_CMD} ${INST_DIR}
  	@##### test -d ${INST_DIR}/dev || ${MAKE_DIR_CMD} ${INST_DIR}/dev
  	test -d ${BINDIR} || ${MAKE_DIR_CMD} ${BINDIR}
@@ -28,10 +28,10 @@
  	-chmod a+x ${BINDIR}/grass${GRASS_VERSION_MAJOR}${GRASS_VERSION_MINOR}
  ifneq ($(strip $(MINGW)),)
  	-sed -e "s#WINGISBASE=.*#WINGISBASE=${INST_DIR}#" ${ARCH_BINDIR}/grass${GRASS_VERSION_MAJOR}${GRASS_VERSION_MINOR}.bat > ${BINDIR}/grass${GRASS_VERSION_MAJOR}${GRASS_VERSION_MINOR}.bat
-@@ -281,9 +282,6 @@
+@@ -297,9 +298,6 @@
  	@#GEM installation
  	-tar cBf - gem/skeleton | (cd ${INST_DIR}/etc ; tar xBf - ) 2>/dev/null
- 	-${INSTALL} gem/gem6 ${BINDIR} 2>/dev/null
+ 	-${INSTALL} gem/gem$(GRASS_VERSION_MAJOR)$(GRASS_VERSION_MINOR) ${BINDIR} 2>/dev/null
 -	@# enable OSX Help Viewer
 -	@if [ "`cat include/Make/Platform.make | grep -i '^ARCH.*darwin'`" ] ; then /bin/ln -sfh "${INST_DIR}/docs/html" /Library/Documentation/Help/GRASS-${GRASS_VERSION_MAJOR}.${GRASS_VERSION_MINOR} ; fi
 -

Modified: trunk/dports/gis/grass/files/patch-configure.diff
===================================================================
--- trunk/dports/gis/grass/files/patch-configure.diff	2010-05-19 08:47:56 UTC (rev 67832)
+++ trunk/dports/gis/grass/files/patch-configure.diff	2010-05-19 08:56:30 UTC (rev 67833)
@@ -1,11 +1,11 @@
---- configure.orig	2008-03-26 09:04:27.000000000 -0600
-+++ configure	2008-11-16 22:26:19.000000000 -0700
-@@ -1279,9 +1279,9 @@
+--- configure.orig	2010-01-06 00:39:02.000000000 +0900
++++ configure	2010-05-19 17:53:30.000000000 +0900
+@@ -1390,9 +1390,9 @@
  # Set INST_DIR
  
  if test -n "$MACOSX_APP" ; then
 -    INSTDIR='${prefix}'"/GRASS-${GRASS_VERSION_MAJOR}.${GRASS_VERSION_MINOR}.app/Contents/MacOS"
-+    INSTDIR='@@APPLICATIONS_DIR@@'"/GRASS-${GRASS_VERSION_MAJOR}.${GRASS_VERSION_MINOR}.app/Contents/MacOS"
++    INSTDIR='/Applications/MacPorts'"/GRASS-${GRASS_VERSION_MAJOR}.${GRASS_VERSION_MINOR}.app/Contents/MacOS"
  else
 -    INSTDIR='${prefix}'"/grass-${GRASS_VERSION_MAJOR}.${GRASS_VERSION_MINOR}.${GRASS_VERSION_RELEASE}"
 +    INSTDIR='${prefix}'"/share/grass-${GRASS_VERSION_MAJOR}.${GRASS_VERSION_MINOR}.${GRASS_VERSION_RELEASE}"

Modified: trunk/dports/gis/grass/files/patch-macosx_Makefile.diff
===================================================================
--- trunk/dports/gis/grass/files/patch-macosx_Makefile.diff	2010-05-19 08:47:56 UTC (rev 67832)
+++ trunk/dports/gis/grass/files/patch-macosx_Makefile.diff	2010-05-19 08:56:30 UTC (rev 67833)
@@ -1,6 +1,6 @@
---- macosx/Makefile.orig	2008-03-26 09:04:27.000000000 -0600
-+++ macosx/Makefile	2008-11-17 00:47:44.000000000 -0700
-@@ -32,6 +32,8 @@
+--- macosx/Makefile.orig	2010-02-19 06:16:31.000000000 +0900
++++ macosx/Makefile	2010-05-19 17:53:30.000000000 +0900
+@@ -35,6 +35,8 @@
  
  include $(MODULE_TOPDIR)/include/Make/Dir.make
  
@@ -8,4 +8,4 @@
 +
  default: subdirs
  
- install-macosx:
+ include bundle.make
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100519/fce9629e/attachment.html>

More information about the macports-changes mailing list