- Update to 1.5.0

6 files changed, 21 insertions, 61 deletions

diff --git a/astro/libosmpbf/Makefile b/astro/libosmpbf/Makefile
index 88df9c57a0f5..92d5e11e991f 100644
--- a/astro/libosmpbf/Makefile
+++ b/astro/libosmpbf/Makefile
@@ -2,16 +2,15 @@
 # $FreeBSD$
 
 PORTNAME=	libosmpbf
-PORTVERSION=	1.3.3
+PORTVERSION=	1.5.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	16
 CATEGORIES=	astro geography devel
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Library for handling binary OpenStreetMap data
 
 LICENSE=	LGPL3+
-LICENSE_FILE=	${WRKSRC}/COPYING.osmpbf
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libprotobuf.so:devel/protobuf
 
diff --git a/astro/libosmpbf/distinfo b/astro/libosmpbf/distinfo
index 6d909ad71903..add620c80b51 100644
--- a/astro/libosmpbf/distinfo
+++ b/astro/libosmpbf/distinfo
@@ -1,2 +1,3 @@
-SHA256 (scrosby-OSM-binary-v1.3.3_GH0.tar.gz) = a109f338ce6a8438a8faae4627cd08599d0403b8977c185499de5c17b92d0798
-SIZE (scrosby-OSM-binary-v1.3.3_GH0.tar.gz) = 37273
+TIMESTAMP = 1611339100
+SHA256 (scrosby-OSM-binary-v1.5.0_GH0.tar.gz) = 2abf3126729793732c3380763999cc365e51bffda369a008213879a3cd90476c
+SIZE (scrosby-OSM-binary-v1.5.0_GH0.tar.gz) = 47543
diff --git a/astro/libosmpbf/files/patch-src_CMakeLists.txt b/astro/libosmpbf/files/patch-src_CMakeLists.txt
deleted file mode 100644
index 61b06b58446d..000000000000
--- a/astro/libosmpbf/files/patch-src_CMakeLists.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-Don't use special compiler flags.
-Add upstream patch to make dependencies explicit; needed for ninja builds.
---- src/CMakeLists.txt.orig	2014-03-15 15:11:32 UTC
-+++ src/CMakeLists.txt
-@@ -3,7 +3,6 @@ PROTOBUF_GENERATE_CPP(CPPS HS fileformat
- if(MSVC)
-     set(CMAKE_CXX_FLAGS "/O3")
- else()
--    set(CMAKE_CXX_FLAGS "-O3")
- endif()
- 
- add_library(osmpbf STATIC ${CPPS})
-@@ -10,8 +10,13 @@ add_library(osmpbf STATIC ${CPPS})
- 
- set_target_properties(osmpbf PROPERTIES LINKER_LANGUAGE CXX LANGUAGE CXX)
- 
--ADD_CUSTOM_COMMAND(TARGET osmpbf POST_BUILD  COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/src/fileformat.pb.h ${CMAKE_SOURCE_DIR}/include/osmpbf)
--ADD_CUSTOM_COMMAND(TARGET osmpbf POST_BUILD  COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/src/osmformat.pb.h ${CMAKE_SOURCE_DIR}/include/osmpbf)
-+ADD_CUSTOM_COMMAND(TARGET osmpbf POST_BUILD
-+    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/src/fileformat.pb.h ${CMAKE_SOURCE_DIR}/include/osmpbf
-+    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/src/osmformat.pb.h ${CMAKE_SOURCE_DIR}/include/osmpbf
-+    BYPRODUCTS
-+        ${CMAKE_SOURCE_DIR}/include/osmpbf/fileformat.pb.h
-+        ${CMAKE_SOURCE_DIR}/include/osmpbf/osmformat.pb.h
-+)
- 
- SET(INCLUDE_INSTALL "include/osmpbf")
- SET(files ${CMAKE_SOURCE_DIR}/include/osmpbf/osmpbf.h ${CMAKE_BINARY_DIR}/src/osmformat.pb.h ${CMAKE_BINARY_DIR}/src/fileformat.pb.h)
diff --git a/astro/libosmpbf/files/patch-tools_CMakeLists.txt b/astro/libosmpbf/files/patch-tools_CMakeLists.txt
deleted file mode 100644
index f2f4789b6197..000000000000
--- a/astro/libosmpbf/files/patch-tools_CMakeLists.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-Don't use special compiler flags.
-Add upstream patch to make dependencies explicit; needed for ninja builds.
---- tools/CMakeLists.txt.orig	2014-03-15 15:11:32 UTC
-+++ tools/CMakeLists.txt
-@@ -4,7 +4,6 @@ PROJECT(${PROJECT})
- if(MSVC)
-     set(CMAKE_CXX_FLAGS "/O3")
- else()
--    set(CMAKE_CXX_FLAGS "-O3 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64")
- endif()
- 
- SET(CPP_SRC osmpbf-outline.cpp)
-@@ -10,6 +10,8 @@ endif()
- SET(CPP_SRC osmpbf-outline.cpp)
- SET(HPP_SRC "")
- SET(C_SRC "")
-+set_source_files_properties(${CPP_SRC}
-+    OBJECT_DEPENDS "${CMAKE_SOURCE_DIR}/include/osmpbf/fileformat.pb.h;${CMAKE_SOURCE_DIR}/include/osmpbf/osmformat.pb.h")
- include_directories("${CMAKE_SOURCE_DIR}/include")
- 
- add_executable(${PROJECT} ${HPP_SRC} ${CPP_SRC} ${C_SRC})
diff --git a/astro/libosmpbf/files/patch-tools_osmpbf-outline.cpp b/astro/libosmpbf/files/patch-tools_osmpbf-outline.cpp
index 275baa253c9a..e9af1e2226d6 100644
--- a/astro/libosmpbf/files/patch-tools_osmpbf-outline.cpp
+++ b/astro/libosmpbf/files/patch-tools_osmpbf-outline.cpp
@@ -1,9 +1,14 @@
---- tools/osmpbf-outline.cpp.orig	2014-03-15 15:11:32 UTC
+--- tools/osmpbf-outline.cpp.orig	2021-01-06 13:47:22 UTC
 +++ tools/osmpbf-outline.cpp
-@@ -1,3 +1,6 @@
-+// for isatty()
-+#include <unistd.h>
-+
- // used for va_list in debug-print methods
- #include <stdarg.h>
+@@ -10,6 +10,11 @@
+ // zlib compression is used inside the pbf blobs
+ #include <zlib.h>
  
++#ifndef WIN32
++	// used for isatty
++	#include <unistd.h>
++#endif
++
+ // netinet or winsock2 provides the network-byte-order conversion function
+ #ifdef D_HAVE_WINSOCK
+     #include <winsock2.h>
diff --git a/astro/libosmpbf/pkg-plist b/astro/libosmpbf/pkg-plist
index dadcfe0d393f..88f7c8fd29a0 100644
--- a/astro/libosmpbf/pkg-plist
+++ b/astro/libosmpbf/pkg-plist
@@ -3,3 +3,7 @@ include/osmpbf/fileformat.pb.h
 include/osmpbf/osmformat.pb.h
 include/osmpbf/osmpbf.h
 lib/libosmpbf.a
+lib/libosmpbf.so
+lib/libosmpbf.so.1
+lib/libosmpbf.so.1.5.0
+man/man1/osmpbf-outline.1.gz