diff options
| author | Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2011-10-04 16:44:07 +0000 |
|---|---|---|
| committer | Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2011-10-04 16:44:07 +0000 |
| commit | 27e2e6cbb6b57450fd025dd90f2526b169c2087d (patch) | |
| tree | c76df53d19408ff85f820e10619d8f7470e1cf1a /databases | |
| parent | 2011-10-03 sysutils/cfvers: Dead upstream, author disowns it, use git/hg instead (diff) | |
- Fix build with db5
- Cosmetic change
PR: ports/152886
Reported by: Anatoly Borodin <anatoly.borodin@gmail.com>
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/py-bsddb/Makefile | 4 | ||||
| -rw-r--r-- | databases/py-bsddb/files/patch-_bsddb.c | 63 |
2 files changed, 65 insertions, 2 deletions
diff --git a/databases/py-bsddb/Makefile b/databases/py-bsddb/Makefile index bc11689c0947..0756fae3715d 100644 --- a/databases/py-bsddb/Makefile +++ b/databases/py-bsddb/Makefile @@ -38,9 +38,9 @@ post-extract: @${CP} ${FILESDIR}/setup.py ${WRKSRC} .if ${PYTHON_REL} < 260 -BSDDB_PATCH=_bsddb.c +BSDDB_PATCH= _bsddb.c .else -BSDDB_PATCH=bsddb.h +BSDDB_PATCH= bsddb.h .endif post-patch: diff --git a/databases/py-bsddb/files/patch-_bsddb.c b/databases/py-bsddb/files/patch-_bsddb.c new file mode 100644 index 000000000000..e6a0e1df4700 --- /dev/null +++ b/databases/py-bsddb/files/patch-_bsddb.c @@ -0,0 +1,63 @@ +--- _bsddb.c.orig 2011-06-11 23:46:26.000000000 +0800 ++++ _bsddb.c 2011-09-14 00:21:23.155423631 +0800 +@@ -696,8 +696,10 @@ + case DB_RUNRECOVERY: errObj = DBRunRecoveryError; break; + case DB_VERIFY_BAD: errObj = DBVerifyBadError; break; + case DB_NOSERVER: errObj = DBNoServerError; break; ++#if (DBVER < 50) + case DB_NOSERVER_HOME: errObj = DBNoServerHomeError; break; + case DB_NOSERVER_ID: errObj = DBNoServerIDError; break; ++#endif + case DB_PAGE_NOTFOUND: errObj = DBPageNotFoundError; break; + case DB_SECONDARY_BAD: errObj = DBSecondaryBadError; break; + case DB_BUFFER_SMALL: errObj = DBNoMemoryError; break; +@@ -7608,6 +7610,7 @@ + RETURN_NONE(); + } + ++#if (DBVER < 50) + static PyObject* + DBEnv_repmgr_set_local_site(DBEnvObject* self, PyObject* args, PyObject* + kwargs) +@@ -7654,6 +7657,7 @@ + RETURN_IF_ERR(); + return NUMBER_FromLong(eidp); + } ++#endif + + static PyObject* + DBEnv_repmgr_set_ack_policy(DBEnvObject* self, PyObject* args) +@@ -8855,10 +8859,12 @@ + #if (DBVER >= 45) + {"repmgr_start", (PyCFunction)DBEnv_repmgr_start, + METH_VARARGS|METH_KEYWORDS}, ++#if (DBVER < 50) + {"repmgr_set_local_site", (PyCFunction)DBEnv_repmgr_set_local_site, + METH_VARARGS|METH_KEYWORDS}, + {"repmgr_add_remote_site", (PyCFunction)DBEnv_repmgr_add_remote_site, + METH_VARARGS|METH_KEYWORDS}, ++#endif + {"repmgr_set_ack_policy", (PyCFunction)DBEnv_repmgr_set_ack_policy, + METH_VARARGS}, + {"repmgr_get_ack_policy", (PyCFunction)DBEnv_repmgr_get_ack_policy, +@@ -9651,8 +9657,10 @@ + ADD_INT(d, DB_LOCK_DEADLOCK); + ADD_INT(d, DB_LOCK_NOTGRANTED); + ADD_INT(d, DB_NOSERVER); ++#if (DBVER < 50) + ADD_INT(d, DB_NOSERVER_HOME); + ADD_INT(d, DB_NOSERVER_ID); ++#endif + ADD_INT(d, DB_NOTFOUND); + ADD_INT(d, DB_OLD_VERSION); + ADD_INT(d, DB_RUNRECOVERY); +@@ -9766,7 +9774,9 @@ + ADD_INT(d, DB_REP_PERMANENT); + + #if (DBVER >= 44) ++#if (DBVER < 50) + ADD_INT(d, DB_REP_CONF_NOAUTOINIT); ++#endif + ADD_INT(d, DB_REP_CONF_DELAYCLIENT); + ADD_INT(d, DB_REP_CONF_BULK); + ADD_INT(d, DB_REP_CONF_NOWAIT); |