CVS commit: pkgsrc/geography/spatialindex

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

Module Name:    pkgsrc
Committed By:   gdt
Date:           Mon May 18 15:36:44 UTC 2026

Modified Files:
        pkgsrc/geography/spatialindex: Makefile PLIST buildlink3.mk distinfo

Log Message:
geography/spatialindex: Update to 2.0.0

packaging NEWS:

  Note that 2.0.0 is not the latest release.  As described on qgis
  lists, 2.1.0 changed how nearest neighbor queries with custom
  functions work and it does not seem possible to use them correctly.
  Thus pkgsrc is avoiding 2.1.0, as recommended by qgis.

Not mentioned in upstream NEWS:

  shlib version changed from 6.1.1 to 7.0.0

upstream NEWS content;

  2.0.0 has been released on 07 JUNE 2024. There are no significant
  major enhancements or refactorings that should change any
  behaviors. It had been a long time (almost 5 years!) since a release
  and 2.0.0 was the next version number...

  Changes of Note

      Added Ball Shape for point neighborhood queries by @Plaba in #232
      libspatialindex no longer emits debugging lint to stderr 0e26d16

  Build configuration

      Fix MinGW build by @SpaceIm in #185
      Allow building static libs by @SpaceIm in #183
      cmake targets by @hobu in #186
      CMakeLists.txt: fix CMAKE_BUILD_TYPE by @ffontaine in #188
      .gitignore: remove mostly autconf/automake components, add build by @mwtoews in #192
      CMake: modern formatting and features by @mwtoews in #196
      CMake: deprecate SIDX_BUILD_TESTS with CTest's BUILD_TESTING option by @mwtoews in #197
      CMake: fix find_package(libspatialindex) by @mwtoews in #199
      pkg-config: restore functionality (via CMake), change Cflags by @mwtoews in #201
      Export target namespace as 'libspatialindex' in CMake Targets #205 by @hobu in #207
      Fix building static libs by @m-kuhn in #223
      Modernize CMake configuration by @hobu in #240
      Release package building by @hobu in #242


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/geography/spatialindex/Makefile \
    pkgsrc/geography/spatialindex/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/geography/spatialindex/PLIST \
    pkgsrc/geography/spatialindex/buildlink3.mk

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

Modified files:

Index: pkgsrc/geography/spatialindex/Makefile
diff -u pkgsrc/geography/spatialindex/Makefile:1.4 pkgsrc/geography/spatialindex/Makefile:1.5
--- pkgsrc/geography/spatialindex/Makefile:1.4  Tue Sep 16 00:56:01 2025
+++ pkgsrc/geography/spatialindex/Makefile      Mon May 18 15:36:44 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2025/09/16 00:56:01 gdt Exp $
+# $NetBSD: Makefile,v 1.5 2026/05/18 15:36:44 gdt Exp $
 
 # Do not update to >= 2.1, because of an upstream bug that causes
 # incorrect results in qgis (and arguably, any other user of the
@@ -6,7 +6,7 @@
 #   https://github.com/libspatialindex/libspatialindex/issues/276
 #   https://lists.osgeo.org/pipermail/qgis-developer/2025-September/067804.html
 #   https://lists.osgeo.org/pipermail/qgis-developer/2025-September/067804.html
-DISTNAME=      spatialindex-src-1.9.3
+DISTNAME=      spatialindex-src-2.0.0
 PKGNAME=       ${DISTNAME:S/-src//}
 CATEGORIES=    geography
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=libspatialindex/}
@@ -20,6 +20,26 @@ COMMENT=     Robust spatial indexing methods
 LICENSE=       mit
 
 USE_LANGUAGES=         c c++
+USE_CXX_FEATURES+=     c++11
+
+# Remediate upstream spelling /bin/sh as /bin/bash.
+# https://github.com/libspatialindex/libspatialindex/issues/299
+SUBST_CLASSES+=                bash
+SUBST_STAGE.bash=      pre-test
+SUBST_FILES.bash=      test/*.sh test/*/*/run
+SUBST_SED.bash=                -e 's,/bin/bash,/bin/sh,g'
+
+# Testing is not documented and googletest is not described.
+# So far, testing does not seem useful, so left off.
+# https://github.com/libspatialindex/libspatialindex/issues/298
+#TEST_TARGET=  test
+#TEST_DEPENDS+=                googletest-[0-9]*:../../devel/googletest
 
 .include "../../devel/cmake/build.mk"
+
+# \todo Only for tests.
+#.include "../../devel/googletest/buildlink3.mk"
+# \todo Change googletest?  Other reason?
+#USE_CXX_FEATURES+=    c++17
+
 .include "../../mk/bsd.pkg.mk"
