Thu Sep 12 14:20:56 2013 UTC ()
1.0.17 Tue Apr  2 14:02:01 HST 2013
* Remove c++ namespace that was being exposed (the API should be plug
  compatible)..
* Fix cases where --servers wasn't behaving the same in all clients.

1.0.16 Thu Jan 31 19:14:32 EST 2013
* Added support to do two part shutdown of socket.
* Fixes for Fedora 18.
* Fix for binary memcached_touch()

1.0.15 Mon Dec 17 07:25:44 EST 2012
* Added support for Murmur3 (HASHKIT_HASH_MURMUR3)
* Portability fixes.

1.0.14 Wed Nov 14 04:56:25 EST 2012
* CLIENT_ERROR fixed to not be treated as a fatal error.
* Compiler fixes for older Ubuntu releases.

1.0.13 Fri Oct 19 00:09:28 EDT 2012
* Fix bug that caused version string to not be exported correctly.

1.0.12 Tue Oct  9 03:30:20 EDT 2012
* Added memcached_result_take_value().
* Added ax_libmemcached.m4

1.0.11 Sun Sep 16 20:32:13 EDT 2012
* Removed custom version of memcached.
* Updated hardening rules.
* Fixed a case where the return error from a socket connection differred
  from that of a TCP/IP socket.

1.0.10 Sun Jul 29 21:50:15 PDT 2012
* --disable-assert has been removed from configure, and --enable-assert
  has been added in its place.
* Compiling fixes for Clang on OSX Mountain Lion.

1.0.9 Wed Jul  4 22:46:19 EDT 2012
* Faster close on socket.
* Instance allocation is now seperated from server interface. This should
  allow for a better preservation of ABI compliance from now on.
* Fix close on exec bug.
* Numerous other bug fixes.

1.0.8 Tue May 22 15:06:04 EDT 2012
* Added support for setting options via ENV variable LIBMEMCACHED
* Fix corner case on last used result.

1.0.7 Sat Apr 28 00:48:29 PDT 2012
* Add API call for exist calls.
* Update all license files to be BSD.

1.0.6 Sat Apr  7 18:26:49 PDT 2012
* Fixes for gcc 4.7, lp:961812
* Fix for restart issue that happens under testing.
* Fix for lp:962815.
* Support for transparent AES encryption.

1.0.5 Tue Mar 13 22:56:47 PDT 2012
* Fixes for OSX.
* Version is now parsed directly in the parser, which makes buffered
  operations now work with it..
* memstat has been extended so that it can be used to find the version
  of the server.
* Update documentation.
* Fixes for compile issues on Debian and Ubuntu

1.0.4 Thu Jan 26 22:33:54 PST 2012
* Fix for memcached_dump().
* Additional testing for memcached_stat_execute().


(fhajny)
diff -r1.6 -r1.7 pkgsrc/devel/libmemcached/Makefile
diff -r1.2 -r1.3 pkgsrc/devel/libmemcached/PLIST
diff -r1.4 -r1.5 pkgsrc/devel/libmemcached/distinfo
diff -r1.1 -r0 pkgsrc/devel/libmemcached/patches/patch-configure
diff -r0 -r1.1 pkgsrc/devel/libmemcached/patches/patch-libmemcached-1.0_deprecated__types.h
diff -r0 -r1.1 pkgsrc/devel/libmemcached/patches/patch-libmemcached_byteorder.cc
diff -r0 -r1.1 pkgsrc/devel/libmemcached/patches/patch-libtest_lite.h
diff -r0 -r1.1 pkgsrc/devel/libmemcached/patches/patch-libtest_main.cc
diff -r0 -r1.1 pkgsrc/devel/libmemcached/patches/patch-libtest_test.hpp
diff -r1.2 -r1.3 pkgsrc/devel/libmemcached/patches/patch-tests_libmemcached-1.0_ketama.cc
diff -r1.2 -r1.3 pkgsrc/devel/libmemcached/patches/patch-tests_libmemcached-1.0_pool.cc

