Disable run-time checks for the libdb version. This should fix problems with

addressbook. Bump PORTREVISION.

PR:		32541
Submitted by:	Joe Marcus Clarke <marcus@marcuscom.com>

6 files changed, 98 insertions, 0 deletions

diff --git a/mail/evolution-devel/Makefile b/mail/evolution-devel/Makefile
index b75a1ff7f657..bd1e55fa867f 100644
--- a/mail/evolution-devel/Makefile
+++ b/mail/evolution-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	evolution
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	mail gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	unstable/sources/evolution
diff --git a/mail/evolution-devel/files/patch-addressbook::backend::pas::pas-backend-file.c b/mail/evolution-devel/files/patch-addressbook::backend::pas::pas-backend-file.c
new file mode 100644
index 000000000000..4ae8e0055e3d
--- /dev/null
+++ b/mail/evolution-devel/files/patch-addressbook::backend::pas::pas-backend-file.c
@@ -0,0 +1,27 @@
+
+$FreeBSD$
+
+--- addressbook/backend/pas/pas-backend-file.c	2001/12/06 10:25:50	1.1
++++ addressbook/backend/pas/pas-backend-file.c	2001/12/06 10:27:02
+@@ -1238,10 +1238,13 @@
+ 	gboolean        writable = FALSE;
+ 	int             db_error;
+ 	DB *db;
++#if 0
+ 	int major, minor, patch;
++#endif
+ 
+ 	g_assert (bf->priv->loaded == FALSE);
+ 
++#if 0
+ 	db_version (&major, &minor, &patch);
+ 
+ 	if (major != 3 ||
+@@ -1250,6 +1253,7 @@
+ 		g_warning ("Wrong version of libdb.");
+ 		return FALSE;
+ 	}
++#endif
+ 
+ 	filename = pas_backend_file_extract_path_from_uri (uri);
+ 
diff --git a/mail/evolution-devel/files/patch-e-util::e-dbhash.c b/mail/evolution-devel/files/patch-e-util::e-dbhash.c
new file mode 100644
index 000000000000..438c608362ae
--- /dev/null
+++ b/mail/evolution-devel/files/patch-e-util::e-dbhash.c
@@ -0,0 +1,21 @@
+
+$FreeBSD$
+
+--- e-util/e-dbhash.c	2001/12/06 10:25:50	1.1
++++ e-util/e-dbhash.c	2001/12/06 10:26:28
+@@ -33,6 +33,7 @@
+ 	DB *db;
+ 	int rv;
+ 
++#if 0
+ 	int major, minor, patch;
+ 
+ 	db_version (&major, &minor, &patch);
+@@ -43,6 +44,7 @@
+ 		g_warning ("Wrong version of libdb.");
+ 		return NULL;
+ 	}
++#endif
+ 
+ 	/* Attempt to open the database */
+ 	rv = db_create (&db, NULL, 0);
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index b75a1ff7f657..bd1e55fa867f 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	evolution
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	mail gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	unstable/sources/evolution
diff --git a/mail/evolution/files/patch-addressbook::backend::pas::pas-backend-file.c b/mail/evolution/files/patch-addressbook::backend::pas::pas-backend-file.c
new file mode 100644
index 000000000000..4ae8e0055e3d
--- /dev/null
+++ b/mail/evolution/files/patch-addressbook::backend::pas::pas-backend-file.c
@@ -0,0 +1,27 @@
+
+$FreeBSD$
+
+--- addressbook/backend/pas/pas-backend-file.c	2001/12/06 10:25:50	1.1
++++ addressbook/backend/pas/pas-backend-file.c	2001/12/06 10:27:02
+@@ -1238,10 +1238,13 @@
+ 	gboolean        writable = FALSE;
+ 	int             db_error;
+ 	DB *db;
++#if 0
+ 	int major, minor, patch;
++#endif
+ 
+ 	g_assert (bf->priv->loaded == FALSE);
+ 
++#if 0
+ 	db_version (&major, &minor, &patch);
+ 
+ 	if (major != 3 ||
+@@ -1250,6 +1253,7 @@
+ 		g_warning ("Wrong version of libdb.");
+ 		return FALSE;
+ 	}
++#endif
+ 
+ 	filename = pas_backend_file_extract_path_from_uri (uri);
+ 
diff --git a/mail/evolution/files/patch-e-util::e-dbhash.c b/mail/evolution/files/patch-e-util::e-dbhash.c
new file mode 100644
index 000000000000..438c608362ae
--- /dev/null
+++ b/mail/evolution/files/patch-e-util::e-dbhash.c
@@ -0,0 +1,21 @@
+
+$FreeBSD$
+
+--- e-util/e-dbhash.c	2001/12/06 10:25:50	1.1
++++ e-util/e-dbhash.c	2001/12/06 10:26:28
+@@ -33,6 +33,7 @@
+ 	DB *db;
+ 	int rv;
+ 
++#if 0
+ 	int major, minor, patch;
+ 
+ 	db_version (&major, &minor, &patch);
+@@ -43,6 +44,7 @@
+ 		g_warning ("Wrong version of libdb.");
+ 		return NULL;
+ 	}
++#endif
+ 
+ 	/* Attempt to open the database */
+ 	rv = db_create (&db, NULL, 0);