aboutsummaryrefslogtreecommitdiff
path: root/net/netatalk
diff options
context:
space:
mode:
authorJoe Marcus Clarke <marcus@FreeBSD.org>2007-01-28 04:10:40 +0000
committerJoe Marcus Clarke <marcus@FreeBSD.org>2007-01-28 04:10:40 +0000
commit8e936f858f0451884c4930414801d331ecb8276f (patch)
tree8dd59eda82aa434dc507ae1071d306fe52fd50af /net/netatalk
parentab32e11c236461ab00d50eab143981231ce6a31d (diff)
downloadports-8e936f858f0451884c4930414801d331ecb8276f.tar.gz
ports-8e936f858f0451884c4930414801d331ecb8276f.zip
Notes
Diffstat (limited to 'net/netatalk')
-rw-r--r--net/netatalk/Makefile2
-rw-r--r--net/netatalk/files/patch-bin_cnid_cnid_index.c14
-rw-r--r--net/netatalk/files/patch-etc_cnid_dbd_dbif.c14
3 files changed, 29 insertions, 1 deletions
diff --git a/net/netatalk/Makefile b/net/netatalk/Makefile
index 9ba6242f51fa..3a0c38695c8c 100644
--- a/net/netatalk/Makefile
+++ b/net/netatalk/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS+= slp.1:${PORTSDIR}/net/openslp
USE_BZIP2= yes
USE_ICONV= yes
-USE_BDB= 41+
+USE_BDB= 43+
USE_RC_SUBR= netatalk
CONFIGURE_ARGS+= --with-tcp-wrappers \
--with-pkgconfdir=${PREFIX}/etc \
diff --git a/net/netatalk/files/patch-bin_cnid_cnid_index.c b/net/netatalk/files/patch-bin_cnid_cnid_index.c
new file mode 100644
index 000000000000..e318f3d35cc3
--- /dev/null
+++ b/net/netatalk/files/patch-bin_cnid_cnid_index.c
@@ -0,0 +1,14 @@
+--- bin/cnid/cnid_index.c.orig Sat Jan 27 23:03:04 2007
++++ bin/cnid/cnid_index.c Sat Jan 27 23:04:51 2007
+@@ -274,7 +274,11 @@ static int dbif_count(const int dbi, u_i
+ DB_BTREE_STAT *sp;
+ DB *db = db_table[dbi].db;
+
++#if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 3)
++ ret = db->stat(db, db_txn, &sp, 0);
++#else
+ ret = db->stat(db, &sp, 0);
++#endif
+
+ if (ret) {
+ LOG(log_error, logtype_cnid, "error getting stat infotmation on database: %s", db_strerror(errno));
diff --git a/net/netatalk/files/patch-etc_cnid_dbd_dbif.c b/net/netatalk/files/patch-etc_cnid_dbd_dbif.c
new file mode 100644
index 000000000000..7a63468359aa
--- /dev/null
+++ b/net/netatalk/files/patch-etc_cnid_dbd_dbif.c
@@ -0,0 +1,14 @@
+--- etc/cnid_dbd/dbif.c.orig Sat Jan 27 23:07:17 2007
++++ etc/cnid_dbd/dbif.c Sat Jan 27 23:08:04 2007
+@@ -514,7 +514,11 @@ int dbif_count(const int dbi, u_int32_t
+ DB_BTREE_STAT *sp;
+ DB *db = db_table[dbi].db;
+
++#if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 3)
++ ret = db->stat(db, db_txn, &sp, 0);
++#else
+ ret = db->stat(db, &sp, 0);
++#endif
+
+ if (ret) {
+ LOG(log_error, logtype_cnid, "error getting stat infotmation on database: %s", db_strerror(errno));