summaryrefslogtreecommitdiff
path: root/mail
diff options
context:
space:
mode:
authorjmmv <jmmv@pkgsrc.org>2004-09-27 16:49:25 +0000
committerjmmv <jmmv@pkgsrc.org>2004-09-27 16:49:25 +0000
commit702c88bf94fde9e0209ff7be6a343899d5746c83 (patch)
tree1dc76017dbf94d928c09da5a603f23a5456649b9 /mail
parent8e66fbe5c9ef08bfe5b01b8c8ac3712a3f40beb5 (diff)
downloadpkgsrc-702c88bf94fde9e0209ff7be6a343899d5746c83.tar.gz
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 (limited to 'mail')
-rw-r--r--mail/evolution12/Makefile7
-rw-r--r--mail/evolution14/Makefile4
2 files changed, 7 insertions, 4 deletions
diff --git a/mail/evolution12/Makefile b/mail/evolution12/Makefile
index 1a656c2680a..5a95cc2d6a8 100644
--- a/mail/evolution12/Makefile
+++ b/mail/evolution12/Makefile
@@ -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 @@ MAINTAINER= rh@NetBSD.org
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 --git a/mail/evolution14/Makefile b/mail/evolution14/Makefile
index 6fc45a1150b..022a08461f5 100644
--- a/mail/evolution14/Makefile
+++ b/mail/evolution14/Makefile
@@ -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 @@ MAINTAINER= rh@NetBSD.org
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