cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

geo/osm2pgsql: update to 1.6.0.

Browse Source 
see https://osm2pgsql.org/news/2022/01/24/release-1.6.0.html
This commit is contained in:
landry 2022-04-19 09:50:27 +00:00
parent b43dee6e92
commit 01b93143d2
7 changed files with 29 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
geo/osm2pgsql/Makefile
View File

@ -1,9 +1,8 @@
COMMENT = OSM data to PostgreSQL converter
GH_TAGNAME = 1.4.2
GH_TAGNAME = 1.6.0
GH_PROJECT = osm2pgsql
GH_ACCOUNT = openstreetmap
REVISION = 1
CATEGORIES = geo databases
@ -30,7 +29,10 @@ LIB_DEPENDS = databases/postgresql \
BUILD_DEPENDS = devel/libtool \
devel/fmt \
devel/protozero \
geo/libosmium>=2.15.6
geo/libosmium>=2.17.0
RUN_DEPENDS += geo/py-osmium${MODPY_FLAVOR} \
databases/py-psycopg2${MODPY_FLAVOR}
# postgresql,-contrib is needed for hstore extension
TEST_DEPENDS = databases/py-psycopg2 \

4
geo/osm2pgsql/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (osm2pgsql-1.4.2.tar.gz) = /GgoOTDM1GjtmyhoUVB0GxYIP+yGgApLARiEriLrBhw=
SIZE (osm2pgsql-1.4.2.tar.gz) = 2469766
SHA256 (osm2pgsql-1.6.0.tar.gz) = Dsi1irlyrINWGFr0FhJwwbYlp3KZ8J5ft/ReYW7xqaU=
SIZE (osm2pgsql-1.6.0.tar.gz) = 2592649

8
geo/osm2pgsql/patches/patch-CMakeLists_txt
View File

@ -10,3 +10,11 @@ Index: CMakeLists.txt
include_directories(SYSTEM ${LUA_INCLUDE_DIR})
endif()
set(HAVE_LUA 1)
@@ -336,6 +336,6 @@ add_subdirectory(docs)
if (ENABLE_INSTALL)
install(TARGETS osm2pgsql DESTINATION bin)
install(PROGRAMS scripts/osm2pgsql-replication DESTINATION bin)
- install(FILES docs/osm2pgsql-replication.1 DESTINATION share/man/man1)
+ install(FILES docs/osm2pgsql-replication.1 DESTINATION man/man1)
install(FILES default.style empty.style DESTINATION share/osm2pgsql)
endif()

20
geo/osm2pgsql/patches/patch-docs_osm2pgsql_1
View File

@ -1,21 +1,21 @@
Index: docs/osm2pgsql.1
--- docs/osm2pgsql.1.orig
+++ docs/osm2pgsql.1
@@ -197,7 +197,7 @@ If the RAM is not big enough, use about 75% of memory.
@@ -153,7 +153,7 @@ If the RAM is not big enough, use about 75% of memory.
Make sure to leave enough RAM for PostgreSQL.
It needs at least the amount of \f[C]shared_buffers\f[] given in its
It needs at least the amount of \f[C]shared_buffers\f[R] given in its
configuration.
-Defaults to 800.
+Defaults to 100.
.RS
.RE
.TP
@@ -290,7 +290,7 @@ The style file.
--cache-strategy=STRATEGY
This deprecated option will be ignored.
@@ -212,7 +212,7 @@ The style file.
This specifies how the data is imported into the database, its format
depends on the output.
(For the \f[B]pgsql\f[] output, the default is
-\f[C]/usr/share/osm2pgsql/default.style\f[], for other outputs there is
+\f[C]${TRUEPREFIX}/usr/share/osm2pgsql/default.style\f[], for other outputs there is
(For the \f[B]pgsql\f[R] output, the default is
-\f[C]/usr/share/osm2pgsql/default.style\f[R], for other outputs there is
+\f[C]${TRUEPREFIX}/share/osm2pgsql/default.style\f[R], for other outputs there is
no default.)
.RS
.RE
.SH PGSQL OUTPUT OPTIONS
.TP

2
geo/osm2pgsql/patches/patch-src_options_cpp
View File

@ -1,7 +1,7 @@
Index: src/options.cpp
--- src/options.cpp.orig
+++ src/options.cpp
@@ -136,7 +136,7 @@ Common options:\n\
@@ -138,7 +138,7 @@ Common options:\n\
required if you want to update with --append later.\n\
--drop Only with --slim: drop temporary tables after import\n\
(no updates are possible).\n\

2
geo/osm2pgsql/patches/patch-src_options_hpp
View File

@ -1,7 +1,7 @@
Index: src/options.hpp
--- src/options.hpp.orig
+++ src/options.hpp
@@ -72,7 +72,7 @@ class options_t (public)
@@ -97,7 +97,7 @@ class options_t (public)
std::shared_ptr<reprojection> projection; ///< SRS of projection
bool append = false; ///< Append to existing data
bool slim = false; ///< In slim mode

2
geo/osm2pgsql/pkg/PLIST
View File

@ -1,5 +1,7 @@
@bin bin/osm2pgsql
bin/osm2pgsql-replication
@man man/man1/osm2pgsql.1
@man man/man1/osm2pgsql-replication.1
share/osm2pgsql/
share/osm2pgsql/default.style
share/osm2pgsql/empty.style