Sun Oct 15 11:26:40 2017 UTC ()
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


(spz)
diff -r1.12 -r1.12.18.1 pkgsrc/devel/libmemcached/distinfo
diff -r1.1 -r1.1.30.1 pkgsrc/devel/libmemcached/patches/patch-clients_memflush.cc
diff -r1.2 -r1.2.30.1 pkgsrc/devel/libmemcached/patches/patch-libmemcached_byteorder.cc
diff -r1.2 -r1.2.30.1 pkgsrc/devel/libmemcached/patches/patch-libtest_test.hpp
diff -r1.3 -r1.3.30.1 pkgsrc/devel/libmemcached/patches/patch-libtest_lite.h
diff -r1.4 -r1.4.30.1 pkgsrc/devel/libmemcached/patches/patch-tests_libmemcached-1.0_ketama.cc
diff -r1.4 -r1.4.30.1 pkgsrc/devel/libmemcached/patches/patch-tests_libmemcached-1.0_pool.cc
cvs diff -r1.12 -r1.12.18.1 pkgsrc/devel/libmemcached/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/libmemcached/distinfo 2015/11/03 03:27:43 1.12
+++ pkgsrc/devel/libmemcached/distinfo 2017/10/15 11:26:40 1.12.18.1
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.12 2015/11/03 03:27:43 agc Exp $ 1$NetBSD: distinfo,v 1.12.18.1 2017/10/15 11:26:40 spz Exp $
2 2
3SHA1 (libmemcached-1.0.18.tar.gz) = 8be06b5b95adbc0a7cb0f232e237b648caf783e1 3SHA1 (libmemcached-1.0.18.tar.gz) = 8be06b5b95adbc0a7cb0f232e237b648caf783e1
4RMD160 (libmemcached-1.0.18.tar.gz) = 647ea760191755da4832f1a4c78847a330e5b515 4RMD160 (libmemcached-1.0.18.tar.gz) = 647ea760191755da4832f1a4c78847a330e5b515
5SHA512 (libmemcached-1.0.18.tar.gz) = 2d95fea63b8b6dc7ded42c3a88a54aad74d5a1d417af1247144dae4a88c3b639a3aabc0c2b66661ff69a7609a314efaaae236e10971af9c428a4bca0a0101585 5SHA512 (libmemcached-1.0.18.tar.gz) = 2d95fea63b8b6dc7ded42c3a88a54aad74d5a1d417af1247144dae4a88c3b639a3aabc0c2b66661ff69a7609a314efaaae236e10971af9c428a4bca0a0101585
6Size (libmemcached-1.0.18.tar.gz) = 1039649 bytes 6Size (libmemcached-1.0.18.tar.gz) = 1039649 bytes
7SHA1 (patch-clients_memflush.cc) = 52423ecc411e9991c2a14d0d54c76a1ce31d4be6 7SHA1 (patch-clients_memflush.cc) = 6f473a5dc362cb3f55e9c5fada475db428d41fb2
8SHA1 (patch-configure) = 413296ba549ee0e4eb5d5ca910f144916a85b02b 8SHA1 (patch-configure) = 413296ba549ee0e4eb5d5ca910f144916a85b02b
9SHA1 (patch-libmemcached_byteorder.cc) = 047f070a47a6e88b5c19c413136e894737b28a7e 9SHA1 (patch-libmemcached_byteorder.cc) = 7e2f4dff5fcb1a490808edabd8b5998081e35b98
10SHA1 (patch-libtest_alarm.cc) = 92120b26fcbbef8ebec0b754d44a3a40b796e602 10SHA1 (patch-libtest_alarm.cc) = 92120b26fcbbef8ebec0b754d44a3a40b796e602
11SHA1 (patch-libtest_lite.h) = f829bb34a4b6cbe767fb658e59c2eb2f4a6176f6 11SHA1 (patch-libtest_lite.h) = d99717f8c6f4a8001ac767d9cc5034581293efe4
12SHA1 (patch-libtest_test.hpp) = 66f1cb24ceaea2233acf73974b0249326dca5376 12SHA1 (patch-libtest_test.hpp) = 889d1a3823b309a3a2f04d8eef36515b1dff6130
13SHA1 (patch-tests_libmemcached-1.0_ketama.cc) = 707ea7b0f8df721db7d947d82df3e142b70ae5a0 13SHA1 (patch-tests_libmemcached-1.0_ketama.cc) = 4da74a41c0a1de28ac318723622c09ad03158c20
14SHA1 (patch-tests_libmemcached-1.0_pool.cc) = 5779ab541e4333150c77752434356469a5c85f21 14SHA1 (patch-tests_libmemcached-1.0_pool.cc) = 4e0bac95e71fdd023e222f4acf96322f4b80f5eb
cvs diff -r1.1 -r1.1.30.1 pkgsrc/devel/libmemcached/patches/patch-clients_memflush.cc (expand / switch to unified diff)