cvs diff -r1.6 -r1.7 pkgsrc/devel/libmemcached/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/libmemcached/Makefile 2013/05/04 12:43:50 1.6
+++ pkgsrc/devel/libmemcached/Makefile 2013/09/12 14:20:56 1.7
@@ -1,33 +1,34 @@ @@ -1,33 +1,34 @@
1# $NetBSD: Makefile,v 1.6 2013/05/04 12:43:50 joerg Exp $ 1# $NetBSD: Makefile,v 1.7 2013/09/12 14:20:56 fhajny Exp $
2# 2#
3 3
4DISTNAME= libmemcached-1.0.4 4DISTNAME= libmemcached-1.0.17
5CATEGORIES= devel 5CATEGORIES= devel
6MASTER_SITES= http://launchpad.net/libmemcached/1.0/${PKGVERSION}/+download/ 6MASTER_SITES= http://launchpad.net/libmemcached/1.0/${PKGVERSION_NOREV}/+download/
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://libmemcached.org/ 9HOMEPAGE= http://libmemcached.org/
10COMMENT= C/C++ client library and tools for the memcached server 10COMMENT= C/C++ client library and tools for the memcached server
11LICENSE= modified-bsd 11LICENSE= modified-bsd
12 12
13GNU_CONFIGURE= yes 13GNU_CONFIGURE= yes
14USE_TOOLS+= pkg-config gmake 14USE_TOOLS+= pkg-config gmake
15USE_LANGUAGES= c c++ 15USE_LANGUAGES= c c++
16USE_LIBTOOL= yes 16USE_LIBTOOL= yes
17 17
18PKGCONFIG_OVERRIDE+= support/libmemcached.pc.in 18PKGCONFIG_OVERRIDE+= support/libmemcached.pc.in
19 19
20.include "../../mk/bsd.prefs.mk" 20.include "../../mk/bsd.prefs.mk"
21# Avoid building 64bit on a 32bit bootstrap (affects SunOS) 21.include "options.mk"
22.if defined(ABI) && empty(ABI:M64) 22
23CONFIGURE_ARGS+= --disable-64bit 23CONFIGURE_ARGS+=--enable-jobserver=no
24.endif 
25 
26# for backtrace 
27.if ${OPSYS} == "NetBSD" && exists(/usr/include/execinfo.h) 
28LIBS+= -lexecinfo 
29.endif 
30 24
31CPPFLAGS+= -D__STDC_FORMAT_MACROS 25CPPFLAGS+= -D__STDC_FORMAT_MACROS
32 26
 27LIBS.SunOS+= -lsocket
 28
 29post-configure:
 30 ${ECHO} '#define HAVE_MEMCACHED_BINARY 1' >> ${WRKSRC}/mem_config.h
 31 ${ECHO} '#define MEMCACHED_BINARY "${PREFIX}/bin/memcached"' >> ${WRKSRC}/mem_config.h
 32
 33.include "../../devel/libexecinfo/buildlink3.mk"
33.include "../../mk/bsd.pkg.mk" 34.include "../../mk/bsd.pkg.mk"

cvs diff -r1.2 -r1.3 pkgsrc/devel/libmemcached/PLIST (expand / switch to unified diff)

