[pkgsrc/pkgsrc-2017Q3]: pkgsrc/devel/libmemcached Pullup ticket #5567 - reque...

[spz <spz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8fe3238cbed9
branches:  pkgsrc-2017Q3
changeset: 408524:8fe3238cbed9
user:      spz <spz%pkgsrc.org@localhost>
date:      Sun Oct 15 11:26:40 2017 +0000

description:
Pullup ticket #5567 - requested by sevan
devel/libmemcached: build fix for Darwin

Revisions pulled up:
- devel/libmemcached/distinfo                                   1.13
- devel/libmemcached/patches/patch-clients_memflush.cc          1.2
- devel/libmemcached/patches/patch-libmemcached_byteorder.cc    1.3
- devel/libmemcached/patches/patch-libtest_lite.h               1.4
- devel/libmemcached/patches/patch-libtest_test.hpp             1.3
- devel/libmemcached/patches/patch-tests_libmemcached-1.0_ketama.cc 1.5
- devel/libmemcached/patches/patch-tests_libmemcached-1.0_pool.cc 1.5

-------------------------------------------------------------------
   Module Name:    pkgsrc
   Committed By:   adam
   Date:           Mon Oct  9 07:48:52 UTC 2017

   Modified Files:
           pkgsrc/devel/libmemcached: distinfo
           pkgsrc/devel/libmemcached/patches: patch-clients_memflush.cc
               patch-libmemcached_byteorder.cc patch-libtest_lite.h
               patch-libtest_test.hpp patch-tests_libmemcached-1.0_ketama.cc
               patch-tests_libmemcached-1.0_pool.cc

   Log Message:
   Fixed building on Darwin; clean-ups


   To generate a diff of this commit:
   cvs rdiff -u -r1.12 -r1.13 pkgsrc/devel/libmemcached/distinfo
   cvs rdiff -u -r1.1 -r1.2 \
       pkgsrc/devel/libmemcached/patches/patch-clients_memflush.cc
   cvs rdiff -u -r1.2 -r1.3 \
       pkgsrc/devel/libmemcached/patches/patch-libmemcached_byteorder.cc \
       pkgsrc/devel/libmemcached/patches/patch-libtest_test.hpp
   cvs rdiff -u -r1.3 -r1.4 \
       pkgsrc/devel/libmemcached/patches/patch-libtest_lite.h
   cvs rdiff -u -r1.4 -r1.5 \
   pkgsrc/devel/libmemcached/patches/patch-tests_libmemcached-1.0_ketama.cc \
       pkgsrc/devel/libmemcached/patches/patch-tests_libmemcached-1.0_pool.cc

diffstat:

 devel/libmemcached/distinfo                                       |  14 +++++-----
 devel/libmemcached/patches/patch-clients_memflush.cc              |   4 ++-
 devel/libmemcached/patches/patch-libmemcached_byteorder.cc        |  11 +++++--
 devel/libmemcached/patches/patch-libtest_lite.h                   |   3 +-
 devel/libmemcached/patches/patch-libtest_test.hpp                 |   3 +-
 devel/libmemcached/patches/patch-tests_libmemcached-1.0_ketama.cc |   3 +-
 devel/libmemcached/patches/patch-tests_libmemcached-1.0_pool.cc   |   3 +-
 7 files changed, 25 insertions(+), 16 deletions(-)

diffs (109 lines):

diff -r 9b74aaee5f03 -r 8fe3238cbed9 devel/libmemcached/distinfo
--- a/devel/libmemcached/distinfo       Sun Oct 15 11:11:02 2017 +0000
+++ b/devel/libmemcached/distinfo       Sun Oct 15 11:26:40 2017 +0000
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.12 2015/11/03 03:27:43 agc Exp $
+$NetBSD: distinfo,v 1.12.18.1 2017/10/15 11:26:40 spz Exp $
 
 SHA1 (libmemcached-1.0.18.tar.gz) = 8be06b5b95adbc0a7cb0f232e237b648caf783e1
 RMD160 (libmemcached-1.0.18.tar.gz) = 647ea760191755da4832f1a4c78847a330e5b515
 SHA512 (libmemcached-1.0.18.tar.gz) = 2d95fea63b8b6dc7ded42c3a88a54aad74d5a1d417af1247144dae4a88c3b639a3aabc0c2b66661ff69a7609a314efaaae236e10971af9c428a4bca0a0101585
 Size (libmemcached-1.0.18.tar.gz) = 1039649 bytes
-SHA1 (patch-clients_memflush.cc) = 52423ecc411e9991c2a14d0d54c76a1ce31d4be6
+SHA1 (patch-clients_memflush.cc) = 6f473a5dc362cb3f55e9c5fada475db428d41fb2
 SHA1 (patch-configure) = 413296ba549ee0e4eb5d5ca910f144916a85b02b
-SHA1 (patch-libmemcached_byteorder.cc) = 047f070a47a6e88b5c19c413136e894737b28a7e
+SHA1 (patch-libmemcached_byteorder.cc) = 7e2f4dff5fcb1a490808edabd8b5998081e35b98
 SHA1 (patch-libtest_alarm.cc) = 92120b26fcbbef8ebec0b754d44a3a40b796e602
-SHA1 (patch-libtest_lite.h) = f829bb34a4b6cbe767fb658e59c2eb2f4a6176f6
-SHA1 (patch-libtest_test.hpp) = 66f1cb24ceaea2233acf73974b0249326dca5376
-SHA1 (patch-tests_libmemcached-1.0_ketama.cc) = 707ea7b0f8df721db7d947d82df3e142b70ae5a0
-SHA1 (patch-tests_libmemcached-1.0_pool.cc) = 5779ab541e4333150c77752434356469a5c85f21
+SHA1 (patch-libtest_lite.h) = d99717f8c6f4a8001ac767d9cc5034581293efe4
+SHA1 (patch-libtest_test.hpp) = 889d1a3823b309a3a2f04d8eef36515b1dff6130
+SHA1 (patch-tests_libmemcached-1.0_ketama.cc) = 4da74a41c0a1de28ac318723622c09ad03158c20
+SHA1 (patch-tests_libmemcached-1.0_pool.cc) = 4e0bac95e71fdd023e222f4acf96322f4b80f5eb
diff -r 9b74aaee5f03 -r 8fe3238cbed9 devel/libmemcached/patches/patch-clients_memflush.cc
--- a/devel/libmemcached/patches/patch-clients_memflush.cc      Sun Oct 15 11:11:02 2017 +0000
+++ b/devel/libmemcached/patches/patch-clients_memflush.cc      Sun Oct 15 11:26:40 2017 +0000
@@ -1,4 +1,6 @@
-$NetBSD: patch-clients_memflush.cc,v 1.1 2014/04/16 16:23:13 joerg Exp $
+$NetBSD: patch-clients_memflush.cc,v 1.1.30.1 2017/10/15 11:26:40 spz Exp $
+
+Fix for missing definition of 'false'.
 
 --- clients/memflush.cc.orig   2014-04-16 15:33:58.000000000 +0000
 +++ clients/memflush.cc
diff -r 9b74aaee5f03 -r 8fe3238cbed9 devel/libmemcached/patches/patch-libmemcached_byteorder.cc
--- a/devel/libmemcached/patches/patch-libmemcached_byteorder.cc        Sun Oct 15 11:11:02 2017 +0000
+++ b/devel/libmemcached/patches/patch-libmemcached_byteorder.cc        Sun Oct 15 11:26:40 2017 +0000
@@ -1,14 +1,17 @@
-$NetBSD: patch-libmemcached_byteorder.cc,v 1.2 2014/04/01 13:51:56 fhajny Exp $
+$NetBSD: patch-libmemcached_byteorder.cc,v 1.2.30.1 2017/10/15 11:26:40 spz Exp $
 
-Need ntohll/htonll defined.
+Find definition of ntohll() and htonll().
+
 --- libmemcached/byteorder.cc.orig     2014-02-09 11:52:42.000000000 +0000
 +++ libmemcached/byteorder.cc
-@@ -36,6 +36,9 @@
+@@ -36,6 +36,11 @@
   */
  
  #include "mem_config.h"
-+#ifdef __sun
++#if defined(__sun)
 +# include "sys/byteorder.h"
++#elif defined(__APPLE__)
++# include "sys/_endian.h"
 +#endif
  #include "libmemcached/byteorder.h"
  
diff -r 9b74aaee5f03 -r 8fe3238cbed9 devel/libmemcached/patches/patch-libtest_lite.h
--- a/devel/libmemcached/patches/patch-libtest_lite.h   Sun Oct 15 11:11:02 2017 +0000
+++ b/devel/libmemcached/patches/patch-libtest_lite.h   Sun Oct 15 11:26:40 2017 +0000
@@ -1,6 +1,7 @@
-$NetBSD: patch-libtest_lite.h,v 1.3 2014/06/26 20:31:03 asau Exp $
+$NetBSD: patch-libtest_lite.h,v 1.3.30.1 2017/10/15 11:26:40 spz Exp $
 
 NetBSD doesn't have alloca.h.
+
 --- libtest/lite.h.orig        2014-02-09 11:52:42.000000000 +0000
 +++ libtest/lite.h
 @@ -53,7 +53,7 @@
diff -r 9b74aaee5f03 -r 8fe3238cbed9 devel/libmemcached/patches/patch-libtest_test.hpp
--- a/devel/libmemcached/patches/patch-libtest_test.hpp Sun Oct 15 11:11:02 2017 +0000
+++ b/devel/libmemcached/patches/patch-libtest_test.hpp Sun Oct 15 11:26:40 2017 +0000
@@ -1,6 +1,7 @@
-$NetBSD: patch-libtest_test.hpp,v 1.2 2014/04/01 13:51:56 fhajny Exp $
+$NetBSD: patch-libtest_test.hpp,v 1.2.30.1 2017/10/15 11:26:40 spz Exp $
 
 cstdarg needed for va_start.
+
 --- libtest/test.hpp.orig      2014-02-09 11:52:42.000000000 +0000
 +++ libtest/test.hpp
 @@ -57,6 +57,7 @@
diff -r 9b74aaee5f03 -r 8fe3238cbed9 devel/libmemcached/patches/patch-tests_libmemcached-1.0_ketama.cc
--- a/devel/libmemcached/patches/patch-tests_libmemcached-1.0_ketama.cc Sun Oct 15 11:11:02 2017 +0000
+++ b/devel/libmemcached/patches/patch-tests_libmemcached-1.0_ketama.cc Sun Oct 15 11:26:40 2017 +0000
@@ -1,6 +1,7 @@
-$NetBSD: patch-tests_libmemcached-1.0_ketama.cc,v 1.4 2014/04/01 13:51:56 fhajny Exp $
+$NetBSD: patch-tests_libmemcached-1.0_ketama.cc,v 1.4.30.1 2017/10/15 11:26:40 spz Exp $
 
 Use stdint.
+
 --- tests/libmemcached-1.0/ketama.cc.orig      2014-02-09 11:52:42.000000000 +0000
 +++ tests/libmemcached-1.0/ketama.cc
 @@ -33,6 +33,7 @@
diff -r 9b74aaee5f03 -r 8fe3238cbed9 devel/libmemcached/patches/patch-tests_libmemcached-1.0_pool.cc
--- a/devel/libmemcached/patches/patch-tests_libmemcached-1.0_pool.cc   Sun Oct 15 11:11:02 2017 +0000
+++ b/devel/libmemcached/patches/patch-tests_libmemcached-1.0_pool.cc   Sun Oct 15 11:26:40 2017 +0000
@@ -1,6 +1,7 @@
-$NetBSD: patch-tests_libmemcached-1.0_pool.cc,v 1.4 2014/04/01 13:51:56 fhajny Exp $
+$NetBSD: patch-tests_libmemcached-1.0_pool.cc,v 1.4.30.1 2017/10/15 11:26:40 spz Exp $
 
 Use stdint.
+
 --- tests/libmemcached-1.0/pool.cc.orig        2014-02-09 11:52:42.000000000 +0000
 +++ tests/libmemcached-1.0/pool.cc
 @@ -34,6 +34,7 @@