--- pkgsrc/devel/libmemcached/patches/patch-clients_memflush.cc 2014/04/16 16:23:13 1.1
+++ pkgsrc/devel/libmemcached/patches/patch-clients_memflush.cc 2017/10/15 11:26:40 1.1.30.1
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: patch-clients_memflush.cc,v 1.1 2014/04/16 16:23:13 joerg Exp $ 1$NetBSD: patch-clients_memflush.cc,v 1.1.30.1 2017/10/15 11:26:40 spz Exp $
 2
 3Fix for missing definition of 'false'.
2 4
3--- clients/memflush.cc.orig 2014-04-16 15:33:58.000000000 +0000 5--- clients/memflush.cc.orig 2014-04-16 15:33:58.000000000 +0000
4+++ clients/memflush.cc 6+++ clients/memflush.cc
5@@ -39,7 +39,7 @@ int main(int argc, char *argv[]) 7@@ -39,7 +39,7 @@ int main(int argc, char *argv[])
6 { 8 {
7 options_parse(argc, argv); 9 options_parse(argc, argv);
8  10
9- if (opt_servers == false) 11- if (opt_servers == false)
10+ if (!opt_servers) 12+ if (!opt_servers)
11 { 13 {
12 char *temp; 14 char *temp;
13  15
14@@ -48,7 +48,7 @@ int main(int argc, char *argv[]) 16@@ -48,7 +48,7 @@ int main(int argc, char *argv[])
cvs diff -r1.2 -r1.2.30.1 pkgsrc/devel/libmemcached/patches/patch-libmemcached_byteorder.cc (expand / switch to unified diff)

--- pkgsrc/devel/libmemcached/patches/patch-libmemcached_byteorder.cc 2014/04/01 13:51:56 1.2
+++ pkgsrc/devel/libmemcached/patches/patch-libmemcached_byteorder.cc 2017/10/15 11:26:40 1.2.30.1
@@ -1,15 +1,18 @@ @@ -1,15 +1,18 @@
1$NetBSD: patch-libmemcached_byteorder.cc,v 1.2 2014/04/01 13:51:56 fhajny Exp $ 1$NetBSD: patch-libmemcached_byteorder.cc,v 1.2.30.1 2017/10/15 11:26:40 spz Exp $
 2
 3Find definition of ntohll() and htonll().
2 4
3Need ntohll/htonll defined. 
4--- libmemcached/byteorder.cc.orig 2014-02-09 11:52:42.000000000 +0000 5--- libmemcached/byteorder.cc.orig 2014-02-09 11:52:42.000000000 +0000
5+++ libmemcached/byteorder.cc 6+++ libmemcached/byteorder.cc
6@@ -36,6 +36,9 @@ 7@@ -36,6 +36,11 @@
7 */ 8 */
8  9
9 #include "mem_config.h" 10 #include "mem_config.h"
10+#ifdef __sun 11+#if defined(__sun)
11+# include "sys/byteorder.h" 12+# include "sys/byteorder.h"
 13+#elif defined(__APPLE__)
 14+# include "sys/_endian.h"
12+#endif 15+#endif
13 #include "libmemcached/byteorder.h" 16 #include "libmemcached/byteorder.h"
14  17
15 /* Byte swap a 64-bit number. */ 18 /* Byte swap a 64-bit number. */
cvs diff -r1.2 -r1.2.30.1 pkgsrc/devel/libmemcached/patches/patch-libtest_test.hpp (expand / switch to unified diff)

--- pkgsrc/devel/libmemcached/patches/patch-libtest_test.hpp 2014/04/01 13:51:56 1.2
+++ pkgsrc/devel/libmemcached/patches/patch-libtest_test.hpp 2017/10/15 11:26:40 1.2.30.1
@@ -1,13 +1,14 @@ @@ -1,13 +1,14 @@
1$NetBSD: patch-libtest_test.hpp,v 1.2 2014/04/01 13:51:56 fhajny Exp $ 1$NetBSD: patch-libtest_test.hpp,v 1.2.30.1 2017/10/15 11:26:40 spz Exp $
2 2
3cstdarg needed for va_start. 3cstdarg needed for va_start.
 4
4--- libtest/test.hpp.orig 2014-02-09 11:52:42.000000000 +0000 5--- libtest/test.hpp.orig 2014-02-09 11:52:42.000000000 +0000
5+++ libtest/test.hpp 6+++ libtest/test.hpp
6@@ -57,6 +57,7 @@ 7@@ -57,6 +57,7 @@
7  8
8 #define LIBYATL_DEFAULT_PARAM __FILE__, __LINE__, __PRETTY_FUNCTION__ 9 #define LIBYATL_DEFAULT_PARAM __FILE__, __LINE__, __PRETTY_FUNCTION__
9  10
10+#include <cstdarg> 11+#include <cstdarg>
11 #include <cstdio> 12 #include <cstdio>
12 #include <cstdlib> 13 #include <cstdlib>
13 #include <arpa/inet.h> 14 #include <arpa/inet.h>
cvs diff -r1.3 -r1.3.30.1 pkgsrc/devel/libmemcached/patches/patch-libtest_lite.h (expand / switch to unified diff)

--- pkgsrc/devel/libmemcached/patches/patch-libtest_lite.h 2014/06/26 20:31:03 1.3
+++ pkgsrc/devel/libmemcached/patches/patch-libtest_lite.h 2017/10/15 11:26:40 1.3.30.1
@@ -1,14 +1,15 @@ @@ -1,14 +1,15 @@
1$NetBSD: patch-libtest_lite.h,v 1.3 2014/06/26 20:31:03 asau Exp $ 1$NetBSD: patch-libtest_lite.h,v 1.3.30.1 2017/10/15 11:26:40 spz Exp $
2 2
3NetBSD doesn't have alloca.h. 3NetBSD doesn't have alloca.h.
 4
4--- libtest/lite.h.orig 2014-02-09 11:52:42.000000000 +0000 5--- libtest/lite.h.orig 2014-02-09 11:52:42.000000000 +0000
5+++ libtest/lite.h 6+++ libtest/lite.h
6@@ -53,7 +53,7 @@ 7@@ -53,7 +53,7 @@
7  8
8 #if defined(WIN32) 9 #if defined(WIN32)
9 # include <malloc.h> 10 # include <malloc.h>
10-#else 11-#else
11+#elif !defined(__NetBSD__) && !defined(__FreeBSD__) 12+#elif !defined(__NetBSD__) && !defined(__FreeBSD__)
12 # include <alloca.h> 13 # include <alloca.h>
13 #endif 14 #endif
14  15
cvs diff -r1.4 -r1.4.30.1 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 2014/04/01 13:51:56 1.4
+++ pkgsrc/devel/libmemcached/patches/patch-tests_libmemcached-1.0_ketama.cc 2017/10/15 11:26:40 1.4.30.1
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1$NetBSD: patch-tests_libmemcached-1.0_ketama.cc,v 1.4 2014/04/01 13:51:56 fhajny Exp $ 1$NetBSD: patch-tests_libmemcached-1.0_ketama.cc,v 1.4.30.1 2017/10/15 11:26:40 spz Exp $
2 2
3Use stdint. 3Use stdint.
 4
4--- tests/libmemcached-1.0/ketama.cc.orig 2014-02-09 11:52:42.000000000 +0000 5--- tests/libmemcached-1.0/ketama.cc.orig 2014-02-09 11:52:42.000000000 +0000
5+++ tests/libmemcached-1.0/ketama.cc 6+++ tests/libmemcached-1.0/ketama.cc
6@@ -33,6 +33,7 @@ 7@@ -33,6 +33,7 @@
7 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 8 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
8 * 9 *
9 */ 10 */
10+#define __STDC_CONSTANT_MACROS 11+#define __STDC_CONSTANT_MACROS
11  12
12 #include <mem_config.h> 13 #include <mem_config.h>
13 #include <libtest/test.hpp> 14 #include <libtest/test.hpp>
14@@ -45,6 +46,7 @@ 15@@ -45,6 +46,7 @@
15  16
16 #include <tests/ketama.h> 17 #include <tests/ketama.h>
cvs diff -r1.4 -r1.4.30.1 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 2014/04/01 13:51:56 1.4
+++ pkgsrc/devel/libmemcached/patches/patch-tests_libmemcached-1.0_pool.cc 2017/10/15 11:26:40 1.4.30.1
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1$NetBSD: patch-tests_libmemcached-1.0_pool.cc,v 1.4 2014/04/01 13:51:56 fhajny Exp $ 1$NetBSD: patch-tests_libmemcached-1.0_pool.cc,v 1.4.30.1 2017/10/15 11:26:40 spz Exp $
2 2
3Use stdint. 3Use stdint.
 4
4--- tests/libmemcached-1.0/pool.cc.orig 2014-02-09 11:52:42.000000000 +0000 5--- tests/libmemcached-1.0/pool.cc.orig 2014-02-09 11:52:42.000000000 +0000
5+++ tests/libmemcached-1.0/pool.cc 6+++ tests/libmemcached-1.0/pool.cc
6@@ -34,6 +34,7 @@ 7@@ -34,6 +34,7 @@
7 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 8 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
8 * 9 *
9 */ 10 */
10+#define __STDC_CONSTANT_MACROS 11+#define __STDC_CONSTANT_MACROS
11  12
12 #include <mem_config.h> 13 #include <mem_config.h>
13 #include <libtest/test.hpp> 14 #include <libtest/test.hpp>
14@@ -44,6 +45,7 @@ using namespace libtest; 15@@ -44,6 +45,7 @@ using namespace libtest;
15 #include <iostream> 16 #include <iostream>
16 #include <string> 17 #include <string>