--- pkgsrc/devel/libmemcached/PLIST 2012/02/07 11:34:00 1.2
+++ pkgsrc/devel/libmemcached/PLIST 2013/09/12 14:20:56 1.3
@@ -1,53 +1,55 @@ @@ -1,53 +1,55 @@
1@comment $NetBSD: PLIST,v 1.2 2012/02/07 11:34:00 fhajny Exp $ 1@comment $NetBSD: PLIST,v 1.3 2013/09/12 14:20:56 fhajny Exp $
2bin/memcapable 2bin/memcapable
3bin/memcat 3bin/memcat
4bin/memcp 4bin/memcp
5bin/memdump 5bin/memdump
6bin/memerror 6bin/memerror
7bin/memexist 7bin/memexist
8bin/memflush 8bin/memflush
9bin/memparse 9bin/memparse
10bin/memping 10bin/memping
11bin/memrm 11bin/memrm
12bin/memslap 12bin/memslap
13bin/memstat 13bin/memstat
14bin/memtouch 14bin/memtouch
15include/libhashkit-1.0/algorithm.h 15include/libhashkit-1.0/algorithm.h
16include/libhashkit-1.0/behavior.h 16include/libhashkit-1.0/behavior.h
17include/libhashkit-1.0/configure.h 17include/libhashkit-1.0/configure.h
18include/libhashkit-1.0/digest.h 18include/libhashkit-1.0/digest.h
19include/libhashkit-1.0/function.h 19include/libhashkit-1.0/function.h
20include/libhashkit-1.0/has.h 20include/libhashkit-1.0/has.h
21include/libhashkit-1.0/hashkit.h 21include/libhashkit-1.0/hashkit.h
22include/libhashkit-1.0/hashkit.hpp 22include/libhashkit-1.0/hashkit.hpp
23include/libhashkit-1.0/str_algorithm.h 23include/libhashkit-1.0/str_algorithm.h
24include/libhashkit-1.0/strerror.h 24include/libhashkit-1.0/strerror.h
 25include/libhashkit-1.0/string.h
25include/libhashkit-1.0/types.h 26include/libhashkit-1.0/types.h
26include/libhashkit-1.0/visibility.h 27include/libhashkit-1.0/visibility.h
27include/libhashkit/hashkit.h 28include/libhashkit/hashkit.h
28include/libmemcached-1.0/alloc.h 29include/libmemcached-1.0/alloc.h
29include/libmemcached-1.0/allocators.h 30include/libmemcached-1.0/allocators.h
30include/libmemcached-1.0/analyze.h 31include/libmemcached-1.0/analyze.h
31include/libmemcached-1.0/auto.h 32include/libmemcached-1.0/auto.h
32include/libmemcached-1.0/basic_string.h 33include/libmemcached-1.0/basic_string.h
33include/libmemcached-1.0/behavior.h 34include/libmemcached-1.0/behavior.h
34include/libmemcached-1.0/callback.h 35include/libmemcached-1.0/callback.h
35include/libmemcached-1.0/callbacks.h 36include/libmemcached-1.0/callbacks.h
36include/libmemcached-1.0/configure.h 37include/libmemcached-1.0/configure.h
37include/libmemcached-1.0/defaults.h 38include/libmemcached-1.0/defaults.h
38include/libmemcached-1.0/delete.h 39include/libmemcached-1.0/delete.h
39include/libmemcached-1.0/deprecated_types.h 40include/libmemcached-1.0/deprecated_types.h
40include/libmemcached-1.0/dump.h 41include/libmemcached-1.0/dump.h
 42include/libmemcached-1.0/encoding_key.h
