<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/c679581c7c17277e31418c3604a65273bc69c4c5">https://github.com/macports/macports-ports/commit/c679581c7c17277e31418c3604a65273bc69c4c5</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit c679581c7c17277e31418c3604a65273bc69c4c5
</span>Author: nilason <n_larsson@yahoo.com>
AuthorDate: Sat Jun 24 18:40:03 2023 +0200
<span style='display:block; white-space:pre;color:#404040;'> grass: update to version 8.3.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - Make 'sqlite3' dependant, remove the variant.
</span><span style='display:block; white-space:pre;color:#404040;'> - Add Python 3.11 variant.
</span>---
gis/grass/Portfile | 26 ++++++++++----------------
gis/grass/files/01_patch-dyld-link.diff | 16 ++++++++++------
2 files changed, 20 insertions(+), 22 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 65b607d8561..8223d92a14f 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.2.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup OSGeo grass 8.3.0
</span> name grass
epoch 1
set main_version [join [lrange [split ${version} "."] 0 1] ""]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 6
</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 https://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 52ab9c515c461f9ceb1b1340ac77effe015ce11e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 8116202fb15352646442862230c7ca48ff8943b7bb83626160ce134980843abd \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 66827246
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 a7f7fc66266f093eb02881a4593af9997b87e53e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 8a38d297a41316ec0af1e4b4f8d00738f1fd98be768b8c6001b00e88817a2764 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 68481826
</span>
depends_build port:pkgconfig
depends_lib port:bzip2 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,6 +41,7 @@ depends_lib port:bzip2 \
</span> port:liblas\
path:lib/pkgconfig/cairo.pc:cairo \
port:zlib \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:sqlite3 \
</span> port:readline
patchfiles 01_patch-dyld-link.diff 02_grass-python.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -71,8 +72,6 @@ configure.args-append \
</span> --with-pdal=${prefix}/bin/pdal-config \
--with-tiff-includes=${prefix}/include \
--with-tiff-libs=${prefix}/lib \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-png-includes=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-png-libs=${prefix}/lib \
</span> --with-geos=${prefix}/bin/geos-config \
--with-liblas=${prefix}/bin/liblas-config \
--without-postgres \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -87,13 +86,16 @@ configure.args-append \
</span> --with-zstd \
--with-zstd-includes=${prefix}/include \
--with-zstd-libs=${prefix}/lib \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-sqlite \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-sqlite-includes=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-sqlite-libs=${prefix}/lib \
</span> --with-readline-includes=${prefix}/include/readline \
--with-readline-libs=${prefix}/lib
build.target default
# Python 3 variants
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set python_suffixes {36 37 38 39 310}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python_suffixes {36 37 38 39 310 311}
</span> set python_variants {}
foreach pyver ${python_suffixes} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -184,7 +186,6 @@ variant gui description {Build with wxPython GUI and application bundle} {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-wxwidgets=${wxWidgets.wxconfig}
</span> configure.args-delete --with-opengl=no
configure.args-append --with-opengl=osx
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -295,13 +296,6 @@ set pgdefault "${pgdefault}} { default_variants +postgresql${suffix} }"
</span>
eval ${pgdefault}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant sqlite description {Add SQLite 3 support} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:sqlite3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-sqlite
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-sqlite-includes=${prefix}/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-sqlite-libs=${prefix}/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> variant openblas description {Use OpenBLAS for BLAS/LAPACK} {
depends_lib-append port:openblas
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/grass/files/01_patch-dyld-link.diff b/gis/grass/files/01_patch-dyld-link.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 4e065ffdcc2..6ca52222b44 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/grass/files/01_patch-dyld-link.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/grass/files/01_patch-dyld-link.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,28 +1,32 @@
</span> Use dynamic linking instead of hardcoded rpath.
lib/init/grass.py: Use LD_RUN_PATH instead of DYLD_LIBRARY_PATH to pass lib path to ctypesgen
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2023-01-21 18:40:37.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2023-05-31 23:25:26.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4045,9 +4045,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2023-06-24 12:01:41.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2023-06-24 18:05:22.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4327,10 +4327,10 @@
</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:#e0ffe0;'>+- SHLIB_LDX="${CXX} -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> + 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;'>++ SHLIB_LDX="${CXX} -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> LDFLAGS="-Wl,-rpath,${INSTDIR}/lib,-rpath,\${GISBASE}/lib"
- LD_LIBRARY_PATH_VAR="LD_RUN_PATH"
+ 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:#ffe0e0;'>---- aclocal.m4.orig 2023-01-21 18:40:37.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ aclocal.m4 2023-05-31 23:25:26.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -506,9 +506,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- aclocal.m4.orig 2023-06-24 12:01:41.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ aclocal.m4 2023-06-24 18:06:08.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -512,10 +512,10 @@
</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:#e0ffe0;'>+- SHLIB_LDX="${CXX} -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> + 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;'>++ SHLIB_LDX="${CXX} -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> LDFLAGS="-Wl,-rpath,${INSTDIR}/lib,-rpath,\${GISBASE}/lib"
- LD_LIBRARY_PATH_VAR="LD_RUN_PATH"
+ LD_LIBRARY_PATH_VAR="DYLD_LIBRARY_PATH"
</pre><pre style='margin:0'>
</pre>