<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/94f88b22fb7528178f6c4db9eca28fa5a5ee652b">https://github.com/macports/macports-ports/commit/94f88b22fb7528178f6c4db9eca28fa5a5ee652b</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 94f88b22fb7 grass: bump to version 8.2.1
</span>94f88b22fb7 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 94f88b22fb7528178f6c4db9eca28fa5a5ee652b
</span>Author: nilason <n_larsson@yahoo.com>
AuthorDate: Sun Jan 22 13:36:07 2023 +0100
<span style='display:block; white-space:pre;color:#404040;'> grass: bump to version 8.2.1
</span>---
gis/grass/Portfile | 17 ++++++++++-------
gis/grass/files/patch-dyld-link.diff | 19 ++++++++++---------
gis/grass/files/patch-r-in-pdal.diff | 20 --------------------
3 files changed, 20 insertions(+), 36 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 f24c7bfea6a..a00f0a9459a 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;'>@@ -6,11 +6,11 @@ PortGroup github 1.0
</span> PortGroup debug 1.0
PortGroup compilers 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup OSGeo grass 8.0.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup OSGeo grass 8.2.1
</span> name grass
epoch 1
set main_version [join [lrange [split ${version} "."] 0 1] ""]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> set realVersion ${version}
distname grass-${realVersion}
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,9 +25,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 b2ee2f92fc546d9632b139d2366d6be9558c4e26 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 e925bf8c44e1809459974457f2ab3c61dd5a24c0655ed026de665d1494f68a96 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 64928098
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 52ab9c515c461f9ceb1b1340ac77effe015ce11e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 8116202fb15352646442862230c7ca48ff8943b7bb83626160ce134980843abd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 66827246
</span>
depends_build port:pkgconfig
depends_lib port:bzip2 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,11 +43,14 @@ depends_lib port:bzip2 \
</span> port:zlib \
port:readline
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-dyld-link.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-r-in-pdal.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-dyld-link.diff
</span>
configure.cflags-append -DGL_SILENCE_DEPRECATION
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# needed for PDAL 2.4+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.cxx_standard 2017
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cxxflags-append -std=c++17
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.pre_args \
--prefix=${prefix}/lib
configure.args-append \
<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><span style='display:block; white-space:pre;color:#808080;'>index 2ef9ef13cca..875be48bd52 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/grass/files/patch-dyld-link.diff
</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;'>@@ -1,29 +1,30 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- aclocal.m4.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- aclocal.m4.orig
</span> +++ aclocal.m4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -506,9 +506,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -506,9 +506,9 @@
</span> *-apple-darwin*)
SHLIB_CFLAGS="-fno-common"
SHLIB_SUFFIX=".dylib"
- 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 style='display:block; white-space:pre;background:#ffe0e0;'>-- LDFLAGS="-Wl,-rpath,${INSTDIR}/lib,-rpath,\${GISBASE}/lib"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- LD_LIBRARY_PATH_VAR="LD_RUN_PATH"
</span> + 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 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> + LD_LIBRARY_PATH_VAR="DYLD_LIBRARY_PATH"
;;
*-sun-solaris*)
# Note: If _REENTRANT isn't defined, then Solaris
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> --- configure.orig
+++ configure
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4050,9 +4050,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4045,9 +4045,9 @@
</span> *-apple-darwin*)
SHLIB_CFLAGS="-fno-common"
SHLIB_SUFFIX=".dylib"
- 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 style='display:block; white-space:pre;background:#ffe0e0;'>-- LDFLAGS="-Wl,-rpath,${INSTDIR}/lib,-rpath,\${GISBASE}/lib"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- LD_LIBRARY_PATH_VAR="LD_RUN_PATH"
</span> + 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 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> + LD_LIBRARY_PATH_VAR="DYLD_LIBRARY_PATH"
;;
<span style='display:block; white-space:pre;background:#ffe0e0;'>- *-sun-solaris*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Note: If _REENTRANT isn't defined, then Solaris
</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-r-in-pdal.diff b/gis/grass/files/patch-r-in-pdal.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index d6e51dc88f5..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/grass/files/patch-r-in-pdal.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,20 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- raster/r.in.pdal/info.cpp.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ raster/r.in.pdal/info.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -34,7 +34,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pdal::LasReader las_reader;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- las_reader.setOptions(las_opts);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- las_reader.prepare(table);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- pdal::LasHeader las_header = las_reader.header();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const pdal::LasHeader& las_header = las_reader.header();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (first) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *min_x = las_header.minX();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *min_y = las_header.minY();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -95,7 +95,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pdal::LasReader las_reader;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- las_reader.setOptions(las_opts);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- las_reader.prepare(table);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- pdal::LasHeader las_header = las_reader.header();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const pdal::LasHeader& las_header = las_reader.header();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pdal::PointLayoutPtr point_layout = table.layout();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const pdal::Dimension::IdList & dims = point_layout->dims();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>