CVS commit: pkgsrc/geography/proj

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

Module Name:    pkgsrc
Committed By:   gdt
Date:           Mon Mar  2 13:52:17 UTC 2026

Modified Files:
        pkgsrc/geography/proj: Makefile PLIST distinfo
Removed Files:
        pkgsrc/geography/proj/patches: patch-CMakeLists.txt

Log Message:
geography/proj: Update to 9.8.0

Require c++17 (belatedly; was in 9.6.0 NEWS).

Drop cmake patch to avoid gcc warning flag, fixed better upstream
which tests for the flag and conditionally includes it.

Upstream NEWS for 9.8.0:

* Database: update to EPSG v12.049 (#4671)

* Database: update ESRI records to ArcGIS Pro 3.6 (#4622)

* Support for Canadian vertical references MTM CGVD2013 epoch 1997, 2002, 2010 and
  UTM CGVD28 epoch 1997, 2002, 2010 (#4623)

* `createOperationsCompoundToGeog()`: improvement to make "PNG94 / PNGMG94 zone 54 + Kumul
  34 height" to "WGS 84 (G2139)" perform vertical transformation (#4624)

* Remove hardcoding of 'ETRS89-NOR [EUREF89]' cases and generalize it to other ETRS89-XXX
  cases (#4625)

* Database: create ESRI aliases for geodetic_datum and geodetic_crs even if they are the
  same as EPSG ones (#4626)

* Use Emscripten fetch in networkfilemanager (#4627)

* `ProjectedCRS::identify()`: do not return CRS whose ellipsoid is totally different from the input one (#4635)

* `projinfo` added as a library function. This installs a new header: `projapps_lib.h`. (#4646)

* respect `CRS_EXTENT_USE=NONE` for ConcatenatedOperations (#4652)

* Add support for  Equidistant Cylindrical ellipsoidal method (EPSG:1028) (#4656)

* Update `proj_symbol_rename.h` (#4657)

* WKT1 importer: deal with 'VERT_CS["Geoid 2012A",' (#4659)

* Generate correct library name in `proj.pc` (#4660)

* Derived projected CRS related improvements (#4667)

* ETRS89-xxx to ETRS89-yyy related improvements (#4668)

* `createCoordinateOperation()`: tune computed accuracy of a concatenated op within ETRS89 (#4670)

* `createOperationsCompoundToGeog()`: discard 2D-only transformations from interpolation
  3D CRS to target 3D CRS (#4677)


To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 pkgsrc/geography/proj/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/geography/proj/PLIST
cvs rdiff -u -r1.35 -r1.36 pkgsrc/geography/proj/distinfo
cvs rdiff -u -r1.5 -r0 pkgsrc/geography/proj/patches/patch-CMakeLists.txt

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

Modified files:

Index: pkgsrc/geography/proj/Makefile
diff -u pkgsrc/geography/proj/Makefile:1.63 pkgsrc/geography/proj/Makefile:1.64
--- pkgsrc/geography/proj/Makefile:1.63 Fri Feb  6 10:04:56 2026
+++ pkgsrc/geography/proj/Makefile      Mon Mar  2 13:52:17 2026
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.63 2026/02/06 10:04:56 wiz Exp $
+# $NetBSD: Makefile,v 1.64 2026/03/02 13:52:17 gdt Exp $
 
-VERSION_BASE=  9.7.1
+VERSION_BASE=  9.8.0
 # Accommodate testing RCs (names like 9.0RC1, unpacking to 9.0).
 #VERSION_RC=   RC1
 VERSION=       ${VERSION_BASE}${VERSION_RC}
@@ -8,7 +8,6 @@ WRKFINAL=       proj-${VERSION_BASE}
 WRKSRC=                ${WRKDIR}/${WRKFINAL}
 DISTNAME=      proj-${VERSION}
 #PKGREVISION=  0
-PKGREVISION=   2
 CATEGORIES=    geography
 MASTER_SITES=  https://download.osgeo.org/proj/
 DISTFILES=     ${DISTNAME}${EXTRACT_SUFX}
@@ -24,7 +23,7 @@ PREV_PKGPATH=         misc/proj
 
 USE_LANGUAGES=         c c++
 USE_CC_FEATURES=       c99
-USE_CXX_FEATURES=      c++11
+USE_CXX_FEATURES=      c++17
 
 USE_LIBTOOL=           yes
 USE_TOOLS+=            gmake pkg-config
@@ -44,7 +43,7 @@ CMAKE_CONFIGURE_ARGS+=        -DEMBED_RESOURCE_
 #CFLAGS+=              -DHAVE_C99_MATH=0
 #.endif
 
-# \todo Document, file uprsteam, and add uptream bug report URL.
+# \todo Document, file upstream, and add uptream bug report URL.
 CXXFLAGS.SunOS+=       -fpermissive
 
 # proj has tests that rely on precise IEEE754 double results, and fail
@@ -59,6 +58,9 @@ CXXFLAGS.SunOS+=      -fpermissive
 CFLAGS+=               -ffloat-store
 .endif
 
+PLIST_SUBST+=          VERSION=${VERSION_BASE}
+PRINT_PLIST_AWK+=      { gsub(/${VERSION_BASE}/, "$${VERSION}") }
+
 # Tests fail on NetBSD 9 earmv7hf-el, but this is apparently a bug in
 # GNU ld < 2.33:
 #   https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=baf46cd78048e1b959462567556e1de1ef6b9039

Index: pkgsrc/geography/proj/PLIST
diff -u pkgsrc/geography/proj/PLIST:1.19 pkgsrc/geography/proj/PLIST:1.20
--- pkgsrc/geography/proj/PLIST:1.19    Mon Dec  1 18:21:05 2025
+++ pkgsrc/geography/proj/PLIST Mon Mar  2 13:52:17 2026
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2025/12/01 18:21:05 gdt Exp $
+@comment $NetBSD: PLIST,v 1.20 2026/03/02 13:52:17 gdt Exp $
 bin/cct
 bin/cs2cs
 bin/geod
@@ -23,6 +23,7 @@ include/proj/util.hpp
 include/proj_constants.h
 include/proj_experimental.h
 include/proj_symbol_rename.h
+include/projapps_lib.h
 lib/cmake/proj/proj-config-version.cmake
 lib/cmake/proj/proj-config.cmake
 lib/cmake/proj/proj-targets-release.cmake
@@ -37,7 +38,7 @@ lib/cmake/proj4/proj4-targets-release.cm
 lib/cmake/proj4/proj4-targets.cmake
 lib/libproj.so
 lib/libproj.so.25
-lib/libproj.so.25.9.7.1
+lib/libproj.so.25.${VERSION}
 lib/pkgconfig/proj.pc
 man/man1/cct.1
 man/man1/cs2cs.1

Index: pkgsrc/geography/proj/distinfo
diff -u pkgsrc/geography/proj/distinfo:1.35 pkgsrc/geography/proj/distinfo:1.36
--- pkgsrc/geography/proj/distinfo:1.35 Mon Dec  1 18:21:05 2025
+++ pkgsrc/geography/proj/distinfo      Mon Mar  2 13:52:17 2026
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.35 2025/12/01 18:21:05 gdt Exp $
+$NetBSD: distinfo,v 1.36 2026/03/02 13:52:17 gdt Exp $
 
-BLAKE2s (proj-9.7.1.tar.gz) = d9afff04a8af1fbd7a5921c75ddd76b3a49ab66e5e2697846e6ee0aa9a5c1e0b
-SHA512 (proj-9.7.1.tar.gz) = fc5a35b8c89deeb4901bf77906fff009a0e7de3c96d26f5f40c6ad8620f5614700227fa80d8fbd38c737742ae813af4fdd3cb0bdc64abd8683f23ada5208d1fd
-Size (proj-9.7.1.tar.gz) = 5915221 bytes
-SHA1 (patch-CMakeLists.txt) = 4135a5cf31ed23a75b8c0b7367458642980776dd
+BLAKE2s (proj-9.8.0.tar.gz) = 802fd5ed4c0759a6eda8a7ce51bfe3ddf20bbb16349e87fc6cb719d1d362e113
+SHA512 (proj-9.8.0.tar.gz) = 892dd0c3a29176d6068b7c8329fd6d6cdbfc0fd15a483ca5d36939c180d25ff2896c6824fd10477ef8bae7578ad466eb16a087c264d67c5c6e34855331902bdf
+Size (proj-9.8.0.tar.gz) = 5980467 bytes