Revision: 87253 http://trac.macports.org/changeset/87253 Author: dports@macports.org Date: 2011-11-14 17:41:23 -0800 (Mon, 14 Nov 2011) Log Message: ----------- port_binary_distributable: CNRI license (another old Python license) is distributable but GPL-conflicting Modified Paths: -------------- trunk/base/portmgr/jobs/port_binary_distributable.tcl Modified: trunk/base/portmgr/jobs/port_binary_distributable.tcl =================================================================== --- trunk/base/portmgr/jobs/port_binary_distributable.tcl 2011-11-15 01:25:10 UTC (rev 87252) +++ trunk/base/portmgr/jobs/port_binary_distributable.tcl 2011-11-15 01:41:23 UTC (rev 87253) @@ -35,8 +35,8 @@ # to do so below. # 'Noncommercial' means a license that prohibits commercial use. set good_licenses {afl agpl apache apsl artistic autoconf beopen bitstreamvera \ - boost bsd bsd-old cecill cecill-b cecill-c copyleft cpl \ - curl epl fpll fontconfig freetype gd gfdl gpl \ + boost bsd bsd-old cecill cecill-b cecill-c cnri copyleft \ + cpl curl epl fpll fontconfig freetype gd gfdl gpl \ gplconflict ibmpl ijg isc jasper lgpl libtool lppl mit \ mpl ncsa noncommercial openldap openssl permissive php \ psf public-domain qpl restrictive/distributable ruby \ @@ -64,12 +64,13 @@ apsl {cecill gpl} beopen {cecill gpl} bsd-old {cecill gpl} + cnri {cecill gpl} cpl {cecill gpl} - cecill {afl agpl apache apsl beopen bsd-old cpl epl gd gplconflict ibmpl lppl mpl noncommercial openssl php qpl restrictive/distributable ruby ssleay zpl-1} + cecill {afl agpl apache apsl beopen bsd-old cnri cpl epl gd gplconflict ibmpl lppl mpl noncommercial openssl php qpl restrictive/distributable ruby ssleay zpl-1} epl {cecill gpl} freetype {gpl-2} gd {cecill gpl} - gpl {afl agpl apache-1 apache-1.1 apsl beopen bsd-old cpl epl gd gplconflict ibmpl lppl mpl noncommercial openssl php qpl restrictive/distributable ruby ssleay zpl-1} + gpl {afl agpl apache-1 apache-1.1 apsl beopen cnri bsd-old cpl epl gd gplconflict ibmpl lppl mpl noncommercial openssl php qpl restrictive/distributable ruby ssleay zpl-1} gpl-1 {apache gpl-3 gpl-3+ lgpl-3 lgpl-3+} gpl-2 {apache freetype gpl-3 gpl-3+ lgpl-3 lgpl-3+} gpl-3 {gpl-1 gpl-2}