diff options
| -rw-r--r-- | mail/postfix-current/Makefile | 4 | ||||
| -rw-r--r-- | mail/postfix/Makefile | 4 | ||||
| -rw-r--r-- | mail/qmail/Makefile | 3 | ||||
| -rw-r--r-- | mail/sendmail/Makefile | 4 | ||||
| -rw-r--r-- | mail/sendmail812/Makefile | 4 |
5 files changed, 10 insertions, 9 deletions
diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile index f53569de975..3b2b69d8ccd 100644 --- a/mail/postfix-current/Makefile +++ b/mail/postfix-current/Makefile @@ -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 @@ COMMENT= Postfix SMTP server and tools 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 --git a/mail/postfix/Makefile b/mail/postfix/Makefile index 25021991a1e..b6238331ac7 100644 --- a/mail/postfix/Makefile +++ b/mail/postfix/Makefile @@ -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 @@ COMMENT= Postfix SMTP server and tools 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 --git a/mail/qmail/Makefile b/mail/qmail/Makefile index 6820672e299..8119e3c5f98 100644 --- a/mail/qmail/Makefile +++ b/mail/qmail/Makefile @@ -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+= daemontools-[0-9]*:../../sysutils/daemontools 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 --git a/mail/sendmail/Makefile b/mail/sendmail/Makefile index e81cd6b285f..283424218e7 100644 --- a/mail/sendmail/Makefile +++ b/mail/sendmail/Makefile @@ -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 @@ PKGNAME= sendmail-${DIST_VERS} 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 --git a/mail/sendmail812/Makefile b/mail/sendmail812/Makefile index b597f3bdac7..ddb72470c6a 100644 --- a/mail/sendmail812/Makefile +++ b/mail/sendmail812/Makefile @@ -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 @@ PKGNAME= sendmail-${DIST_VERS} 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 |