Changeset 80655

Timestamp:

07/16/11 04:40:29 (4 years ago)

Author:

jmr@…

Message:

apache license does not conflict with GPLv3

File:

• trunk/base/portmgr/jobs/port_binary_distributable.tcl (modified) (1 diff)

trunk/base/portmgr/jobs/port_binary_distributable.tcl

@@ -46 +46 @@
 array set license_conflicts \
     {agpl {cecill gpl-1 gpl-2 gplconflict noncommercial restrictive/distributable}
-    apache {cecill gpl}
+    apache {cecill gpl-1 gpl-2}
     apsl {cecill gpl}
     cpl {cecill gpl}
     cecill {agpl apache apsl cpl gplconflict ibmpl mpl noncommercial openssl php qpl restrictive/distributable ssleay zpl-1}
     freetype {gpl-2}
-    gpl {agpl apache apsl cpl gplconflict ibmpl mpl noncommercial 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 {agpl apsl cpl gplconflict ibmpl 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}
     gpl-3+ {gpl-1 gpl-2}