mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-19 00:13:33 +00:00
Code Issues Releases Activity

converters/osm2pgsql: update 1.7.2 → 1.8.0

Browse Source 
- Rapidjson dependency is no longer needed
- Switch to USES=luajit
This commit is contained in:
Dmitry Marakasov 2023-01-30 17:45:14 +03:00
parent ccaa220972
commit 516b8d8c01
3 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
converters/osm2pgsql/Makefile
View File

@ -1,6 +1,5 @@
PORTNAME= osm2pgsql
PORTVERSION= 1.7.2
PORTREVISION= 3
PORTVERSION= 1.8.0
CATEGORIES= converters geography
MAINTAINER= amdmi3@FreeBSD.org
@ -16,8 +15,7 @@ LIB_DEPENDS= libproj.so:graphics/proj \
libboost_system.so:devel/boost-libs \
libexpat.so:textproc/expat2
BUILD_DEPENDS= ${LOCALBASE}/include/osmium/version.hpp:astro/libosmium \
${LOCALBASE}/include/protozero/version.hpp:devel/protozero \
${LOCALBASE}/include/rapidjson/stringbuffer.h:devel/rapidjson
${LOCALBASE}/include/protozero/version.hpp:devel/protozero
USE_GITHUB= yes
GH_ACCOUNT= openstreetmap
@ -26,8 +24,7 @@ USES= cmake compiler:c++17-lang pgsql python:run shebangfix
SHEBANG_FILES= scripts/osm2pgsql-replication
CMAKE_ON= CMAKE_DISABLE_FIND_PACKAGE_Git \
EXTERNAL_LIBOSMIUM \
EXTERNAL_PROTOZERO \
EXTERNAL_RAPIDJSON
EXTERNAL_PROTOZERO
# EXTERNAL_FMT # XXX: does not build with libfmt 9.x from ports, so use bundled version until upstream fixes
CMAKE_ARGS= -DLUA_EXE="${LOCALBASE}/bin/${LUA_CMD}"
@ -38,8 +35,7 @@ OPTIONS_DEFINE= DOCS LUAJIT TEST
LUAJIT_DESC= Build with LuaJIT support
LUAJIT_CMAKE_BOOL= WITH_LUAJIT
LUAJIT_LIB_DEPENDS= libluajit-5.1.so:lang/luajit
LUAJIT_USES= lua:54:build # just for running tests in fact
LUAJIT_USES= luajit lua:54:build # lua is needed just for running tests
LUAJIT_USES_OFF= lua:54
TEST_CMAKE_BOOL= BUILD_TESTS
TEST_TEST_TARGET= test

6
converters/osm2pgsql/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1668181735
SHA256 (openstreetmap-osm2pgsql-1.7.2_GH0.tar.gz) = 94c72ceb3c401c816499339f8765c62efbf40685a798dcdf9a4bf7dbedf6c7a5
SIZE (openstreetmap-osm2pgsql-1.7.2_GH0.tar.gz) = 2627913
TIMESTAMP = 1675081473
SHA256 (openstreetmap-osm2pgsql-1.8.0_GH0.tar.gz) = b266b50f46fe4d1caddab61d26b39f10ea33b896ec23b8b3e294be4666e7b927
SIZE (openstreetmap-osm2pgsql-1.8.0_GH0.tar.gz) = 2544929

4
converters/osm2pgsql/files/patch-CMakeLists.txt
View File

@ -13,8 +13,8 @@
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_BINARY_DIR})
find_package(Osmium 2.17.3 REQUIRED COMPONENTS io)
-include_directories(SYSTEM ${OSMIUM_INCLUDE_DIRS} ${PROTOZERO_INCLUDE_DIR} ${FMT_INCLUDE_DIR} ${RAPIDJSON_INCLUDE_DIR})
+include_directories(SYSTEM ${OSMIUM_INCLUDE_DIRS} ${PROTOZERO_INCLUDE_DIR} ${RAPIDJSON_INCLUDE_DIR})
-include_directories(SYSTEM ${OSMIUM_INCLUDE_DIRS} ${PROTOZERO_INCLUDE_DIR} ${FMT_INCLUDE_DIR})
+include_directories(SYSTEM ${OSMIUM_INCLUDE_DIRS} ${PROTOZERO_INCLUDE_DIR})
if (WITH_LUA)
if (WITH_LUAJIT)