41include/libmemcached-1.0/error.h 43include/libmemcached-1.0/error.h
42include/libmemcached-1.0/exception.hpp 44include/libmemcached-1.0/exception.hpp
43include/libmemcached-1.0/exist.h 45include/libmemcached-1.0/exist.h
44include/libmemcached-1.0/fetch.h 46include/libmemcached-1.0/fetch.h
45include/libmemcached-1.0/flush.h 47include/libmemcached-1.0/flush.h
46include/libmemcached-1.0/flush_buffers.h 48include/libmemcached-1.0/flush_buffers.h
47include/libmemcached-1.0/get.h 49include/libmemcached-1.0/get.h
48include/libmemcached-1.0/hash.h 50include/libmemcached-1.0/hash.h
49include/libmemcached-1.0/limits.h 51include/libmemcached-1.0/limits.h
50include/libmemcached-1.0/memcached.h 52include/libmemcached-1.0/memcached.h
51include/libmemcached-1.0/memcached.hpp 53include/libmemcached-1.0/memcached.hpp
52include/libmemcached-1.0/options.h 54include/libmemcached-1.0/options.h
53include/libmemcached-1.0/parse.h 55include/libmemcached-1.0/parse.h
@@ -75,52 +77,51 @@ include/libmemcached-1.0/triggers.h @@ -75,52 +77,51 @@ include/libmemcached-1.0/triggers.h
75include/libmemcached-1.0/types.h 77include/libmemcached-1.0/types.h
76include/libmemcached-1.0/types/behavior.h 78include/libmemcached-1.0/types/behavior.h
77include/libmemcached-1.0/types/callback.h 79include/libmemcached-1.0/types/callback.h
78include/libmemcached-1.0/types/connection.h 80include/libmemcached-1.0/types/connection.h
79include/libmemcached-1.0/types/hash.h 81include/libmemcached-1.0/types/hash.h
80include/libmemcached-1.0/types/return.h 82include/libmemcached-1.0/types/return.h
81include/libmemcached-1.0/types/server_distribution.h 83include/libmemcached-1.0/types/server_distribution.h
82include/libmemcached-1.0/verbosity.h 84include/libmemcached-1.0/verbosity.h
83include/libmemcached-1.0/version.h 85include/libmemcached-1.0/version.h
84include/libmemcached-1.0/visibility.h 86include/libmemcached-1.0/visibility.h
85include/libmemcached/memcached.h 87include/libmemcached/memcached.h
86include/libmemcached/memcached.hpp 88include/libmemcached/memcached.hpp
87include/libmemcached/util.h 89include/libmemcached/util.h
88include/libmemcachedprotocol-0.0/binary.h 
89include/libmemcachedprotocol-0.0/callback.h 
90include/libmemcachedprotocol-0.0/handler.h 
91include/libmemcachedprotocol-0.0/vbucket.h 
92include/libmemcachedutil-1.0/flush.h 90include/libmemcachedutil-1.0/flush.h
93include/libmemcachedutil-1.0/ostream.hpp 91include/libmemcachedutil-1.0/ostream.hpp
94include/libmemcachedutil-1.0/pid.h 92include/libmemcachedutil-1.0/pid.h
95include/libmemcachedutil-1.0/ping.h 93include/libmemcachedutil-1.0/ping.h
96include/libmemcachedutil-1.0/pool.h 94include/libmemcachedutil-1.0/pool.h
97include/libmemcachedutil-1.0/util.h 95include/libmemcachedutil-1.0/util.h
98include/libmemcachedutil-1.0/version.h 96include/libmemcachedutil-1.0/version.h
99lib/libhashkit.la 97lib/libhashkit.la
100lib/libmemcached.la 98lib/libmemcached.la
101lib/libmemcachedprotocol.la 
102lib/libmemcachedutil.la 99lib/libmemcachedutil.la
103lib/pkgconfig/libmemcached.pc 100lib/pkgconfig/libmemcached.pc
104man/man1/memaslap.1 101man/man1/memaslap.1
105man/man1/memcapable.1 102man/man1/memcapable.1
106man/man1/memcat.1 103man/man1/memcat.1
107man/man1/memcp.1 104man/man1/memcp.1
108man/man1/memdump.1 105man/man1/memdump.1
109man/man1/memerror.1 106man/man1/memerror.1
 107man/man1/memexist.1
110man/man1/memflush.1 108man/man1/memflush.1
 109man/man1/memparse.1
 110man/man1/memping.1
111man/man1/memrm.1 111man/man1/memrm.1
112man/man1/memslap.1 112man/man1/memslap.1
113man/man1/memstat.1 113man/man1/memstat.1
 114man/man1/memtouch.1
