<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/3b5e93588d7e1c421b3e1ac796515dd2014c211d">https://github.com/macports/macports-ports/commit/3b5e93588d7e1c421b3e1ac796515dd2014c211d</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 3b5e935 grass: Update to 6.4.6
</span>3b5e935 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 3b5e93588d7e1c421b3e1ac796515dd2014c211d
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Tue Feb 27 10:15:20 2018 -0600
<span style='display:block; white-space:pre;color:#404040;'> grass: Update to 6.4.6
</span>---
gis/grass/Portfile | 12 +++++-------
gis/grass/files/patch-Makefile.diff | 12 ++++++------
gis/grass/files/patch-configure.diff | 6 +++---
.../files/patch-gui-wxpython-core-globalvar.py.diff | 12 ------------
.../files/patch-gui-wxpython-gui_core-ghelp.py.diff | 21 ---------------------
gis/grass/files/patch-is_void.diff | 19 +++++++++----------
6 files changed, 23 insertions(+), 59 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/grass/Portfile b/gis/grass/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 046836c..31ea2fe 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/grass/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/grass/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,9 +5,8 @@ PortGroup wxWidgets 1.0
</span> PortGroup active_variants 1.1
name grass
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 6.4.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 6
</span> epoch 1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+version 6.4.6
</span> maintainers nomaintainer
categories gis
license GPL-2+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,8 +19,9 @@ long_description GRASS is a Geographic Information System (GIS) used for \
</span> homepage http://grass.osgeo.org/
master_sites ${homepage}grass[join [lrange [split ${version} .] 0 1] {}]/source/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 bdbd671972730701aa8213c2041abe31a68eea4c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 5d29d322a262330894aa046845e6790258cd6e3f95b28c350ed7839810672ed6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 7c67afcd9ef8c75558ef8eafd8cab23ad257c37c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 5a84754614619cc265d843980e28f39a1d24048805b9b2865e76a583d973f333 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 25737006
</span>
depends_build port:pkgconfig
depends_lib port:fftw-3 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,8 +42,6 @@ depends_lib port:fftw-3 \
</span> # compiler.blacklist *clang*
patchfiles patch-configure.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-gui-wxpython-core-globalvar.py.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-gui-wxpython-gui_core-ghelp.py.diff \
</span> patch-is_void.diff \
patch-lib-init-grass.src.diff \
patch-macosx_Makefile.diff \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,7 +50,7 @@ patchfiles patch-configure.diff \
</span>
post-patch {
reinplace "s|@@APPLICATIONS_DIR@@|${applications_dir}|" ${worksrcpath}/configure
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # http://trac.osgeo.org/grass/ticket/2169
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://trac.osgeo.org/grass/ticket/2169
</span> reinplace "s|CC=gcc|CC=${configure.cc}|" ${worksrcpath}/gem/Makefile
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/grass/files/patch-Makefile.diff b/gis/grass/files/patch-Makefile.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 67496df..0707271 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/grass/files/patch-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/grass/files/patch-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -24,7 +24,7 @@ include $(MODULE_TOPDIR)/include/Make/Grass.make
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.orig 2014-12-16 16:11:04.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile 2018-02-27 06:23:00.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -24,7 +24,7 @@
</span>
# Install directories
exec_prefix= ${prefix}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,7 +9,7 @@
</span>
# Shell commands
MAKE_DIR_CMD= mkdir -p -m 755
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -81,6 +81,9 @@ DOXNAME=grass
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -81,6 +81,9 @@
</span> include $(MODULE_TOPDIR)/include/Make/Docs.make
include $(MODULE_TOPDIR)/include/Make/Doxygen.make
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,7 +19,7 @@
</span> default: builddemolocation
@echo "GRASS GIS compilation log" > $(ERRORLOG)
@echo "-------------------------" >> $(ERRORLOG)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -272,7 +275,7 @@ real-install: FORCE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -273,7 +276,7 @@
</span> 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}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,7 +28,7 @@
</span> -chmod a+x ${BINDIR}/grass${GRASS_VERSION_MAJOR}${GRASS_VERSION_MINOR}
-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
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -310,8 +313,6 @@ ifeq ($(strip $(MINGW)),)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -311,8 +314,6 @@
</span> -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
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/grass/files/patch-configure.diff b/gis/grass/files/patch-configure.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 172baf7..0b504f4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/grass/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/grass/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1424,9 +1424,9 @@ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2016-08-17 02:18:55.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2018-02-27 06:16:59.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1430,9 +1430,9 @@
</span> # Set INST_DIR
if test -n "$MACOSX_APP" ; then
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/grass/files/patch-gui-wxpython-core-globalvar.py.diff b/gis/grass/files/patch-gui-wxpython-core-globalvar.py.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 914ec57..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/grass/files/patch-gui-wxpython-core-globalvar.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,12 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-just a temporary (pretty much useless) workaround that allows to start the GUI with wxPython 2.9.4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gui/wxpython/core/globalvar.py.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gui/wxpython/core/globalvar.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -59,7 +59,7 @@ def CheckForWx():
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- raise ValueError('Your wxPython version is %s.%s.%s.%s' % tuple(version.split('.')))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if map(int, version.split('.')) >= unsupportedVersion:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- print >> sys.stderr, 'ERROR: wxGUI does not support wxPython %s yet.' % version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- sys.exit(1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # sys.exit(1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- except ImportError, e:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- print >> sys.stderr, 'ERROR: wxGUI requires wxPython. %s' % str(e)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sys.exit(1)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/grass/files/patch-gui-wxpython-gui_core-ghelp.py.diff b/gis/grass/files/patch-gui-wxpython-gui_core-ghelp.py.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 3f36d1b..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/grass/files/patch-gui-wxpython-gui_core-ghelp.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,21 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-http://trac.osgeo.org/grass/changeset/51052
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Doesn't really help because grass refuses to run with "ERROR: wxGUI does not support wxPython 2.9.4.0 yet."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gui/wxpython/gui_core/ghelp.py.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gui/wxpython/gui_core/ghelp.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -88,7 +88,6 @@ class SearchModuleWindow(wx.Panel):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- """!Do layout"""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sizer = wx.StaticBoxSizer(self.box, wx.HORIZONTAL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gridSizer = wx.GridBagSizer(hgap = 3, vgap = 3)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- gridSizer.AddGrowableCol(1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gridSizer.Add(item = self.searchBy,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- flag = wx.ALIGN_CENTER_VERTICAL, pos = (0, 0))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -104,6 +103,8 @@ class SearchModuleWindow(wx.Panel):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gridSizer.Add(item = self.searchChoice,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- flag = wx.ALIGN_CENTER_VERTICAL | wx.EXPAND, pos = (row, 0), span = (1, 2))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ gridSizer.AddGrowableCol(1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sizer.Add(item = gridSizer, proportion = 1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- self.SetSizer(sizer)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/grass/files/patch-is_void.diff b/gis/grass/files/patch-is_void.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index e5d55e7..fc78080 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/grass/files/patch-is_void.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/grass/files/patch-is_void.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-http://trac.osgeo.org/grass/ticket/2170
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- raster/r.terraflow/direction.cc.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ raster/r.terraflow/direction.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -53,11 +53,11 @@ encodeDirectionMFD(const genericWindow<elevation_type>& elevwin,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://trac.osgeo.org/grass/ticket/2170
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- raster/r.terraflow/direction.cpp.orig 2016-07-20 09:58:41.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ raster/r.terraflow/direction.cpp 2018-02-27 06:23:54.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -53,11 +53,11 @@
</span>
if(!is_nodata(elevwin.get())) {
dir = 0;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,9 +17,9 @@ http://trac.osgeo.org/grass/ticket/2170
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- raster/r.terraflow/nodata.cc.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ raster/r.terraflow/nodata.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -73,7 +73,7 @@ is_nodata(float x) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- raster/r.terraflow/nodata.cpp.orig 2016-07-20 09:58:41.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ raster/r.terraflow/nodata.cpp 2018-02-27 06:23:54.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -73,7 +73,7 @@
</span>
int
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,8 +28,8 @@ http://trac.osgeo.org/grass/ticket/2170
</span> return (el == nodataType::ELEVATION_NODATA);
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- raster/r.terraflow/nodata.h.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ raster/r.terraflow/nodata.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- raster/r.terraflow/nodata.h.orig 2012-09-01 04:52:26.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ raster/r.terraflow/nodata.h 2018-02-27 06:23:54.000000000 -0600
</span> @@ -37,7 +37,7 @@
int is_nodata(elevation_type el);
int is_nodata(int x);
</pre><pre style='margin:0'>
</pre>