Changeset 80656

Timestamp:

07/16/11 04:44:46 (4 years ago)

Author:

jmr@…

Message:

apache 1.x license does conflict with all GPL versions

File:

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

trunk/base/portmgr/jobs/port_binary_distributable.tcl

@@ -45 +45 @@
 # keep these values sorted
 array set license_conflicts \
-    {agpl {cecill gpl-1 gpl-2 gplconflict noncommercial restrictive/distributable}
+    {agpl {apache-1 apache-1.1 cecill gpl-1 gpl-2 gplconflict noncommercial restrictive/distributable}
     apache {cecill gpl-1 gpl-2}
+    apache-1 {agpl gpl}
+    apache-1.1 {agpl gpl}
     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 apsl cpl gplconflict ibmpl mpl noncommercial openssl php qpl restrictive/distributable ssleay zpl-1}
+    gpl {agpl apache-1 apache-1.1 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+}