summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorobache <obache@pkgsrc.org>2010-03-12 13:19:49 +0000
committerobache <obache@pkgsrc.org>2010-03-12 13:19:49 +0000
commit68f33f9fb6991ffd0a00d5cd4b30493a3e817616 (patch)
tree197914f6b8b4d77534bb042c81558db89f90880a
parent7c627975ddc404422ab028ce95468e788444b9fb (diff)
downloadpkgsrc-68f33f9fb6991ffd0a00d5cd4b30493a3e817616.tar.gz
marked as CONFLICTS with esmtp>=1.2 (bin/mailq and/or bin/newaliases)
-rw-r--r--mail/courier-mta/Makefile4
-rw-r--r--mail/fastforward/Makefile4
-rw-r--r--mail/postfix-current/Makefile4
-rw-r--r--mail/postfix/Makefile3
-rw-r--r--mail/sendmail/Makefile3
5 files changed, 10 insertions, 8 deletions
diff --git a/mail/courier-mta/Makefile b/mail/courier-mta/Makefile
index a9cd6c8b74e..c07bc4d239a 100644
--- a/mail/courier-mta/Makefile
+++ b/mail/courier-mta/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2010/01/09 22:20:31 heinz Exp $
+# $NetBSD: Makefile,v 1.29 2010/03/12 13:19:49 obache Exp $
DISTNAME= courier-${COURIER_VERSION}
PKGNAME= ${DISTNAME:S/-/-mta-/}
@@ -7,7 +7,7 @@ CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=courier/}
EXTRACT_SUFX= .tar.bz2
-CONFLICTS+= postfix-[0-9]* qmail-[0-9]* sendmail-[0-9]*
+CONFLICTS+= esmtp>=1.2 postfix-[0-9]* qmail-[0-9]* sendmail-[0-9]*
MAINTAINER= jlam@pkgsrc.org
COMMENT= Courier mail transport agent
diff --git a/mail/fastforward/Makefile b/mail/fastforward/Makefile
index 6411562073a..d1a79176641 100644
--- a/mail/fastforward/Makefile
+++ b/mail/fastforward/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2009/05/19 09:07:14 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2010/03/12 13:19:49 obache Exp $
#
DISTNAME= fastforward-0.51
@@ -13,7 +13,7 @@ LICENSE= public-domain
DEPENDS+= qmail>=1.03nb7:../../mail/qmail
-CONFLICTS+= postfix-[0-9]* sendmail-[0-9]*
+CONFLICTS+= esmtp>=1.2 postfix-[0-9]* sendmail-[0-9]*
USE_TOOLS+= nroff
diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile
index 3913b55031e..6ee265d9d44 100644
--- a/mail/postfix-current/Makefile
+++ b/mail/postfix-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.111 2010/02/25 13:02:02 martti Exp $
+# $NetBSD: Makefile,v 1.112 2010/03/12 13:19:49 obache Exp $
DISTNAME= postfix-2.8-20100213
PKGNAME= postfix-2.8.20100213
@@ -15,7 +15,7 @@ COMMENT= Postfix SMTP server and tools
LICENSE= postfix-license
CONFLICTS+= courier-mta-[0-9]* fastforward>=0.51nb2 sendmail-[0-9]*
-CONFLICTS+= postfix-2.[6-7]-[0-9]*
+CONFLICTS+= postfix-2.[6-7]-[0-9]* esmtp>=1.2
PKG_DESTDIR_SUPPORT= user-destdir
PKG_INSTALLATION_TYPES= overwrite pkgviews
diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index dca1b3bec24..9db899bb77a 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.231 2010/02/25 13:01:22 martti Exp $
+# $NetBSD: Makefile,v 1.232 2010/03/12 13:19:49 obache Exp $
DISTNAME= postfix-2.7.0
#PKGREVISION= 1
@@ -15,6 +15,7 @@ COMMENT= Postfix SMTP server and tools
LICENSE= postfix-license
CONFLICTS+= courier-mta-[0-9]* fastforward>=0.51nb2 sendmail-[0-9]*
+CONFLICTS+= esmtp>=1.2
PKG_DESTDIR_SUPPORT= user-destdir
PKG_INSTALLATION_TYPES= overwrite pkgviews
diff --git a/mail/sendmail/Makefile b/mail/sendmail/Makefile
index 428fec76dc7..8d3f4c147e8 100644
--- a/mail/sendmail/Makefile
+++ b/mail/sendmail/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.108 2010/01/16 00:31:13 jnemeth Exp $
+# $NetBSD: Makefile,v 1.109 2010/03/12 13:19:49 obache Exp $
PKGNAME= sendmail-${DIST_VERS}
COMMENT= The well known Mail Transport Agent
CONFLICTS+= courier-mta-[0-9]* fastforward>=0.51nb2 postfix-[0-9]*
+CONFLICTS+= esmtp>=1.2
PKG_DESTDIR_SUPPORT= user-destdir