<pre style='margin:0'>
Vincent (Veence) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/fb098cb6c9a5df0e16d138b692fdf81abdf61e27">https://github.com/macports/macports-ports/commit/fb098cb6c9a5df0e16d138b692fdf81abdf61e27</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 fb098cb6c9a grass: revitalize port for GRASS v 8.0
</span>fb098cb6c9a is described below
<span style='display:block; white-space:pre;color:#808000;'>commit fb098cb6c9a5df0e16d138b692fdf81abdf61e27
</span>Author: nilason <n_larsson@yahoo.com>
AuthorDate: Fri Jan 14 15:16:04 2022 +0100
<span style='display:block; white-space:pre;color:#404040;'> grass: revitalize port for GRASS v 8.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Co-authored-by: Ryan Schmidt <ryandesign@macports.org>
</span>---
gis/grass/Portfile | 326 +++++++++++++++++++++++++-
gis/grass/files/patch-Makefile.diff | 39 ---
gis/grass/files/patch-configure.diff | 14 --
gis/grass/files/patch-dyld-link.diff | 29 +++
gis/grass/files/patch-ffmpeg.diff | 11 -
gis/grass/files/patch-is_void.diff | 41 ----
gis/grass/files/patch-lib-init-grass.src.diff | 9 -
gis/grass/files/patch-macosx_Makefile.diff | 11 -
gis/grass/files/patch-r-in-pdal.diff | 20 ++
9 files changed, 370 insertions(+), 130 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 c9be9380f9f..a04d572e08c 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;'>@@ -1,11 +1,327 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# -*- coding: utf-8; mode: tcl; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=2:ts=2:sts=2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
</span>
PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup wxWidgets 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup debug 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup compilers 1.0
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup OSGeo grass 8.0.1
</span> name grass
epoch 1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 6.4.6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-replaced_by grass7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup obsolete 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set main_version [join [lrange [split ${version} "."] 0 1] ""]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set realVersion ${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distname grass-${realVersion}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers nomaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories gis
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license GPL-2+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platforms darwin
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+description GRASS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description GRASS is a Geographic Information System (GIS) used for \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ geospatial data management and analysis.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage http://grass.osgeo.org/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites ${homepage}grass[join [lrange [split ${realVersion} .] 0 1] {}]/source/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 b2ee2f92fc546d9632b139d2366d6be9558c4e26 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 e925bf8c44e1809459974457f2ab3c61dd5a24c0655ed026de665d1494f68a96 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 64928098
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib port:bzip2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:freetype \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:fftw-3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gdal \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pdal \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:geos \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:tiff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libpng \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:liblas\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/cairo.pc:cairo \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:zlib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:readline
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-dyld-link.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-r-in-pdal.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cflags-append -DGL_SILENCE_DEPRECATION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.pre_args \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --prefix=${prefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --exec-prefix=${prefix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-opengl=no \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-opencl=no \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-openmp=no \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-x \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-bzlib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-bzlib-includes=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-bzlib-libs=${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-fftw-includes=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-fftw-libs=${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-freetype \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-freetype-includes=${prefix}/include/freetype2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-freetype-libs=${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-gdal=${prefix}/bin/gdal-config \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-pdal=${prefix}/bin/pdal-config \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-tiff-includes=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-tiff-libs=${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-png-includes=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-png-libs=${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-geos=${prefix}/bin/geos-config \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-liblas=${prefix}/bin/liblas-config \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-postgres \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-mysql \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-pthread \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-cairo \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-cairo-includes=${prefix}/include/cairo \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-cairo-libs=${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-blas=no \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-lapack=no \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-readline \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-zstd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-zstd-includes=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-zstd-libs=${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-readline-includes=${prefix}/include/readline \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-readline-libs=${prefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.target default
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Python 3 variants
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python_suffixes {36 37 38 39}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python_variants {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach pyver ${python_suffixes} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend python_variants python${pyver}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach pyver ${python_suffixes} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set index [lsearch -exact ${python_variants} python${pyver}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set conf [lreplace ${python_variants} ${index} ${index}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant python${pyver} description "Use python${pyver}" conflicts {*}${conf} "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:python${pyver} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${pyver}-Pillow \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${pyver}-numpy \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${pyver}-six
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run-append port:py${pyver}-psycopg2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Patches scripts to launch the selected Python version (fixes #59954)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach pyver ${python_suffixes} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset python${pyver}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set pyversion [string index ${pyver} 0].[string range ${pyver} 1 end]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set pybin ${prefix}/bin/python${pyversion}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fs-traverse f ${worksrcpath} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[file extension ${f}] eq ".py"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -q "s|/usr/bin/env python3|${pybin}|" ${f}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|PYVER.*|PYVER = ${pyversion}|" ${worksrcpath}/macosx/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|^PYTHON.*|PYTHON = ${pybin}|" ${worksrcpath}/include/Make/Platform.make.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|MACOS = sys.platform.startswith(\"darwin\")|&\\nos.environ\[\"GRASS_PYTHON\"\] = \"${pybin}\"|" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/lib/init/grass.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Use LD_RUN_PATH instead of DYLD_LIBRARY_PATH to pass lib path to ctypesgen
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|LD_LIBRARY_PATH_VAR = \".*|LD_LIBRARY_PATH_VAR = \"LD_RUN_PATH\"|" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/lib/init/grass.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Python default
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set pydefault "if {"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach suffix ${python_suffixes} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set pydefault "${pydefault}!\[variant_isset python${suffix}\] && "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set pydefault [string range ${pydefault} 0 end-4]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set pydefault "${pydefault}} { default_variants +python${suffix} }"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+eval ${pydefault}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set proj_versions {6 7 8}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set proj_variants {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach pjver ${proj_versions} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend proj_variants proj${pjver}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach proj_ver ${proj_versions} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set index [lsearch -exact ${proj_variants} proj${proj_ver}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set cflcts [lreplace ${proj_variants} ${index} ${index}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant proj${proj_ver} description "Use Proj${proj_ver}" conflicts {*}${cflcts} "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:proj${proj_ver}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env PATH=$::env(PATH):${prefix}/lib/proj${proj_ver}/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env PATH=$::env(PATH):${prefix}/lib/proj${proj_ver}/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-proj-includes=${prefix}/lib/proj${proj_ver}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-proj-libs=${prefix}/lib/proj${proj_ver}/lib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-proj-share=${prefix}/lib/proj${proj_ver}/share/proj
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set projdf "if {"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach pv ${proj_versions} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set projdf "${projdf}!\[variant_isset proj${pv}\] && "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set projdf [string range ${projdf} 0 end-4]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set projdf "${projdf}} { default_variants +proj${pv} }"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+eval ${projdf}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant gui description {Build with wxPython GUI and application bundle} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ wxWidgets.use wxWidgets-3.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:${wxWidgets.port}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach pyver ${python_suffixes} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset python${pyver}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:py${pyver}-wxpython-4.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-wxwidgets=${wxWidgets.wxconfig}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete --with-opengl=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-opengl=osx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Create app bundle
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global app_name
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set app_name_version [join [lrange [split ${version} "."] 0 1] "."]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set app_name GRASS-${app_name_version}.app
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-build {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d -m 0755 ${worksrcpath}/${app_name}/Contents
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d -m 0755 ${worksrcpath}/${app_name}/Contents/Resources
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d -m 0755 ${worksrcpath}/${app_name}/Contents/MacOS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set script [open "${worksrcpath}/${app_name}/Contents/MacOS/GRASS" w 0755]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts ${script} "#!/usr/bin/osascript"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts ${script} ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts ${script} "tell application \"Terminal\" to do script \"${prefix}/bin/grass${main_version} --gui; exit\""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ close ${script}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${worksrcpath}/macosx/app/AppIcon.icns \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/${app_name}/Contents/Resources/AppIcon.icns
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${worksrcpath}/macosx/app/GRASSDocument_gxw.icns \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/${app_name}/Contents/Resources/GRASSDocument_gxw.icns
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set info_plist ${worksrcpath}/${app_name}/Contents/Info.plist
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${worksrcpath}/macosx/app/Info.plist.in ${info_plist}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set version_file [open ${worksrcpath}/include/VERSION]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set version_data [split [read ${version_file}] "\n"]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ close ${version_file}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set grass_version_major [lindex ${version_data} 0]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set grass_version_minor [lindex ${version_data} 1]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set grass_version_date [lindex ${version_data} 3]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set bundle_version [join [lrange ${version_data} 0 2] "."]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@GRASS_VERSION_MAJOR@|${grass_version_major}|" ${info_plist}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@GRASS_VERSION_MINOR@|${grass_version_minor}|" ${info_plist}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@GRASS_VERSION_DATE@|${grass_version_date}|" ${info_plist}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@BUNDLE_VERSION@|${bundle_version}|" ${info_plist}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@DEPLOYMENT_TARGET@|${macosx_deployment_target}|" ${info_plist}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${worksrcpath}/${app_name} ${destroot}${applications_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# OpenMPI
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant openmpi description {Add OpenMPI support} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete --with-openmp=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-openmp=yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-openmp-includes=${prefix}/include/libomp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-openmp-libs=${prefix}/lib/libomp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compilers.choose cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compilers.setup clang13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.compiler macports-clang-13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.ldflags-append -L${prefix}/lib/libomp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant mysql57 conflicts mysql8 description {Add MySQL 5.7 support} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:mysql57
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace --without-mysql \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-mysql-includes=${prefix}/include/mysql57/mysql \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-mysql-libs=${prefix}/lib/mysql57/mysql
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append MYSQLD_CONFIG=${prefix}/lib/mysql57/bin/mysql_config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant mysql8 conflicts mysql57 description {Add MySQL 8 support} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:mysql8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace --without-mysql \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-mysql-includes=${prefix}/include/mysql8/mysql \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-mysql-libs=${prefix}/lib/mysql8/mysql
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append MYSQLD_CONFIG=${prefix}/lib/mysql8/bin/mysql_config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# PostGreSQL variants (from the GDAL port)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set postgresql_suffixes {10 11 12 13 14}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set postgresql_variants {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach suffix ${postgresql_suffixes} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend postgresql_variants postgresql${suffix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach suffix ${postgresql_suffixes} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set vrt postgresql${suffix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set pgversion [string index ${suffix} 0].[string index ${suffix} 1]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set index [lsearch -exact ${postgresql_variants} ${vrt}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set conf [lreplace ${postgresql_variants} ${index} ${index}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant ${vrt} description "Use PostgreSQL ${pgversion}" conflicts {*}${conf} "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:${vrt}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-postgres-includes=${prefix}/include/${vrt}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-postgres-libs=${prefix}/lib/${vrt}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete --with-postgres=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-postgres=yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# PostGreSQL default
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set pgdefault "if {"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach suffix ${postgresql_suffixes} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set pgdefault "${pgdefault}!\[variant_isset postgresql${suffix}\] && "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set pgdefault [string range ${pgdefault} 0 end-4]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set pgdefault "${pgdefault}} { default_variants +postgresql${suffix} }"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+eval ${pgdefault}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant sqlite description {Add SQLite 3 support} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:sqlite3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-sqlite
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-sqlite-includes=${prefix}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-sqlite-libs=${prefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant openblas description {Use OpenBLAS for BLAS/LAPACK} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:openblas
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete --with-blas=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete --with-lapack=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-blas=yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-lapack=yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-liblas=${prefix}/bin/liblas-config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-lapack-includes=${prefix}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-lapack-libs=${prefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-configure {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -E "s|\\\$\\\(CPPFLAGS)| \$(CPPFLAGS) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ \\\\\"-Drestrict=\\\\\" \\\\\"-D__attribute__(x)=\\\\\" \\\\\"-D_Nonnull=\\\\\" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ \\\\\"-Dint8_t=char\\\\\" \\\\\"-DCF_INLINE=\\\\\" \\\\\"-D_Null_unspecified=\\\\\" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ \\\\\"-D__DARWIN_OS_INLINE=\\\\\"|" ${worksrcpath}/python/libgrass_interface_generator/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.type regex
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.url ${master_sites}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.regex grass-(\[0-9.\]+)[quotemeta ${extract.suffix}]
</span><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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 07072713de1..00000000000
</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;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,39 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile.orig 2014-12-16 16:11:04.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile 2018-02-27 06:23:00.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -24,7 +24,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Install directories
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- exec_prefix= ${prefix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--BINDIR= ${UNIX_BIN}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+BINDIR= ${DESTDIR}${UNIX_BIN}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Shell commands
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MAKE_DIR_CMD= mkdir -p -m 755
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -81,6 +81,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- include $(MODULE_TOPDIR)/include/Make/Docs.make
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- include $(MODULE_TOPDIR)/include/Make/Doxygen.make
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+FINAL_GISBASE:=${INST_DIR}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+INST_DIR:=${DESTDIR}${INST_DIR}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default: builddemolocation
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @echo "GRASS GIS compilation log" > $(ERRORLOG)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @echo "-------------------------" >> $(ERRORLOG)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -273,7 +276,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- test -d ${INST_DIR} || ${MAKE_DIR_CMD} ${INST_DIR}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @##### test -d ${INST_DIR}/dev || ${MAKE_DIR_CMD} ${INST_DIR}/dev
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- test -d ${BINDIR} || ${MAKE_DIR_CMD} ${BINDIR}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- -sed -e "s#GISBASE=.*#GISBASE=${INST_DIR}#" ${ARCH_BINDIR}/grass${GRASS_VERSION_MAJOR}${GRASS_VERSION_MINOR} > ${BINDIR}/grass${GRASS_VERSION_MAJOR}${GRASS_VERSION_MINOR}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ -sed -e "s#GISBASE=.*#GISBASE=${FINAL_GISBASE}#" ${ARCH_BINDIR}/grass${GRASS_VERSION_MAJOR}${GRASS_VERSION_MINOR} > ${BINDIR}/grass${GRASS_VERSION_MAJOR}${GRASS_VERSION_MINOR}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -chmod a+x ${BINDIR}/grass${GRASS_VERSION_MAJOR}${GRASS_VERSION_MINOR}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -cd ${GISBASE} ; tar cBf - $(FILES) | (cd ${INST_DIR} ; tar xBf - ) 2>/dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -cd ${GISBASE} ; tar cBf - bin | (cd ${INST_DIR} ; tar xBf - ) 2>/dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -311,8 +314,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -tar cBf - gem/skeleton | (cd ${INST_DIR}/etc ; tar xBf - ) 2>/dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -${INSTALL} gem/gem$(GRASS_VERSION_MAJOR)$(GRASS_VERSION_MINOR) ${BINDIR} 2>/dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- @# enable OSX Help Viewer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- @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
</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;'>- install-strip: FORCE
</span><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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0b504f4d52f..00000000000
</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;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2016-08-17 02:18:55.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2018-02-27 06:16:59.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1430,9 +1430,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Set INST_DIR
</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;'>-- INSTDIR='${prefix}'"/GRASS-${GRASS_VERSION_MAJOR}.${GRASS_VERSION_MINOR}.app/Contents/MacOS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ INSTDIR='@@APPLICATIONS_DIR@@'"/GRASS-${GRASS_VERSION_MAJOR}.${GRASS_VERSION_MINOR}.app/Contents/MacOS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- INSTDIR='${prefix}'"/grass-${GRASS_VERSION_MAJOR}.${GRASS_VERSION_MINOR}.${GRASS_VERSION_RELEASE}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ INSTDIR='${prefix}'"/share/grass-${GRASS_VERSION_MAJOR}.${GRASS_VERSION_MINOR}.${GRASS_VERSION_RELEASE}"
</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;color:#808080;'>diff --git a/gis/grass/files/patch-dyld-link.diff b/gis/grass/files/patch-dyld-link.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..2ef9ef13cca
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/grass/files/patch-dyld-link.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,29 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- aclocal.m4.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ aclocal.m4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -506,9 +506,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *-apple-darwin*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SHLIB_CFLAGS="-fno-common"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SHLIB_SUFFIX=".dylib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SHLIB_LD="${CC} -dynamiclib -compatibility_version \${GRASS_VERSION_MAJOR}.\${GRASS_VERSION_MINOR} -current_version \${GRASS_VERSION_MAJOR}.\${GRASS_VERSION_MINOR} -install_name @rpath/lib\${LIB_NAME}\${SHLIB_SUFFIX}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LDFLAGS="-Wl,-rpath,${INSTDIR}/lib,-rpath,\${GISBASE}/lib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LD_LIBRARY_PATH_VAR="LD_RUN_PATH"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ SHLIB_LD="${CC} -dynamiclib -compatibility_version \${GRASS_VERSION_MAJOR}.\${GRASS_VERSION_MINOR} -current_version \${GRASS_VERSION_MAJOR}.\${GRASS_VERSION_MINOR} -install_name \${INST_DIR}/lib/lib\${LIB_NAME}\${SHLIB_SUFFIX}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ LD_LIBRARY_PATH_VAR="DYLD_LIBRARY_PATH"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *-sun-solaris*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Note: If _REENTRANT isn't defined, then Solaris
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4050,9 +4050,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *-apple-darwin*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SHLIB_CFLAGS="-fno-common"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SHLIB_SUFFIX=".dylib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SHLIB_LD="${CC} -dynamiclib -compatibility_version \${GRASS_VERSION_MAJOR}.\${GRASS_VERSION_MINOR} -current_version \${GRASS_VERSION_MAJOR}.\${GRASS_VERSION_MINOR} -install_name @rpath/lib\${LIB_NAME}\${SHLIB_SUFFIX}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LDFLAGS="-Wl,-rpath,${INSTDIR}/lib,-rpath,\${GISBASE}/lib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LD_LIBRARY_PATH_VAR="LD_RUN_PATH"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ SHLIB_LD="${CC} -dynamiclib -compatibility_version \${GRASS_VERSION_MAJOR}.\${GRASS_VERSION_MINOR} -current_version \${GRASS_VERSION_MAJOR}.\${GRASS_VERSION_MINOR} -install_name \${INST_DIR}/lib/lib\${LIB_NAME}\${SHLIB_SUFFIX}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ LD_LIBRARY_PATH_VAR="DYLD_LIBRARY_PATH"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *-sun-solaris*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Note: If _REENTRANT isn't defined, then Solaris
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/grass/files/patch-ffmpeg.diff b/gis/grass/files/patch-ffmpeg.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 49ca30a53d1..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/grass/files/patch-ffmpeg.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/ogsf/gsd_img_mpeg.c.orig 2013-10-03 10:01:55.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/ogsf/gsd_img_mpeg.c 2013-10-03 10:02:38.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -31,7 +31,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <avutil.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* libavutil 51.22.1's avutil.h doesn't include libavutil/mathematics.h */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <mathematics.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <libavutil/mathematics.h>
</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;'>- /* 5 seconds stream duration */
</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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index fc78080de4b..00000000000
</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;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,41 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://trac.osgeo.org/grass/ticket/2170
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- raster/r.terraflow/direction.cpp.orig 2016-07-20 09:58:41.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ raster/r.terraflow/direction.cpp 2018-02-27 06:23:54.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -53,11 +53,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(!is_nodata(elevwin.get())) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dir = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (elevwin.get(5) < elevwin.get() && !is_void(elevwin.get(5))) dir |= 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (elevwin.get(3) < elevwin.get() && !is_void(elevwin.get(3))) dir |= 16;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (elevwin.get(5) < elevwin.get() && !elevation_type_is_void(elevwin.get(5))) dir |= 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (elevwin.get(3) < elevwin.get() && !elevation_type_is_void(elevwin.get(3))) dir |= 16;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for(int i=0; i<3; i++) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if(elevwin.get(i) < elevwin.get() && !is_void(elevwin.get(i))) dir |= 32<<i;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if(elevwin.get(i+6) < elevwin.get() && !is_void(elevwin.get(6+i))) dir |= 8>>i;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(elevwin.get(i) < elevwin.get() && !elevation_type_is_void(elevwin.get(i))) dir |= 32<<i;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(elevwin.get(i+6) < elevwin.get() && !elevation_type_is_void(elevwin.get(6+i))) dir |= 8>>i;
</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;'>---- raster/r.terraflow/nodata.cpp.orig 2016-07-20 09:58:41.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ raster/r.terraflow/nodata.cpp 2018-02-27 06:23:54.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -73,7 +73,7 @@
</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;'>- int
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--is_void(elevation_type el) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+elevation_type_is_void(elevation_type el) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return (el == nodataType::ELEVATION_NODATA);
</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;'>---- raster/r.terraflow/nodata.h.orig 2012-09-01 04:52:26.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ raster/r.terraflow/nodata.h 2018-02-27 06:23:54.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -37,7 +37,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int is_nodata(elevation_type el);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int is_nodata(int x);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int is_nodata(float x);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--int is_void(elevation_type el);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+int elevation_type_is_void(elevation_type el);
</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;'>- class nodataType : public ijBaseType {
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/grass/files/patch-lib-init-grass.src.diff b/gis/grass/files/patch-lib-init-grass.src.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 838fe3a78d7..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/grass/files/patch-lib-init-grass.src.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,9 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/init/grass.src.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/init/grass.src
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -21,5 +21,6 @@ trap "echo 'User break!' ; exit" 2 3 9 15
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Set the GISBASE variable
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GISBASE="GISBASE_VALUE"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- export GISBASE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+export GRASS_PYTHON=@@PYTHON@@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- exec "$GISBASE/etc/Init.sh" "$@"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/grass/files/patch-macosx_Makefile.diff b/gis/grass/files/patch-macosx_Makefile.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 5becd7965c6..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/grass/files/patch-macosx_Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- macosx/Makefile.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ macosx/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -35,6 +35,8 @@ FILES = AUTHORS COPYING CHANGES REQUIREMENTS.html GPL.TXT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- include $(MODULE_TOPDIR)/include/Make/Dir.make
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+INST_DIR:=${DESTDIR}${INST_DIR}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default: subdirs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- include bundle.make
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/grass/files/patch-r-in-pdal.diff b/gis/grass/files/patch-r-in-pdal.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..d6e51dc88f5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/grass/files/patch-r-in-pdal.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- raster/r.in.pdal/info.cpp.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ raster/r.in.pdal/info.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -34,7 +34,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pdal::LasReader las_reader;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ las_reader.setOptions(las_opts);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ las_reader.prepare(table);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- pdal::LasHeader las_header = las_reader.header();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const pdal::LasHeader& las_header = las_reader.header();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (first) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *min_x = las_header.minX();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *min_y = las_header.minY();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -95,7 +95,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pdal::LasReader las_reader;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ las_reader.setOptions(las_opts);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ las_reader.prepare(table);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- pdal::LasHeader las_header = las_reader.header();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const pdal::LasHeader& las_header = las_reader.header();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pdal::PointLayoutPtr point_layout = table.layout();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const pdal::Dimension::IdList & dims = point_layout->dims();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>