114man/man3/hashkit_clone.3 115man/man3/hashkit_clone.3
115man/man3/hashkit_crc32.3 116man/man3/hashkit_crc32.3
116man/man3/hashkit_create.3 117man/man3/hashkit_create.3
117man/man3/hashkit_fnv1_32.3 118man/man3/hashkit_fnv1_32.3
118man/man3/hashkit_fnv1_64.3 119man/man3/hashkit_fnv1_64.3
119man/man3/hashkit_fnv1a_32.3 120man/man3/hashkit_fnv1a_32.3
120man/man3/hashkit_fnv1a_64.3 121man/man3/hashkit_fnv1a_64.3
121man/man3/hashkit_free.3 122man/man3/hashkit_free.3
122man/man3/hashkit_functions.3 123man/man3/hashkit_functions.3
123man/man3/hashkit_hsieh.3 124man/man3/hashkit_hsieh.3
124man/man3/hashkit_is_allocated.3 125man/man3/hashkit_is_allocated.3
125man/man3/hashkit_jenkins.3 126man/man3/hashkit_jenkins.3
126man/man3/hashkit_md5.3 127man/man3/hashkit_md5.3
@@ -204,13 +205,14 @@ man/man3/memcached_set_by_key.3 @@ -204,13 +205,14 @@ man/man3/memcached_set_by_key.3
204man/man3/memcached_set_memory_allocators.3 205man/man3/memcached_set_memory_allocators.3
205man/man3/memcached_set_sasl_callbacks.3 206man/man3/memcached_set_sasl_callbacks.3
206man/man3/memcached_set_user_data.3 207man/man3/memcached_set_user_data.3
207man/man3/memcached_stat.3 208man/man3/memcached_stat.3
208man/man3/memcached_stat_execute.3 209man/man3/memcached_stat_execute.3
209man/man3/memcached_stat_get_keys.3 210man/man3/memcached_stat_get_keys.3
210man/man3/memcached_stat_get_value.3 211man/man3/memcached_stat_get_value.3
211man/man3/memcached_stat_servername.3 212man/man3/memcached_stat_servername.3
212man/man3/memcached_strerror.3 213man/man3/memcached_strerror.3
213man/man3/memcached_touch.3 214man/man3/memcached_touch.3
214man/man3/memcached_touch_by_key.3 215man/man3/memcached_touch_by_key.3
215man/man3/memcached_verbosity.3 216man/man3/memcached_verbosity.3
216man/man3/memcached_version.3 217man/man3/memcached_version.3
 218share/aclocal/ax_libmemcached.m4

cvs diff -r1.4 -r1.5 pkgsrc/devel/libmemcached/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/libmemcached/distinfo 2013/06/04 21:17:17 1.4
+++ pkgsrc/devel/libmemcached/distinfo 2013/09/12 14:20:56 1.5
@@ -1,8 +1,12 @@ @@ -1,8 +1,12 @@
1$NetBSD: distinfo,v 1.4 2013/06/04 21:17:17 fhajny Exp $ 1$NetBSD: distinfo,v 1.5 2013/09/12 14:20:56 fhajny Exp $
2 2
3SHA1 (libmemcached-1.0.4.tar.gz) = a74644a368b14954c80623879bd722ebf552f857 3SHA1 (libmemcached-1.0.17.tar.gz) = 1023bc8c738b1f5b8ea2cd16d709ec6b47c3efa8
4RMD160 (libmemcached-1.0.4.tar.gz) = 2a9c71cd7894ed1c55d2557fd71fc75b5bc54ceb 4RMD160 (libmemcached-1.0.17.tar.gz) = f0e617e0dc5f2eb27f9da7ea5a9f5a7b043b80a8
5Size (libmemcached-1.0.4.tar.gz) = 951310 bytes 5Size (libmemcached-1.0.17.tar.gz) = 1023177 bytes
6SHA1 (patch-configure) = 9bda748d780dc2b3d0f114e302c04a5f5d3b0eee 6SHA1 (patch-libmemcached-1.0_deprecated__types.h) = 9dcb5a508df69f0959e2b7a34f20ff8311cd41de
7SHA1 (patch-tests_libmemcached-1.0_ketama.cc) = 80a4d84457659dfc22c9004469426ba1c35a6f73 7SHA1 (patch-libmemcached_byteorder.cc) = 18d5b6447e7457bf35dbac6c693735932871f095
8SHA1 (patch-tests_libmemcached-1.0_pool.cc) = b222a16d3ef03a9d60379aeacb10a205961732e0 8SHA1 (patch-libtest_lite.h) = 6460bd76650111613311c35d3d836674dab0c801
 9SHA1 (patch-libtest_main.cc) = e9c2d88085f2a66b3296f7acd40484e485fd3c16
 10SHA1 (patch-libtest_test.hpp) = 684d1dcfe5c6a4b510353bd578c8919da216542b
 11SHA1 (patch-tests_libmemcached-1.0_ketama.cc) = 8dacea6366738254e1a71eef8cd4e04329f4e53c
 12SHA1 (patch-tests_libmemcached-1.0_pool.cc) = d5656a54277f7155b1b78a0f90fd0f939ef39be6

