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.

3 files changed, 21 insertions, 14 deletions

diff --git a/geography/mapcode/Makefile b/geography/mapcode/Makefile
index b2b705849b5..4eb90ad0b82 100644
--- a/geography/mapcode/Makefile
+++ b/geography/mapcode/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2016/11/08 08:08:52 fhajny Exp $
+# $NetBSD: Makefile,v 1.5 2017/01/16 13:49:40 fhajny Exp $
 
-DISTNAME=	mapcode-cpp-2.5.1
+DISTNAME=	mapcode-cpp-2.5.2
 PKGNAME=	${DISTNAME:S/-cpp//}
 CATEGORIES=	geography
 MASTER_SITES=	${MASTER_SITE_GITHUB:=mapcode-foundation/}
diff --git a/geography/mapcode/distinfo b/geography/mapcode/distinfo
index 5429e96555a..04084dd54a0 100644
--- a/geography/mapcode/distinfo
+++ b/geography/mapcode/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2016/11/03 15:06:41 fhajny Exp $
+$NetBSD: distinfo,v 1.4 2017/01/16 13:49:40 fhajny Exp $
 
-SHA1 (mapcode-cpp-2.5.1.tar.gz) = d988b54e7303067959c32d9f09fe58bbfbc6b4ad
-RMD160 (mapcode-cpp-2.5.1.tar.gz) = 249060a872ad83599c77556f9002cef9d48cb182
-SHA512 (mapcode-cpp-2.5.1.tar.gz) = 01a14a12c233be40f3014d535fba418685f327a1e7b59b41d8931fd7376f85049c81f35eec7b307b809f484fe2e6b513604f30dc7702c07ed606705c1f07f275
-Size (mapcode-cpp-2.5.1.tar.gz) = 1043969 bytes
-SHA1 (patch-CMakeLists.txt) = 4d029bd3666278d52aa41e9ea831b5f5544555c1
+SHA1 (mapcode-cpp-2.5.2.tar.gz) = 6ee4f7757c38aa047ce989fd68c35973009ce4d0
+RMD160 (mapcode-cpp-2.5.2.tar.gz) = 3a8101f20fade6d0d06af99d466bd5ae1e7a3d6b
+SHA512 (mapcode-cpp-2.5.2.tar.gz) = 9e1815c5a6f154185ba7651d99b5f389df093a0f4d9bd2caffefb7ef536adaca6fbb21f5c12c230500aafb0191a31606c836b24ba113c353fd90ad389582c5f5
+Size (mapcode-cpp-2.5.2.tar.gz) = 1163456 bytes
+SHA1 (patch-CMakeLists.txt) = b700ffd3efe7d1daa25a87186db304d8d5b6a34c
diff --git a/geography/mapcode/patches/patch-CMakeLists.txt b/geography/mapcode/patches/patch-CMakeLists.txt
index e6069288616..394cfca20c4 100644
--- a/geography/mapcode/patches/patch-CMakeLists.txt
+++ b/geography/mapcode/patches/patch-CMakeLists.txt
@@ -1,8 +1,8 @@
-$NetBSD: patch-CMakeLists.txt,v 1.1 2016/11/03 15:06:41 fhajny Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.2 2017/01/16 13:49:40 fhajny Exp $
 
 Fix cmake build, ensure sane lib name.
 
---- CMakeLists.txt.orig	2016-11-02 12:47:12.000000000 +0000
+--- CMakeLists.txt.orig	2017-01-14 14:03:07.000000000 +0000
 +++ CMakeLists.txt
 @@ -43,6 +43,9 @@ set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${MAPC
  set(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "${MAPCODE_SANITIZER_LINKER_OPTIONS}")
@@ -14,13 +14,20 @@ Fix cmake build, ensure sane lib name.
  set(SOURCE_FILES_MAPCODELIB
          mapcodelib/internal_data.h
          mapcodelib/internal_alphabet_recognizer.h
-@@ -65,7 +68,8 @@ set(SOURCE_FILES_UNITTEST
- set(SOURCE_FILES_UTILITY
-         utility/mapcode.cpp)
+@@ -95,7 +98,8 @@ set(THREADS_PREFER_PTHREAD_FLAG ON)
+ find_package(Threads REQUIRED)
+ find_library(M_LIB m)
  
 -add_library(mapcodelib ${SOURCE_FILES_MAPCODELIB})
 +add_library(mapcodelib SHARED ${SOURCE_FILES_MAPCODELIB})
 +set_target_properties(mapcodelib PROPERTIES OUTPUT_NAME mapcode)
  target_include_directories(mapcodelib PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+ target_link_libraries(mapcodelib Threads::Threads)
+ target_link_libraries(mapcodelib ${M_LIB})
+@@ -110,4 +114,4 @@ target_link_libraries(mapcode LINK_PUBLI
+ target_link_libraries(mapcode LINK_PUBLIC Threads::Threads)
+ target_link_libraries(mapcode LINK_PUBLIC ${M_LIB})
  
- add_executable(unittest ${SOURCE_FILES_UNITTEST})
+-install(TARGETS mapcode DESTINATION /usr/local/bin)
+\ No newline at end of file
++install(TARGETS mapcode DESTINATION /usr/local/bin)