aboutsummaryrefslogtreecommitdiff
path: root/converters
diff options
context:
space:
mode:
authorDmitry Marakasov <amdmi3@FreeBSD.org>2022-11-02 16:11:20 +0000
committerDmitry Marakasov <amdmi3@FreeBSD.org>2022-11-03 12:09:17 +0000
commit78cfe65ee0c8b6f73a06b8ca4333b2aa40e15f54 (patch)
tree97a6b317d32aff5dd48a3a64bcf36012b3d28e94 /converters
parent058d5ac7166ea1adb9b5b1a13dd4e5497b1848b2 (diff)
downloadports-78cfe65ee0c8b6f73a06b8ca4333b2aa40e15f54.tar.gz
ports-78cfe65ee0c8b6f73a06b8ca4333b2aa40e15f54.zip
converters/osm2pgsql: update 1.7.0 → 1.7.1
Diffstat (limited to 'converters')
-rw-r--r--converters/osm2pgsql/Makefile6
-rw-r--r--converters/osm2pgsql/distinfo6
-rw-r--r--converters/osm2pgsql/files/patch-f7b99c16928c09ab4baa4962850af635132f7beb50
3 files changed, 57 insertions, 5 deletions
diff --git a/converters/osm2pgsql/Makefile b/converters/osm2pgsql/Makefile
index 2d75960bee76..76a038d12131 100644
--- a/converters/osm2pgsql/Makefile
+++ b/converters/osm2pgsql/Makefile
@@ -1,10 +1,12 @@
PORTNAME= osm2pgsql
-PORTVERSION= 1.7.0
+PORTVERSION= 1.7.1
CATEGORIES= converters geography
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= Convert OSM XML data to PostgreSQL database
-WWW= https://wiki.openstreetmap.org/wiki/Osm2pgsql
+WWW= https://osm2pgsql.org/ \
+ https://wiki.openstreetmap.org/wiki/Osm2pgsql \
+ https://github.com/openstreetmap/osm2pgsql
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
diff --git a/converters/osm2pgsql/distinfo b/converters/osm2pgsql/distinfo
index 5c066a03fcfc..0ba3f7cc4b01 100644
--- a/converters/osm2pgsql/distinfo
+++ b/converters/osm2pgsql/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1660665094
-SHA256 (openstreetmap-osm2pgsql-1.7.0_GH0.tar.gz) = 0f722baf0f04eda387d934d86228aae07d848993900db6b9e7ab312c91fd84e5
-SIZE (openstreetmap-osm2pgsql-1.7.0_GH0.tar.gz) = 2620585
+TIMESTAMP = 1667404495
+SHA256 (openstreetmap-osm2pgsql-1.7.1_GH0.tar.gz) = 76c303bfb28440eee546d0f7327565a08d6dac20a915f95dbb4bf21f2e691141
+SIZE (openstreetmap-osm2pgsql-1.7.1_GH0.tar.gz) = 2626690
diff --git a/converters/osm2pgsql/files/patch-f7b99c16928c09ab4baa4962850af635132f7beb b/converters/osm2pgsql/files/patch-f7b99c16928c09ab4baa4962850af635132f7beb
new file mode 100644
index 000000000000..eb175ff4714e
--- /dev/null
+++ b/converters/osm2pgsql/files/patch-f7b99c16928c09ab4baa4962850af635132f7beb
@@ -0,0 +1,50 @@
+From f7b99c16928c09ab4baa4962850af635132f7beb Mon Sep 17 00:00:00 2001
+From: Sarah Hoffmann <lonvia@denofr.de>
+Date: Sat, 22 Oct 2022 11:52:11 +0200
+Subject: [PATCH] always expect osm2pgsql in same path as osm2pgsql-replication
+
+Anything else causes issues with the installation process of cmake.
+---
+ CMakeLists.txt | 3 +--
+ scripts/osm2pgsql-replication | 9 +++------
+ 2 files changed, 4 insertions(+), 8 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 7fbc8ce06..dea959ed6 100644
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -337,6 +337,5 @@ include(GNUInstallDirs)
+ if (ENABLE_INSTALL)
+ install(TARGETS osm2pgsql DESTINATION bin)
+ install(FILES default.style empty.style DESTINATION share/osm2pgsql)
+- install(CODE "set(OSM2PGSQL_BINDIR ${CMAKE_INSTALL_FULL_BINDIR})
+- configure_file(${PROJECT_SOURCE_DIR}/scripts/osm2pgsql-replication ${CMAKE_INSTALL_FULL_BINDIR}/osm2pgsql-replication)")
++ install(PROGRAMS scripts/osm2pgsql-replication DESTINATION bin)
+ endif()
+diff --git a/scripts/osm2pgsql-replication b/scripts/osm2pgsql-replication
+index e721da350..0485169c8 100755
+--- scripts/osm2pgsql-replication
++++ scripts/osm2pgsql-replication
+@@ -51,10 +51,7 @@ except ImportError:
+
+ LOG = logging.getLogger()
+
+-# Will be replaced when installed via CMake.
+-INSTALL_PREFIX = '@OSM2PGSQL_BINDIR@/'
+-if INSTALL_PREFIX.startswith('@'):
+- INSTALL_PREFIX = ''
++OSM2PGSQL_PATH = Path(__file__).parent.resolve() / 'osm2pgsql'
+
+ def pretty_format_timedelta(seconds):
+ minutes = int(seconds/60)
+@@ -493,8 +490,8 @@ def get_parser():
+ help='File to save changes before they are applied to osm2pgsql.')
+ cmd.add_argument('--max-diff-size', type=int, default=500,
+ help='Maximum data to load in MB (default: 500MB)')
+- cmd.add_argument('--osm2pgsql-cmd', default=INSTALL_PREFIX + 'osm2pgsql',
+- help=f'Path to osm2pgsql command (default: {INSTALL_PREFIX}osm2pgsql)')
++ cmd.add_argument('--osm2pgsql-cmd', default=str(OSM2PGSQL_PATH),
++ help=f'Path to osm2pgsql command (default: {OSM2PGSQL_PATH})')
+ cmd.add_argument('--once', action='store_true',
+ help='Run updates only once, even when more data is available.')
+ cmd.add_argument('--post-processing', metavar='SCRIPT',