Changeset 139862


Ignore:
Timestamp:
Aug 30, 2015, 11:45:34 AM (5 years ago)
Author:
jmr@…
Message:

set conflicts for cc-by and cc-by-sa

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/base/portmgr/jobs/port_binary_distributable.tcl

    r139859 r139862  
    5959array set license_conflicts \
    6060    "afl {agpl cecill gpl}
    61     agpl {afl apache-1 apache-1.1 apsl beopen bsd-old cddl cecill cnri cpl epl gd gpl-1 gpl-2 gplconflict ibmpl lppl mpl noncommercial openssl php qpl restrictive/distributable ruby ssleay zpl-1}
     61    agpl {afl apache-1 apache-1.1 apsl beopen bsd-old cc-by-1 cc-by-2 cc-by-2.5 cc-by-3 cc-by-sa cddl cecill cnri cpl epl gd gpl-1 gpl-2 gplconflict ibmpl lppl mpl noncommercial openssl php qpl restrictive/distributable ruby ssleay zpl-1}
    6262    agpl-1 {apache freetype gpl-3 gpl-3+ lgpl-3 lgpl-3+}
    6363    apache {agpl-1 cecill gpl-1 gpl-2}
     
    6767    beopen {agpl cecill gpl}
    6868    bsd-old {agpl cecill gpl}
     69    cc-by-1 {agpl cecill gpl}
     70    cc-by-2 {agpl cecill gpl}
     71    cc-by-2.5 {agpl cecill gpl}
     72    cc-by-3 {agpl cecill gpl}
     73    cc-by-sa {agpl cecill gpl}
    6974    cddl {agpl cecill gpl}
    70     cecill {afl agpl apache apsl beopen bsd-old cddl cnri cpl epl gd gplconflict ibmpl lppl mpl noncommercial openssl php qpl restrictive/distributable ruby ssleay zpl-1}
     75    cecill {afl agpl apache apsl beopen bsd-old cc-by-1 cc-by-2 cc-by-2.5 cc-by-3 cc-by-sa cddl cnri cpl epl gd gplconflict ibmpl lppl mpl noncommercial openssl php qpl restrictive/distributable ruby ssleay zpl-1}
    7176    cnri {agpl cecill gpl}
    7277    cpl {agpl cecill gpl}
     
    7479    freetype {agpl-1 gpl-2}
    7580    gd {agpl cecill gpl}
    76     gpl {afl apache-1 apache-1.1 apsl beopen cddl cnri bsd-old cpl epl gd gplconflict ibmpl lppl mpl noncommercial openssl php qpl restrictive/distributable ruby ssleay zpl-1}
     81    gpl {afl apache-1 apache-1.1 apsl beopen bsd-old cc-by-1 cc-by-2 cc-by-2.5 cc-by-3 cc-by-sa cddl cnri cpl epl gd gplconflict ibmpl lppl mpl noncommercial openssl php qpl restrictive/distributable ruby ssleay zpl-1}
    7782    gpl-1 {agpl apache gpl-3 gpl-3+ lgpl-3 lgpl-3+}
    7883    gpl-2 {agpl apache freetype gpl-3 gpl-3+ lgpl-3 lgpl-3+}
Note: See TracChangeset for help on using the changeset viewer.