From 08158e35bcfb78cac5437d8c876118ff24553463 Mon Sep 17 00:00:00 2001
From: rh <rh>
Date: Thu, 5 Sep 2002 23:25:27 +0000
Subject: Fix db3 version check so that addressbook now finally works. Bump
 PKGREVISION. This closes PR pkg/18164 by Ales Krenek <ljocha@ics.muni.cz>

---
 mail/evolution/Makefile         |  7 ++++---
 mail/evolution/distinfo         |  6 +++---
 mail/evolution/patches/patch-ag | 17 +++++++++++++++--
 mail/evolution/patches/patch-aj | 19 ++++++++++++++++---
 4 files changed, 38 insertions(+), 11 deletions(-)

(limited to 'mail')

diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index e6be8dff9b3..44cdf65c163 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2002/08/13 08:55:04 agc Exp $
+# $NetBSD: Makefile,v 1.22 2002/09/05 23:25:27 rh Exp $
 
 DISTNAME=		evolution-1.0.8
+PKGREVISION=		1
 CATEGORIES=		mail time gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=stable/sources/evolution/}
 EXTRACT_SUFX=		.tar.bz2
@@ -16,8 +17,8 @@ BUILD_USES_MSGFMT=	YES
 
 BUILDLINK_DEPENDS.gdk-pixbuf=		gdk-pixbuf>=0.11.0nb1
 BUILDLINK_DEPENDS.gdk-pixbuf-gnome=	gdk-pixbuf-gnome>=0.11.0nb1
-# Using a wildcard here doesn't make sence because the version number of
-# "db3" is hardcoded in the "configure" script.
+# Using a wildcard here doesn't make sense because the version number of
+# "db3" is hardcoded in the "configure" script and some source modules.
 BUILDLINK_DEPENDS.db3=			db3-3.11.2
 BUILDLINK_DEPENDS.gal=			gal>=0.19.2
 
diff --git a/mail/evolution/distinfo b/mail/evolution/distinfo
index 82094bf96a1..821a4c7558b 100644
--- a/mail/evolution/distinfo
+++ b/mail/evolution/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2002/07/12 23:39:50 mycroft Exp $
+$NetBSD: distinfo,v 1.14 2002/09/05 23:25:27 rh Exp $
 
 SHA1 (evolution-1.0.8.tar.bz2) = 68e0545f15f7ab3bc43f386ff8f829f1836e05ef
 Size (evolution-1.0.8.tar.bz2) = 10772710 bytes
@@ -8,9 +8,9 @@ SHA1 (patch-ac) = c8b2b2b1077894a34569af48544151b0c477e02d
 SHA1 (patch-ad) = fd7327c9cfbc52bb81304f1a80f0014f4e654d8e
 SHA1 (patch-ae) = 155e692bc82f32d25c37a5c37aa8145615a50329
 SHA1 (patch-af) = dbbd2272d21079d6fe28d59e75f9acb26634f438
-SHA1 (patch-ag) = 5ede54f3734736b790b5128757673ab2c82268b0
+SHA1 (patch-ag) = 57d64084a79c6e3a687b7a148fdea02b0f1eefbd
 SHA1 (patch-ah) = cdd1973d64ca10a52dc4c868bc7a6a15156526ae
 SHA1 (patch-ai) = 2d73b5a3a2a006bb29b83650154ca64d721ef09d
-SHA1 (patch-aj) = 806b53d759961acb80a7d5486dfe717e2b656bb0
+SHA1 (patch-aj) = 0e132d78a59631d443a8fe03a838033089e1802c
 SHA1 (patch-ak) = b9ab6bd5cfc3645ff606c34df01fec4ce0054a43
 SHA1 (patch-am) = ff3becd8e70f76bcf001cc95c96a066b39338660
diff --git a/mail/evolution/patches/patch-ag b/mail/evolution/patches/patch-ag
index 60789be2325..a9bea5231ee 100644
--- a/mail/evolution/patches/patch-ag
+++ b/mail/evolution/patches/patch-ag
@@ -1,6 +1,6 @@
-$NetBSD: patch-ag,v 1.3 2001/12/03 10:08:26 tron Exp $
+$NetBSD: patch-ag,v 1.4 2002/09/05 23:25:27 rh Exp $
 
---- e-util/e-dbhash.c.orig	Sat Jul 28 00:14:12 2001
+--- e-util/e-dbhash.c.orig	Mon Oct 22 23:54:12 2001
 +++ e-util/e-dbhash.c
 @@ -16,9 +16,9 @@
  #include "md5-utils.h"
@@ -15,3 +15,16 @@ $NetBSD: patch-ag,v 1.3 2001/12/03 10:08:26 tron Exp $
  #endif
  
  struct _EDbHashPrivate 
+@@ -37,9 +37,9 @@
+ 
+ 	db_version (&major, &minor, &patch);
+ 
+-	if (major != 3 ||
+-	    minor != 1 ||
+-	    patch != 17) {
++	if (major != DB_VERSION_MAJOR ||
++	    minor != DB_VERSION_MINOR ||
++	    patch != DB_VERSION_PATCH) {
+ 		g_warning ("Wrong version of libdb.");
+ 		return NULL;
+ 	}
diff --git a/mail/evolution/patches/patch-aj b/mail/evolution/patches/patch-aj
index 80d5d7c717f..6447df571dd 100644
--- a/mail/evolution/patches/patch-aj
+++ b/mail/evolution/patches/patch-aj
@@ -1,7 +1,7 @@
-$NetBSD: patch-aj,v 1.5 2002/03/26 20:50:13 rh Exp $
+$NetBSD: patch-aj,v 1.6 2002/09/05 23:25:27 rh Exp $
 
---- addressbook/backend/pas/pas-backend-file.c.orig	Mon Mar 18 21:58:17 2002
-+++ addressbook/backend/pas/pas-backend-file.c	Tue Mar 26 15:02:22 2002
+--- addressbook/backend/pas/pas-backend-file.c.orig	Sun Jun 16 08:54:02 2002
++++ addressbook/backend/pas/pas-backend-file.c
 @@ -21,9 +21,9 @@
  #include <e-util/e-db3-utils.h>
  
@@ -15,3 +15,16 @@ $NetBSD: patch-aj,v 1.5 2002/03/26 20:50:13 rh Exp $
  #endif
  
  #include <gtk/gtksignal.h>
+@@ -1244,9 +1244,9 @@
+ 
+ 	db_version (&major, &minor, &patch);
+ 
+-	if (major != 3 ||
+-	    minor != 1 ||
+-	    patch != 17) {
++	if (major != DB_VERSION_MAJOR ||
++	    minor != DB_VERSION_MINOR ||
++	    patch != DB_VERSION_PATCH) {
+ 		g_warning ("Wrong version of libdb.");
+ 		return GNOME_Evolution_Addressbook_BookListener_OtherError;
+ 	}
-- 
cgit v1.2.3