diff --git a/jobs/port_binary_distributable.tcl b/jobs/port_binary_distributable.tcl index 45807e6..6af1362 100755 --- a/jobs/port_binary_distributable.tcl +++ b/jobs/port_binary_distributable.tcl @@ -36,7 +36,7 @@ set check_deptypes {depends_build depends_lib} # 'Noncommercial' means a license that prohibits commercial use. set good_licenses {afl agpl apache apsl artistic autoconf boost bsd cecill copyleft cpl curl fontconfig freebsd freetype gfdl gd gpl gplconflict ibmpl ijg - jasper lgpl libpng libtool mit mpl noncommercial openssl permissive + jasper lgpl lppl libpng libtool mit mpl noncommercial openssl permissive php psf qpl public-domain restrictive/distributable ruby sleepycat ssleay tcl/tk x11 zlib zpl} foreach lic $good_licenses { @@ -61,10 +61,10 @@ array set license_conflicts \ apache-1.1 {agpl gpl} apsl {cecill gpl} cpl {cecill gpl} - cecill {afl agpl apache apsl cpl gd gplconflict ibmpl mpl noncommercial openssl php qpl restrictive/distributable ssleay zpl-1} + cecill {afl agpl apache apsl cpl gd gplconflict ibmpl lppl mpl noncommercial openssl php qpl restrictive/distributable ssleay zpl-1} freetype {gpl-2} gd {cecill gpl} - gpl {afl agpl apache-1 apache-1.1 apsl cpl gd gplconflict ibmpl mpl noncommercial openssl php qpl restrictive/distributable ssleay zpl-1} + gpl {afl agpl apache-1 apache-1.1 apsl cpl gd gplconflict ibmpl lppl mpl noncommercial openssl php qpl restrictive/distributable 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} @@ -72,6 +72,7 @@ array set license_conflicts \ ibmpl {cecill gpl} lgpl-3 {gpl-1 gpl-2} lgpl-3+ {gpl-1 gpl-2} + lppl {cecill gpl} mpl {cecill gpl} openssl {cecill gpl} opensslexception [all_licenses_except openssl ssleay]