Update libmemcached to 1.0.18.

Changes in 1.0.18:
- MEMCACHED_BEHAVIOR_RETRY_TIMEOUT can now be set to zero.
- Numerous bug fixes.

8 files changed, 60 insertions, 64 deletions

diff --git a/devel/libmemcached/Makefile b/devel/libmemcached/Makefile
index 8b44a0f53aa..5b9828749e8 100644
--- a/devel/libmemcached/Makefile
+++ b/devel/libmemcached/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2013/09/15 12:28:22 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2014/04/01 13:51:56 fhajny Exp $
 #
 
-DISTNAME=	libmemcached-1.0.17
-PKGREVISION=	1
+DISTNAME=	libmemcached-1.0.18
 CATEGORIES=	devel
 MASTER_SITES=	http://launchpad.net/libmemcached/1.0/${PKGVERSION_NOREV}/+download/
 
diff --git a/devel/libmemcached/distinfo b/devel/libmemcached/distinfo
index 11ef1d37f13..ea1d0b981d0 100644
--- a/devel/libmemcached/distinfo
+++ b/devel/libmemcached/distinfo
@@ -1,14 +1,11 @@
-$NetBSD: distinfo,v 1.7 2013/09/15 12:28:22 joerg Exp $
+$NetBSD: distinfo,v 1.8 2014/04/01 13:51:56 fhajny Exp $
 
-SHA1 (libmemcached-1.0.17.tar.gz) = 1023bc8c738b1f5b8ea2cd16d709ec6b47c3efa8
-RMD160 (libmemcached-1.0.17.tar.gz) = f0e617e0dc5f2eb27f9da7ea5a9f5a7b043b80a8
-Size (libmemcached-1.0.17.tar.gz) = 1023177 bytes
-SHA1 (patch-configure) = 82c954244cc79f892b3ed08be1b5c8f60bceab1a
-SHA1 (patch-libmemcached-1.0_deprecated__types.h) = bf4c3440b1734bf73f39940c983eb3fb1be171d7
-SHA1 (patch-libmemcached-1.0_memcached.h) = 0edfc9d7622fec2b690e2e253f3f8c9aaf4147d5
-SHA1 (patch-libmemcached_byteorder.cc) = 18d5b6447e7457bf35dbac6c693735932871f095
-SHA1 (patch-libtest_lite.h) = 6460bd76650111613311c35d3d836674dab0c801
-SHA1 (patch-libtest_main.cc) = e9c2d88085f2a66b3296f7acd40484e485fd3c16
-SHA1 (patch-libtest_test.hpp) = 684d1dcfe5c6a4b510353bd578c8919da216542b
-SHA1 (patch-tests_libmemcached-1.0_ketama.cc) = 8dacea6366738254e1a71eef8cd4e04329f4e53c
-SHA1 (patch-tests_libmemcached-1.0_pool.cc) = d5656a54277f7155b1b78a0f90fd0f939ef39be6
+SHA1 (libmemcached-1.0.18.tar.gz) = 8be06b5b95adbc0a7cb0f232e237b648caf783e1
+RMD160 (libmemcached-1.0.18.tar.gz) = 647ea760191755da4832f1a4c78847a330e5b515
+Size (libmemcached-1.0.18.tar.gz) = 1039649 bytes
+SHA1 (patch-configure) = 82927d933832a8bf07b3da276bc330c01e04fc71
+SHA1 (patch-libmemcached_byteorder.cc) = 047f070a47a6e88b5c19c413136e894737b28a7e
+SHA1 (patch-libtest_lite.h) = cef673c15034d2e6ab68fdf9ad35366608fca3a0
+SHA1 (patch-libtest_test.hpp) = 66f1cb24ceaea2233acf73974b0249326dca5376
+SHA1 (patch-tests_libmemcached-1.0_ketama.cc) = 707ea7b0f8df721db7d947d82df3e142b70ae5a0
+SHA1 (patch-tests_libmemcached-1.0_pool.cc) = 5779ab541e4333150c77752434356469a5c85f21
diff --git a/devel/libmemcached/patches/patch-configure b/devel/libmemcached/patches/patch-configure
index 2e1b38f97ae..de17ab8bfba 100644
--- a/devel/libmemcached/patches/patch-configure
+++ b/devel/libmemcached/patches/patch-configure
@@ -1,8 +1,8 @@
-$NetBSD: patch-configure,v 1.3 2013/09/15 12:28:22 joerg Exp $
+$NetBSD: patch-configure,v 1.4 2014/04/01 13:51:56 fhajny Exp $
 
