[97442] trunk/dports/gis/grass

[ryandesign at macports.org]

Revision: 97442
          https://trac.macports.org/changeset/97442
Author:   ryandesign at macports.org
Date:     2012-09-05 22:06:21 -0700 (Wed, 05 Sep 2012)
Log Message:
-----------
grass: update to 6.4.2 (#36006)

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

Modified: trunk/dports/gis/grass/Portfile
===================================================================
--- trunk/dports/gis/grass/Portfile	2012-09-06 04:11:35 UTC (rev 97441)
+++ trunk/dports/gis/grass/Portfile	2012-09-06 05:06:21 UTC (rev 97442)
@@ -4,8 +4,7 @@
 
 name              grass
 epoch             1
-version           6.4.0
-revision          3
+version           6.4.2
 maintainers       nomaintainer
 categories        gis
 license           GPL-2+
@@ -18,8 +17,8 @@
 homepage          http://grass.osgeo.org/
 master_sites      ${homepage}grass[join [lrange [split ${version} .] 0 1] {}]/source/
 
-checksums         sha1    c91e8501c7a756a94d2be47729f640d33b2a7468 \
-                  rmd160  b0bd2d2ce048a5f10f345786bc81fa4bd22df019
+checksums         rmd160  2a8a2a63edf8e1cc53b7b26975087eef59c9a397 \
+                  sha256  670bb74d3000ea0932b7e988d3080d0c629f9eb22a8479bb2987ded473f7b4ca
 
 depends_build     port:pkgconfig
 depends_lib       port:fftw-3 \

Modified: trunk/dports/gis/grass/files/patch-Makefile.diff
===================================================================
--- trunk/dports/gis/grass/files/patch-Makefile.diff	2012-09-06 04:11:35 UTC (rev 97441)
+++ trunk/dports/gis/grass/files/patch-Makefile.diff	2012-09-06 05:06:21 UTC (rev 97442)
@@ -1,5 +1,5 @@
---- Makefile.orig	2010-02-19 06:16:35.000000000 +0900
-+++ Makefile	2010-05-19 17:53:30.000000000 +0900
+--- Makefile.orig	2011-05-13 14:01:14.000000000 -0500
++++ Makefile	2012-09-05 23:55:59.000000000 -0500
 @@ -24,7 +24,7 @@
  
  # Install directories
@@ -9,32 +9,31 @@
  
  # Shell commands
  MAKE_DIR_CMD=		mkdir -p -m 755
-@@ -32,7 +32,8 @@
- # Extra commands
- HTML2PDF=		htmldoc --footer d.1
- GRASS_PDFDIR=		$(GISBASE)/docs/pdf
--
+@@ -80,6 +80,9 @@
+ include $(MODULE_TOPDIR)/include/Make/Docs.make
+ include $(MODULE_TOPDIR)/include/Make/Doxygen.make
+ 
 +FINAL_GISBASE:=${INST_DIR}
 +INST_DIR:=${DESTDIR}${INST_DIR}
- 
- DIRS = \
- 	lib \
-@@ -265,7 +266,7 @@
++
+ default: builddemolocation
+ 	@echo "GRASS GIS compilation log"     > $(ERRORLOG)
+ 	@echo "-------------------------"    >> $(ERRORLOG)
+@@ -269,7 +272,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}
--	-sed -e "s#^GISBASE.*#GISBASE=${INST_DIR}#" ${ARCH_BINDIR}/grass${GRASS_VERSION_MAJOR}${GRASS_VERSION_MINOR} > ${BINDIR}/grass${GRASS_VERSION_MAJOR}${GRASS_VERSION_MINOR}
-+	-sed -e "s#^GISBASE.*#GISBASE=${FINAL_GISBASE}#" ${ARCH_BINDIR}/grass${GRASS_VERSION_MAJOR}${GRASS_VERSION_MINOR} > ${BINDIR}/grass${GRASS_VERSION_MAJOR}${GRASS_VERSION_MINOR}
+-	-sed -e "s#GISBASE=.*#GISBASE=${INST_DIR}#" ${ARCH_BINDIR}/grass${GRASS_VERSION_MAJOR}${GRASS_VERSION_MINOR} > ${BINDIR}/grass${GRASS_VERSION_MAJOR}${GRASS_VERSION_MINOR}
++	-sed -e "s#GISBASE=.*#GISBASE=${FINAL_GISBASE}#" ${ARCH_BINDIR}/grass${GRASS_VERSION_MAJOR}${GRASS_VERSION_MINOR} > ${BINDIR}/grass${GRASS_VERSION_MAJOR}${GRASS_VERSION_MINOR}
  	-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
-@@ -297,9 +298,6 @@
- 	@#GEM installation
+ 	-cd ${GISBASE} ; tar cBf - $(FILES) | (cd ${INST_DIR} ; tar xBf - ) 2>/dev/null
+ 	-cd ${GISBASE} ; tar cBf - bin | (cd ${INST_DIR} ; tar xBf - ) 2>/dev/null
+@@ -304,8 +307,6 @@
  	-tar cBf - gem/skeleton | (cd ${INST_DIR}/etc ; tar xBf - ) 2>/dev/null
  	-${INSTALL} gem/gem$(GRASS_VERSION_MAJOR)$(GRASS_VERSION_MINOR) ${BINDIR} 2>/dev/null
+ endif
 -	@# 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
--
  
+ 
  install-strip: FORCE
- 	${MAKE} strip

Modified: trunk/dports/gis/grass/files/patch-configure.diff
===================================================================
--- trunk/dports/gis/grass/files/patch-configure.diff	2012-09-06 04:11:35 UTC (rev 97441)
+++ trunk/dports/gis/grass/files/patch-configure.diff	2012-09-06 05:06:21 UTC (rev 97442)
@@ -1,6 +1,6 @@
---- configure.orig	2010-01-06 00:39:02.000000000 +0900
-+++ configure	2010-05-19 17:53:30.000000000 +0900
-@@ -1390,9 +1390,9 @@
+--- configure.orig	2012-02-06 04:16:07.000000000 -0600
++++ configure	2012-09-05 23:57:31.000000000 -0500
+@@ -1437,9 +1437,9 @@
  # Set INST_DIR
  
  if test -n "$MACOSX_APP" ; then
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120905/ab602673/attachment.html>