From eaa21ba9df18fa0903e9510acbf3916f2226d9d4 Mon Sep 17 00:00:00 2001
From: adam <adam@pkgsrc.org>
Date: Fri, 25 Aug 2017 08:32:19 +0000
Subject: Snappy 1.1.7 Improved CMake build support for 64-bit Linux
 distributions. MSVC builds now use MSVC-specific intrinsics that map to
 clzll. ARM64 (AArch64) builds use the code paths optimized for 64-bit
 processors.

---
 devel/snappy/Makefile                     |  4 ++--
 devel/snappy/PLIST                        |  7 ++++---
 devel/snappy/distinfo                     | 12 ++++++------
 devel/snappy/patches/patch-CMakeLists.txt | 20 ++++++++++----------
 4 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/devel/snappy/Makefile b/devel/snappy/Makefile
index 7b29a301e70..acf9e96ceab 100644
--- a/devel/snappy/Makefile
+++ b/devel/snappy/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2017/07/14 17:27:40 adam Exp $
+# $NetBSD: Makefile,v 1.11 2017/08/25 08:32:19 adam Exp $
 
-DISTNAME=	snappy-1.1.6
+DISTNAME=	snappy-1.1.7
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=google/}
 
diff --git a/devel/snappy/PLIST b/devel/snappy/PLIST
index 06096539393..1f13c9c0fd0 100644
--- a/devel/snappy/PLIST
+++ b/devel/snappy/PLIST
@@ -1,12 +1,13 @@
-@comment $NetBSD: PLIST,v 1.4 2017/07/14 17:27:40 adam Exp $
+@comment $NetBSD: PLIST,v 1.5 2017/08/25 08:32:19 adam Exp $
 include/snappy-c.h
 include/snappy-sinksource.h
 include/snappy-stubs-public.h
 include/snappy.h
+lib/cmake/Snappy/SnappyConfig.cmake
+lib/cmake/Snappy/SnappyConfigVersion.cmake
 lib/cmake/Snappy/SnappyTargets-noconfig.cmake
 lib/cmake/Snappy/SnappyTargets.cmake
-lib/cmake/SnappyConfig.cmake
-lib/cmake/SnappyConfigVersion.cmake
+lib/libsnappy.a
 lib/libsnappy.so
 lib/libsnappy.so.1
 lib/libsnappy.so.1.1.6
diff --git a/devel/snappy/distinfo b/devel/snappy/distinfo
index 8f05bb64fc2..a73c5525cf1 100644
--- a/devel/snappy/distinfo
+++ b/devel/snappy/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.8 2017/07/14 17:27:40 adam Exp $
+$NetBSD: distinfo,v 1.9 2017/08/25 08:32:19 adam Exp $
 
-SHA1 (snappy-1.1.6.tar.gz) = 8d428406c3145edf1d1096cc6eddb995e32e1655
-RMD160 (snappy-1.1.6.tar.gz) = 9b71dc2cb330dac502fda4565895cba4f02ae044
-SHA512 (snappy-1.1.6.tar.gz) = 38698b7ff03b39528de88bf62a84fcfc6f3dce2e98efa25a97ebdf396b6aba49860072ffa99830323944ab41c3721a3c53ff2636beb3422d5f812e84afe8dadf
-Size (snappy-1.1.6.tar.gz) = 1128388 bytes
-SHA1 (patch-CMakeLists.txt) = 1ad499704436db4f1cd81b07c66d5a3b31f71c81
+SHA1 (snappy-1.1.7.tar.gz) = 1ec676b842fc96fd8a95b03c12758935e7f257b0
+RMD160 (snappy-1.1.7.tar.gz) = a512cb6b3954ef42a8a54c30787fda79d430bb20
+SHA512 (snappy-1.1.7.tar.gz) = 32046f532606ba545a4e4825c0c66a19be449f2ca2ff760a6fa170a3603731479a7deadb683546e5f8b5033414c50f4a9a29f6d23b7a41f047e566e69eca7caf
+Size (snappy-1.1.7.tar.gz) = 1090550 bytes
+SHA1 (patch-CMakeLists.txt) = f43089ec760081b07aa8e74a556528e43609bf07
diff --git a/devel/snappy/patches/patch-CMakeLists.txt b/devel/snappy/patches/patch-CMakeLists.txt
index e3b380ed647..f6fc3df5dd0 100644
--- a/devel/snappy/patches/patch-CMakeLists.txt
+++ b/devel/snappy/patches/patch-CMakeLists.txt
@@ -1,15 +1,15 @@
-$NetBSD: patch-CMakeLists.txt,v 1.1 2017/07/14 17:27:40 adam Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.2 2017/08/25 08:32:19 adam Exp $
 
 Correcly link against googletest libraries.
 
---- CMakeLists.txt.orig	2017-07-14 08:22:42.000000000 +0000
+--- CMakeLists.txt.orig	2017-08-24 23:54:23.000000000 +0000
 +++ CMakeLists.txt
-@@ -147,7 +147,7 @@ ENDIF (HAVE_LIBQUICKLZ)
- ADD_EXECUTABLE(snappy-unittest snappy_unittest.cc snappy-test.cc)
- TARGET_COMPILE_DEFINITIONS(snappy-unittest PRIVATE -DHAVE_CONFIG_H)
- TARGET_LINK_LIBRARIES(snappy-unittest snappy ${COMPRESSION_LIBS}
--                      ${GFLAGS_LIBRARIES})
-+                      ${GTEST_BOTH_LIBRARIES})
- TARGET_INCLUDE_DIRECTORIES(snappy-unittest BEFORE PRIVATE ${Snappy_SOURCE_DIR}
-                            ${GTEST_INCLUDE_DIRS} ${GFLAGS_INCLUDE_DIRS})
+@@ -118,7 +118,7 @@ if(SNAPPY_BUILD_TESTS)
+       "${PROJECT_SOURCE_DIR}/snappy-test.cc"
+   )
+   target_compile_definitions(snappy_unittest PRIVATE -DHAVE_CONFIG_H)
+-  target_link_libraries(snappy_unittest snappy ${GFLAGS_LIBRARIES})
++  target_link_libraries(snappy_unittest snappy ${GTEST_BOTH_LIBRARIES})
  
+   if(HAVE_LIBZ)
+     target_link_libraries(snappy_unittest z)
-- 
cgit v1.2.3