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

[jmr at macports.org]

Revision: 80655
          http://trac.macports.org/changeset/80655
Author:   jmr at macports.org
Date:     2011-07-16 04:40:29 -0700 (Sat, 16 Jul 2011)
Log Message:
-----------
apache license does not conflict with GPLv3

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-16 11:34:08 UTC (rev 80654)
+++ trunk/base/portmgr/jobs/port_binary_distributable.tcl	2011-07-16 11:40:29 UTC (rev 80655)
@@ -45,14 +45,14 @@
 # keep these values sorted
 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}
     ibmpl {cecill gpl}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110716/7f035932/attachment.html>