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

[jmr at macports.org]

Revision: 80656
          http://trac.macports.org/changeset/80656
Author:   jmr at macports.org
Date:     2011-07-16 04:44:46 -0700 (Sat, 16 Jul 2011)
Log Message:
-----------
apache 1.x license does conflict with all GPL versions

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:40:29 UTC (rev 80655)
+++ trunk/base/portmgr/jobs/port_binary_distributable.tcl	2011-07-16 11:44:46 UTC (rev 80656)
@@ -44,13 +44,15 @@
 }
 # 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+}
     gpl-3 {gpl-1 gpl-2}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110716/caaf9ac8/attachment.html>