---- configure.orig	2013-04-03 04:22:41.000000000 +0000
+--- configure.orig	2014-02-09 11:52:52.000000000 +0000
 +++ configure
-@@ -26555,15 +26555,15 @@ else
+@@ -26560,15 +26560,15 @@ else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
@@ -21,7 +21,7 @@ $NetBSD: patch-configure,v 1.3 2013/09/15 12:28:22 joerg Exp $
    eval "$as_CACHEVAR=yes"
  else
    eval "$as_CACHEVAR=no"
-@@ -26628,7 +26628,7 @@ main ()
+@@ -26632,7 +26632,7 @@ main ()
    return 0;
  }
  _ACEOF
@@ -30,7 +30,7 @@ $NetBSD: patch-configure,v 1.3 2013/09/15 12:28:22 joerg Exp $
    eval "$as_CACHEVAR=yes"
  else
    eval "$as_CACHEVAR=no"
-@@ -26685,15 +26685,17 @@ else
+@@ -26688,15 +26688,17 @@ else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
@@ -50,7 +50,7 @@ $NetBSD: patch-configure,v 1.3 2013/09/15 12:28:22 joerg Exp $
    eval "$as_CACHEVAR=yes"
  else
    eval "$as_CACHEVAR=no"
-@@ -26750,15 +26752,17 @@ else
+@@ -26752,15 +26754,17 @@ else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
@@ -71,7 +71,7 @@ $NetBSD: patch-configure,v 1.3 2013/09/15 12:28:22 joerg Exp $
    eval "$as_CACHEVAR=yes"
  else
    eval "$as_CACHEVAR=no"
-@@ -26823,7 +26827,7 @@ main ()
+@@ -26824,7 +26828,7 @@ main ()
    return 0;
  }
  _ACEOF
@@ -116,7 +116,7 @@ $NetBSD: patch-configure,v 1.3 2013/09/15 12:28:22 joerg Exp $
    eval "$as_CACHEVAR=yes"
  else
    eval "$as_CACHEVAR=no"
-@@ -27148,7 +27152,7 @@ main ()
+@@ -27147,7 +27151,7 @@ main ()
    return 0;
  }
  _ACEOF
@@ -125,7 +125,7 @@ $NetBSD: patch-configure,v 1.3 2013/09/15 12:28:22 joerg Exp $
    eval "$as_CACHEVAR=yes"
  else
    eval "$as_CACHEVAR=no"
-@@ -27213,7 +27217,7 @@ main ()
+@@ -27211,7 +27215,7 @@ main ()
    return 0;
  }
  _ACEOF
@@ -134,7 +134,7 @@ $NetBSD: patch-configure,v 1.3 2013/09/15 12:28:22 joerg Exp $
    eval "$as_CACHEVAR=yes"
  else
    eval "$as_CACHEVAR=no"
-@@ -27278,7 +27282,7 @@ main ()
+@@ -27275,7 +27279,7 @@ main ()
    return 0;
  }
  _ACEOF
@@ -143,7 +143,7 @@ $NetBSD: patch-configure,v 1.3 2013/09/15 12:28:22 joerg Exp $
    eval "$as_CACHEVAR=yes"
  else
    eval "$as_CACHEVAR=no"