Index: pkgsrc/geography/spatialindex/distinfo
diff -u pkgsrc/geography/spatialindex/distinfo:1.4 pkgsrc/geography/spatialindex/distinfo:1.5
--- pkgsrc/geography/spatialindex/distinfo:1.4  Wed Feb 15 23:17:32 2023
+++ pkgsrc/geography/spatialindex/distinfo      Mon May 18 15:36:44 2026
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2023/02/15 23:17:32 wiz Exp $
+$NetBSD: distinfo,v 1.5 2026/05/18 15:36:44 gdt Exp $
 
-BLAKE2s (spatialindex-src-1.9.3.tar.bz2) = 8acafd9a2d4af01695a94ff5b19d48036a028477f2269685c6aec83585dd9e3b
-SHA512 (spatialindex-src-1.9.3.tar.bz2) = 7922807a2f7026542a014d3d7943da5410429b291cf469267ffea5b8075eab2a94e68b6c013425615d221b930fd319c403f3bf43404c9b1d2c92d0e2baae3066
-Size (spatialindex-src-1.9.3.tar.bz2) = 520817 bytes
+BLAKE2s (spatialindex-src-2.0.0.tar.bz2) = c5c383b17515953de9322df499def6dc609472105565b6c5c2bde3ed6571c15a
+SHA512 (spatialindex-src-2.0.0.tar.bz2) = 5838c8845ccfe4cf3b527414332d62d6cdacaf690b43b95162493e29b026b5e28630ea6cac732ad3ab0d2ac53ee13d1f021cf0e4b25735e87ba8f5b49380235b
+Size (spatialindex-src-2.0.0.tar.bz2) = 504814 bytes

Index: pkgsrc/geography/spatialindex/PLIST
diff -u pkgsrc/geography/spatialindex/PLIST:1.2 pkgsrc/geography/spatialindex/PLIST:1.3
--- pkgsrc/geography/spatialindex/PLIST:1.2     Wed Feb 15 23:17:32 2023
+++ pkgsrc/geography/spatialindex/PLIST Mon May 18 15:36:44 2026
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.2 2023/02/15 23:17:32 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2026/05/18 15:36:44 gdt Exp $
+include/spatialindex/Ball.h
 include/spatialindex/LineSegment.h
 include/spatialindex/MVRTree.h
 include/spatialindex/MovingPoint.h
@@ -29,9 +30,14 @@ include/spatialindex/tools/PointerPool.h
 include/spatialindex/tools/PoolPointer.h
 include/spatialindex/tools/Tools.h
 include/spatialindex/tools/rand48.h
+lib/cmake/libspatialindex/libspatialindexConfig.cmake
+lib/cmake/libspatialindex/libspatialindexConfigVersion.cmake
+lib/cmake/libspatialindex/libspatialindexTargets-release.cmake
+lib/cmake/libspatialindex/libspatialindexTargets.cmake
 lib/libspatialindex.so
-lib/libspatialindex.so.6
-lib/libspatialindex.so.6.1.1
+lib/libspatialindex.so.7
+lib/libspatialindex.so.7.0.0
 lib/libspatialindex_c.so
-lib/libspatialindex_c.so.6
-lib/libspatialindex_c.so.6.1.1
+lib/libspatialindex_c.so.7
+lib/libspatialindex_c.so.7.0.0
+lib/pkgconfig/libspatialindex.pc
Index: pkgsrc/geography/spatialindex/buildlink3.mk
diff -u pkgsrc/geography/spatialindex/buildlink3.mk:1.2 pkgsrc/geography/spatialindex/buildlink3.mk:1.3
--- pkgsrc/geography/spatialindex/buildlink3.mk:1.2     Wed Feb 15 23:17:32 2023
+++ pkgsrc/geography/spatialindex/buildlink3.mk Mon May 18 15:36:44 2026
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2023/02/15 23:17:32 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2026/05/18 15:36:44 gdt Exp $
 
 BUILDLINK_TREE+=       spatialindex
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        spatialindex
 SPATIALINDEX_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.spatialindex+=   spatialindex>=1.8.5
-BUILDLINK_ABI_DEPENDS.spatialindex+=   spatialindex>=1.9.3
+BUILDLINK_ABI_DEPENDS.spatialindex+=   spatialindex>=2.0.0
 BUILDLINK_PKGSRCDIR.spatialindex?=     ../../geography/spatialindex
 .endif # SPATIALINDEX_BUILDLINK3_MK