[80411] trunk/base/portmgr/jobs/port_binary_distributable.tcl

[jmr at macports.org]

Revision: 80411
          http://trac.macports.org/changeset/80411
Author:   jmr at macports.org
Date:     2011-07-12 06:07:49 -0700 (Tue, 12 Jul 2011)
Log Message:
-----------
update license conflicts

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-07-12 12:55:53 UTC (rev 80410)
+++ trunk/base/portmgr/jobs/port_binary_distributable.tcl	2011-07-12 13:07:49 UTC (rev 80411)
@@ -36,13 +36,13 @@
 }
 # keep these values sorted
 array set license_conflicts \
-    {agpl {cecill gpl}
+    {agpl {cecill gpl-2 gpl-1 restrictive/distributable}
     apache {cecill gpl}
     apsl {cecill gpl}
     cpl {cecill gpl}
-    cecill {agpl apache apsl cpl ibmpl mpl openssl php qpl ssleay zpl-1}
+    cecill {agpl apache apsl cpl ibmpl mpl openssl php qpl restrictive/distributable ssleay zpl-1}
     freetype {gpl-2}
-    gpl {agpl apache apsl cpl ibmpl mpl openssl php qpl ssleay zpl-1}
+    gpl {agpl apache apsl cpl ibmpl mpl openssl php qpl restrictive/distributable ssleay zpl-1}
     gpl-1 {gpl-3 gpl-3+ lgpl-3 lgpl-3+}
     gpl-2 {freetype gpl-3 gpl-3+ lgpl-3 lgpl-3+}
     gpl-3 {gpl-1 gpl-2}
@@ -54,6 +54,7 @@
     openssl {cecill gpl}
     php {cecill gpl}
     qpl {cecill gpl}
+    restrictive/distributable {agpl cecill gpl}
     ssleay {cecill gpl}
     zpl-1 {cecill gpl}}
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110712/9b4d31c8/attachment.html>