netbird/FreeBSD-ports
0
0
Fork 0
mirror of https://github.com/netbirdio/FreeBSD-ports.git synced 2026-05-22 18:42:42 -07:00
Code Issues Packages Projects Releases Wiki Activity

converters/osm2pgsql: update 1.5.1 → 1.6.0

Browse Source 
- Switch to latest lua
- Tweak depends
This commit is contained in:
Dmitry Marakasov
2022-03-15 14:50:06 +03:00
parent 1c27e08172
commit 526e37bd33
4 changed files with 27 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
converters/osm2pgsql/Makefile
+9 -9
View File
@@ -1,5 +1,5 @@
PORTNAME= osm2pgsql
PORTVERSION= 1.5.1
PORTVERSION= 1.6.0
CATEGORIES= converters geography
MAINTAINER= amdmi3@FreeBSD.org
@@ -10,24 +10,23 @@ LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libproj.so:graphics/proj \
libboost_system.so:devel/boost-libs \
libexpat.so:textproc/expat2 \
libfmt.so:devel/libfmt
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/rapidjson/stringbuffer.h:devel/rapidjson \
${LOCALBASE}/include/fmt/core.h:devel/libfmt
USE_GITHUB= yes
GH_ACCOUNT= openstreetmap
USES= cmake compiler:c++14-lang pgsql
USES= cmake compiler:c++14-lang pgsql python:run shebangfix
SHEBANG_FILES= scripts/osm2pgsql-replication
CMAKE_ON= CMAKE_DISABLE_FIND_PACKAGE_Git \
EXTERNAL_LIBOSMIUM \
EXTERNAL_PROTOZERO \
EXTERNAL_FMT \
EXTERNAL_RAPIDJSON
PLIST_FILES= bin/osm2pgsql \
share/man/man1/osm2pgsql.1.gz
CMAKE_ARGS= LUA_EXE="${LUA_CMD}"
PORTDOCS= AUTHORS CONTRIBUTING.md README.md
PORTDATA= *
@@ -37,7 +36,8 @@ 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_OFF= lua:53
LUAJIT_USES= lua:54:build # just for running tests in fact
LUAJIT_USES_OFF= lua:54
TEST_CMAKE_BOOL= BUILD_TESTS
TEST_TEST_TARGET= test
TEST_CMAKE_ON= -DCMAKE_CTEST_ARGUMENTS="--label-regex;NoDB;--output-on-failure"
converters/osm2pgsql/distinfo
+3 -3
View File
@@ -1,3 +1,3 @@
TIMESTAMP = 1629133137
SHA256 (openstreetmap-osm2pgsql-1.5.1_GH0.tar.gz) = 4df0d332e5d77a9d363f2f06f199da0ac23a0dc7890b3472ea1b5123ac363f6e
SIZE (openstreetmap-osm2pgsql-1.5.1_GH0.tar.gz) = 2577801
TIMESTAMP = 1647270699
SHA256 (openstreetmap-osm2pgsql-1.6.0_GH0.tar.gz) = 0ec8b58ab972ac8356185af4161270c1b625a77299f09e5fb7f45e616ef1a9a5
SIZE (openstreetmap-osm2pgsql-1.6.0_GH0.tar.gz) = 2592649
converters/osm2pgsql/files/patch-src_output-flex.cpp
+11
View File
@@ -0,0 +1,11 @@
--- src/output-flex.cpp.orig 2022-01-24 15:04:03 UTC
+++ src/output-flex.cpp
@@ -636,7 +636,7 @@ void output_flex_t::write_column(
}
} else {
throw std::runtime_error{
- "Column type {} not implemented."_format(column.type())};
+ "Column type {} not implemented."_format(static_cast<uint8_t>(column.type()))};
}
lua_pop(lua_state(), 1);
converters/osm2pgsql/pkg-plist
+4
View File
@@ -0,0 +1,4 @@
bin/osm2pgsql
bin/osm2pgsql-replication
share/man/man1/osm2pgsql.1.gz
share/man/man1/osm2pgsql-replication.1.gz