Changeset 80386

Timestamp:

07/11/11 04:36:21 (4 years ago)

Author:

jmr@…

Message:

GPLv3 conflicts with older GPL versions without "any later version"

File:

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

trunk/base/portmgr/jobs/port_binary_distributable.tcl

@@ -37 +37 @@
     freetype {gpl-2} \
     gpl {agpl apache apsl cpl ibmpl mpl openssl php qpl ssleay zpl-1} \
-    gpl-2 {freetype} \
+    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} \
+    gpl-3+ {gpl-1 gpl-2} \
     ibmpl {cecill gpl} \
+    lgpl-3 {gpl-1 gpl-2} \
+    lgpl-3+ {gpl-1 gpl-2} \
     mpl {cecill gpl} \
     openssl {cecill gpl} \