[pkgsrc/trunk]: pkgsrc/mail Conflict with courier-mta.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/61c6872eba55
branches:  trunk
changeset: 512086:61c6872eba55
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Mon May 01 02:57:03 2006 +0000

description:
Conflict with courier-mta.

diffstat:

 mail/postfix-current/Makefile |  4 ++--
 mail/postfix/Makefile         |  4 ++--
 mail/qmail/Makefile           |  3 ++-
 mail/sendmail/Makefile        |  4 ++--
 mail/sendmail812/Makefile     |  4 ++--
 5 files changed, 10 insertions(+), 9 deletions(-)

diffs (89 lines):

diff -r 5d4e64b7622e -r 61c6872eba55 mail/postfix-current/Makefile
--- a/mail/postfix-current/Makefile     Mon May 01 00:27:04 2006 +0000
+++ b/mail/postfix-current/Makefile     Mon May 01 02:57:03 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.62 2006/04/23 00:12:38 jlam Exp $
+# $NetBSD: Makefile,v 1.63 2006/05/01 02:57:03 jlam Exp $
 
 DISTNAME=      postfix-2.3-20060405
 #PKGREVISION=  1
@@ -12,7 +12,7 @@
 
 DIST_SUBDIR=   postfix
 
-CONFLICTS+=    sendmail-[0-9]* fastforward>=0.51nb2
+CONFLICTS+=    courier-mta-[0-9]* fastforward>=0.51nb2 sendmail-[0-9]*
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
 
diff -r 5d4e64b7622e -r 61c6872eba55 mail/postfix/Makefile
--- a/mail/postfix/Makefile     Mon May 01 00:27:04 2006 +0000
+++ b/mail/postfix/Makefile     Mon May 01 02:57:03 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.180 2006/04/23 00:12:38 jlam Exp $
+# $NetBSD: Makefile,v 1.181 2006/05/01 02:57:03 jlam Exp $
 
 DISTNAME=      postfix-2.2.10
 #PKGREVISION=  1
@@ -11,7 +11,7 @@
 
 DIST_SUBDIR=   postfix
 
-CONFLICTS+=    sendmail-[0-9]* fastforward>=0.51nb2
+CONFLICTS+=    courier-mta-[0-9]* fastforward>=0.51nb2 sendmail-[0-9]*
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
 
diff -r 5d4e64b7622e -r 61c6872eba55 mail/qmail/Makefile
--- a/mail/qmail/Makefile       Mon May 01 00:27:04 2006 +0000
+++ b/mail/qmail/Makefile       Mon May 01 02:57:03 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2006/04/30 08:03:42 schmonz Exp $
+# $NetBSD: Makefile,v 1.50 2006/05/01 02:57:03 jlam Exp $
 #
 
 DISTNAME=              netqmail-1.05
@@ -16,6 +16,7 @@
 DEPENDS+=              ucspi-tcp-[0-9]*:../../net/ucspi-tcp
 
 CONFLICTS+=            courier-maildirmake-[0-9]*
+CONFLICTS+=            courier-mta-[0-9]*
 CONFLICTS+=            mirrordir-[0-9]*
 CONFLICTS+=            mutt<=1.4.2.1nb1
 CONFLICTS+=            netqmail-[0-9]*
diff -r 5d4e64b7622e -r 61c6872eba55 mail/sendmail/Makefile
--- a/mail/sendmail/Makefile    Mon May 01 00:27:04 2006 +0000
+++ b/mail/sendmail/Makefile    Mon May 01 02:57:03 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.85 2006/04/23 00:12:39 jlam Exp $
+# $NetBSD: Makefile,v 1.86 2006/05/01 02:57:03 jlam Exp $
 
 .include "../../mail/sendmail/Makefile.common"
 
@@ -6,7 +6,7 @@
 PKGREVISION=   2
 COMMENT=       The well known Mail Transport Agent
 
-CONFLICTS+=    postfix-[0-9]* fastforward>=0.51nb2
+CONFLICTS+=    courier-mta-[0-9]* fastforward>=0.51nb2 postfix-[0-9]*
 
 MESSAGE_SRC=   ${WRKDIR}/.MESSAGE_SRC
 PLIST_SRC=     ${WRKDIR}/.PLIST_SRC
diff -r 5d4e64b7622e -r 61c6872eba55 mail/sendmail812/Makefile
--- a/mail/sendmail812/Makefile Mon May 01 00:27:04 2006 +0000
+++ b/mail/sendmail812/Makefile Mon May 01 02:57:03 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/04/23 00:12:39 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2006/05/01 02:57:03 jlam Exp $
 
 .include "options.mk"
 .include "../../mail/sendmail812/Makefile.common"
@@ -7,7 +7,7 @@
 PKGREVISION=   2
 COMMENT=       The well known Mail Transport Agent
 
-CONFLICTS+=    postfix-[0-9]* fastforward>=0.51nb2
+CONFLICTS+=    courier-mta-[0-9]* fastforward>=0.51nb2 postfix-[0-9]*
 
 MESSAGE_SRC=   ${WRKDIR}/.MESSAGE_SRC
 PLIST_SRC=     ${WRKDIR}/.PLIST_SRC