Upgrade to 1.0.2.

8 files changed, 83 insertions, 189 deletions

diff --git a/databases/libmemcached/Makefile b/databases/libmemcached/Makefile
index 0445485b87bc..c7880746492f 100644
--- a/databases/libmemcached/Makefile
+++ b/databases/libmemcached/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libmemcached
-PORTVERSION=	0.51
+PORTVERSION=	1.0.2
 PORTREVISION=	0
 CATEGORIES=	databases
 MASTER_SITES=	http://launchpad.net/${PORTNAME}/1.0/${PORTVERSION}/+download/
@@ -86,6 +86,8 @@ MAN3=		hashkit_clone.3 \
 		memcached_delete_by_key.3 \
 		memcached_destroy_sasl_auth_data.3 \
 		memcached_dump.3 \
+		memcached_exist.3 \
+		memcached_exist_by_key.3 \
 		memcached_fetch.3 \
 		memcached_flush_buffers.3 \
 		memcached_fetch_execute.3 \
@@ -100,17 +102,21 @@ MAN3=		hashkit_clone.3 \
 		memcached_get_user_data.3 \
 		memcached_increment.3 \
 		memcached_increment_with_initial.3 \
+		memcached_last_error_message.3 \
 		memcached_lib_version.3 \
 		memcached_mget.3 \
 		memcached_mget_by_key.3 \
 		memcached_mget_execute.3 \
 		memcached_mget_execute_by_key.3 \
+		memcached_pool.3 \
 		memcached_pool_behavior_get.3 \
 		memcached_pool_behavior_set.3 \
 		memcached_pool_create.3 \
 		memcached_pool_destroy.3 \
+		memcached_pool_fetch.3 \
 		memcached_pool_pop.3 \
 		memcached_pool_push.3 \
+		memcached_pool_release.3 \
 		memcached_pool_st.3 \
 		memcached_prepend.3 \
 		memcached_prepend_by_key.3 \
@@ -138,6 +144,8 @@ MAN3=		hashkit_clone.3 \
 		memcached_stat_get_value.3 \
 		memcached_stat_servername.3 \
 		memcached_strerror.3 \
+		memcached_touch.3 \
+		memcached_touch_by_key.3 \
 		memcached_verbosity.3 \
 		memcached_version.3
 .endif
