Changeset 79385


Ignore:
Timestamp:
Jun 12, 2011, 7:59:29 AM (9 years ago)
Author:
jmr@…
Message:

fix ports using the deactivate hack to work with trunk

Location:
trunk/dports
Files:
27 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/gnome/atkmm/Portfile

    r77712 r79385  
    3434        && [rpm-vercomp [lindex $vers 1] 2.22.0] < 0} {
    3535       
    36         registry_deactivate gtkmm "" [list ports_nodepcheck 1]
     36        set deactivate_proc registry_deactivate_composite
     37        if {[info commands registry_deactivate_composite] == {}} {
     38            set deactivate_proc registry_deactivate
     39        }
     40        $deactivate_proc gtkmm "" [list ports_nodepcheck 1]
    3741    }
    3842}
  • trunk/dports/graphics/gdk-pixbuf2/Portfile

    r77840 r79385  
    4242        && [rpm-vercomp [lindex $vers 1] 2.22.0] < 0} {
    4343       
    44         registry_deactivate gtk2 "" [list ports_nodepcheck 1]
     44        set deactivate_proc registry_deactivate_composite
     45        if {[info commands registry_deactivate_composite] == {}} {
     46            set deactivate_proc registry_deactivate
     47        }
     48        $deactivate_proc gtk2 "" [list ports_nodepcheck 1]
    4549    }
    4650}
  • trunk/dports/kde/kdelibs4/Portfile

    r78428 r79385  
    7777        && ![catch {set vers [lindex [registry_active kdebase4-runtime] 0]}]
    7878        && [rpm-vercomp [lindex $vers 1] 4.6.0] < 0} {
    79         registry_deactivate kdebase4-runtime "" [list ports_nodepcheck 1]
     79        set deactivate_proc registry_deactivate_composite
     80        if {[info commands registry_deactivate_composite] == {}} {
     81            set deactivate_proc registry_deactivate
     82        }
     83        $deactivate_proc kdebase4-runtime "" [list ports_nodepcheck 1]
    8084    }
    8185}
  • trunk/dports/perl/p5-file-listing/Portfile

    r79379 r79385  
    2626      && [rpm-vercomp [lindex $vers 1] 6.0] < 0} {
    2727        ui_warn "Deactivating old, pre-6.x libwww-perl to activate ${name}"
    28         registry_deactivate p5-libwww-perl "" [list ports_nodepcheck 1]
     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]
    2933    }
    3034}
  • trunk/dports/perl/p5-html-form/Portfile

    r79379 r79385  
    2828      && [rpm-vercomp [lindex $vers 1] 6.0] < 0} {
    2929        ui_warn "Deactivating old, pre-6.x libwww-perl to activate ${name}"
    30         registry_deactivate p5-libwww-perl "" [list ports_nodepcheck 1]
     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]
    3135    }
    3236}
  • trunk/dports/perl/p5-http-cookies/Portfile

    r79379 r79385  
    2727      && [rpm-vercomp [lindex $vers 1] 6.0] < 0} {
    2828        ui_warn "Deactivating old, pre-6.x libwww-perl to activate ${name}"
    29         registry_deactivate p5-libwww-perl "" [list ports_nodepcheck 1]
     29        set deactivate_proc registry_deactivate_composite
     30        if {[info commands registry_deactivate_composite] == {}} {
     31            set deactivate_proc registry_deactivate
     32        }
     33        $deactivate_proc p5-libwww-perl "" [list ports_nodepcheck 1]
    3034    }
    3135}
  • trunk/dports/perl/p5-http-daemon/Portfile

    r79379 r79385  
    2828      && [rpm-vercomp [lindex $vers 1] 6.0] < 0} {
    2929        ui_warn "Deactivating old, pre-6.x libwww-perl to activate ${name}"
    30         registry_deactivate p5-libwww-perl "" [list ports_nodepcheck 1]
     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]
    3135    }
    3236}
  • trunk/dports/perl/p5-http-date/Portfile

    r79379 r79385  
    2626      && [rpm-vercomp [lindex $vers 1] 6.0] < 0} {
    2727        ui_warn "Deactivating old, pre-6.x libwww-perl to activate ${name}"
    28         registry_deactivate p5-libwww-perl "" [list ports_nodepcheck 1]
     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]
    2933    }
    3034}
  • trunk/dports/perl/p5-http-message/Portfile

    r79379 r79385  
    3333      && [rpm-vercomp [lindex $vers 1] 6.0] < 0} {
    3434        ui_warn "Deactivating old, pre-6.x libwww-perl to activate ${name}"
    35         registry_deactivate p5-libwww-perl "" [list ports_nodepcheck 1]
     35        set deactivate_proc registry_deactivate_composite
     36        if {[info commands registry_deactivate_composite] == {}} {
     37            set deactivate_proc registry_deactivate
     38        }
     39        $deactivate_proc p5-libwww-perl "" [list ports_nodepcheck 1]
    3640    }
    3741}
  • trunk/dports/perl/p5-http-negotiate/Portfile

    r79379 r79385  
    2626      && [rpm-vercomp [lindex $vers 1] 6.0] < 0} {
    2727        ui_warn "Deactivating old, pre-6.x libwww-perl to activate ${name}"
    28         registry_deactivate p5-libwww-perl "" [list ports_nodepcheck 1]
     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]
    2933    }
    3034}
  • trunk/dports/perl/p5-lwp-mediatypes/Portfile

    r79379 r79385  
    2323      && [rpm-vercomp [lindex $vers 1] 6.0] < 0} {
    2424        ui_warn "Deactivating old, pre-6.x libwww-perl to activate ${name}"
    25         registry_deactivate p5-libwww-perl "" [list ports_nodepcheck 1]
     25        set deactivate_proc registry_deactivate_composite
     26        if {[info commands registry_deactivate_composite] == {}} {
     27            set deactivate_proc registry_deactivate
     28        }
     29        $deactivate_proc p5-libwww-perl "" [list ports_nodepcheck 1]
    2630    }
    2731}
  • trunk/dports/perl/p5-lwp-protocol-http10/Portfile

    r79379 r79385  
    2626      && [rpm-vercomp [lindex $vers 1] 6.0] < 0} {
    2727        ui_warn "Deactivating old, pre-6.x libwww-perl to activate ${name}"
    28         registry_deactivate p5-libwww-perl "" [list ports_nodepcheck 1]
     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]
    2933    }
    3034}
  • trunk/dports/perl/p5-lwp-protocol-https/Portfile

    r79379 r79385  
    3333      && [rpm-vercomp [lindex $vers 1] 6.0] < 0} {
    3434        ui_warn "Deactivating old, pre-6.x libwww-perl to activate ${name}"
    35         registry_deactivate p5-libwww-perl "" [list ports_nodepcheck 1]
     35        set deactivate_proc registry_deactivate_composite
     36        if {[info commands registry_deactivate_composite] == {}} {
     37            set deactivate_proc registry_deactivate
     38        }
     39        $deactivate_proc p5-libwww-perl "" [list ports_nodepcheck 1]
    3640    }
    3741}
  • trunk/dports/perl/p5-net-http/Portfile

    r79379 r79385  
    2424      && [rpm-vercomp [lindex $vers 1] 6.0] < 0} {
    2525        ui_warn "Deactivating old, pre-6.x libwww-perl to activate ${name}"
    26         registry_deactivate p5-libwww-perl "" [list ports_nodepcheck 1]
     26        set deactivate_proc registry_deactivate_composite
     27        if {[info commands registry_deactivate_composite] == {}} {
     28            set deactivate_proc registry_deactivate
     29        }
     30        $deactivate_proc p5-libwww-perl "" [list ports_nodepcheck 1]
    2731    }
    2832}
  • trunk/dports/perl/p5-www-robotrules/Portfile

    r79379 r79385  
    2626      && [rpm-vercomp [lindex $vers 1] 6.0] < 0} {
    2727        ui_warn "Deactivating old, pre-6.x libwww-perl to activate ${name}"
    28         registry_deactivate p5-libwww-perl "" [list ports_nodepcheck 1]
     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]
    2933    }
    3034}
  • trunk/dports/python/py26-roman/Portfile

    r70583 r79385  
    2727        && ![catch {set vers [lindex [registry_active py26-docutils] 0]}]
    2828        && [rpm-vercomp [lindex $vers 1] 0.6] < 0} {
    29         # check for arbitrary 1.9 feature
    30         if {[info exists negated_variants]} {
    31             registry_deactivate py26-docutils "" [list ports_nodepcheck 1]
    32         } else {
    33             return -code error "py26-docutils [lindex $vers 1] conflicts with $name, please deactivate it first."
     29        set deactivate_proc registry_deactivate_composite
     30        if {[info commands registry_deactivate_composite] == {}} {
     31            set deactivate_proc registry_deactivate
    3432        }
     33        $deactivate_proc py26-docutils "" [list ports_nodepcheck 1]
    3534    }
    3635}
  • trunk/dports/python/py27-roman/Portfile

    r73938 r79385  
    2727        && ![catch {set vers [lindex [registry_active py27-docutils] 0]}]
    2828        && [rpm-vercomp [lindex $vers 1] 0.6] < 0} {
    29         # check for arbitrary 1.9 feature
    30         if {[info exists negated_variants]} {
    31             registry_deactivate py27-docutils "" [list ports_nodepcheck 1]
    32         } else {
    33             return -code error "py27-docutils [lindex $vers 1] conflicts with $name, please deactivate it first."
     29        set deactivate_proc registry_deactivate_composite
     30        if {[info commands registry_deactivate_composite] == {}} {
     31            set deactivate_proc registry_deactivate
    3432        }
     33        $deactivate_proc py27-docutils "" [list ports_nodepcheck 1]
    3534    }
    3635}
  • trunk/dports/tex/latexdiff/Portfile

    r77438 r79385  
    5959        && ![catch {set vers [lindex [registry_active texlive-bin-extra] 0]}]
    6060        && [rpm-vercomp [lindex $vers 1] 19536] < 0} {
    61         registry_deactivate texlive-bin-extra "" [list ports_nodepcheck 1]
     61        set deactivate_proc registry_deactivate_composite
     62        if {[info commands registry_deactivate_composite] == {}} {
     63            set deactivate_proc registry_deactivate
     64        }
     65        $deactivate_proc texlive-bin-extra "" [list ports_nodepcheck 1]
    6266    }
    6367}
  • trunk/dports/tex/texlive-basic/Portfile

    r77617 r79385  
    5555
    5656pre-activate {
     57    set deactivate_proc registry_deactivate_composite
     58    if {[info commands registry_deactivate_composite] == {}} {
     59        set deactivate_proc registry_deactivate
     60    }
    5761    # If texlive 2007 metaport is installed, deactivate it to avoid
    5862    # conflicts on $prefix/bin/etex etc.
     
    6064        && ![catch {set vers [lindex [registry_active texlive] 0]}]
    6165        && [rpm-vercomp [lindex $vers 1] 2009] < 0} {
    62         registry_deactivate texlive "" [list ports_nodepcheck 1]
     66        $deactivate_proc texlive "" [list ports_nodepcheck 1]
    6367    }
    6468
     
    6771    if {![catch {set vers [lindex [registry_active texlive-fontutils] 0]}]
    6872        && [rpm-vercomp [lindex $vers 1] 16392] < 0} {
    69         registry_deactivate texlive-fontutils "" [list ports_nodepcheck 1]
     73        $deactivate_proc texlive-fontutils "" [list ports_nodepcheck 1]
    7074    }
    7175
     
    7680         && [rpm-vercomp [lindex $vers 1] 14727] == 0
    7781         && [lindex $vers 2] < 2} {
    78         registry_deactivate texlive-lang-mongolian "" [list ports_nodepcheck 1]
     82        $deactivate_proc texlive-lang-mongolian "" [list ports_nodepcheck 1]
    7983    }
    8084
  • trunk/dports/tex/texlive-bin/Portfile

    r77764 r79385  
    158158         && [rpm-vercomp [lindex $vers 1] 13822] == 0
    159159         && [lindex $vers 2] <3} {
    160         registry_deactivate texlive-htmlxml "" [list ports_nodepcheck 1]
     160        set deactivate_proc registry_deactivate_composite
     161        if {[info commands registry_deactivate_composite] == {}} {
     162            set deactivate_proc registry_deactivate
     163        }
     164        $deactivate_proc texlive-htmlxml "" [list ports_nodepcheck 1]
    161165    }
    162166}
  • trunk/dports/tex/texlive-common/Portfile

    r75079 r79385  
    111111    # does not accomplish this because not all of these ports conflict
    112112    # with this one (although they will cause problems later).
     113    set deactivate_proc registry_deactivate_composite
     114    if {[info commands registry_deactivate_composite] == {}} {
     115        set deactivate_proc registry_deactivate
     116    }
    113117    foreach oldport {texlive_base texlive_texmf-full texlive_texmf-minimal texlive_texmf-docs teTeX} {
    114118        if {![catch {registry_active $oldport}]} {
    115             registry_deactivate $oldport "" [list ports_nodepcheck 1]
     119            $deactivate_proc $oldport "" [list ports_nodepcheck 1]
    116120        }
    117121    }
  • trunk/dports/tex/texlive-fonts-recommended/Portfile

    r73314 r79385  
    4949    if {![catch {set vers [lindex [registry_active texlive-fonts-extra] 0]}]
    5050        && [rpm-vercomp [lindex $vers 1] 19491] < 0} {
    51         registry_deactivate texlive-fonts-extra "" [list ports_nodepcheck 1]
     51        set deactivate_proc registry_deactivate_composite
     52        if {[info commands registry_deactivate_composite] == {}} {
     53            set deactivate_proc registry_deactivate
     54        }
     55        $deactivate_proc texlive-fonts-extra "" [list ports_nodepcheck 1]
    5256    }
    5357}
  • trunk/dports/tex/texlive-generic-recommended/Portfile

    r74955 r79385  
    2424    if {![catch {set vers [lindex [registry_active texlive-latex-extra] 0]}]
    2525        && [rpm-vercomp [lindex $vers 1] 19548] < 0} {
    26         registry_deactivate texlive-latex-extra "" [list ports_nodepcheck 1]
     26        set deactivate_proc registry_deactivate_composite
     27        if {[info commands registry_deactivate_composite] == {}} {
     28            set deactivate_proc registry_deactivate
     29        }
     30        $deactivate_proc texlive-latex-extra "" [list ports_nodepcheck 1]
    2731    }
    2832}
  • trunk/dports/tex/texlive-latex/Portfile

    r75626 r79385  
    3838    if {![catch {set vers [lindex [registry_active texlive-context] 0]}]
    3939        && [rpm-vercomp [lindex $vers 1] 18549] < 0} {
    40         registry_deactivate texlive-context "" [list ports_nodepcheck 1]
     40        set deactivate_proc registry_deactivate_composite
     41        if {[info commands registry_deactivate_composite] == {}} {
     42            set deactivate_proc registry_deactivate
     43        }
     44        $deactivate_proc texlive-context "" [list ports_nodepcheck 1]
    4145    }
    4246}
  • trunk/dports/tex/texlive-math-extra/Portfile

    r74955 r79385  
    3131    if {![catch {set vers [lindex [registry_active texlive-latex-extra] 0]}]
    3232        && [rpm-vercomp [lindex $vers 1] 19538] < 0} {
    33         registry_deactivate texlive-latex-extra "" [list ports_nodepcheck 1]
     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]
    3438    }
    3539}
  • trunk/dports/tex/texlive-pictures/Portfile

    r74955 r79385  
    3232    if {![catch {set vers [lindex [registry_active texlive-latex-extra] 0]}]
    3333        && [rpm-vercomp [lindex $vers 1] 19538] < 0} {
    34         registry_deactivate texlive-latex-extra "" [list ports_nodepcheck 1]
     34        set deactivate_proc registry_deactivate_composite
     35        if {[info commands registry_deactivate_composite] == {}} {
     36            set deactivate_proc registry_deactivate
     37        }
     38        $deactivate_proc texlive-latex-extra "" [list ports_nodepcheck 1]
    3539    }
    3640}
  • trunk/dports/textproc/pdfjam/Portfile

    r74956 r79385  
    6161        && ![catch {set vers [lindex [registry_active texlive-bin-extra] 0]}]
    6262        && [rpm-vercomp [lindex $vers 1] 19536] < 0} {
    63         registry_deactivate texlive-bin-extra "" [list ports_nodepcheck 1]
     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]
    6468    }
    6569}
Note: See TracChangeset for help on using the changeset viewer.