- Update to 1.3.3

This commit is contained in:
Dmitry Marakasov
2016-01-09 13:21:30 +00:00
parent 0e58284d2e
commit 6c1cb568cd
7 changed files with 35 additions and 48 deletions
+3 -16
View File
@@ -2,15 +2,14 @@
# $FreeBSD$
PORTNAME= libosmpbf
PORTVERSION= 1.3.0
PORTVERSION= 1.3.3
DISTVERSIONPREFIX= v
PORTREVISION= 1
CATEGORIES= astro geography devel
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= Library for handling binary OpenStreetMap data
LICENSE= GPLv3
LICENSE= LGPL3 # or later
LICENSE_FILE= ${WRKSRC}/COPYING.osmpbf
LIB_DEPENDS= libprotobuf.so:${PORTSDIR}/devel/protobuf
@@ -19,18 +18,6 @@ USE_GITHUB= yes
GH_ACCOUNT= scrosby
GH_PROJECT= OSM-binary
USES= gmake
BUILD_WRKSRC= ${WRKSRC}/src
INSTALL_WRKSRC= ${WRKSRC}/src
CXXFLAGS+= -I${LOCALBASE}/include
PORTDOCS= *
OPTIONS_DEFINE= DOCS
post-install:
${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}/
USES= cmake
.include <bsd.port.mk>
+2 -2
View File
@@ -1,2 +1,2 @@
SHA256 (scrosby-OSM-binary-v1.3.0_GH0.tar.gz) = c4bb6de92ae52481775ba2a6e8b751eb39dade17a1ee6669d79b694cd5266ff8
SIZE (scrosby-OSM-binary-v1.3.0_GH0.tar.gz) = 23768
SHA256 (scrosby-OSM-binary-v1.3.3_GH0.tar.gz) = a109f338ce6a8438a8faae4627cd08599d0403b8977c185499de5c17b92d0798
SIZE (scrosby-OSM-binary-v1.3.3_GH0.tar.gz) = 37273
-30
View File
@@ -1,30 +0,0 @@
--- src/Makefile.orig 2012-12-05 08:14:05.000000000 +0400
+++ src/Makefile 2013-05-23 03:08:09.903921308 +0400
@@ -1,6 +1,6 @@
-CXX = g++
-CXXFLAGS = -O3
+CXX ?= g++
+CXXFLAGS ?= -O3
AR = ar
all: libosmpbf.a ../include/osmpbf/fileformat.pb.h ../include/osmpbf/osmformat.pb.h
@@ -16,12 +16,12 @@
cp *.pb.h ../include/osmpbf/
install:
- install -m 755 -g root -o root -d $(DESTDIR)/usr/lib
- install -m 644 -g root -o root libosmpbf.a $(DESTDIR)/usr/lib
- install -m 755 -g root -o root -d $(DESTDIR)/usr/include/osmpbf
- install -m 644 -g root -o root ../include/osmpbf/osmpbf.h $(DESTDIR)/usr/include/osmpbf
- install -m 644 -g root -o root ../include/osmpbf/fileformat.pb.h $(DESTDIR)/usr/include/osmpbf
- install -m 644 -g root -o root ../include/osmpbf/osmformat.pb.h $(DESTDIR)/usr/include/osmpbf
+ install -m 755 -d $(DESTDIR)$(PREFIX)/lib
+ install -m 644 libosmpbf.a $(DESTDIR)$(PREFIX)/lib
+ install -m 755 -d $(DESTDIR)$(PREFIX)/include/osmpbf
+ install -m 644 ../include/osmpbf/osmpbf.h $(DESTDIR)$(PREFIX)/include/osmpbf
+ install -m 644 ../include/osmpbf/fileformat.pb.h $(DESTDIR)$(PREFIX)/include/osmpbf
+ install -m 644 ../include/osmpbf/osmformat.pb.h $(DESTDIR)$(PREFIX)/include/osmpbf
clean:
rm -f *.pb.h *.pb.cc *.pb.o libosmpbf.a
@@ -0,0 +1,10 @@
--- 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})
@@ -0,0 +1,10 @@
--- 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)
@@ -0,0 +1,9 @@
--- tools/osmpbf-outline.cpp.orig 2014-03-15 15:11:32 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>
+1
View File
@@ -1,3 +1,4 @@
bin/osmpbf-outline
include/osmpbf/fileformat.pb.h
include/osmpbf/osmformat.pb.h
include/osmpbf/osmpbf.h