Changeset 99736


Ignore:
Timestamp:
Nov 15, 2012, 3:13:11 PM (7 years ago)
Author:
jmr@…
Message:

fix incorrect deactivate hacks, and simplify others by removing compatibility with old base versions

Location:
trunk/dports
Files:
42 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/databases/mariadb/Portfile

    r97283 r99736  
    153153            && ![catch {set vers [lindex [registry_active ${name_mysql}-server] 0]}]
    154154            && [vercmp [lindex $vers 1] 5.5.24] < 0 } {
    155        
    156             set deactivate_proc registry_deactivate_composite
    157             if {[info commands registry_deactivate_composite] == {}} {
    158                 set deactivate_proc registry_deactivate
    159             }
    160             $deactivate_proc ${name_mysql}-server "" [list ports_nodepcheck 1]
     155
     156            registry_deactivate_composite ${name_mysql}-server "" [list ports_nodepcheck 1]
    161157        }
    162158    }
  • trunk/dports/databases/mysql51/Portfile

    r98673 r99736  
    169169            && [vercmp [lindex $vers 1] 5.1.63] < 1
    170170            && [vercmp [lindex $vers 2] 3] < 0 } {
    171        
    172             set deactivate_proc registry_deactivate_composite
    173             if {[info commands registry_deactivate_composite] == {}} {
    174                 set deactivate_proc registry_deactivate
    175             }
    176             $deactivate_proc ${name_mysql}-server "" [list ports_nodepcheck 1]
     171
     172            registry_deactivate_composite ${name_mysql}-server "" [list ports_nodepcheck 1]
    177173        }
    178174    }
  • trunk/dports/databases/mysql55/Portfile

    r98674 r99736  
    145145            && ![catch {set vers [lindex [registry_active ${name_mysql}-server] 0]}]
    146146            && [vercmp [lindex $vers 1] 5.5.25] < 0 } {
    147        
    148             set deactivate_proc registry_deactivate_composite
    149             if {[info commands registry_deactivate_composite] == {}} {
    150                 set deactivate_proc registry_deactivate
    151             }
    152             $deactivate_proc ${name_mysql}-server "" [list ports_nodepcheck 1]
     147
     148            registry_deactivate_composite ${name_mysql}-server "" [list ports_nodepcheck 1]
    153149        }
    154150    }
  • trunk/dports/databases/percona/Portfile

    r98675 r99736  
    160160            && ![catch {set vers [lindex [registry_active ${name_mysql}-server] 0]}]
    161161            && [vercmp [lindex $vers 1] 5.5.24-26.0] < 0 } {
    162        
    163             set deactivate_proc registry_deactivate_composite
    164             if {[info commands registry_deactivate_composite] == {}} {
    165                 set deactivate_proc registry_deactivate
    166             }
    167             $deactivate_proc ${name_mysql}-server "" [list ports_nodepcheck 1]
     162
     163            registry_deactivate_composite ${name_mysql}-server "" [list ports_nodepcheck 1]
    168164        }
    169165    }
  • trunk/dports/devel/zmq22/Portfile

    r98878 r99736  
    3737        pre-activate {
    3838            # provide an upgrade path for the zmq-update to 3.2
    39             set deactivate_proc registry_deactivate_composite
    40             if {[info commands registry_deactivate_composite] == {}} {
    41                 set deactivate_proc registry_deactivate
    42             }
    43             $deactivate_proc zmq "" [list ports_nodepcheck 1]
     39            registry_deactivate_composite zmq "" [list ports_nodepcheck 1]
    4440        }
    4541    } else {
  • trunk/dports/games/simutrans/Portfile

    r99164 r99736  
    142142            && ![catch {set vers [lindex [registry_active simutrans] 0]}]
    143143            && [vercmp [lindex $vers 1] 111.2.2] < 0} {
    144             registry_deactivate simutrans "" [list ports_nodepcheck 1]
     144            registry_deactivate_composite simutrans "" [list ports_nodepcheck 1]
    145145        }
    146146    }
  • trunk/dports/gnome/atkmm/Portfile

    r89810 r99736  
    3434        && ![catch {set vers [lindex [registry_active gtkmm] 0]}]
    3535        && [vercmp [lindex $vers 1] 2.22.0] < 0} {
    36        
    37         set deactivate_proc registry_deactivate_composite
    38         if {[info commands registry_deactivate_composite] == {}} {
    39             set deactivate_proc registry_deactivate
    40         }
    41         $deactivate_proc gtkmm "" [list ports_nodepcheck 1]
     36
     37        registry_deactivate_composite gtkmm "" [list ports_nodepcheck 1]
    4238    }
    4339}
  • trunk/dports/kde/dragon/Portfile

    r99724 r99736  
    3131        && ![catch {set vers [lindex [registry_active kdemultimedia4] 0]}]
    3232        && [rpm-vercomp [lindex $vers 1] 4.9.3] < 0} {
    33             registry_deactivate kdemultimedia4 "" [list ports_nodepcheck 1]
     33            registry_deactivate_composite kdemultimedia4 "" [list ports_nodepcheck 1]
    3434    }
    3535}
  • trunk/dports/kde/ffmpegthumbs/Portfile

    r99724 r99736  
    2727        && ![catch {set vers [lindex [registry_active kdemultimedia4] 0]}]
    2828        && [rpm-vercomp [lindex $vers 1] 4.9.3] < 0} {
    29             registry_deactivate kdemultimedia4 "" [list ports_nodepcheck 1]
     29            registry_deactivate_composite kdemultimedia4 "" [list ports_nodepcheck 1]
    3030    }
    3131}
  • trunk/dports/kde/juk/Portfile

    r99724 r99736  
    3434        && ![catch {set vers [lindex [registry_active kdemultimedia4] 0]}]
    3535        && [rpm-vercomp [lindex $vers 1] 4.9.3] < 0} {
    36             registry_deactivate kdemultimedia4 "" [list ports_nodepcheck 1]
     36            registry_deactivate_composite kdemultimedia4 "" [list ports_nodepcheck 1]
    3737    }
    3838}
  • trunk/dports/kde/kdelibs4/Portfile

    r99689 r99736  
    8181    if {![catch {set vers [lindex [registry_active kde4-runtime] 0]}]
    8282        && [vercmp [lindex $vers 1] 4.8.1] < 0} {
    83         set deactivate_proc registry_deactivate_composite
    84         if {[info commands registry_deactivate_composite] == {}} {
    85             set deactivate_proc registry_deactivate
    86         }
    87         $deactivate_proc kde4-runtime "" [list ports_nodepcheck 1]
     83        registry_deactivate_composite kde4-runtime "" [list ports_nodepcheck 1]
    8884    }
    8985}
  • trunk/dports/kde/libkcddb/Portfile

    r99724 r99736  
    3030        && ![catch {set vers [lindex [registry_active kdemultimedia4] 0]}]
    3131        && [rpm-vercomp [lindex $vers 1] 4.9.3] < 0} {
    32             registry_deactivate kdemultimedia4 "" [list ports_nodepcheck 1]
     32            registry_deactivate_composite kdemultimedia4 "" [list ports_nodepcheck 1]
    3333    }
    3434}
  • trunk/dports/kde/libkcompactdisc/Portfile

    r99724 r99736  
    2626        && ![catch {set vers [lindex [registry_active kdemultimedia4] 0]}]
    2727        && [rpm-vercomp [lindex $vers 1] 4.9.3] < 0} {
    28             registry_deactivate kdemultimedia4 "" [list ports_nodepcheck 1]
     28            registry_deactivate_composite kdemultimedia4 "" [list ports_nodepcheck 1]
    2929    }
    3030}
  • trunk/dports/kde/mplayerthumbs/Portfile

    r99724 r99736  
    2626        && ![catch {set vers [lindex [registry_active kdemultimedia4] 0]}]
    2727        && [rpm-vercomp [lindex $vers 1] 4.9.3] < 0} {
    28             registry_deactivate kdemultimedia4 "" [list ports_nodepcheck 1]
     28            registry_deactivate_composite kdemultimedia4 "" [list ports_nodepcheck 1]
    2929    }
    3030}
  • trunk/dports/kde/nepomuk-core/Portfile

    r99723 r99736  
    3636        && ![catch {set vers [lindex [registry_active kde4-runtime] 0]}]
    3737        && [rpm-vercomp [lindex $vers 1] 4.9.3] < 0} {
    38             registry_deactivate kde4-runtime "" [list ports_nodepcheck 1]
     38            registry_deactivate_composite kde4-runtime "" [list ports_nodepcheck 1]
    3939    }
    4040}
  • trunk/dports/perl/p5-file-listing/Portfile

    r94655 r99736  
    2929      && [vercmp [lindex $vers 1] 6.0] < 0} {
    3030        ui_warn "Deactivating old, pre-6.x libwww-perl to activate ${name}"
    31         set deactivate_proc registry_deactivate_composite
    32         if {[info commands registry_deactivate_composite] == {}} {
    33             set deactivate_proc registry_deactivate
    34         }
    35         $deactivate_proc p5-libwww-perl "" [list ports_nodepcheck 1]
     31        registry_deactivate_composite p5-libwww-perl "" [list ports_nodepcheck 1]
    3632    }
    3733}
  • trunk/dports/perl/p5-html-form/Portfile

    r94655 r99736  
    3131      && [vercmp [lindex $vers 1] 6.0] < 0} {
    3232        ui_warn "Deactivating old, pre-6.x libwww-perl to activate ${name}"
    33         set deactivate_proc registry_deactivate_composite
    34         if {[info commands registry_deactivate_composite] == {}} {
    35             set deactivate_proc registry_deactivate
    36         }
    37         $deactivate_proc p5-libwww-perl "" [list ports_nodepcheck 1]
     33        registry_deactivate_composite p5-libwww-perl "" [list ports_nodepcheck 1]
    3834    }
    3935}
  • trunk/dports/perl/p5-http-cookies/Portfile

    r99580 r99736  
    2929      && [vercmp [lindex $vers 1] 6.0] < 0} {
    3030        ui_warn "Deactivating old, pre-6.x libwww-perl to activate ${name}"
    31         set deactivate_proc registry_deactivate_composite
    32         if {[info commands registry_deactivate_composite] == {}} {
    33             set deactivate_proc registry_deactivate
    34         }
    35         $deactivate_proc p5-libwww-perl "" [list ports_nodepcheck 1]
     31        registry_deactivate_composite p5-libwww-perl "" [list ports_nodepcheck 1]
    3632    }
    3733}
  • trunk/dports/perl/p5-http-daemon/Portfile

    r99581 r99736  
    3030      && [vercmp [lindex $vers 1] 6.0] < 0} {
    3131        ui_warn "Deactivating old, pre-6.x libwww-perl to activate ${name}"
    32         set deactivate_proc registry_deactivate_composite
    33         if {[info commands registry_deactivate_composite] == {}} {
    34             set deactivate_proc registry_deactivate
    35         }
    36         $deactivate_proc p5-libwww-perl "" [list ports_nodepcheck 1]
     32        registry_deactivate_composite p5-libwww-perl "" [list ports_nodepcheck 1]
    3733    }
    3834}
  • trunk/dports/perl/p5-http-date/Portfile

    r99583 r99736  
    2828      && [vercmp [lindex $vers 1] 6.0] < 0} {
    2929        ui_warn "Deactivating old, pre-6.x libwww-perl to activate ${name}"
    30         set deactivate_proc registry_deactivate_composite
    31         if {[info commands registry_deactivate_composite] == {}} {
    32             set deactivate_proc registry_deactivate
    33         }
    34         $deactivate_proc p5-libwww-perl "" [list ports_nodepcheck 1]
     30        registry_deactivate_composite p5-libwww-perl "" [list ports_nodepcheck 1]
    3531    }
    3632}
  • trunk/dports/perl/p5-http-message/Portfile

    r99584 r99736  
    3535      && [vercmp [lindex $vers 1] 6.0] < 0} {
    3636        ui_warn "Deactivating old, pre-6.x libwww-perl to activate ${name}"
    37         set deactivate_proc registry_deactivate_composite
    38         if {[info commands registry_deactivate_composite] == {}} {
    39             set deactivate_proc registry_deactivate
    40         }
    41         $deactivate_proc p5-libwww-perl "" [list ports_nodepcheck 1]
     37        registry_deactivate_composite p5-libwww-perl "" [list ports_nodepcheck 1]
    4238    }
    4339}
  • trunk/dports/perl/p5-http-negotiate/Portfile

    r99585 r99736  
    2828      && [vercmp [lindex $vers 1] 6.0] < 0} {
    2929        ui_warn "Deactivating old, pre-6.x libwww-perl to activate ${name}"
    30         set deactivate_proc registry_deactivate_composite
    31         if {[info commands registry_deactivate_composite] == {}} {
    32             set deactivate_proc registry_deactivate
    33         }
    34         $deactivate_proc p5-libwww-perl "" [list ports_nodepcheck 1]
     30        registry_deactivate_composite p5-libwww-perl "" [list ports_nodepcheck 1]
    3531    }
    3632}
  • trunk/dports/perl/p5-lwp-mediatypes/Portfile

    r94655 r99736  
    2525      && [vercmp [lindex $vers 1] 6.0] < 0} {
    2626        ui_warn "Deactivating old, pre-6.x libwww-perl to activate ${name}"
    27         set deactivate_proc registry_deactivate_composite
    28         if {[info commands registry_deactivate_composite] == {}} {
    29             set deactivate_proc registry_deactivate
    30         }
    31         $deactivate_proc p5-libwww-perl "" [list ports_nodepcheck 1]
     27        registry_deactivate_composite p5-libwww-perl "" [list ports_nodepcheck 1]
    3228    }
    3329}
  • trunk/dports/perl/p5-lwp-protocol-http10/Portfile

    r94655 r99736  
    2929      && [vercmp [lindex $vers 1] 6.0] < 0} {
    3030        ui_warn "Deactivating old, pre-6.x libwww-perl to activate ${name}"
    31         set deactivate_proc registry_deactivate_composite
    32         if {[info commands registry_deactivate_composite] == {}} {
    33             set deactivate_proc registry_deactivate
    34         }
    35         $deactivate_proc p5-libwww-perl "" [list ports_nodepcheck 1]
     31        registry_deactivate_composite p5-libwww-perl "" [list ports_nodepcheck 1]
    3632    }
    3733}
  • trunk/dports/perl/p5-lwp-protocol-https/Portfile

    r94655 r99736  
    3636      && [vercmp [lindex $vers 1] 6.0] < 0} {
    3737        ui_warn "Deactivating old, pre-6.x libwww-perl to activate ${name}"
    38         set deactivate_proc registry_deactivate_composite
    39         if {[info commands registry_deactivate_composite] == {}} {
    40             set deactivate_proc registry_deactivate
    41         }
    42         $deactivate_proc p5-libwww-perl "" [list ports_nodepcheck 1]
     38        registry_deactivate_composite p5-libwww-perl "" [list ports_nodepcheck 1]
    4339    }
    4440}
  • trunk/dports/perl/p5-net-http/Portfile

    r94655 r99736  
    2626      && [vercmp [lindex $vers 1] 6.0] < 0} {
    2727        ui_warn "Deactivating old, pre-6.x libwww-perl to activate ${name}"
    28         set deactivate_proc registry_deactivate_composite
    29         if {[info commands registry_deactivate_composite] == {}} {
    30             set deactivate_proc registry_deactivate
    31         }
    32         $deactivate_proc p5-libwww-perl "" [list ports_nodepcheck 1]
     28        registry_deactivate_composite p5-libwww-perl "" [list ports_nodepcheck 1]
    3329    }
    3430}
  • trunk/dports/perl/p5-www-robotrules/Portfile

    r94655 r99736  
    2929      && [vercmp [lindex $vers 1] 6.0] < 0} {
    3030        ui_warn "Deactivating old, pre-6.x libwww-perl to activate ${name}"
    31         set deactivate_proc registry_deactivate_composite
    32         if {[info commands registry_deactivate_composite] == {}} {
    33             set deactivate_proc registry_deactivate
    34         }
    35         $deactivate_proc p5-libwww-perl "" [list ports_nodepcheck 1]
     31        registry_deactivate_composite p5-libwww-perl "" [list ports_nodepcheck 1]
    3632    }
    3733}
  • trunk/dports/python/py-roman/Portfile

    r89810 r99736  
    3131            && ![catch {set vers [lindex [registry_active py${python.version}-docutils] 0]}]
    3232            && [vercmp [lindex $vers 1] 0.6] < 0} {
    33             set deactivate_proc registry_deactivate_composite
    34             if {[info commands registry_deactivate_composite] == {}} {
    35                 set deactivate_proc registry_deactivate
    36             }
    37             $deactivate_proc py${python.version}-docutils "" [list ports_nodepcheck 1]
     33            registry_deactivate_composite py${python.version}-docutils "" [list ports_nodepcheck 1]
    3834        }
    3935    }
  • trunk/dports/science/lalsimulation/Portfile

    r94664 r99736  
    4141    && ![catch {set vers [lindex [registry_active lalburst] 0]}]
    4242    && [vercmp [lindex $vers 1] 1.0.1] < 0} {
    43       registry_deactivate lalburst "" [list ports_nodepcheck 1]
     43      registry_deactivate_composite lalburst "" [list ports_nodepcheck 1]
    4444  }
    4545  if {[file exists ${prefix}/include/lal/LALSimInspiral.h]
    4646    && ![catch {set vers [lindex [registry_active lalinspiral] 0]}]
    4747    && [vercmp [lindex $vers 1] 1.1.0] < 0} {
    48       registry_deactivate lalinspiral "" [list ports_nodepcheck 1]
     48      registry_deactivate_composite lalinspiral "" [list ports_nodepcheck 1]
    4949  }
    5050}
  • trunk/dports/tex/dvipng/Portfile

    r97436 r99736  
    4444             || [vercmp [lindex $vers 1] 23089] == 0
    4545             && [lindex $vers 2] < 1)} {
    46         set deactivate_proc registry_deactivate_composite
    47         if {[info commands registry_deactivate_composite] == {}} {
    48             set deactivate_proc registry_deactivate
    49         }
    50         $deactivate_proc texlive-bin-extra "" [list ports_nodepcheck 1]
     46        registry_deactivate_composite texlive-bin-extra "" [list ports_nodepcheck 1]
    5147    }
    5248}
  • trunk/dports/tex/latexdiff/Portfile

    r89810 r99736  
    6161        && ![catch {set vers [lindex [registry_active texlive-bin-extra] 0]}]
    6262        && [vercmp [lindex $vers 1] 19536] < 0} {
    63         set deactivate_proc registry_deactivate_composite
    64         if {[info commands registry_deactivate_composite] == {}} {
    65             set deactivate_proc registry_deactivate
    66         }
    67         $deactivate_proc texlive-bin-extra "" [list ports_nodepcheck 1]
     63        registry_deactivate_composite texlive-bin-extra "" [list ports_nodepcheck 1]
    6864    }
    6965}
  • trunk/dports/tex/texlive-basic/Portfile

    r95340 r99736  
    6969
    7070pre-activate {
    71     set deactivate_proc registry_deactivate_composite
    72     if {[info commands registry_deactivate_composite] == {}} {
    73         set deactivate_proc registry_deactivate
    74     }
    7571    # If texlive 2007 metaport is installed, deactivate it to avoid
    7672    # conflicts on $prefix/bin/etex etc.
     
    7874        && ![catch {set vers [lindex [registry_active texlive] 0]}]
    7975        && [vercmp [lindex $vers 1] 2009] < 0} {
    80         $deactivate_proc texlive "" [list ports_nodepcheck 1]
     76        registry_deactivate_composite texlive "" [list ports_nodepcheck 1]
    8177    }
    8278
     
    8581    if {![catch {set vers [lindex [registry_active texlive-fontutils] 0]}]
    8682        && [vercmp [lindex $vers 1] 16392] < 0} {
    87         $deactivate_proc texlive-fontutils "" [list ports_nodepcheck 1]
     83        registry_deactivate_composite texlive-fontutils "" [list ports_nodepcheck 1]
    8884    }
    8985
     
    9490         && [vercmp [lindex $vers 1] 14727] == 0
    9591         && [lindex $vers 2] < 2} {
    96         $deactivate_proc texlive-lang-mongolian "" [list ports_nodepcheck 1]
     92        registry_deactivate_composite texlive-lang-mongolian "" [list ports_nodepcheck 1]
    9793    }
    9894}
  • trunk/dports/tex/texlive-bin/Portfile

    r97757 r99736  
    237237         && [vercmp [lindex $vers 1] 13822] == 0
    238238         && [lindex $vers 2] <3} {
    239         set deactivate_proc registry_deactivate_composite
    240         if {[info commands registry_deactivate_composite] == {}} {
    241             set deactivate_proc registry_deactivate
    242         }
    243         $deactivate_proc texlive-htmlxml "" [list ports_nodepcheck 1]
     239        registry_deactivate_composite texlive-htmlxml "" [list ports_nodepcheck 1]
    244240    }
    245241
     
    247243         && ![catch {set vers [lindex [registry_active texlive-basic] 0]}]
    248244         && [vercmp [lindex $vers 1] 23152] < 0} {
    249         set deactivate_proc registry_deactivate_composite
    250         if {[info commands registry_deactivate_composite] == {}} {
    251             set deactivate_proc registry_deactivate
    252         }
    253         $deactivate_proc texlive-basic "" [list ports_nodepcheck 1]
     245        registry_deactivate_composite texlive-basic "" [list ports_nodepcheck 1]
    254246    }
    255247
  • trunk/dports/tex/texlive-fonts-recommended/Portfile

    r95340 r99736  
    5555    if {![catch {set vers [lindex [registry_active texlive-fonts-extra] 0]}]
    5656        && [vercmp [lindex $vers 1] 19491] < 0} {
    57         set deactivate_proc registry_deactivate_composite
    58         if {[info commands registry_deactivate_composite] == {}} {
    59             set deactivate_proc registry_deactivate
    60         }
    61         $deactivate_proc texlive-fonts-extra "" [list ports_nodepcheck 1]
     57        registry_deactivate_composite texlive-fonts-extra "" [list ports_nodepcheck 1]
    6258    }
    6359}
  • trunk/dports/tex/texlive-generic-recommended/Portfile

    r95340 r99736  
    3131    if {![catch {set vers [lindex [registry_active texlive-latex-extra] 0]}]
    3232        && [vercmp [lindex $vers 1] 19548] < 0} {
    33         set deactivate_proc registry_deactivate_composite
    34         if {[info commands registry_deactivate_composite] == {}} {
    35             set deactivate_proc registry_deactivate
    36         }
    37         $deactivate_proc texlive-latex-extra "" [list ports_nodepcheck 1]
     33        registry_deactivate_composite texlive-latex-extra "" [list ports_nodepcheck 1]
    3834    }
    3935}
  • trunk/dports/tex/texlive-latex-recommended/Portfile

    r95340 r99736  
    3636    if {![catch {set vers [lindex [registry_active texlive-xetex] 0]}]
    3737        && [vercmp [lindex $vers 1] 23080] < 0} {
    38         set deactivate_proc registry_deactivate_composite
    39         if {[info commands registry_deactivate_composite] == {}} {
    40             set deactivate_proc registry_deactivate
    41         }
    42         $deactivate_proc texlive-xetex "" [list ports_nodepcheck 1]
     38        registry_deactivate_composite texlive-xetex "" [list ports_nodepcheck 1]
    4339    }
    4440
     
    4642    if {![catch {set vers [lindex [registry_active texlive-latex-extra] 0]}]
    4743        && [vercmp [lindex $vers 1] 22931] < 0} {
    48         set deactivate_proc registry_deactivate_composite
    49         if {[info commands registry_deactivate_composite] == {}} {
    50             set deactivate_proc registry_deactivate
    51         }
    52         $deactivate_proc texlive-latex-extra "" [list ports_nodepcheck 1]
     44        registry_deactivate_composite texlive-latex-extra "" [list ports_nodepcheck 1]
    5345    }
    5446}
  • trunk/dports/tex/texlive-latex/Portfile

    r95340 r99736  
    4747    if {![catch {set vers [lindex [registry_active texlive-context] 0]}]
    4848        && [vercmp [lindex $vers 1] 18549] < 0} {
    49         set deactivate_proc registry_deactivate_composite
    50         if {[info commands registry_deactivate_composite] == {}} {
    51             set deactivate_proc registry_deactivate
    52         }
    53         $deactivate_proc texlive-context "" [list ports_nodepcheck 1]
     49        registry_deactivate_composite texlive-context "" [list ports_nodepcheck 1]
    5450    }
    5551}
  • trunk/dports/tex/texlive-math-extra/Portfile

    r95340 r99736  
    4040    if {![catch {set vers [lindex [registry_active texlive-latex-extra] 0]}]
    4141        && [vercmp [lindex $vers 1] 19538] < 0} {
    42         set deactivate_proc registry_deactivate_composite
    43         if {[info commands registry_deactivate_composite] == {}} {
    44             set deactivate_proc registry_deactivate
    45         }
    46         $deactivate_proc texlive-latex-extra "" [list ports_nodepcheck 1]
     42        registry_deactivate_composite texlive-latex-extra "" [list ports_nodepcheck 1]
    4743    }
    4844}
  • trunk/dports/tex/texlive-pictures/Portfile

    r95340 r99736  
    4545    if {![catch {set vers [lindex [registry_active texlive-latex-extra] 0]}]
    4646        && [vercmp [lindex $vers 1] 19538] < 0} {
    47         set deactivate_proc registry_deactivate_composite
    48         if {[info commands registry_deactivate_composite] == {}} {
    49             set deactivate_proc registry_deactivate
    50         }
    51         $deactivate_proc texlive-latex-extra "" [list ports_nodepcheck 1]
     47        registry_deactivate_composite texlive-latex-extra "" [list ports_nodepcheck 1]
    5248    }
    5349}
  • trunk/dports/textproc/chasen-base/Portfile

    r89810 r99736  
    7777            [vercmp [lindex $vers 1] 2.4.4] == 0
    7878            && [vercmp [lindex $vers 2] 1] < 1)} {
    79         registry_deactivate chasen "" [list ports_nodepcheck 1]
     79        registry_deactivate_composite chasen "" [list ports_nodepcheck 1]
    8080    }
    8181}
  • trunk/dports/textproc/mecab-base/Portfile

    r97489 r99736  
    5858            [vercmp [lindex $vers 1] 0.98] == 0
    5959            && [vercmp [lindex $vers 2] 1] < 1)} {
    60         registry_deactivate mecab "" [list ports_nodepcheck 1]
     60        registry_deactivate_composite mecab "" [list ports_nodepcheck 1]
    6161    }
    6262}
  • trunk/dports/textproc/pdfjam/Portfile

    r89810 r99736  
    6060        && ![catch {set vers [lindex [registry_active texlive-bin-extra] 0]}]
    6161        && [vercmp [lindex $vers 1] 19536] < 0} {
    62         set deactivate_proc registry_deactivate_composite
    63         if {[info commands registry_deactivate_composite] == {}} {
    64             set deactivate_proc registry_deactivate
    65         }
    66         $deactivate_proc texlive-bin-extra "" [list ports_nodepcheck 1]
     62        registry_deactivate_composite texlive-bin-extra "" [list ports_nodepcheck 1]
    6763    }
    6864}
Note: See TracChangeset for help on using the changeset viewer.