CVS commit: pkgsrc/geography/osm2pgsql

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

Module Name:    pkgsrc
Committed By:   gdt
Date:           Mon Mar 10 22:54:38 UTC 2025

Modified Files:
        pkgsrc/geography/osm2pgsql: Makefile distinfo
Added Files:
        pkgsrc/geography/osm2pgsql/patches: patch-man_CMakeLists.txt
Removed Files:
        pkgsrc/geography/osm2pgsql/patches: patch-docs_CMakeLists.txt

Log Message:
geography/osm2pgsal: Update to 1.11.0

Upstream NEWS content:

Release 1.11.0

This release makes the new middle database format the default. If you
have not switched already, you need to reimport your database to take
advantage of that.

We have changed the way we are parsing the command line options. The
new code uses the CLI11 library (a copy of which is included in the
repository) and is much cleaner and also much stricter. You now get
warnings (and sometimes errors) for many combinations of options that
don't make sense. Please check the output from osm2pgsql and
osm2pgsql-replication for such messages and fix your command lines
accordingly. Note especially that duplicated options are not allowed
any more. This can happen, for instance, when using
osm2pgsql-replication which adds the database connection parameters
(such as -d) when it calls osm2pgsql.

Release 1.10.0

This is a relatively small but still important release.

The new middle table format has changed slightly: the tags field can
now be NULL. This makes storage more efficient and indexing
faster. The new middle format is now declared stable and production
ready. To use it, use the command line option
--middle-database-format=new, in a future version of osm2pgsql this
will become the new default. If you have used this option already with
one of the 1.9.x versions of osm2pgsql you have to reload your
database or use this SQL command to update the table: ALTER TABLE
<name> ALTER COLUMN tags DROP NOT NULL;, for <name> use
planet_osm_nodes, planet_osm_ways, and planet_osm_rels or the
equivalents if you are using a different table name prefix.


To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 pkgsrc/geography/osm2pgsql/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/geography/osm2pgsql/distinfo
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/geography/osm2pgsql/patches/patch-docs_CMakeLists.txt
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/geography/osm2pgsql/patches/patch-man_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/osm2pgsql/Makefile
diff -u pkgsrc/geography/osm2pgsql/Makefile:1.56 pkgsrc/geography/osm2pgsql/Makefile:1.57
--- pkgsrc/geography/osm2pgsql/Makefile:1.56    Mon Jan  6 19:18:00 2025
+++ pkgsrc/geography/osm2pgsql/Makefile Mon Mar 10 22:54:38 2025
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.56 2025/01/06 19:18:00 gdt Exp $
+# $NetBSD: Makefile,v 1.57 2025/03/10 22:54:38 gdt Exp $
 
-DISTNAME=      osm2pgsql-1.9.2
+DISTNAME=      osm2pgsql-1.11.0
 CATEGORIES=    geography
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=openstreetmap/}
 GITHUB_TAG=    ${PKGVERSION_NOREV}
@@ -39,12 +39,14 @@ TEST_TARGET=        test
 .include "../../textproc/nlohmann-json/buildlink3.mk"
 
 # vendored libs which could be provided:
+#   CLI11
 #   fmt
 #   libosmium
 #   protozero
 
 # optional for generalization:
 #   cimg
+#   opencv
 #   potrace
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/geography/osm2pgsql/distinfo
diff -u pkgsrc/geography/osm2pgsql/distinfo:1.11 pkgsrc/geography/osm2pgsql/distinfo:1.12
--- pkgsrc/geography/osm2pgsql/distinfo:1.11    Mon Jan  6 19:18:00 2025
+++ pkgsrc/geography/osm2pgsql/distinfo Mon Mar 10 22:54:38 2025
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.11 2025/01/06 19:18:00 gdt Exp $
+$NetBSD: distinfo,v 1.12 2025/03/10 22:54:38 gdt Exp $
 
-BLAKE2s (osm2pgsql-1.9.2.tar.gz) = 3ff365887a93410bc40d2a6c46037a505e5934e0ff1d4f591132f4d11c27ad82
-SHA512 (osm2pgsql-1.9.2.tar.gz) = b8685ad564be43cf7c4ea9e1bacb6cb00c88fb894f13888e802d86bf7912ade582b30eb05c53bb66119b7f14e4db0c8acced55e74ee4dc6c7c35fc96b8effc9f
-Size (osm2pgsql-1.9.2.tar.gz) = 2598971 bytes
-SHA1 (patch-docs_CMakeLists.txt) = 9b1d0e80cdaa2174328081a1d5e076e5d5d9e007
+BLAKE2s (osm2pgsql-1.11.0.tar.gz) = 8850f020cd39f4c3c84aadac0d79e5c4c5e99fa68ea8e17695c21b913f0b01da
+SHA512 (osm2pgsql-1.11.0.tar.gz) = 91df5a0428d9fc67c3830b9f6ac5de9cfe5b6dfee2980bb6807d3fe1796e040749c990ca696aa9462bf1e16f9c4fd95047ce1d4f71ae6c22f0d124f9cbeda430
+Size (osm2pgsql-1.11.0.tar.gz) = 2722008 bytes
+SHA1 (patch-docs_CMakeLists.txt) = 7ddfb3706cb6a67598a8f9e4027ae6b38fb4a811

Added files:

Index: pkgsrc/geography/osm2pgsql/patches/patch-man_CMakeLists.txt
diff -u /dev/null pkgsrc/geography/osm2pgsql/patches/patch-man_CMakeLists.txt:1.1
--- /dev/null   Mon Mar 10 22:54:38 2025
+++ pkgsrc/geography/osm2pgsql/patches/patch-man_CMakeLists.txt Mon Mar 10 22:54:38 2025
@@ -0,0 +1,21 @@
+$NetBSD: patch-man_CMakeLists.txt,v 1.1 2025/03/10 22:54:38 gdt Exp $
+
+Ask cmake config to respect CMAKE_INSTALL_MANDIR.
+
+\todo File upstream.
+
+--- man/CMakeLists.txt.orig    2025-01-06 18:19:00.158960664 +0000
++++ man/CMakeLists.txt
+@@ -62,9 +62,9 @@ if(MANPAGE_TARGETS)
+ endif()
+ 
+ if(ENABLE_INSTALL)
+-    install(FILES osm2pgsql.1 DESTINATION share/man/man1)
+-    install(FILES osm2pgsql-replication.1 DESTINATION share/man/man1)
++    install(FILES osm2pgsql.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
++    install(FILES osm2pgsql-replication.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
+     if (BUILD_GEN)
+-        install(FILES osm2pgsql-gen.1 COMPONENT gen EXCLUDE_FROM_ALL DESTINATION share/man/man1)
++        install(FILES osm2pgsql-gen.1 COMPONENT gen EXCLUDE_FROM_ALL DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
+     endif()
+ endif()