-@@ -27343,7 +27347,7 @@ main ()
+@@ -27339,7 +27343,7 @@ main ()
    return 0;
  }
  _ACEOF
@@ -152,7 +152,7 @@ $NetBSD: patch-configure,v 1.3 2013/09/15 12:28:22 joerg Exp $
    eval "$as_CACHEVAR=yes"
  else
    eval "$as_CACHEVAR=no"
-@@ -27408,7 +27412,7 @@ main ()
+@@ -27403,7 +27407,7 @@ main ()
    return 0;
  }
  _ACEOF
@@ -161,7 +161,7 @@ $NetBSD: patch-configure,v 1.3 2013/09/15 12:28:22 joerg Exp $
    eval "$as_CACHEVAR=yes"
  else
    eval "$as_CACHEVAR=no"
-@@ -27473,7 +27477,7 @@ main ()
+@@ -27468,7 +27472,7 @@ main ()
    return 0;
  }
  _ACEOF
@@ -170,7 +170,7 @@ $NetBSD: patch-configure,v 1.3 2013/09/15 12:28:22 joerg Exp $
    eval "$as_CACHEVAR=yes"
  else
    eval "$as_CACHEVAR=no"
-@@ -27529,16 +27533,19 @@ else
+@@ -27523,16 +27527,19 @@ else
    CFLAGS="$CFLAGS -Werror $flag"
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
@@ -193,7 +193,7 @@ $NetBSD: patch-configure,v 1.3 2013/09/15 12:28:22 joerg Exp $
    eval "$as_CACHEVAR=yes"
  else
    eval "$as_CACHEVAR=no"
-@@ -27603,7 +27610,7 @@ main ()
+@@ -27596,7 +27603,7 @@ main ()
    return 0;
  }
  _ACEOF
@@ -202,7 +202,7 @@ $NetBSD: patch-configure,v 1.3 2013/09/15 12:28:22 joerg Exp $
    eval "$as_CACHEVAR=yes"
  else
    eval "$as_CACHEVAR=no"
-@@ -27668,7 +27675,7 @@ main ()
+@@ -27660,7 +27667,7 @@ main ()
    return 0;
  }
  _ACEOF
@@ -211,7 +211,7 @@ $NetBSD: patch-configure,v 1.3 2013/09/15 12:28:22 joerg Exp $
    eval "$as_CACHEVAR=yes"
  else
    eval "$as_CACHEVAR=no"
-@@ -27733,7 +27740,7 @@ main ()
+@@ -27725,7 +27732,7 @@ main ()
    return 0;
  }
  _ACEOF
@@ -220,7 +220,7 @@ $NetBSD: patch-configure,v 1.3 2013/09/15 12:28:22 joerg Exp $
    eval "$as_CACHEVAR=yes"
  else
    eval "$as_CACHEVAR=no"
-@@ -27798,7 +27805,7 @@ main ()
+@@ -27790,7 +27797,7 @@ main ()
    return 0;
  }
  _ACEOF
@@ -229,7 +229,7 @@ $NetBSD: patch-configure,v 1.3 2013/09/15 12:28:22 joerg Exp $
    eval "$as_CACHEVAR=yes"
  else
    eval "$as_CACHEVAR=no"
-@@ -31956,16 +31963,16 @@ else
+@@ -31967,16 +31974,16 @@ else
    CXXFLAGS="$CXXFLAGS -Werror $flag"
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
@@ -249,7 +249,7 @@ $NetBSD: patch-configure,v 1.3 2013/09/15 12:28:22 joerg Exp $
    eval "$as_CACHEVAR=yes"
  else
    eval "$as_CACHEVAR=no"
-@@ -32030,7 +32037,7 @@ main ()
+@@ -32042,7 +32049,7 @@ main ()
    return 0;
  }
  _ACEOF
