Wed Jun 16 18:36:49 2010 UTC ()
Change LICENSE to cpl-1.0.  This has only minor wording differences
from postfix-license, of the same level of importance as changing the
name of the copyright holder, rather than in the nature of the terms.
Everyone believes that postfix is Open Source, and this causes postfix
to fall under DEFAULT_ACCEPTABLE_LICENSES.

ok martti@


(gdt)
diff -r1.233 -r1.234 pkgsrc/mail/postfix/Makefile
diff -r1.113 -r1.114 pkgsrc/mail/postfix-current/Makefile
cvs diff -r1.233 -r1.234 pkgsrc/mail/postfix/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/postfix/Makefile 2010/06/08 15:14:34 1.233
+++ pkgsrc/mail/postfix/Makefile 2010/06/16 18:36:48 1.234
@@ -1,28 +1,31 @@ @@ -1,28 +1,31 @@
1# $NetBSD: Makefile,v 1.233 2010/06/08 15:14:34 martti Exp $ 1# $NetBSD: Makefile,v 1.234 2010/06/16 18:36:48 gdt Exp $
2 2
3DISTNAME= postfix-2.7.1 3DISTNAME= postfix-2.7.1
4#PKGREVISION= 1 4#PKGREVISION= 1
5CATEGORIES= mail 5CATEGORIES= mail
6MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ 6MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/
7MASTER_SITES+= http://postfix.it-austria.net/releases/official/ 7MASTER_SITES+= http://postfix.it-austria.net/releases/official/
8MASTER_SITES+= http://mirrors.isc.org/pub/postfix/official/ 8MASTER_SITES+= http://mirrors.isc.org/pub/postfix/official/
9MASTER_SITES+= http://mirror.postfix.jp/postfix-release/official/ 9MASTER_SITES+= http://mirror.postfix.jp/postfix-release/official/
10DIST_SUBDIR= postfix 10DIST_SUBDIR= postfix
11 11
12MAINTAINER= martti@NetBSD.org 12MAINTAINER= martti@NetBSD.org
13HOMEPAGE= http://www.postfix.org/ 13HOMEPAGE= http://www.postfix.org/
14COMMENT= Postfix SMTP server and tools 14COMMENT= Postfix SMTP server and tools
15LICENSE= postfix-license 15
 16# The postfix license has only very minor diffs from cpl-1.0.
 17LICENSE= cpl-1.0
 18#LICENSE= postfix-license
16 19
17CONFLICTS+= courier-mta-[0-9]* fastforward>=0.51nb2 sendmail-[0-9]* 20CONFLICTS+= courier-mta-[0-9]* fastforward>=0.51nb2 sendmail-[0-9]*
18CONFLICTS+= esmtp>=1.2 21CONFLICTS+= esmtp>=1.2
19 22
20PKG_DESTDIR_SUPPORT= user-destdir 23PKG_DESTDIR_SUPPORT= user-destdir
21PKG_INSTALLATION_TYPES= overwrite pkgviews 24PKG_INSTALLATION_TYPES= overwrite pkgviews
22 25
23USE_TOOLS+= perl 26USE_TOOLS+= perl
24CHECK_HEADERS_SKIP+= src/global/mail_params.h 27CHECK_HEADERS_SKIP+= src/global/mail_params.h
25 28
26.include "../../mk/bsd.prefs.mk" 29.include "../../mk/bsd.prefs.mk"
27 30
28SPECIAL_PERMS+= sbin/postdrop postfix maildrop 2555 31SPECIAL_PERMS+= sbin/postdrop postfix maildrop 2555
cvs diff -r1.113 -r1.114 pkgsrc/mail/postfix-current/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/postfix-current/Attic/Makefile 2010/06/08 15:15:03 1.113
+++ pkgsrc/mail/postfix-current/Attic/Makefile 2010/06/16 18:36:48 1.114
@@ -1,28 +1,31 @@ @@ -1,28 +1,31 @@
1# $NetBSD: Makefile,v 1.113 2010/06/08 15:15:03 martti Exp $ 1# $NetBSD: Makefile,v 1.114 2010/06/16 18:36:48 gdt Exp $
2 2
3DISTNAME= postfix-2.8-20100603 3DISTNAME= postfix-2.8-20100603
4PKGNAME= postfix-2.8.20100603 4PKGNAME= postfix-2.8.20100603
5CATEGORIES= mail 5CATEGORIES= mail
6MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/ 6MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/
7MASTER_SITES+= http://postfix.it-austria.net/releases/experimental/ 7MASTER_SITES+= http://postfix.it-austria.net/releases/experimental/
8MASTER_SITES+= http://mirrors.isc.org/pub/postfix/experimental/ 8MASTER_SITES+= http://mirrors.isc.org/pub/postfix/experimental/
9MASTER_SITES+= http://mirror.postfix.jp/postfix-release/experimental/ 9MASTER_SITES+= http://mirror.postfix.jp/postfix-release/experimental/
10DIST_SUBDIR= postfix 10DIST_SUBDIR= postfix
11 11
12MAINTAINER= martti@NetBSD.org 12MAINTAINER= martti@NetBSD.org
13HOMEPAGE= http://www.postfix.org/ 13HOMEPAGE= http://www.postfix.org/
14COMMENT= Postfix SMTP server and tools 14COMMENT= Postfix SMTP server and tools
15LICENSE= postfix-license 15
 16# The postfix license has only very minor diffs from cpl-1.0.
 17LICENSE= cpl-1.0
 18#LICENSE= postfix-license
16 19
17CONFLICTS+= courier-mta-[0-9]* fastforward>=0.51nb2 sendmail-[0-9]* 20CONFLICTS+= courier-mta-[0-9]* fastforward>=0.51nb2 sendmail-[0-9]*
18CONFLICTS+= postfix-2.[6-7]-[0-9]* esmtp>=1.2 21CONFLICTS+= postfix-2.[6-7]-[0-9]* esmtp>=1.2
19 22
20PKG_DESTDIR_SUPPORT= user-destdir 23PKG_DESTDIR_SUPPORT= user-destdir
21PKG_INSTALLATION_TYPES= overwrite pkgviews 24PKG_INSTALLATION_TYPES= overwrite pkgviews
22 25
23USE_TOOLS+= perl 26USE_TOOLS+= perl
24CHECK_HEADERS_SKIP+= src/global/mail_params.h 27CHECK_HEADERS_SKIP+= src/global/mail_params.h
25 28
26.include "../../mk/bsd.prefs.mk" 29.include "../../mk/bsd.prefs.mk"
27 30
28SPECIAL_PERMS+= sbin/postdrop postfix maildrop 2555 31SPECIAL_PERMS+= sbin/postdrop postfix maildrop 2555