Mon Jan 16 13:49:40 2017 UTC ()
Update geography/mapcode to 2.5.2.

- Added unit test for floating point error with code "40822.schol".
- Added locale support.
- Added many languages.
- Hardened unit tests.


(fhajny)
diff -r1.4 -r1.5 pkgsrc/geography/mapcode/Makefile
diff -r1.3 -r1.4 pkgsrc/geography/mapcode/distinfo
diff -r1.1 -r1.2 pkgsrc/geography/mapcode/patches/patch-CMakeLists.txt
cvs diff -r1.4 -r1.5 pkgsrc/geography/mapcode/Makefile (expand / switch to unified diff)

--- pkgsrc/geography/mapcode/Makefile 2016/11/08 08:08:52 1.4
+++ pkgsrc/geography/mapcode/Makefile 2017/01/16 13:49:40 1.5
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1# $NetBSD: Makefile,v 1.4 2016/11/08 08:08:52 fhajny Exp $ 1# $NetBSD: Makefile,v 1.5 2017/01/16 13:49:40 fhajny Exp $
2 2
3DISTNAME= mapcode-cpp-2.5.1 3DISTNAME= mapcode-cpp-2.5.2
4PKGNAME= ${DISTNAME:S/-cpp//} 4PKGNAME= ${DISTNAME:S/-cpp//}
5CATEGORIES= geography 5CATEGORIES= geography
6MASTER_SITES= ${MASTER_SITE_GITHUB:=mapcode-foundation/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=mapcode-foundation/}
7 7
8MAINTAINER= filip@joyent.com 8MAINTAINER= filip@joyent.com
9HOMEPAGE= https://github.com/mapcode-foundation/mapcode-cpp/ 9HOMEPAGE= https://github.com/mapcode-foundation/mapcode-cpp/
10COMMENT= Mapcode Library for C/C++ 10COMMENT= Mapcode Library for C/C++
11LICENSE= apache-2.0 11LICENSE= apache-2.0
12 12
13GITHUB_PROJECT= mapcode-cpp 13GITHUB_PROJECT= mapcode-cpp
14GITHUB_TAG= v${PKGVERSION_NOREV} 14GITHUB_TAG= v${PKGVERSION_NOREV}
15 15
16USE_LANGUAGES= c c++ 16USE_LANGUAGES= c c++
cvs diff -r1.3 -r1.4 pkgsrc/geography/mapcode/distinfo (expand / switch to unified diff)

--- pkgsrc/geography/mapcode/distinfo 2016/11/03 15:06:41 1.3
+++ pkgsrc/geography/mapcode/distinfo 2017/01/16 13:49:40 1.4
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.3 2016/11/03 15:06:41 fhajny Exp $ 1$NetBSD: distinfo,v 1.4 2017/01/16 13:49:40 fhajny Exp $
2 2
3SHA1 (mapcode-cpp-2.5.1.tar.gz) = d988b54e7303067959c32d9f09fe58bbfbc6b4ad 3SHA1 (mapcode-cpp-2.5.2.tar.gz) = 6ee4f7757c38aa047ce989fd68c35973009ce4d0
4RMD160 (mapcode-cpp-2.5.1.tar.gz) = 249060a872ad83599c77556f9002cef9d48cb182 4RMD160 (mapcode-cpp-2.5.2.tar.gz) = 3a8101f20fade6d0d06af99d466bd5ae1e7a3d6b
5SHA512 (mapcode-cpp-2.5.1.tar.gz) = 01a14a12c233be40f3014d535fba418685f327a1e7b59b41d8931fd7376f85049c81f35eec7b307b809f484fe2e6b513604f30dc7702c07ed606705c1f07f275 5SHA512 (mapcode-cpp-2.5.2.tar.gz) = 9e1815c5a6f154185ba7651d99b5f389df093a0f4d9bd2caffefb7ef536adaca6fbb21f5c12c230500aafb0191a31606c836b24ba113c353fd90ad389582c5f5
6Size (mapcode-cpp-2.5.1.tar.gz) = 1043969 bytes 6Size (mapcode-cpp-2.5.2.tar.gz) = 1163456 bytes
7SHA1 (patch-CMakeLists.txt) = 4d029bd3666278d52aa41e9ea831b5f5544555c1 7SHA1 (patch-CMakeLists.txt) = b700ffd3efe7d1daa25a87186db304d8d5b6a34c
cvs diff -r1.1 -r1.2 pkgsrc/geography/mapcode/patches/patch-CMakeLists.txt (expand / switch to unified diff)

--- pkgsrc/geography/mapcode/patches/patch-CMakeLists.txt 2016/11/03 15:06:41 1.1
+++ pkgsrc/geography/mapcode/patches/patch-CMakeLists.txt 2017/01/16 13:49:40 1.2
@@ -1,26 +1,33 @@ @@ -1,26 +1,33 @@
1$NetBSD: patch-CMakeLists.txt,v 1.1 2016/11/03 15:06:41 fhajny Exp $ 1$NetBSD: patch-CMakeLists.txt,v 1.2 2017/01/16 13:49:40 fhajny Exp $
2 2
3Fix cmake build, ensure sane lib name. 3Fix cmake build, ensure sane lib name.
4 4
5--- CMakeLists.txt.orig 2016-11-02 12:47:12.000000000 +0000 5--- CMakeLists.txt.orig 2017-01-14 14:03:07.000000000 +0000
6+++ CMakeLists.txt 6+++ CMakeLists.txt
7@@ -43,6 +43,9 @@ set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${MAPC 7@@ -43,6 +43,9 @@ set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${MAPC
8 set(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "${MAPCODE_SANITIZER_LINKER_OPTIONS}") 8 set(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "${MAPCODE_SANITIZER_LINKER_OPTIONS}")
9 set(CMAKE_EXE_LINKER_FLAGS_RELEASE "") 9 set(CMAKE_EXE_LINKER_FLAGS_RELEASE "")
10  10
11+set(EXECUTABLE_OUTPUT_PATH "${CMAKE_BINARY_DIR}/build" ) 11+set(EXECUTABLE_OUTPUT_PATH "${CMAKE_BINARY_DIR}/build" )
12+set(LIBRARY_OUTPUT_PATH "${CMAKE_BINARY_DIR}/build" ) 12+set(LIBRARY_OUTPUT_PATH "${CMAKE_BINARY_DIR}/build" )
13+ 13+
14 set(SOURCE_FILES_MAPCODELIB 14 set(SOURCE_FILES_MAPCODELIB
15 mapcodelib/internal_data.h 15 mapcodelib/internal_data.h
16 mapcodelib/internal_alphabet_recognizer.h 16 mapcodelib/internal_alphabet_recognizer.h
17@@ -65,7 +68,8 @@ set(SOURCE_FILES_UNITTEST 17@@ -95,7 +98,8 @@ set(THREADS_PREFER_PTHREAD_FLAG ON)
18 set(SOURCE_FILES_UTILITY 18 find_package(Threads REQUIRED)
19 utility/mapcode.cpp) 19 find_library(M_LIB m)
20  20
21-add_library(mapcodelib ${SOURCE_FILES_MAPCODELIB}) 21-add_library(mapcodelib ${SOURCE_FILES_MAPCODELIB})
22+add_library(mapcodelib SHARED ${SOURCE_FILES_MAPCODELIB}) 22+add_library(mapcodelib SHARED ${SOURCE_FILES_MAPCODELIB})
23+set_target_properties(mapcodelib PROPERTIES OUTPUT_NAME mapcode) 23+set_target_properties(mapcodelib PROPERTIES OUTPUT_NAME mapcode)
24 target_include_directories(mapcodelib PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) 24 target_include_directories(mapcodelib PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 25 target_link_libraries(mapcodelib Threads::Threads)
 26 target_link_libraries(mapcodelib ${M_LIB})
 27@@ -110,4 +114,4 @@ target_link_libraries(mapcode LINK_PUBLI
 28 target_link_libraries(mapcode LINK_PUBLIC Threads::Threads)
 29 target_link_libraries(mapcode LINK_PUBLIC ${M_LIB})
25  30
26 add_executable(unittest ${SOURCE_FILES_UNITTEST}) 31-install(TARGETS mapcode DESTINATION /usr/local/bin)
 32\ No newline at end of file
 33+install(TARGETS mapcode DESTINATION /usr/local/bin)