@@ -258,7 +258,7 @@ $NetBSD: patch-configure,v 1.3 2013/09/15 12:28:22 joerg Exp $
    eval "$as_CACHEVAR=yes"
  else
    eval "$as_CACHEVAR=no"
-@@ -32087,15 +32094,17 @@ else
+@@ -32098,15 +32105,17 @@ else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
@@ -278,7 +278,7 @@ $NetBSD: patch-configure,v 1.3 2013/09/15 12:28:22 joerg Exp $
    eval "$as_CACHEVAR=yes"
  else
    eval "$as_CACHEVAR=no"
-@@ -32155,12 +32164,12 @@ else
+@@ -32165,12 +32174,12 @@ else
  int
  main ()
  {
@@ -294,7 +294,7 @@ $NetBSD: patch-configure,v 1.3 2013/09/15 12:28:22 joerg Exp $
    eval "$as_CACHEVAR=yes"
  else
    eval "$as_CACHEVAR=no"
-@@ -32225,7 +32234,7 @@ main ()
+@@ -32234,7 +32243,7 @@ main ()
    return 0;
  }
  _ACEOF
@@ -303,7 +303,7 @@ $NetBSD: patch-configure,v 1.3 2013/09/15 12:28:22 joerg Exp $
    eval "$as_CACHEVAR=yes"
  else
    eval "$as_CACHEVAR=no"
-@@ -32290,7 +32299,7 @@ main ()
+@@ -32298,7 +32307,7 @@ main ()
    return 0;
  }
  _ACEOF
@@ -312,7 +312,7 @@ $NetBSD: patch-configure,v 1.3 2013/09/15 12:28:22 joerg Exp $
    eval "$as_CACHEVAR=yes"
  else
    eval "$as_CACHEVAR=no"
-@@ -32355,7 +32364,7 @@ main ()
+@@ -32362,7 +32371,7 @@ main ()
    return 0;
  }
  _ACEOF
@@ -321,7 +321,7 @@ $NetBSD: patch-configure,v 1.3 2013/09/15 12:28:22 joerg Exp $
    eval "$as_CACHEVAR=yes"
  else
    eval "$as_CACHEVAR=no"
-@@ -32420,7 +32429,7 @@ main ()
+@@ -32426,7 +32435,7 @@ main ()
    return 0;
  }
  _ACEOF
@@ -330,7 +330,7 @@ $NetBSD: patch-configure,v 1.3 2013/09/15 12:28:22 joerg Exp $
    eval "$as_CACHEVAR=yes"
  else
    eval "$as_CACHEVAR=no"
-@@ -32485,7 +32494,7 @@ main ()
+@@ -32490,7 +32499,7 @@ main ()
    return 0;
  }
  _ACEOF
@@ -339,7 +339,7 @@ $NetBSD: patch-configure,v 1.3 2013/09/15 12:28:22 joerg Exp $
    eval "$as_CACHEVAR=yes"
  else
    eval "$as_CACHEVAR=no"
-@@ -32550,7 +32559,7 @@ main ()
+@@ -32554,7 +32563,7 @@ main ()
    return 0;
  }
  _ACEOF
@@ -348,7 +348,7 @@ $NetBSD: patch-configure,v 1.3 2013/09/15 12:28:22 joerg Exp $
    eval "$as_CACHEVAR=yes"
  else
    eval "$as_CACHEVAR=no"
-@@ -32615,7 +32624,7 @@ main ()
+@@ -32618,7 +32627,7 @@ main ()
    return 0;
  }
  _ACEOF
@@ -357,7 +357,7 @@ $NetBSD: patch-configure,v 1.3 2013/09/15 12:28:22 joerg Exp $
    eval "$as_CACHEVAR=yes"
  else
    eval "$as_CACHEVAR=no"
-@@ -32680,7 +32689,7 @@ main ()
+@@ -32682,7 +32691,7 @@ main ()
    return 0;
  }
  _ACEOF
