CVS commit: pkgsrc/geography/gama

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Fri Apr 19 00:09:04 UTC 2024

Modified Files:
        pkgsrc/geography/gama: Makefile distinfo
Added Files:
        pkgsrc/geography/gama/patches: patch-configure
            patch-lib_gnu__gama_local_deformation.cpp
            patch-tests_gama-local_src_check__version.cpp

Log Message:
geography/gama: Update to 2.30

Upstream changes:

  minor/bugfixes

Packaging changes:

  remediate test ==

  add missing headers (detected by macOS/clang; standards say they are
  required but gcc builds without them)


To generate a diff of this commit:
cvs rdiff -u -r1.68 -r1.69 pkgsrc/geography/gama/Makefile
cvs rdiff -u -r1.37 -r1.38 pkgsrc/geography/gama/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/geography/gama/patches/patch-configure \
    pkgsrc/geography/gama/patches/patch-lib_gnu__gama_local_deformation.cpp \
    pkgsrc/geography/gama/patches/patch-tests_gama-local_src_check__version.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/geography/gama/Makefile
diff -u pkgsrc/geography/gama/Makefile:1.68 pkgsrc/geography/gama/Makefile:1.69
--- pkgsrc/geography/gama/Makefile:1.68 Tue Feb 20 12:01:01 2024
+++ pkgsrc/geography/gama/Makefile      Fri Apr 19 00:09:04 2024
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.68 2024/02/20 12:01:01 gdt Exp $
+# $NetBSD: Makefile,v 1.69 2024/04/19 00:09:04 gdt Exp $
 #
 
-DISTNAME=      gama-2.29
+DISTNAME=      gama-2.30
 CATEGORIES=    geography
 MASTER_SITES=  ${MASTER_SITE_GNU:=gama/}
 

Index: pkgsrc/geography/gama/distinfo
diff -u pkgsrc/geography/gama/distinfo:1.37 pkgsrc/geography/gama/distinfo:1.38
--- pkgsrc/geography/gama/distinfo:1.37 Tue Feb 20 12:01:01 2024
+++ pkgsrc/geography/gama/distinfo      Fri Apr 19 00:09:04 2024
@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.37 2024/02/20 12:01:01 gdt Exp $
+$NetBSD: distinfo,v 1.38 2024/04/19 00:09:04 gdt Exp $
 
-BLAKE2s (gama-2.29.tar.gz) = 5deba15cdbdbd4c1de2788a6deffab94eaa17339e72c51f7cc3e0b98179f3faf
-SHA512 (gama-2.29.tar.gz) = e7fa85edd666e8d9068b6b4559fcb945b648ee0268825f5482dee68e9f19fdbad74c51f07a3671d5dd71964adb937b8eab01ce10dbc80fa94958e4937d17a814
-Size (gama-2.29.tar.gz) = 15433693 bytes
+BLAKE2s (gama-2.30.tar.gz) = 7f04cea68f1d4de51a526efa45e6020084ec353def10efcf70375c28c3309148
+SHA512 (gama-2.30.tar.gz) = c205ade7182484819b2b59437d21142fd26531bc8c9ccf75b5177f46f673af6724188358e562d42773996ee9ceed41aff1016e382eddcdb345b173811ed13766
+Size (gama-2.30.tar.gz) = 15438619 bytes
+SHA1 (patch-configure) = fe310c3ddf799e96bcede402e82c8ecd7aef7bee
+SHA1 (patch-lib_gnu__gama_local_deformation.cpp) = 5054f73c7d5bdd66280cf33070c13b4774221b54
+SHA1 (patch-tests_gama-local_src_check__version.cpp) = 34d553ee4e0e614a9bce64420ddc7b97dddf7229

Added files:

Index: pkgsrc/geography/gama/patches/patch-configure
diff -u /dev/null pkgsrc/geography/gama/patches/patch-configure:1.1
--- /dev/null   Fri Apr 19 00:09:04 2024
+++ pkgsrc/geography/gama/patches/patch-configure       Fri Apr 19 00:09:04 2024
@@ -0,0 +1,17 @@
+$NetBSD: patch-configure,v 1.1 2024/04/19 00:09:04 gdt Exp $
+
+Remediate "test ==" (bashism).
+
+Reported upstream by email 20240412.
+
+--- configure.orig     2024-04-14 13:05:56.818284356 +0000
++++ configure
+@@ -6339,7 +6339,7 @@ then :
+ fi
+ 
+ 
+-if test x$enable_expat_1_1 == x
++if test x$enable_expat_1_1 = x
+ then :
+   enable_expat_1_1=yes
+ fi
Index: pkgsrc/geography/gama/patches/patch-lib_gnu__gama_local_deformation.cpp
diff -u /dev/null pkgsrc/geography/gama/patches/patch-lib_gnu__gama_local_deformation.cpp:1.1
--- /dev/null   Fri Apr 19 00:09:04 2024
+++ pkgsrc/geography/gama/patches/patch-lib_gnu__gama_local_deformation.cpp     Fri Apr 19 00:09:04 2024
@@ -0,0 +1,16 @@
+$NetBSD: patch-lib_gnu__gama_local_deformation.cpp,v 1.1 2024/04/19 00:09:04 gdt Exp $
+
+Use of std::ostringstream requires sstream.
+
+Reported upstream by email 20240413.
+
+--- lib/gnu_gama/local/deformation.cpp.orig    2024-03-12 10:55:34.000000000 +0000
++++ lib/gnu_gama/local/deformation.cpp
+@@ -21,6 +21,7 @@
+ 
+ #include <iostream>
+ #include <map>
++#include <sstream>
+ #include <vector>
+ 
+ #include <gnu_gama/local/deformation.h>
Index: pkgsrc/geography/gama/patches/patch-tests_gama-local_src_check__version.cpp
diff -u /dev/null pkgsrc/geography/gama/patches/patch-tests_gama-local_src_check__version.cpp:1.1
--- /dev/null   Fri Apr 19 00:09:04 2024
+++ pkgsrc/geography/gama/patches/patch-tests_gama-local_src_check__version.cpp Fri Apr 19 00:09:04 2024
@@ -0,0 +1,16 @@
+$NetBSD: patch-tests_gama-local_src_check__version.cpp,v 1.1 2024/04/19 00:09:04 gdt Exp $
+
+Use of std::ostringstream requires sstream.
+
+Not yet reported upstream.
+
+--- tests/gama-local/src/check_version.cpp.orig        2024-04-14 23:02:47.223962253 +0000
++++ tests/gama-local/src/check_version.cpp
+@@ -20,6 +20,7 @@
+ 
+ #include <iostream>
+ #include <fstream>
++#include <sstream>
+ #include <regex>
+ #include <gnu_gama/version.h>
+