summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mail/evolution/Makefile7
-rw-r--r--mail/evolution/distinfo7
-rw-r--r--mail/evolution/patches/patch-ad16
3 files changed, 6 insertions, 24 deletions
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index 46488e9c313..dae5bb8b88f 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.73 2005/01/25 15:23:46 drochner Exp $
+# $NetBSD: Makefile,v 1.74 2005/02/22 18:25:31 jmmv Exp $
-DISTNAME= evolution-2.0.3
-PKGREVISION= 1
+DISTNAME= evolution-2.0.4
CATEGORIES= mail time gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/evolution/2.0/}
EXTRACT_SUFX= .tar.bz2
@@ -13,7 +12,7 @@ COMMENT= GNOME mailer, calendar, contact manager, and communications tool
DEPENDS+= psmisc-[0-9]*:../../sysutils/psmisc
BUILD_USES_MSGFMT= YES
-BUILDLINK_DEPENDS.gal2+= gal2>=2.2.4
+BUILDLINK_DEPENDS.gal2+= gal2>=2.2.5
BUILDLINK_DEPENDS.glib2+= glib2>=2.4.0nb2
BUILDLINK_DEPENDS.gtkhtml3+= gtkhtml3>=3.2.4
BUILDLINK_DEPENDS.evolution-data-server+= evolution-data-server>=1.0.3
diff --git a/mail/evolution/distinfo b/mail/evolution/distinfo
index 3b9cb73d6e5..9ca581e0416 100644
--- a/mail/evolution/distinfo
+++ b/mail/evolution/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.33 2005/01/25 15:23:46 drochner Exp $
+$NetBSD: distinfo,v 1.34 2005/02/22 18:25:31 jmmv Exp $
-SHA1 (evolution-2.0.3.tar.bz2) = 059253acd24648b841c6fc24e376c475b2598b6d
-Size (evolution-2.0.3.tar.bz2) = 15381448 bytes
+SHA1 (evolution-2.0.4.tar.bz2) = 2f6ad658e5426999dfe83f7bb2f2e8a87a9a7213
+Size (evolution-2.0.4.tar.bz2) = 15395184 bytes
SHA1 (patch-aa) = a89da54c40813c07af76dd98f876dd2e979c2554
SHA1 (patch-ab) = 871a322eefd1a42e7197da764d49cd1d24f6535d
SHA1 (patch-ac) = 5150f3163e7307e03ed82757e1d31a54310feae3
-SHA1 (patch-ad) = 32b3b688033518602cd91888e5239b78558f1558
diff --git a/mail/evolution/patches/patch-ad b/mail/evolution/patches/patch-ad
deleted file mode 100644
index e58c27566cf..00000000000
--- a/mail/evolution/patches/patch-ad
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ad,v 1.6 2005/01/25 15:23:46 drochner Exp $
-
---- camel/camel-lock-helper.c.orig 2005-01-25 15:34:38.000000000 +0100
-+++ camel/camel-lock-helper.c
-@@ -360,8 +360,9 @@ int main(int argc, char **argv)
- switch(msg.id) {
- case CAMEL_LOCK_HELPER_LOCK:
- res = CAMEL_LOCK_HELPER_STATUS_NOMEM;
-- path = malloc(msg.data+1);
-- if (path != NULL) {
-+ if (msg.data > 0xffff) {
-+ res = CAMEL_LOCK_HELPER_STATUS_PROTOCOL;
-+ } else if ((path = malloc(msg.data+1)) != NULL) {
- res = CAMEL_LOCK_HELPER_STATUS_PROTOCOL;
- len = read_n(STDIN_FILENO, path, msg.data);
- if (len == msg.data) {