diff --git a/databases/libmemcached/distinfo b/databases/libmemcached/distinfo
index 902ccf5e7c22..c2aeb567bac5 100644
--- a/databases/libmemcached/distinfo
+++ b/databases/libmemcached/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libmemcached-0.51.tar.gz) = aa144280a2ace846da8166b9beffbcbc88e28a01c8895b9acf671e8f327ce3f2
-SIZE (libmemcached-0.51.tar.gz) = 916491
+SHA256 (libmemcached-1.0.2.tar.gz) = c5ca21dbb85ce4a4de91e4aed6b3d1f8a4599980aa606ef0812eeb52b7d017f2
+SIZE (libmemcached-1.0.2.tar.gz) = 942891
diff --git a/databases/libmemcached/files/patch-clients__memparse.cc b/databases/libmemcached/files/patch-clients__memparse.cc
deleted file mode 100644
index 3c2d5905af12..000000000000
--- a/databases/libmemcached/files/patch-clients__memparse.cc
+++ /dev/null
@@ -1,10 +0,0 @@
---- clients/memparse.cc.orig	2011-03-30 00:50:27.000000000 +0800
-+++ clients/memparse.cc	2011-05-23 20:36:12.000000000 +0800
-@@ -37,6 +37,7 @@
- 
- #include <config.h>
- 
-+#include <string.h>
- #include <iostream>
- 
- #include <libmemcached/memcached.h>
diff --git a/databases/libmemcached/files/patch-tests__mem_functions.cc b/databases/libmemcached/files/patch-tests__mem_functions.cc
deleted file mode 100644
index 6b49f4c84e25..000000000000
--- a/databases/libmemcached/files/patch-tests__mem_functions.cc
+++ /dev/null
@@ -1,38 +0,0 @@
---- tests/mem_functions.cc.orig	2011-08-05 09:20:08.000000000 +0800
-+++ tests/mem_functions.cc	2011-08-05 09:29:52.000000000 +0800
-@@ -3629,7 +3629,7 @@ static test_return_t pre_nonblock_binary
-     memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NO_BLOCK, 0);
-     test_compare(MEMCACHED_SUCCESS,
-                  memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL, 1));
--    test_compare(1UL, memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL));
-+    test_compare(1UL, (unsigned long)memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL));
-   }
-   else
-   {
-@@ -4401,7 +4401,7 @@ static test_return_t connection_pool_tes
-     uint64_t number_value;
-     test_compare(MEMCACHED_SUCCESS,
-                  memcached_increment(mmc[x], key, keylen, 1, &number_value));
--    test_compare(number_value, (x+1));
-+    test_compare(number_value, (uint64_t)(x+1));
-   }
- 
-   // Release them..
-@@ -4951,7 +4951,7 @@ static test_return_t ketama_compatibilit
-   test_compare(MEMCACHED_SUCCESS,
-                memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_KETAMA_WEIGHTED, 1));
- 
--  test_compare(1UL, memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_KETAMA_WEIGHTED));
-+  test_compare(1UL, (unsigned long)memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_KETAMA_WEIGHTED));
- 
-   test_compare(MEMCACHED_SUCCESS, memcached_behavior_set_distribution(memc, MEMCACHED_DISTRIBUTION_CONSISTENT_KETAMA));
-   test_compare(MEMCACHED_DISTRIBUTION_CONSISTENT_KETAMA, memcached_behavior_get_distribution(memc));
-@@ -5882,7 +5882,7 @@ static test_return_t regression_bug_6554
- 
-     test_compare(MEMCACHED_SUCCESS, rc);
-     test_true(value);
--    test_compare(100UL, value_length);
-+    test_compare(100UL, (unsigned long)value_length);
-     free(value);
-   }
- 
diff --git a/databases/libmemcached/files/patch-tests__namespace.cc b/databases/libmemcached/files/patch-tests__namespace.cc
deleted file mode 100644
index fc6eb9e32694..000000000000
--- a/databases/libmemcached/files/patch-tests__namespace.cc
+++ /dev/null
@@ -1,43 +0,0 @@
---- tests/namespace.cc.orig	2011-08-05 09:20:13.000000000 +0800
-+++ tests/namespace.cc	2011-08-05 09:21:03.000000000 +0800
-@@ -58,13 +58,13 @@ test_return_t memcached_increment_namesp
-                memcached_increment(memc,
-                                    test_literal_param("number"),
-                                    1, &new_number));
--  test_compare(1UL, new_number);
-+  test_compare(1UL, (unsigned long)new_number);
- 
-   test_compare(MEMCACHED_SUCCESS, 
-                memcached_increment(memc,
-                                    test_literal_param("number"),
-                                    1, &new_number));
--  test_compare(2UL, new_number);
-+  test_compare(2UL, (unsigned long)new_number);
- 
-   memcached_st *clone= memcached_clone(NULL, memc);
- 
-@@ -86,7 +86,7 @@ test_return_t memcached_increment_namesp
-                              test_literal_param("number"),
-                              0, 0, 0);
-   test_true(value);
--  test_compare(2UL, strlen(value));
-+  test_compare(2UL, (unsigned long)strlen(value));
-   test_strcmp("10", value);
-   free(value);
- 
-@@ -94,13 +94,13 @@ test_return_t memcached_increment_namesp
-                memcached_increment(clone,
-                                    test_literal_param("number"),
-                                    1, &new_number));
--  test_compare(11UL, new_number);
-+  test_compare(11UL, (unsigned long)new_number);
- 
-   test_compare(MEMCACHED_SUCCESS, 
-                memcached_increment(memc,
-                                    test_literal_param("number"),
-                                    1, &new_number));
--  test_compare(3UL, new_number);
-+  test_compare(3UL, (unsigned long)new_number);
- 
-   memcached_free(clone);
- 
diff --git a/databases/libmemcached/files/patch-tests__plus.cpp b/databases/libmemcached/files/patch-tests__plus.cpp
deleted file mode 100644
index 482d6f166c65..000000000000
--- a/databases/libmemcached/files/patch-tests__plus.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
---- tests/plus.cpp.orig	2011-08-05 09:23:49.000000000 +0800
-+++ tests/plus.cpp	2011-08-05 09:25:22.000000000 +0800
-@@ -128,13 +128,13 @@ test_return_t increment_test(memcached_s
-   test_compare(int_inc_value, int_ret_value);
- 
-   test_true(mcach.increment(key, 1, &int_ret_value));
--  test_compare(2UL, int_ret_value);
-+  test_compare(2UL, (unsigned long)int_ret_value);
- 
-   test_true(mcach.increment(key, 1, &int_ret_value));
--  test_compare(3UL, int_ret_value);
-+  test_compare(3UL, (unsigned long)int_ret_value);
- 
-   test_true(mcach.increment(key, 5, &int_ret_value));
--  test_compare(8UL, int_ret_value);
-+  test_compare(8UL, (unsigned long)int_ret_value);
- 
-   return TEST_SUCCESS;
- }
diff --git a/databases/libmemcached/files/patch-tests__replication.cc b/databases/libmemcached/files/patch-tests__replication.cc
deleted file mode 100644
index 1017fede639e..000000000000
--- a/databases/libmemcached/files/patch-tests__replication.cc
+++ /dev/null
@@ -1,15 +0,0 @@
---- tests/replication.cc.orig	2011-08-05 09:22:41.000000000 +0800
-+++ tests/replication.cc	2011-08-05 09:23:16.000000000 +0800
-@@ -249,10 +249,10 @@ test_return_t replication_delete_test(me
- 
-   // Make one copy
-   test_compare(MEMCACHED_SUCCESS, memcached_behavior_set(memc_replicated, MEMCACHED_BEHAVIOR_NUMBER_OF_REPLICAS, 1UL));
--  test_compare(1UL, memcached_behavior_get(memc_replicated, MEMCACHED_BEHAVIOR_NUMBER_OF_REPLICAS));
-+  test_compare(1UL, (unsigned long)memcached_behavior_get(memc_replicated, MEMCACHED_BEHAVIOR_NUMBER_OF_REPLICAS));
- 
-   test_compare(MEMCACHED_SUCCESS, memcached_behavior_set(memc_not_replicate, MEMCACHED_BEHAVIOR_NUMBER_OF_REPLICAS, 0UL));
--  test_compare(0UL, memcached_behavior_get(memc_not_replicate, MEMCACHED_BEHAVIOR_NUMBER_OF_REPLICAS));
-+  test_compare(0UL, (unsigned long)memcached_behavior_get(memc_not_replicate, MEMCACHED_BEHAVIOR_NUMBER_OF_REPLICAS));
- 
-   for (size_t x= 0; x < test_array_length(keys); ++x)
-   {
diff --git a/databases/libmemcached/pkg-plist b/databases/libmemcached/pkg-plist
index 35f284cec92c..2106918d5eff 100644
--- a/databases/libmemcached/pkg-plist
+++ b/databases/libmemcached/pkg-plist
@@ -3,88 +3,99 @@ bin/memcat
 bin/memcp
 bin/memdump
 bin/memerror
+bin/memexist
 bin/memflush
 bin/memparse
+bin/memping
 bin/memrm
 bin/memslap
 bin/memstat
-include/libhashkit/algorithm.h
-include/libhashkit/behavior.h
-include/libhashkit/configure.h
-include/libhashkit/digest.h
-include/libhashkit/function.h
+bin/memtouch
 include/libhashkit/hashkit.h
-include/libhashkit/hashkit.hpp
-include/libhashkit/strerror.h
-include/libhashkit/str_algorithm.h
-include/libhashkit/types.h
-include/libhashkit/visibility.h
-include/libmemcached/allocators.h
-include/libmemcached/analyze.h
-include/libmemcached/array.h
-include/libmemcached/auto.h
-include/libmemcached/basic_string.h
-include/libmemcached/behavior.h
-include/libmemcached/callback.h
-include/libmemcached/configure.h
-include/libmemcached/constants.h
-include/libmemcached/delete.h
-include/libmemcached/dump.h
-include/libmemcached/error.h
-include/libmemcached/exception.hpp
-include/libmemcached/fetch.h
-include/libmemcached/flush.h
-include/libmemcached/flush_buffers.h
-include/libmemcached/get.h
-include/libmemcached/hash.h
+include/libhashkit-1.0/algorithm.h
+include/libhashkit-1.0/behavior.h
+include/libhashkit-1.0/configure.h
+include/libhashkit-1.0/digest.h
+include/libhashkit-1.0/function.h
+include/libhashkit-1.0/has.h
+include/libhashkit-1.0/hashkit.h
+include/libhashkit-1.0/hashkit.hpp
+include/libhashkit-1.0/strerror.h
+include/libhashkit-1.0/str_algorithm.h
+include/libhashkit-1.0/types.h
+include/libhashkit-1.0/visibility.h
 include/libmemcached/memcached.h
 include/libmemcached/memcached.hpp
-include/libmemcached/memcached_util.h
-include/libmemcached/memcached/protocol_binary.h
-include/libmemcached/memcached/vbucket.h
-include/libmemcached/namespace.h
-include/libmemcached/options.h
-include/libmemcached/parse.h
-include/libmemcached/platform.h
-include/libmemcached/protocol_handler.h
-include/libmemcached/protocol/cache.h
-include/libmemcached/protocol/callback.h
-include/libmemcached/quit.h
-include/libmemcached/result.h
-include/libmemcached/return.h
-include/libmemcached/sasl.h
-include/libmemcached/server.h
-include/libmemcached/server_list.h
-include/libmemcached/stats.h
-include/libmemcached/storage.h
-include/libmemcached/strerror.h
-include/libmemcached/string.h
-include/libmemcached/types.h
 include/libmemcached/util.h
-include/libmemcached/util/flush.h
-include/libmemcached/util/pid.h
-include/libmemcached/util/ping.h
-include/libmemcached/util/pool.h
-include/libmemcached/util/version.h
-include/libmemcached/verbosity.h
-include/libmemcached/version.h
-include/libmemcached/visibility.h
-include/libmemcached/watchpoint.h
+include/libmemcached-1.0/allocators.h
+include/libmemcached-1.0/analyze.h
+include/libmemcached-1.0/auto.h
+include/libmemcached-1.0/basic_string.h
+include/libmemcached-1.0/behavior.h
+include/libmemcached-1.0/callback.h
+include/libmemcached-1.0/configure.h
+include/libmemcached-1.0/constants.h
+include/libmemcached-1.0/delete.h
+include/libmemcached-1.0/dump.h
+include/libmemcached-1.0/error.h
+include/libmemcached-1.0/exception.hpp
+include/libmemcached-1.0/exist.h
+include/libmemcached-1.0/fetch.h
+include/libmemcached-1.0/flush.h
+include/libmemcached-1.0/flush_buffers.h
+include/libmemcached-1.0/get.h
+include/libmemcached-1.0/hash.h
+include/libmemcached-1.0/memcached.h
+include/libmemcached-1.0/memcached.hpp
+include/libmemcached-1.0/options.h
+include/libmemcached-1.0/parse.h
+include/libmemcached-1.0/platform.h
+include/libmemcached-1.0/quit.h
+include/libmemcached-1.0/result.h
+include/libmemcached-1.0/return.h
+include/libmemcached-1.0/sasl.h
+include/libmemcached-1.0/server.h
+include/libmemcached-1.0/server_list.h
+include/libmemcached-1.0/stats.h
+include/libmemcached-1.0/storage.h
+include/libmemcached-1.0/strerror.h
+include/libmemcached-1.0/string.h
+include/libmemcached-1.0/touch.h
+include/libmemcached-1.0/types.h
+include/libmemcached-1.0/verbosity.h
+include/libmemcached-1.0/version.h
+include/libmemcached-1.0/visibility.h
+include/libmemcachedprotocol-0.0/binary.h
+include/libmemcachedprotocol-0.0/callback.h
+include/libmemcachedprotocol-0.0/handler.h
+include/libmemcachedprotocol-0.0/vbucket.h
+include/libmemcachedutil-1.0/flush.h
+include/libmemcachedutil-1.0/ostream.hpp
+include/libmemcachedutil-1.0/pid.h
+include/libmemcachedutil-1.0/ping.h
+include/libmemcachedutil-1.0/pool.h
+include/libmemcachedutil-1.0/util.h
+include/libmemcachedutil-1.0/version.h
+lib/libhashkit.a
 lib/libhashkit.la
 lib/libhashkit.so
 lib/libhashkit.so.1
+lib/libmemcached.a
 lib/libmemcached.la
 lib/libmemcached.so
 lib/libmemcached.so.8
+lib/libmemcachedprotocol.a
 lib/libmemcachedprotocol.la
 lib/libmemcachedprotocol.so
 lib/libmemcachedprotocol.so.0
+lib/libmemcachedutil.a
 lib/libmemcachedutil.la
 lib/libmemcachedutil.so
 lib/libmemcachedutil.so.2
 libdata/pkgconfig/libmemcached.pc
-@dirrm include/libmemcached/util
-@dirrm include/libmemcached/protocol
-@dirrm include/libmemcached/memcached
+@dirrm include/libmemcachedutil-1.0
+@dirrm include/libmemcachedprotocol-0.0
+@dirrm include/libmemcached-1.0
 @dirrm include/libmemcached
+@dirrm include/libhashkit-1.0
 @dirrm include/libhashkit