summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mail/postfix-current/Makefile7
-rw-r--r--mail/postfix/Makefile7
2 files changed, 10 insertions, 4 deletions
diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile
index 3f9f8d201d9..b8867aeadd6 100644
--- a/mail/postfix-current/Makefile
+++ b/mail/postfix-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.113 2010/06/08 15:15:03 martti Exp $
+# $NetBSD: Makefile,v 1.114 2010/06/16 18:36:48 gdt Exp $
DISTNAME= postfix-2.8-20100603
PKGNAME= postfix-2.8.20100603
@@ -12,7 +12,10 @@ DIST_SUBDIR= postfix
MAINTAINER= martti@NetBSD.org
HOMEPAGE= http://www.postfix.org/
COMMENT= Postfix SMTP server and tools
-LICENSE= postfix-license
+
+# The postfix license has only very minor diffs from cpl-1.0.
+LICENSE= cpl-1.0
+#LICENSE= postfix-license
CONFLICTS+= courier-mta-[0-9]* fastforward>=0.51nb2 sendmail-[0-9]*
CONFLICTS+= postfix-2.[6-7]-[0-9]* esmtp>=1.2
diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index bf471fc2de1..cd5c2bff3c3 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.233 2010/06/08 15:14:34 martti Exp $
+# $NetBSD: Makefile,v 1.234 2010/06/16 18:36:48 gdt Exp $
DISTNAME= postfix-2.7.1
#PKGREVISION= 1
@@ -12,7 +12,10 @@ DIST_SUBDIR= postfix
MAINTAINER= martti@NetBSD.org
HOMEPAGE= http://www.postfix.org/
COMMENT= Postfix SMTP server and tools
-LICENSE= postfix-license
+
+# The postfix license has only very minor diffs from cpl-1.0.
+LICENSE= cpl-1.0
+#LICENSE= postfix-license
CONFLICTS+= courier-mta-[0-9]* fastforward>=0.51nb2 sendmail-[0-9]*
CONFLICTS+= esmtp>=1.2