<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/9cda37ac89666ef179f74055ba0fc90962c6e5d5">https://github.com/macports/macports-ports/commit/9cda37ac89666ef179f74055ba0fc90962c6e5d5</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 9cda37ac896 grass7: bump to 7.8.6
</span>9cda37ac896 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 9cda37ac89666ef179f74055ba0fc90962c6e5d5
</span>Author: nilason <n_larsson@yahoo.com>
AuthorDate: Fri Oct 1 12:51:55 2021 +0200
<span style='display:block; white-space:pre;color:#404040;'> grass7: bump to 7.8.6
</span>---
gis/grass7/Portfile | 24 +++----
gis/grass7/files/patch-Install_make.diff | 97 ----------------------------
gis/grass7/files/patch-bool-fix.diff | 72 ---------------------
gis/grass7/files/patch-configure.diff | 31 ---------
gis/grass7/files/patch-libraster_gdal_c.diff | 73 ---------------------
5 files changed, 8 insertions(+), 289 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/grass7/Portfile b/gis/grass7/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4db0a9a081f..441d400815d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/grass7/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/grass7/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,10 +5,10 @@ PortGroup wxWidgets 1.0
</span> PortGroup github 1.0
PortGroup debug 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup OSGeo grass 7.8.5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup OSGeo grass 7.8.6
</span> name grass7
set main_version [join [lrange [split ${version} "."] 0 1] ""]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> set realVersion ${version}
#distname grass-${version}
distname grass-${realVersion}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,9 +24,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 ${realVersion} .] 0 1] {}]/source/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 44502e643db9b79b427429b6b0f5b604e465bce0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 a359bb665524ecccb643335d70f5436b1c84ffb6a0e428b78dffebacd983ff37 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 61801712
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 4393641be9fe3821f3fbd11a79d86ea07f088e00 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 d85e17b0a717e344cdda8f6c5bdeb86763e48d1ee74a62ab471dc8e1293993be \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 66331264
</span>
depends_build port:pkgconfig
depends_lib port:bzip2 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,11 +41,9 @@ depends_lib port:bzip2 \
</span> path:lib/pkgconfig/cairo.pc:cairo \
port:readline
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-configure.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-Install_make.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-grass.py.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-bool-fix.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-libraster_gdal_c.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-grass.py.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cflags -DGL_SILENCE_DEPRECATION
</span>
configure.args-append \
--prefix=${prefix}/share \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -116,7 +114,6 @@ post-patch {
</span> }
reinplace "s|PYVER.*|PYVER = ${pyversion}|" ${worksrcpath}/macosx/Makefile
reinplace "s|^PYTHON.*|PYTHON = ${pybin}|" ${worksrcpath}/include/Make/Platform.make.in
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/lib/raster/gdal.c
</span> }
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -315,11 +312,6 @@ post-configure {
</span> \\\\\"-D__DARWIN_OS_INLINE=\\\\\"|" ${worksrcpath}/lib/python/ctypes/Makefile
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-pre-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d ${destroot}${prefix}/share/grass${main_version}/etc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- touch ${destroot}${prefix}/share/grass${main_version}/etc/fontcap
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> livecheck.type regex
livecheck.url http://grass.osgeo.org/download/software/sources/
livecheck.regex grass-(7.\[0-9.\]+)${extract.suffix}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/grass7/files/patch-Install_make.diff b/gis/grass7/files/patch-Install_make.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 54263576f7d..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/grass7/files/patch-Install_make.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,97 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- include/Make/Install.make.orig 2020-04-27 11:15:39.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/Make/Install.make 2020-04-27 10:57:13.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -54,7 +54,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- while [ ! -d "$$INST_PATH" ]; do \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- INST_PATH=`dirname $$INST_PATH`; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- done; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if [ ! -d "$(INST_DIR)" -a ! -w "$$INST_PATH" ] ; then \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if [ ! -d "$(DESTDIR)$(INST_DIR)" -a ! -w "$(DESTDIR)$$INST_PATH" ] ; then \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "ERROR: Directory $$INST_PATH is a parent directory of your" >&2 ; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo " install directory $(INST_DIR) and is not writable." >&2 ; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo " Perhaps you need root access." >&2 ; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -63,7 +63,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install-check-writable:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- @ if [ -d "$(INST_DIR)" -a ! -w "$(INST_DIR)" ] ; then \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ @ if [ -d "$(DESTDIR)$(INST_DIR)" -a ! -w "$(DESTDIR)$(INST_DIR)" ] ; then \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "ERROR: Your install directory $(INST_DIR) is not writable." >&2 ; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo " Perhaps you need root access." >&2 ; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo " Installation aborted, exiting Make." >&2 ; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -71,7 +71,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install-check-prefix:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- @ result=`echo "$(INST_DIR)" | awk '{ if ($$1 ~ /grass/) print $$1 }'`; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ @ result=`echo "$(DESTDIR)$(INST_DIR)" | awk '{ if ($$1 ~ /grass/) print $$1 }'`; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if [ "$$result" = "" ] ; then \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "WARNING: Your install directory $(INST_DIR)" >&2 ; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo " does not contain the word 'grass'." >&2 ; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -96,52 +96,52 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PLATMAKE = include/Make/Platform.make
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GRASSMAKE = include/Make/Grass.make
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--real-install: | $(INST_DIR) $(UNIX_BIN)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- -tar cBCf $(GISBASE) - . | tar xBCf $(INST_DIR) - 2>/dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- -rm $(INST_DIR)/$(GRASS_NAME).tmp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+real-install: | $(DESTDIR) $(INST_DIR) $(UNIX_BIN)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ -tar cBCf $(GISBASE) - . | tar xBCf $(DESTDIR)$(INST_DIR) - 2>/dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ -rm $(DESTDIR)$(INST_DIR)/$(GRASS_NAME).tmp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(MAKE) $(STARTUP)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- -rm $(INST_DIR)/$(FONTCAP)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ -rm $(DESTDIR)$(INST_DIR)/$(FONTCAP)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(MAKE) $(INST_DIR)/$(FONTCAP)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- -rm $(INST_DIR)/$(TMPGISRC)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ -rm $(DESTDIR)$(INST_DIR)/$(TMPGISRC)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(MAKE) $(INST_DIR)/$(TMPGISRC)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- -rm $(INST_DIR)/$(PLATMAKE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ -rm $(DESTDIR)$(INST_DIR)/$(PLATMAKE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(MAKE) $(INST_DIR)/$(PLATMAKE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- -rm $(INST_DIR)/$(GRASSMAKE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ -rm $(DESTDIR)$(INST_DIR)/$(GRASSMAKE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(MAKE) $(INST_DIR)/$(GRASSMAKE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- -$(CHMOD) -R a+rX $(INST_DIR) 2>/dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ -$(CHMOD) -R a+rX $(DESTDIR)$(INST_DIR) 2>/dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ifneq ($(findstring darwin,$(ARCH)),)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @# enable OSX Help Viewer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- @/bin/ln -sfh "$(INST_DIR)/docs/html" /Library/Documentation/Help/GRASS-$(GRASS_VERSION_MAJOR).$(GRASS_VERSION_MINOR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ @#/bin/ln -sfh "$(INST_DIR)/docs/html" /Library/Documentation/Help/GRASS-$(GRASS_VERSION_MAJOR).$(GRASS_VERSION_MINOR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(INST_DIR) $(UNIX_BIN):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(MAKE_DIR_CMD) $@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(MAKE_DIR_CMD) $(DESTDIR)$@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(STARTUP): $(ARCH_DISTDIR)/$(GRASS_NAME).tmp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sed -e 's#'@GISBASE@'#'$(INST_DIR)'#g' \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -e 's#'@LD_LIBRARY_PATH_VAR@'#'$(LD_LIBRARY_PATH_VAR)'#g' \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -e 's#'@CONFIG_PROJSHARE@'#'$(PROJSHARE)'#g' \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $< > $@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- -$(CHMOD) a+x $@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $< > $(DESTDIR)$@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ -$(CHMOD) a+x $(DESTDIR)$@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- define fix_gisbase
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--sed -e 's#$(GISBASE)#$(INST_DIR)#g' $< > $@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+sed -e 's#$(GISBASE)#$(INST_DIR)#g' $< > $(DESTDIR)$@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endef
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- define fix_grass_home
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sed -e 's#^\(GRASS_HOME.[^=]*\).*#\1= $(INST_DIR)#g' \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- -e 's#$(GISBASE)#$(INST_DIR)#g' $< > $@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ -e 's#$(GISBASE)#$(INST_DIR)#g' $< > $(DESTDIR)$@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endef
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- define fix_grass_arch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sed -e 's#^\(ARCH_DISTDIR.[^=]*\).*#\1= $(INST_DIR)#g' \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- -e 's#^\(ARCH_BINDIR.[^=]*\).*#\1= $(UNIX_BIN)#g' $< > $@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ -e 's#^\(ARCH_BINDIR.[^=]*\).*#\1= $(UNIX_BIN)#g' $< > $(DESTDIR)$@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endef
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(INST_DIR)/$(FONTCAP): $(GISBASE)/$(FONTCAP)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/grass7/files/patch-bool-fix.diff b/gis/grass7/files/patch-bool-fix.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index ba5cbdfeae8..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/grass7/files/patch-bool-fix.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,72 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- vector/v.hull/chull.c.orig 2021-05-29 15:37:11.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ vector/v.hull/chull.c 2021-05-29 18:39:54.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -22,6 +22,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <math.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <stdbool.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <grass/gis.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <grass/vector.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -29,10 +30,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "globals.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--/*Define Boolean type */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--typedef enum
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--{ BFALSE, BTRUE } bool;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Define vertex indices. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define X 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define Y 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -76,10 +73,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Define flags */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define ONHULL BTRUE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define REMOVED BTRUE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define VISIBLE BTRUE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define PROCESSED BTRUE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define ONHULL true
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define REMOVED true
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define VISIBLE true
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define PROCESSED true
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Global variable definitions */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- tVertex vertices = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -436,7 +433,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- tFace f;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- tEdge e, temp;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- long int vol;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- bool vis = BFALSE;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ bool vis = false;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Mark faces visible from p. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -446,7 +443,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (vol < 0) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- f->visible = VISIBLE;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- vis = BTRUE;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ vis = true;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- f = f->next;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } while (f != faces);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -454,7 +451,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* If no faces are visible from p, then p is inside the hull. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!vis) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- p->onhull = !ONHULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return BFALSE;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return false;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Mark edges in interior of visible region for deletion.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -470,7 +467,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- e->newface = MakeConeFace(e, p);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- e = temp;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } while (e != edges);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return BTRUE;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return true;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /*---------------------------------------------------------------------
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/grass7/files/patch-configure.diff b/gis/grass7/files/patch-configure.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 7860288da57..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/grass7/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,31 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2020-09-28 16:37:42.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2020-09-28 16:48:50.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -13428,7 +13428,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if test -n "$MACOSX_APP" ; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if test -n "$MACOSX_APP" ; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ac_save_cppflags="$CPPFLAGS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CPPFLAGS="$OCLINCPATH $CPPFLAGS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -13528,15 +13528,15 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OCLLIB="$OCLLIB -framework OpenCL"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- echo "$ac_t""no" 1>&6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# echo "$ac_t""no" 1>&6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--{ echo "configure: error: *** Unable to locate OpenCL library." 1>&2; exit 1; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#{ echo "configure: error: *** Unable to locate OpenCL library." 1>&2; exit 1; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBS=${ac_save_libs}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS=${ac_save_ldflags}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/grass7/files/patch-libraster_gdal_c.diff b/gis/grass7/files/patch-libraster_gdal_c.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 33f1cec8a81..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/grass7/files/patch-libraster_gdal_c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,73 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/raster/gdal.c.orig 2020-02-03 13:02:01.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/raster/gdal.c 2020-02-03 13:04:44.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -30,7 +30,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef GDAL_LINK
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef GDAL_DYNAMIC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# if defined(__unix) || defined(__unix__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# if defined(__unix) || defined(__unix__) || defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # include <dlfcn.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # ifdef _WIN32
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -78,12 +78,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void *sym;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# ifdef __unix__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sym = dlsym(library_h, name);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# ifdef _WIN32
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- sym = GetProcAddress((HINSTANCE) library_h, name);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!sym)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- G_fatal_error(_("Unable to locate symbol <%s>"), name);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -93,47 +88,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static void try_load_library(const char *name)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# ifdef __unix__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- library_h = dlopen(name, RTLD_NOW);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# ifdef _WIN32
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- library_h = LoadLibrary(name);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static void load_library(void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static const char *const candidates[] = {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# ifdef __unix__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "libgdal.so.26", /* GDAL 3.0 */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "libgdal.so.20",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "libgdal.so.1",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "libgdal.1.1.so",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "gdal.1.0.so",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "gdal.so.1.0",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "libgdal.so",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "libgdal1.6.0.so",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "libgdal1.7.0.so",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# ifdef _WIN32
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "gdal300.dll",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "gdal204.dll",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "gdal203.dll",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "gdal202.dll",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "gdal201.dll",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "gdal200.dll",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "gdal111.dll",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "gdal110.dll",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "gdal19.dll",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "gdal18.dll",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "gdal17.dll",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "gdal16.dll",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "gdal15.dll",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "gdal11.dll",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "gdal.1.0.dll",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "libgdal-1.dll",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "gdal.dll",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "@PREFIX@/lib/libgdal.dylib",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NULL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int i;
</span></pre><pre style='margin:0'>
</pre>