@@ -366,7 +366,7 @@ $NetBSD: patch-configure,v 1.3 2013/09/15 12:28:22 joerg Exp $
    eval "$as_CACHEVAR=yes"
  else
    eval "$as_CACHEVAR=no"
-@@ -32745,7 +32754,7 @@ main ()
+@@ -32746,7 +32755,7 @@ main ()
    return 0;
  }
  _ACEOF
@@ -384,7 +384,7 @@ $NetBSD: patch-configure,v 1.3 2013/09/15 12:28:22 joerg Exp $
    eval "$as_CACHEVAR=yes"
  else
    eval "$as_CACHEVAR=no"
-@@ -32875,7 +32884,7 @@ main ()
+@@ -32874,7 +32883,7 @@ main ()
    return 0;
  }
  _ACEOF
@@ -393,7 +393,7 @@ $NetBSD: patch-configure,v 1.3 2013/09/15 12:28:22 joerg Exp $
    eval "$as_CACHEVAR=yes"
  else
    eval "$as_CACHEVAR=no"
-@@ -32931,16 +32940,19 @@ else
+@@ -32929,16 +32938,19 @@ else
    CXXFLAGS="$CXXFLAGS -Werror $flag"
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
@@ -416,7 +416,7 @@ $NetBSD: patch-configure,v 1.3 2013/09/15 12:28:22 joerg Exp $
    eval "$as_CACHEVAR=yes"
  else
    eval "$as_CACHEVAR=no"
-@@ -33005,7 +33017,7 @@ main ()
+@@ -33002,7 +33014,7 @@ main ()
    return 0;
  }
  _ACEOF
@@ -425,7 +425,7 @@ $NetBSD: patch-configure,v 1.3 2013/09/15 12:28:22 joerg Exp $
    eval "$as_CACHEVAR=yes"
  else
    eval "$as_CACHEVAR=no"
-@@ -33070,7 +33082,7 @@ main ()
+@@ -33066,7 +33078,7 @@ main ()
    return 0;
  }
  _ACEOF
@@ -434,7 +434,7 @@ $NetBSD: patch-configure,v 1.3 2013/09/15 12:28:22 joerg Exp $
    eval "$as_CACHEVAR=yes"
  else
    eval "$as_CACHEVAR=no"
-@@ -33135,7 +33147,7 @@ main ()
+@@ -33131,7 +33143,7 @@ main ()
    return 0;
  }
  _ACEOF
@@ -443,7 +443,7 @@ $NetBSD: patch-configure,v 1.3 2013/09/15 12:28:22 joerg Exp $
    eval "$as_CACHEVAR=yes"
  else
    eval "$as_CACHEVAR=no"
-@@ -33200,7 +33212,7 @@ main ()
+@@ -33195,7 +33207,7 @@ main ()
    return 0;
  }
  _ACEOF
diff --git a/devel/libmemcached/patches/patch-libmemcached_byteorder.cc b/devel/libmemcached/patches/patch-libmemcached_byteorder.cc
index ac4a91ec91a..c2c8a316647 100644
--- a/devel/libmemcached/patches/patch-libmemcached_byteorder.cc
+++ b/devel/libmemcached/patches/patch-libmemcached_byteorder.cc
@@ -1,7 +1,7 @@
-$NetBSD: patch-libmemcached_byteorder.cc,v 1.1 2013/09/12 14:20:56 fhajny Exp $
+$NetBSD: patch-libmemcached_byteorder.cc,v 1.2 2014/04/01 13:51:56 fhajny Exp $
 
 Need ntohll/htonll defined.
---- libmemcached/byteorder.cc.orig	2013-04-03 04:22:00.000000000 +0000
+--- libmemcached/byteorder.cc.orig	2014-02-09 11:52:42.000000000 +0000
 +++ libmemcached/byteorder.cc
 @@ -36,6 +36,9 @@
   */
