CVS commit: pkgsrc/databases

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Fri Aug 26 17:23:16 UTC 2016

Modified Files:
        pkgsrc/databases/db5: distinfo
        pkgsrc/databases/db6: distinfo
Added Files:
        pkgsrc/databases/db5/patches: patch-src_dbinc_db.in
        pkgsrc/databases/db6/patches: patch-src_dbinc_db.in

Log Message:
Defining a store macro and using <atomic> are mutally conflicting. So
avoid the former for C++.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 pkgsrc/databases/db5/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/databases/db5/patches/patch-src_dbinc_db.in
cvs rdiff -u -r1.6 -r1.7 pkgsrc/databases/db6/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/databases/db6/patches/patch-src_dbinc_db.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/databases/db5/distinfo
diff -u pkgsrc/databases/db5/distinfo:1.14 pkgsrc/databases/db5/distinfo:1.15
--- pkgsrc/databases/db5/distinfo:1.14  Fri Aug 26 12:40:25 2016
+++ pkgsrc/databases/db5/distinfo       Fri Aug 26 17:23:16 2016
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2016/08/26 12:40:25 richard Exp $
+$NetBSD: distinfo,v 1.15 2016/08/26 17:23:16 joerg Exp $
 
 SHA1 (db-5.3.28.tar.gz) = fa3f8a41ad5101f43d08bc0efb6241c9b6fc1ae9
 RMD160 (db-5.3.28.tar.gz) = a4898908ef6dccb137df02e43843f7d3cfab6a3c
@@ -9,6 +9,7 @@ SHA1 (patch-ab) = b09fac68d7d847c5660078
 SHA1 (patch-ac) = 0a243583ae2b66290fb83b112c539001bf3feef2
 SHA1 (patch-dist_aclocal_libtool.m4) = 2d56b318b4f0d14a9352f6c1eb14a4c2b8315fc0
 SHA1 (patch-src_dbinc_atomic.h) = c4fbe421d2c8ba68dc81aeeda1cad09a2c68fbe5
+SHA1 (patch-src_dbinc_db.in) = d20a8c474485811b2e28d54fa5cf2d340d417992
 SHA1 (patch-src_mp_mp__fget.c) = c5050193279db979d51d47f5e2c8d7c5cace0fa7
 SHA1 (patch-src_mp_mp__mvcc.c) = 2e8b4e5ff7a7534681597261ba82ca08e9231567
 SHA1 (patch-src_mp_mp__region.c) = 1c33dc783660515ff24ba018d1ef99cedf9eb3f8

Index: pkgsrc/databases/db6/distinfo
diff -u pkgsrc/databases/db6/distinfo:1.6 pkgsrc/databases/db6/distinfo:1.7
--- pkgsrc/databases/db6/distinfo:1.6   Fri Aug 26 12:31:34 2016
+++ pkgsrc/databases/db6/distinfo       Fri Aug 26 17:23:16 2016
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2016/08/26 12:31:34 richard Exp $
+$NetBSD: distinfo,v 1.7 2016/08/26 17:23:16 joerg Exp $
 
 SHA1 (db-6.1.26.tar.gz) = 5ae05c6c4a1766270fd5cfb28539e2b7a19c33b2
 RMD160 (db-6.1.26.tar.gz) = 6d242b65cd316060c5ed4634bb11e621f3cc6d93
@@ -8,6 +8,7 @@ SHA1 (patch-dist_Makefile.in) = dbc5f8fd
 SHA1 (patch-dist_aclocal_libtool.m4) = 37367e10d9d856cf233b7a0efd3680f35728039e
 SHA1 (patch-dist_configure) = 3825e3d8ed8c582105dc75f9e1a97971b932e347
 SHA1 (patch-src_dbinc_atomic.h) = 240a4a6ec094e868d9a5e95ec4ab72d5b9ddfc23
+SHA1 (patch-src_dbinc_db.in) = 78579e81cb682b60a4306c752e04472b7f0d8d5a
 SHA1 (patch-src_hmac_sha1.c) = 0e98e6383c214adbb939839bb345e55efe8d89da
 SHA1 (patch-src_mp_mp__fget.c) = 059ecdb74bef29c17b445c305b6d4934b5a3c59b
 SHA1 (patch-src_mp_mp__mvcc.c) = 7a543c4e56d72bba607d6e8ec6b667b944e418f1

Added files:

Index: pkgsrc/databases/db5/patches/patch-src_dbinc_db.in
diff -u /dev/null pkgsrc/databases/db5/patches/patch-src_dbinc_db.in:1.1
--- /dev/null   Fri Aug 26 17:23:16 2016
+++ pkgsrc/databases/db5/patches/patch-src_dbinc_db.in  Fri Aug 26 17:23:16 2016
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_dbinc_db.in,v 1.1 2016/08/26 17:23:16 joerg Exp $
+
+--- src/dbinc/db.in.orig       2016-08-26 13:25:32.335739127 +0000
++++ src/dbinc/db.in
+@@ -2782,7 +2782,9 @@ typedef struct {
+ #define       fetch(a)        __db_dbm_fetch@DB_VERSION_UNIQUE_NAME@(a)
+ #define       firstkey        __db_dbm_firstkey@DB_VERSION_UNIQUE_NAME@
+ #define       nextkey(a)      __db_dbm_nextkey@DB_VERSION_UNIQUE_NAME@(a)
++#if !defined(__cplusplus)
+ #define       store(a, b)     __db_dbm_store@DB_VERSION_UNIQUE_NAME@(a, b)
++#endif
+ 
+ /*******************************************************
+  * Hsearch historic interface.

Index: pkgsrc/databases/db6/patches/patch-src_dbinc_db.in
diff -u /dev/null pkgsrc/databases/db6/patches/patch-src_dbinc_db.in:1.1
--- /dev/null   Fri Aug 26 17:23:16 2016
+++ pkgsrc/databases/db6/patches/patch-src_dbinc_db.in  Fri Aug 26 17:23:16 2016
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_dbinc_db.in,v 1.1 2016/08/26 17:23:16 joerg Exp $
+
+--- src/dbinc/db.in.orig       2015-06-18 20:05:04.000000000 +0000
++++ src/dbinc/db.in
+@@ -2888,7 +2888,9 @@ typedef struct {
+ #define       fetch(a)        __db_dbm_fetch@DB_VERSION_UNIQUE_NAME@(a)
+ #define       firstkey        __db_dbm_firstkey@DB_VERSION_UNIQUE_NAME@
+ #define       nextkey(a)      __db_dbm_nextkey@DB_VERSION_UNIQUE_NAME@(a)
++#if !defined(__cplusplus)
+ #define       store(a, b)     __db_dbm_store@DB_VERSION_UNIQUE_NAME@(a, b)
++#endif
+ 
+ /*******************************************************
+  * Hsearch historic interface.