svn commit: r433549 - in head/converters/osm2pgsql: . files
Dmitry Marakasov
amdmi3 at FreeBSD.org
Tue Feb 7 13:16:19 UTC 2017
Author: amdmi3
Date: Tue Feb 7 13:16:17 2017
New Revision: 433549
URL: https://svnweb.freebsd.org/changeset/ports/433549
Log:
- Update to 0.92.0 and unbreak by switching geos dependency to graphics/geos35
PR: 214819, 216338
Added:
head/converters/osm2pgsql/files/
head/converters/osm2pgsql/files/patch-CMakeLists.txt (contents, props changed)
head/converters/osm2pgsql/files/patch-cmake_FindOsmium.cmake (contents, props changed)
Modified:
head/converters/osm2pgsql/Makefile
head/converters/osm2pgsql/distinfo
Modified: head/converters/osm2pgsql/Makefile
==============================================================================
--- head/converters/osm2pgsql/Makefile Tue Feb 7 13:13:39 2017 (r433548)
+++ head/converters/osm2pgsql/Makefile Tue Feb 7 13:16:17 2017 (r433549)
@@ -2,51 +2,40 @@
# $FreeBSD$
PORTNAME= osm2pgsql
-PORTVERSION= 0.87.2
-PORTREVISION= 3
+PORTVERSION= 0.92.0
CATEGORIES= converters geography
MAINTAINER= amdmi3 at FreeBSD.org
COMMENT= Convert OSM XML data to PostgreSQL database
-BROKEN= Last update of graphics/geos broke compatibility
-
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libproj.so:graphics/proj \
- libgeos.so:graphics/geos \
- libprotobuf-c.so:devel/protobuf-c \
- libboost_thread.so:devel/boost-libs
+ libgeos35.so:graphics/geos35 \
+ libboost_system.so:devel/boost-libs \
+ libexpat.so:textproc/expat2
USE_GITHUB= yes
GH_ACCOUNT= openstreetmap
-USES= autoreconf gmake libtool lua pgsql
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS= LUA="${LUA_CMD}" \
- LUA_INCLUDE="-I${LUA_INCDIR}" \
- LUA_LIB="-L${LUA_LIBDIR} -llua-${LUA_VER}" \
- --without-lockfree # workaround for build error
-USE_GNOME= libxml2
-
-PLIST_FILES= bin/nodecachefilereader \
- bin/osm2pgsql \
- man/man1/nodecachefilereader.1.gz \
+USES= cmake:outsource lua:53 pgsql
+
+PLIST_FILES= bin/osm2pgsql \
man/man1/osm2pgsql.1.gz
-PORTDOCS= ChangeLog README AUTHORS TODO
+PORTDOCS= AUTHORS ChangeLog README.md
PORTDATA= *
OPTIONS_DEFINE= DOCS
post-patch:
- @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' ${WRKSRC}/m4/*.m4
- @${REINPLACE_CMD} -e 's|AC_MSG_WARN|AC_MSG_ERROR|' ${WRKSRC}/configure.ac
- @${REINPLACE_CMD} -e 's|-lstdc++||' ${WRKSRC}/Makefile.am
+ @${REINPLACE_CMD} -e 's|include <geos|&35/geos|' \
+ ${WRKSRC}/contrib/libosmium/osmium/geom/geos.hpp \
+ ${WRKSRC}/geometry-builder.cpp
post-install-DOCS-on:
- ${MKDIR} ${STAGEDIR}${DOCSDIR}
+ @${MKDIR} ${STAGEDIR}${DOCSDIR}
.for f in ${PORTDOCS}
${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}/
.endfor
Modified: head/converters/osm2pgsql/distinfo
==============================================================================
--- head/converters/osm2pgsql/distinfo Tue Feb 7 13:13:39 2017 (r433548)
+++ head/converters/osm2pgsql/distinfo Tue Feb 7 13:16:17 2017 (r433549)
@@ -1,2 +1,3 @@
-SHA256 (openstreetmap-osm2pgsql-0.87.2_GH0.tar.gz) = ac78805c7a312462dbade4a907ddb84cdfeeecea888d439c288ec60f6fc1ec76
-SIZE (openstreetmap-osm2pgsql-0.87.2_GH0.tar.gz) = 2139759
+TIMESTAMP = 1486403531
+SHA256 (openstreetmap-osm2pgsql-0.92.0_GH0.tar.gz) = b741cfdf6489fd5def721f75a9558b8cda53165dda7ca9548fcc5b43e163ee77
+SIZE (openstreetmap-osm2pgsql-0.92.0_GH0.tar.gz) = 1364481
Added: head/converters/osm2pgsql/files/patch-CMakeLists.txt
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/converters/osm2pgsql/files/patch-CMakeLists.txt Tue Feb 7 13:16:17 2017 (r433549)
@@ -0,0 +1,9 @@
+--- CMakeLists.txt.orig 2016-07-17 02:30:16 UTC
++++ CMakeLists.txt
+@@ -257,5 +257,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 900913.sql DESTINATION share/osm2pgsql)
Added: head/converters/osm2pgsql/files/patch-cmake_FindOsmium.cmake
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/converters/osm2pgsql/files/patch-cmake_FindOsmium.cmake Tue Feb 7 13:16:17 2017 (r433549)
@@ -0,0 +1,13 @@
+--- cmake/FindOsmium.cmake.orig 2016-07-17 02:30:16 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)
More information about the svn-ports-head
mailing list