Ignore:
Timestamp:
Sep 30, 2011, 10:54:17 PM (9 years ago)
Author:
derek@…
Message:

Merge from trunk

Location:
branches/gsoc11-statistics/base
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • branches/gsoc11-statistics/base

  • branches/gsoc11-statistics/base/portmgr/jobs/mirror_macports.sh

    r66457 r84763  
    88
    99# regexp of ports that we do not mirror
    10 EXCLUSIONS='^(molden)$'
     10EXCLUSIONS='^(molden|metis)$'
    1111
    1212# macports really wants this, so lets appease it
  • branches/gsoc11-statistics/base/portmgr/jobs/org.macports.PortIndex2MySQL.plist

    r31671 r84763  
    11<?xml version="1.0" encoding="UTF-8"?>
    2 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
     2<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
    33<plist version="1.0">
    44    <dict>
     
    1212        <array>
    1313            <dict>
    14                 <key>Hour</key>
    15                 <integer>4</integer>
    16                 <key>Minute</key>
    17                 <integer>15</integer>
    18             </dict>
    19             <dict>
    20                 <key>Hour</key>
    21                 <integer>16</integer>
    22                 <key>Minute</key>
    23                 <integer>15</integer>
    24             </dict>
     14                <key>Hour</key>
     15                <integer>4</integer>
     16                <key>Minute</key>
     17                <integer>15</integer>
     18            </dict>
     19            <dict>
     20                <key>Hour</key>
     21                <integer>16</integer>
     22                <key>Minute</key>
     23                <integer>15</integer>
     24            </dict>
    2525        </array>
    2626        <key>UserName</key>
  • branches/gsoc11-statistics/base/portmgr/jobs/org.macports.mprsyncup.plist

    r53280 r84763  
    11<?xml version="1.0" encoding="UTF-8"?>
    2 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
     2<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
    33<plist version="1.0">
    44    <dict>
     
    1212        <array>
    1313            <dict>
    14                 <key>Minute</key>
    15                 <integer>00</integer>
    16             </dict>
    17             <dict>
    18                 <key>Minute</key>
    19                 <integer>30</integer>
    20             </dict>
     14                <key>Minute</key>
     15                <integer>00</integer>
     16            </dict>
     17            <dict>
     18                <key>Minute</key>
     19                <integer>30</integer>
     20            </dict>
    2121        </array>
    2222    </dict>
  • branches/gsoc11-statistics/base/portmgr/jobs/port_binary_distributable.tcl

    r82923 r84763  
    3535# to do so below.
    3636# 'Noncommercial' means a license that prohibits commercial use.
    37 set good_licenses {agpl apache apsl artistic autoconf boost bsd cecill copyleft cpl
    38                    curl fontconfig freebsd freetype gfdl gpl gplconflict ibmpl ijg
    39                    jasper lgpl libpng libtool mit mpl noncommercial openssl permissive
    40                    php psf qpl public-domain restrictive/distributable ruby sleepycat
    41                    ssleay tcl/tk x11 zlib zpl}
     37set good_licenses {afl agpl apache apsl artistic autoconf boost bsd cecill \
     38                   copyleft cpl curl epl fontconfig freebsd freetype gd gfdl \
     39                   gpl gplconflict ibmpl ijg isc jasper lgpl libpng libtool \
     40                   lppl mit mpl ncsa noncommercial openssl permissive php \
     41                   psf public-domain qpl restrictive/distributable ruby \
     42                   sleepycat ssleay tcl/tk w3c wtfpl x11 zlib zpl}
    4243foreach lic $good_licenses {
    4344    set license_good($lic) 1
    4445}
     46
     47proc all_licenses_except { args } {
     48    global good_licenses
     49    set remaining $good_licenses
     50    foreach arg $args {
     51        set remaining [lsearch -inline -all -not -exact $remaining $arg]
     52    }
     53    return [list $remaining]
     54}
     55
    4556# keep these values sorted
    4657array set license_conflicts \
    47     {agpl {apache-1 apache-1.1 cecill gpl-1 gpl-2 gplconflict noncommercial restrictive/distributable}
     58    "afl {cecill gpl}
     59    agpl {apache-1 apache-1.1 cecill gpl-1 gpl-2 gplconflict noncommercial restrictive/distributable}
    4860    apache {cecill gpl-1 gpl-2}
    4961    apache-1 {agpl gpl}
     
    5163    apsl {cecill gpl}
    5264    cpl {cecill gpl}
    53     cecill {agpl apache apsl cpl gplconflict ibmpl mpl noncommercial openssl php qpl restrictive/distributable ssleay zpl-1}
     65    cecill {afl agpl apache apsl cpl epl gd gplconflict ibmpl lppl mpl noncommercial openssl php qpl restrictive/distributable ruby ssleay zpl-1}
     66    epl {cecill gpl}
    5467    freetype {gpl-2}
    55     gpl {agpl apache-1 apache-1.1 apsl cpl gplconflict ibmpl mpl noncommercial openssl php qpl restrictive/distributable ssleay zpl-1}
     68    gd {cecill gpl}
     69    gpl {afl agpl apache-1 apache-1.1 apsl cpl epl gd gplconflict ibmpl lppl mpl noncommercial openssl php qpl restrictive/distributable ruby ssleay zpl-1}
    5670    gpl-1 {apache gpl-3 gpl-3+ lgpl-3 lgpl-3+}
    5771    gpl-2 {apache freetype gpl-3 gpl-3+ lgpl-3 lgpl-3+}
     
    6175    lgpl-3 {gpl-1 gpl-2}
    6276    lgpl-3+ {gpl-1 gpl-2}
     77    lppl {cecill gpl}
    6378    mpl {cecill gpl}
    6479    openssl {cecill gpl}
     80    opensslexception [all_licenses_except openssl ssleay]
    6581    php {cecill gpl}
    6682    qpl {cecill gpl}
    6783    restrictive/distributable {agpl cecill gpl}
     84    ruby {cecill gpl}
    6885    ssleay {cecill gpl}
    69     zpl-1 {cecill gpl}}
     86    zpl-1 {cecill gpl}"
    7087
    7188proc printUsage {} {
Note: See TracChangeset for help on using the changeset viewer.