diff options
| author | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2017-10-09 14:01:09 +0000 |
|---|---|---|
| committer | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2017-10-09 14:01:09 +0000 |
| commit | b56a2da45e99e977c0e4e60ca7f9c19d9129748f (patch) | |
| tree | ae5e4fe21729e32235a67f2002f456bf510a93a1 /converters/osm2pgsql | |
| parent | 444ccb0ab6738d245acf75d7f167d0c18ca3f033 (diff) | |
| download | ports-b56a2da45e99e977c0e4e60ca7f9c19d9129748f.tar.gz ports-b56a2da45e99e977c0e4e60ca7f9c19d9129748f.zip | |
- Update to 0.94.0
Notes
Notes:
svn path=/head/; revision=451615
Diffstat (limited to 'converters/osm2pgsql')
| -rw-r--r-- | converters/osm2pgsql/Makefile | 8 | ||||
| -rw-r--r-- | converters/osm2pgsql/distinfo | 6 | ||||
| -rw-r--r-- | converters/osm2pgsql/files/patch-CMakeLists.txt | 9 | ||||
| -rw-r--r-- | converters/osm2pgsql/files/patch-cmake_FindOsmium.cmake | 13 |
4 files changed, 5 insertions, 31 deletions
diff --git a/converters/osm2pgsql/Makefile b/converters/osm2pgsql/Makefile index 39ad31512cf6..3df0432804a5 100644 --- a/converters/osm2pgsql/Makefile +++ b/converters/osm2pgsql/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= osm2pgsql -PORTVERSION= 0.92.1 -PORTREVISION= 3 +PORTVERSION= 0.94.0 CATEGORIES= converters geography MAINTAINER= amdmi3@FreeBSD.org @@ -13,7 +12,6 @@ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libproj.so:graphics/proj \ - libgeos35.so:graphics/geos35 \ libboost_system.so:devel/boost-libs \ libexpat.so:textproc/expat2 @@ -33,9 +31,7 @@ PORTDATA= * OPTIONS_DEFINE= DOCS post-patch: - @${REINPLACE_CMD} -e 's|include <geos|&35/geos|' \ - ${WRKSRC}/contrib/libosmium/osmium/geom/geos.hpp \ - ${WRKSRC}/geometry-builder.cpp + @${REINPLACE_CMD} -e 's|share/man/man1|man/man1|' ${WRKSRC}/CMakeLists.txt post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} diff --git a/converters/osm2pgsql/distinfo b/converters/osm2pgsql/distinfo index b7a1455155c1..7f748d15f6b4 100644 --- a/converters/osm2pgsql/distinfo +++ b/converters/osm2pgsql/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1492513697 -SHA256 (openstreetmap-osm2pgsql-0.92.1_GH0.tar.gz) = 0912a344aaa38ed4b78f6dcab1a873975adb434dcc31cdd6fec3ec6a30025390 -SIZE (openstreetmap-osm2pgsql-0.92.1_GH0.tar.gz) = 1364504 +TIMESTAMP = 1507552761 +SHA256 (openstreetmap-osm2pgsql-0.94.0_GH0.tar.gz) = 9e67e400deca48185313921431884171fb087dfe9e0d21e31857b8b06f20d317 +SIZE (openstreetmap-osm2pgsql-0.94.0_GH0.tar.gz) = 1203310 diff --git a/converters/osm2pgsql/files/patch-CMakeLists.txt b/converters/osm2pgsql/files/patch-CMakeLists.txt deleted file mode 100644 index cc146264385b..000000000000 --- a/converters/osm2pgsql/files/patch-CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ ---- CMakeLists.txt.orig 2017-04-13 20:58:25 UTC -+++ CMakeLists.txt -@@ -252,5 +252,5 @@ endif() - ############################################################# - - install(TARGETS osm2pgsql DESTINATION bin) --install(FILES docs/osm2pgsql.1 DESTINATION share/man/man1) -+install(FILES docs/osm2pgsql.1 DESTINATION man/man1) - install(FILES default.style empty.style DESTINATION share/osm2pgsql) diff --git a/converters/osm2pgsql/files/patch-cmake_FindOsmium.cmake b/converters/osm2pgsql/files/patch-cmake_FindOsmium.cmake deleted file mode 100644 index f4dbca97a348..000000000000 --- a/converters/osm2pgsql/files/patch-cmake_FindOsmium.cmake +++ /dev/null @@ -1,13 +0,0 @@ ---- cmake/FindOsmium.cmake.orig 2017-04-13 20:58:25 UTC -+++ cmake/FindOsmium.cmake -@@ -151,8 +151,8 @@ list(APPEND OSMIUM_LIBRARIES - #---------------------------------------------------------------------- - # Component 'geos' - if(Osmium_USE_GEOS) -- find_path(GEOS_INCLUDE_DIR geos/geom.h) -- find_library(GEOS_LIBRARY NAMES geos) -+ find_path(GEOS_INCLUDE_DIR geos35/geos/geom.h) -+ find_library(GEOS_LIBRARY NAMES geos35) - - list(APPEND OSMIUM_EXTRA_FIND_VARS GEOS_INCLUDE_DIR GEOS_LIBRARY) - if(GEOS_INCLUDE_DIR AND GEOS_LIBRARY) |