Mon Nov 24 00:48:18 2014 UTC ()
libc++ uses the !tr1 branch too.


(joerg)
diff -r1.1 -r1.2 pkgsrc/databases/kyotocabinet/distinfo
diff -r1.1 -r1.2 pkgsrc/databases/kyotocabinet/patches/patch-kccommon.h
cvs diff -r1.1 -r1.2 pkgsrc/databases/kyotocabinet/distinfo (expand / switch to unified diff)

--- pkgsrc/databases/kyotocabinet/distinfo 2014/11/21 11:29:52 1.1
+++ pkgsrc/databases/kyotocabinet/distinfo 2014/11/24 00:48:17 1.2
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.1 2014/11/21 11:29:52 obache Exp $ 1$NetBSD: distinfo,v 1.2 2014/11/24 00:48:17 joerg Exp $
2 2
3SHA1 (kyotocabinet-1.2.76.tar.gz) = a4ec70d08ca6c8f510dbc329d5c27b55030d3521 3SHA1 (kyotocabinet-1.2.76.tar.gz) = a4ec70d08ca6c8f510dbc329d5c27b55030d3521
4RMD160 (kyotocabinet-1.2.76.tar.gz) = 3bc2feb6e01310764c422cc93d9a98ced1da2cfb 4RMD160 (kyotocabinet-1.2.76.tar.gz) = 3bc2feb6e01310764c422cc93d9a98ced1da2cfb
5Size (kyotocabinet-1.2.76.tar.gz) = 951930 bytes 5Size (kyotocabinet-1.2.76.tar.gz) = 951930 bytes
6SHA1 (patch-configure) = b443de68ff2865bf94780c2995302b6c42c5dc13 6SHA1 (patch-configure) = b443de68ff2865bf94780c2995302b6c42c5dc13
7SHA1 (patch-kccommon.h) = 5126d9af028bc2a86c3212797a0d5eb1f9de8d83 7SHA1 (patch-kccommon.h) = 9d807716722cbcb9cfae0816e5e5f42a07e74df3
8SHA1 (patch-kcthread.cc) = d09d280cd9589b10bbc10b29dc51d40ce074cc7f 8SHA1 (patch-kcthread.cc) = d09d280cd9589b10bbc10b29dc51d40ce074cc7f
cvs diff -r1.1 -r1.2 pkgsrc/databases/kyotocabinet/patches/Attic/patch-kccommon.h (expand / switch to unified diff)

--- pkgsrc/databases/kyotocabinet/patches/Attic/patch-kccommon.h 2014/11/21 11:29:52 1.1
+++ pkgsrc/databases/kyotocabinet/patches/Attic/patch-kccommon.h 2014/11/24 00:48:18 1.2
@@ -1,15 +1,24 @@ @@ -1,15 +1,24 @@
1$NetBSD: patch-kccommon.h,v 1.1 2014/11/21 11:29:52 obache Exp $ 1$NetBSD: patch-kccommon.h,v 1.2 2014/11/24 00:48:18 joerg Exp $
2 2
3* NetBSD also missing modfl(3) 3* NetBSD also missing modfl(3)
4 4
5--- kccommon.h.orig 2012-05-24 16:27:59.000000000 +0000 5--- kccommon.h.orig 2012-05-24 16:27:59.000000000 +0000
6+++ kccommon.h 6+++ kccommon.h
7@@ -68,7 +68,7 @@ extern "C" { 7@@ -68,7 +68,7 @@ extern "C" {
8 #define snprintf _snprintf 8 #define snprintf _snprintf
9 #endif 9 #endif
10  10
11-#if defined(__CYGWIN__) 11-#if defined(__CYGWIN__)
12+#if defined(__CYGWIN__) || defined(__NetBSD__) 12+#if defined(__CYGWIN__) || defined(__NetBSD__)
13 inline long double modfl(long double val, long double* iptr) { 13 inline long double modfl(long double val, long double* iptr) {
14 double integ; 14 double integ;
15 double fract = std::modf(val, &integ); 15 double fract = std::modf(val, &integ);
 16@@ -82,7 +82,7 @@ using ::modfl;
 17 using ::snprintf;
 18 }
 19
 20-#if __cplusplus > 199711L || defined(__GXX_EXPERIMENTAL_CXX0X__) || defined(_MSC_VER)
 21+#if __cplusplus > 199711L || defined(__GXX_EXPERIMENTAL_CXX0X__) || defined(_MSC_VER) || defined(_LIBCPP_VERSION)
 22
 23 #include <unordered_map>
 24 #include <unordered_set>