File Deleted: pkgsrc/devel/libmemcached/patches/patch-configure

File Added: pkgsrc/devel/libmemcached/patches/Attic/patch-libmemcached-1.0_deprecated__types.h
$NetBSD: patch-libmemcached-1.0_deprecated__types.h,v 1.1 2013/09/12 14:20:56 fhajny Exp $

Add type to overcome a breaking API change.
https://bugs.launchpad.net/libmemcached/+bug/1190240
--- libmemcached-1.0/deprecated_types.h.orig	2013-04-03 04:22:00.000000000 +0000
+++ libmemcached-1.0/deprecated_types.h
@@ -57,4 +57,5 @@ typedef memcached_server_fn memcached_se
 typedef memcached_trigger_key_fn memcached_trigger_key;
 typedef memcached_trigger_delete_key_fn memcached_trigger_delete_key;
 typedef memcached_dump_fn memcached_dump_func;
+typedef memcached_instance_st memcached_server_instance_st;
 

File Added: pkgsrc/devel/libmemcached/patches/patch-libmemcached_byteorder.cc
$NetBSD: patch-libmemcached_byteorder.cc,v 1.1 2013/09/12 14:20:56 fhajny Exp $

Need ntohll/htonll defined.
--- libmemcached/byteorder.cc.orig	2013-04-03 04:22:00.000000000 +0000
+++ libmemcached/byteorder.cc
@@ -36,6 +36,9 @@
  */
 
 #include "mem_config.h"
+#ifdef __sun
+# include "sys/byteorder.h"
+#endif
 #include "libmemcached/byteorder.h"
 
 /* Byte swap a 64-bit number. */

File Added: pkgsrc/devel/libmemcached/patches/patch-libtest_lite.h
$NetBSD: patch-libtest_lite.h,v 1.1 2013/09/12 14:20:56 fhajny Exp $

NetBSD doesn't have alloca.h.
--- libtest/lite.h.orig	2013-04-03 04:22:00.000000000 +0000
+++ libtest/lite.h
@@ -53,7 +53,7 @@
 
 #if defined(_WIN32)
 # include <malloc.h>
-#else
+#elif !defined(__NetBSD__)
 # include <alloca.h>
 #endif
 

File Added: pkgsrc/devel/libmemcached/patches/Attic/patch-libtest_main.cc
$NetBSD: patch-libtest_main.cc,v 1.1 2013/09/12 14:20:56 fhajny Exp $

strings.h needed for rindex.
--- libtest/main.cc.orig	2013-04-03 04:22:00.000000000 +0000
+++ libtest/main.cc
@@ -45,6 +45,7 @@
 #include <iostream>
 #include <fstream>
 #include <memory>
+#include <strings.h>
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <sys/types.h>

File Added: pkgsrc/devel/libmemcached/patches/patch-libtest_test.hpp
$NetBSD: patch-libtest_test.hpp,v 1.1 2013/09/12 14:20:56 fhajny Exp $

cstdarg needed for va_start.
--- libtest/test.hpp.orig	2013-04-03 04:22:00.000000000 +0000
+++ libtest/test.hpp
@@ -57,6 +57,7 @@
 
 #define LIBYATL_DEFAULT_PARAM __FILE__, __LINE__, __PRETTY_FUNCTION__
 
+#include <cstdarg>
 #include <cstdio>
 #include <cstdlib>
 #include <arpa/inet.h>

cvs diff -r1.2 -r1.3 pkgsrc/devel/libmemcached/patches/patch-tests_libmemcached-1.0_ketama.cc (expand / switch to unified diff)

