proj: Update to 9.5.1RC2

diff --git a/proj/Makefile b/proj/Makefile
index e512d5e222470ca955edab6df62c7d8a8771534f..877d7e877192d1160e87d39417117bafb36ae9c3 100644 (file)
--- a/proj/Makefile
+++ b/proj/Makefile
@@ -2,12 +2,12 @@
 
 VERSION_BASE=  9.5.1
 # Accommodate testing RCs (names like 9.0RC1, unpacking to 9.0).
-VERSION_RC=    RC1
+VERSION_RC=    RC2
 VERSION=       ${VERSION_BASE}${VERSION_RC}
 WRKFINAL=      proj-${VERSION_BASE}
 WRKSRC=                ${WRKDIR}/${WRKFINAL}
 DISTNAME=      proj-${VERSION}
-PKGREVISION=   3
+#PKGREVISION=  0
 CATEGORIES=    geography
 MASTER_SITES=  https://download.osgeo.org/proj/
 DISTFILES=     ${DISTNAME}${EXTRACT_SUFX}

diff --git a/proj/distinfo b/proj/distinfo
index 4d7c7863644e78b0ed91b721e9a7bc44ca0028e6..9aa9574ff28c6aefa9775e8e82743e619e885385 100644 (file)
--- a/proj/distinfo
+++ b/proj/distinfo
@@ -1,6 +1,5 @@
 $NetBSD: distinfo,v 1.24 2024/09/15 12:53:31 gdt Exp $
 
-BLAKE2s (proj-9.5.1RC1.tar.gz) = 458295e298a7bf8e5ec93e437f49a9e7d0c0a0ca35f80cd220da3c2362178234
-SHA512 (proj-9.5.1RC1.tar.gz) = 02c46e2e47dc65dd1dc52b7e02bbd9d9802915d4fb301dd187df846b110b3f7c55f8ac531b25962e657f81bbd0d16f1baf24508f6049692f2b1621b7e7d0ec65
-Size (proj-9.5.1RC1.tar.gz) = 5702389 bytes
-SHA1 (patch-data_CMakeLists.txt) = eeae6e976aeb5fa35efd99096a52253e788a8592
+BLAKE2s (proj-9.5.1RC2.tar.gz) = ad43b92e6196f7e1649f29adda587e01f45fe58453fb11b4f127e36c96f0dded
+SHA512 (proj-9.5.1RC2.tar.gz) = 66078ebca236477324859ad2dab492e10bbd23f65cc53f588b468dce2176b66b42ea50613d05bd99a144ecd66d33628e335d2b1e9382f6a8cf36ee9619505a09
+Size (proj-9.5.1RC2.tar.gz) = 5702355 bytes

diff --git a/proj/patches/patch-data_CMakeLists.txt b/proj/patches/patch-data_CMakeLists.txt
deleted file mode 100644 (file)
index 29c4ea1..0000000
--- a/proj/patches/patch-data_CMakeLists.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD$
-
-Fix upstream bug, fix expected in RC2.
-https://salsa.debian.org/debian-gis-team/proj/-/raw/debian/9.5.1_rc1-1_exp1/debian/patches/generate_proj_db.patch?ref_type=tags
-
---- data/CMakeLists.txt.orig   2024-11-26 16:57:37.313886158 +0000
-+++ data/CMakeLists.txt
-@@ -45,7 +45,7 @@ set(ALL_SQL_IN "${CMAKE_CURRENT_BINARY_D
- set(PROJ_DB "${CMAKE_CURRENT_BINARY_DIR}/proj.db")
- include(sql_filelist.cmake)
- 
--set(PROJ_DB_SQL_EXPECTED_MD5 "79e88859b5e194b02d45edf80e80ada9")
-+set(PROJ_DB_SQL_EXPECTED_MD5 "0491c73526276ee8e99fe8f4597f9565")
- 
- add_custom_command(
-   OUTPUT ${PROJ_DB}