diff --git a/devel/libmemcached/patches/patch-libtest_lite.h b/devel/libmemcached/patches/patch-libtest_lite.h
index a6d9ed35f6e..ba57a9c145b 100644
--- a/devel/libmemcached/patches/patch-libtest_lite.h
+++ b/devel/libmemcached/patches/patch-libtest_lite.h
@@ -1,11 +1,11 @@
-$NetBSD: patch-libtest_lite.h,v 1.1 2013/09/12 14:20:56 fhajny Exp $
+$NetBSD: patch-libtest_lite.h,v 1.2 2014/04/01 13:51:56 fhajny Exp $
 
 NetBSD doesn't have alloca.h.
---- libtest/lite.h.orig	2013-04-03 04:22:00.000000000 +0000
+--- libtest/lite.h.orig	2014-02-09 11:52:42.000000000 +0000
 +++ libtest/lite.h
 @@ -53,7 +53,7 @@
  
- #if defined(_WIN32)
+ #if defined(WIN32)
  # include <malloc.h>
 -#else
 +#elif !defined(__NetBSD__)
diff --git a/devel/libmemcached/patches/patch-libtest_test.hpp b/devel/libmemcached/patches/patch-libtest_test.hpp
index ef5e361ef11..389024f2913 100644
--- a/devel/libmemcached/patches/patch-libtest_test.hpp
+++ b/devel/libmemcached/patches/patch-libtest_test.hpp
@@ -1,7 +1,7 @@
-$NetBSD: patch-libtest_test.hpp,v 1.1 2013/09/12 14:20:56 fhajny Exp $
+$NetBSD: patch-libtest_test.hpp,v 1.2 2014/04/01 13:51:56 fhajny Exp $
 
 cstdarg needed for va_start.
---- libtest/test.hpp.orig	2013-04-03 04:22:00.000000000 +0000
+--- libtest/test.hpp.orig	2014-02-09 11:52:42.000000000 +0000
 +++ libtest/test.hpp
 @@ -57,6 +57,7 @@
  
diff --git a/devel/libmemcached/patches/patch-tests_libmemcached-1.0_ketama.cc b/devel/libmemcached/patches/patch-tests_libmemcached-1.0_ketama.cc
index e6d73f7a1c8..f6c3bb29c98 100644
--- a/devel/libmemcached/patches/patch-tests_libmemcached-1.0_ketama.cc
+++ b/devel/libmemcached/patches/patch-tests_libmemcached-1.0_ketama.cc
@@ -1,7 +1,7 @@
-$NetBSD: patch-tests_libmemcached-1.0_ketama.cc,v 1.3 2013/09/12 14:20:56 fhajny Exp $
+$NetBSD: patch-tests_libmemcached-1.0_ketama.cc,v 1.4 2014/04/01 13:51:56 fhajny Exp $
 
 Use stdint.
---- tests/libmemcached-1.0/ketama.cc.orig	2013-04-03 04:22:00.000000000 +0000
+--- 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 @@
   *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/devel/libmemcached/patches/patch-tests_libmemcached-1.0_pool.cc b/devel/libmemcached/patches/patch-tests_libmemcached-1.0_pool.cc
index 38ab45438be..68c015f30ec 100644
--- a/devel/libmemcached/patches/patch-tests_libmemcached-1.0_pool.cc
+++ b/devel/libmemcached/patches/patch-tests_libmemcached-1.0_pool.cc
@@ -1,7 +1,7 @@
-$NetBSD: patch-tests_libmemcached-1.0_pool.cc,v 1.3 2013/09/12 14:20:56 fhajny Exp $
+$NetBSD: patch-tests_libmemcached-1.0_pool.cc,v 1.4 2014/04/01 13:51:56 fhajny Exp $
 
 Use stdint.
---- tests/libmemcached-1.0/pool.cc.orig	2013-04-03 04:22:00.000000000 +0000
+--- 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 @@
   *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.