--- pkgsrc/devel/libmemcached/patches/patch-tests_libmemcached-1.0_ketama.cc 2013/06/04 21:17:17 1.2
+++ pkgsrc/devel/libmemcached/patches/patch-tests_libmemcached-1.0_ketama.cc 2013/09/12 14:20:56 1.3
@@ -1,20 +1,21 @@ @@ -1,20 +1,21 @@
1$NetBSD: patch-tests_libmemcached-1.0_ketama.cc,v 1.2 2013/06/04 21:17:17 fhajny Exp $ 1$NetBSD: patch-tests_libmemcached-1.0_ketama.cc,v 1.3 2013/09/12 14:20:56 fhajny Exp $
2 2
3--- tests/libmemcached-1.0/ketama.cc.orig 2013-05-05 20:35:41.000000000 +0000 3Use stdint.
 4--- tests/libmemcached-1.0/ketama.cc.orig 2013-04-03 04:22:00.000000000 +0000
4+++ tests/libmemcached-1.0/ketama.cc 5+++ tests/libmemcached-1.0/ketama.cc
5@@ -33,6 +33,7 @@ 6@@ -33,6 +33,7 @@
6 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 7 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
7 * 8 *
8 */ 9 */
9+#define __STDC_CONSTANT_MACROS 10+#define __STDC_CONSTANT_MACROS
10  11
11 #include <config.h> 12 #include <mem_config.h>
12 #include <libtest/test.hpp> 13 #include <libtest/test.hpp>
13@@ -43,6 +44,7 @@ 14@@ -45,6 +46,7 @@
14  15
15 #include <tests/ketama.h> 16 #include <tests/ketama.h>
16 #include <tests/ketama_test_cases.h> 17 #include <tests/ketama_test_cases.h>
17+#include <stdint.h> 18+#include <stdint.h>
18  19
19 test_return_t ketama_compatibility_libmemcached(memcached_st *) 20 test_return_t ketama_compatibility_libmemcached(memcached_st *)
20 { 21 {

cvs diff -r1.2 -r1.3 pkgsrc/devel/libmemcached/patches/patch-tests_libmemcached-1.0_pool.cc (expand / switch to unified diff)

--- pkgsrc/devel/libmemcached/patches/patch-tests_libmemcached-1.0_pool.cc 2013/06/04 21:17:17 1.2
+++ pkgsrc/devel/libmemcached/patches/patch-tests_libmemcached-1.0_pool.cc 2013/09/12 14:20:56 1.3
@@ -1,21 +1,21 @@ @@ -1,21 +1,21 @@
1$NetBSD: patch-tests_libmemcached-1.0_pool.cc,v 1.2 2013/06/04 21:17:17 fhajny Exp $ 1$NetBSD: patch-tests_libmemcached-1.0_pool.cc,v 1.3 2013/09/12 14:20:56 fhajny Exp $
2 2
3--- tests/libmemcached-1.0/pool.cc.orig 2013-05-05 20:36:30.000000000 +0000 3Use stdint.
 4--- tests/libmemcached-1.0/pool.cc.orig 2013-04-03 04:22:00.000000000 +0000
4+++ tests/libmemcached-1.0/pool.cc 5+++ tests/libmemcached-1.0/pool.cc
5@@ -34,7 +34,7 @@ 6@@ -34,6 +34,7 @@
6 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 7 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
7 * 8 *
8 */ 9 */
9- 
10+#define __STDC_CONSTANT_MACROS 10+#define __STDC_CONSTANT_MACROS
11 #include <config.h> 
12 #include <libtest/test.hpp> 
13  11
14@@ -44,6 +44,7 @@ using namespace libtest; 12 #include <mem_config.h>
 13 #include <libtest/test.hpp>
 14@@ -44,6 +45,7 @@ using namespace libtest;
15 #include <iostream> 15 #include <iostream>
16 #include <string> 16 #include <string>
17 #include <cerrno> 17 #include <cerrno>
18+#include <stdint.h> 18+#include <stdint.h>
19  19
20 #include <semaphore.h> 20 #include <semaphore.h>
21  21