summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVlad Glagolev2012-01-19 07:13:39 +0400
committerVlad Glagolev2012-01-19 07:13:39 +0400
commita9a159c50097a720f50f27c0f69410d04c5d8b79 (patch)
treee2686950ea4806682d13d58a800a73cf0eabdc83
parent34d632e64a5c405d5baed2f159d1e10738628aeb (diff)
postfix: conflicts masqmail
-rwxr-xr-xmail/postfix/CONFLICTS1
-rw-r--r--mail/postfix/HISTORY3
2 files changed, 4 insertions, 0 deletions
diff --git a/mail/postfix/CONFLICTS b/mail/postfix/CONFLICTS
index ef52ac0b50..b94f6db1b3 100755
--- a/mail/postfix/CONFLICTS
+++ b/mail/postfix/CONFLICTS
@@ -1,3 +1,4 @@
+conflicts masqmail &&
conflicts exim &&
conflicts qmail &&
conflicts sendmail
diff --git a/mail/postfix/HISTORY b/mail/postfix/HISTORY
index 79e1a0254c..a795e426a1 100644
--- a/mail/postfix/HISTORY
+++ b/mail/postfix/HISTORY
@@ -1,3 +1,6 @@
+2012-01-19 Vlad Glagolev <stealth@sourcemage.org>
+ * CONFLICTS: added masqmail
+
2011-06-25 Elisamuel Resto <ryuji@sourcemage.org>
* DEPENDS: updated stable to 2.8.3; experimental to 2.9-20110615