[pkgsrc/trunk]: pkgsrc/mail Now that evolution 1.4's package is named evoluti...

[jmmv <jmmv%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ec0c6a0456bd
branches:  trunk
changeset: 481199:ec0c6a0456bd
user:      jmmv <jmmv%pkgsrc.org@localhost>
date:      Mon Sep 27 16:49:25 2004 +0000

description:
Now that evolution 1.4's package is named evolution14, rename evolution 1.2
to evolution12 and set CONFLICTS accordingly.  Addresses PR pkg/27048.

diffstat:

 mail/evolution12/Makefile |  7 ++++---
 mail/evolution14/Makefile |  4 +++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diffs (40 lines):

diff -r aab00fc33587 -r ec0c6a0456bd mail/evolution12/Makefile
--- a/mail/evolution12/Makefile Mon Sep 27 16:46:42 2004 +0000
+++ b/mail/evolution12/Makefile Mon Sep 27 16:49:25 2004 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2004/04/25 20:37:39 snj Exp $
+# $NetBSD: Makefile,v 1.10 2004/09/27 16:49:25 jmmv Exp $
 
-DISTNAME=              evolution-1.2.4
-PKGREVISION=           10
+DISTNAME=              evolution12-1.2.4
 CATEGORIES=            mail time gnome
 MASTER_SITES=          ftp://ftp.ximian.com/pub/ximian-evolution/source/ \
                        ftp://ximian.netnitco.net/pub/mirrors/ximian/ximian-evolution/source/ \
@@ -20,6 +19,8 @@
 HOMEPAGE=              http://ximian.com/products/evolution/
 COMMENT=               GNOME mailer, calendar, contact manager, and communications tool
 
+CONFLICTS+=            evolution<2.0 evolution14-[0-9]*
+
 BUILD_DEPENDS+=                bison-[0-9]*:../../devel/bison
 DEPENDS+=              psmisc-[0-9]*:../../sysutils/psmisc
 BUILD_USES_MSGFMT=     YES
diff -r aab00fc33587 -r ec0c6a0456bd mail/evolution14/Makefile
--- a/mail/evolution14/Makefile Mon Sep 27 16:46:42 2004 +0000
+++ b/mail/evolution14/Makefile Mon Sep 27 16:49:25 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/09/27 16:46:42 jmmv Exp $
+# $NetBSD: Makefile,v 1.4 2004/09/27 16:49:25 jmmv Exp $
 
 DISTNAME=              evolution-1.4.6
 PKGNAME=               ${DISTNAME:S/evolution/evolution14/}
@@ -11,6 +11,8 @@
 HOMEPAGE=              http://ximian.com/products/evolution/
 COMMENT=               GNOME mailer, calendar, contact manager, and communications tool
 
+CONFLICTS+=            evolution12-[0-9]*
+
 DEPENDS+=              psmisc-[0-9]*:../../sysutils/psmisc
 BUILD_USES_MSGFMT=     YES