From 99011bebfa395386ec544402e258b7350175b670 Mon Sep 17 00:00:00 2001
From: Nicklas Larsson <n_larsson@yahoo.com>
Date: Mon, 24 Feb 2025 19:17:04 +0100
Subject: [PATCH] grass: update to 8.4.1

---
 gis/grass/Portfile | 31 +++++++++++++------------------
 1 file changed, 13 insertions(+), 18 deletions(-)

diff --git a/gis/grass/Portfile b/gis/grass/Portfile
index cd50723594f94..3e9e5153e45d8 100644
--- a/gis/grass/Portfile
+++ b/gis/grass/Portfile
@@ -2,17 +2,12 @@
 
 PortSystem          1.0
 PortGroup           debug 1.0
-PortGroup           github  1.0
 
 epoch               1
 
-# Revert to https://grass.osgeo.org as master site with next point release
-
-# name                grass
-github.setup        osgeo grass 8.4.0
-github.tarball_from releases
-# version             8.4.0
-revision            4
+name                grass
+version             8.4.1
+revision            0
 
 maintainers         {yahoo.com:n_larsson @nilason} openmaintainer
 categories          gis
@@ -32,12 +27,11 @@ long_description    GRASS GIS offers powerful raster, vector, and geospatial   \
                     to enable graphical user interface.
 
 homepage            https://grass.osgeo.org
-# master_sites        ${homepage}/grass[join [lrange [split ${version} .] 0 1] {}]/source/
-worksrcdir          grass
+master_sites        ${homepage}/grass[join [lrange [split ${version} .] 0 1] {}]/source/
 
-checksums           rmd160  f8f4a671ad8b97a562a19c635b2577597decbebf \
-                    sha256  5669a217ba4cee3e7a514b2e45038a42795f0d9030c02cc741878dcb53360de8 \
-                    size    69895829
+checksums           rmd160  8892e0067af6143986c2ad87ab55fa45e1247ed5 \
+                    sha256  d17dcf67e7c9bcd7103d53f4ba46a9d88430d84c6ce1350650b7021d62db0864 \
+                    size    69956380
 
 depends_build-append \
                     port:bison \
@@ -108,7 +102,9 @@ configure.args-append \
                     --with-zstd-libs=${prefix}/lib \
                     --with-x=no
 
-set python_suffixes {39 310 311 312}
+set python_suffixes {39 310 311 312 313}
+# keep python_default in sync with qgis3
+set python_default 312
 
 if {${subport} eq ${name}} {
     build.target    default
@@ -244,7 +240,7 @@ if {${subport} eq ${name}} {
         set pydefault "${pydefault}!\[variant_isset python${suffix}\] && "
     }
     set pydefault [string range ${pydefault} 0 end-4]
-    set pydefault "${pydefault}} { default_variants +python${suffix} }"
+    set pydefault "${pydefault}} { default_variants +python${python_default} }"
     eval ${pydefault}
 
     post-configure {
@@ -283,8 +279,7 @@ subport grass-gui {
     build               {}
 
     # Python variants
-    # for the time being, missing `py312-wxpython-4.0`, skip Python 3.12
-    set python_suffixes {39 310 311}
+    set python_suffixes {39 310 311 312 313}
     set py_grass        [lindex $python_suffixes end]
     set py_variant      ${py_grass}
     foreach pyver ${python_suffixes} {
@@ -322,7 +317,7 @@ version of 'grass'. Change +python${py_variant} to +python${py_grass}."
         set pydefault "${pydefault}!\[variant_isset python${suffix}\] && "
     }
     set pydefault [string range ${pydefault} 0 end-4]
-    set pydefault "${pydefault}} { default_variants +python${suffix} }"
+    set pydefault "${pydefault}} { default_variants +python${python_default} }"
     eval ${pydefault}
 
     # Create app bundle