[79385] trunk/dports
jmr at macports.org
jmr at macports.org
Sun Jun 12 00:59:32 PDT 2011
Revision: 79385
http://trac.macports.org/changeset/79385
Author: jmr at macports.org
Date: 2011-06-12 00:59:29 -0700 (Sun, 12 Jun 2011)
Log Message:
-----------
fix ports using the deactivate hack to work with trunk
Modified Paths:
--------------
trunk/dports/gnome/atkmm/Portfile
trunk/dports/graphics/gdk-pixbuf2/Portfile
trunk/dports/kde/kdelibs4/Portfile
trunk/dports/perl/p5-file-listing/Portfile
trunk/dports/perl/p5-html-form/Portfile
trunk/dports/perl/p5-http-cookies/Portfile
trunk/dports/perl/p5-http-daemon/Portfile
trunk/dports/perl/p5-http-date/Portfile
trunk/dports/perl/p5-http-message/Portfile
trunk/dports/perl/p5-http-negotiate/Portfile
trunk/dports/perl/p5-lwp-mediatypes/Portfile
trunk/dports/perl/p5-lwp-protocol-http10/Portfile
trunk/dports/perl/p5-lwp-protocol-https/Portfile
trunk/dports/perl/p5-net-http/Portfile
trunk/dports/perl/p5-www-robotrules/Portfile
trunk/dports/python/py26-roman/Portfile
trunk/dports/python/py27-roman/Portfile
trunk/dports/tex/latexdiff/Portfile
trunk/dports/tex/texlive-basic/Portfile
trunk/dports/tex/texlive-bin/Portfile
trunk/dports/tex/texlive-common/Portfile
trunk/dports/tex/texlive-fonts-recommended/Portfile
trunk/dports/tex/texlive-generic-recommended/Portfile
trunk/dports/tex/texlive-latex/Portfile
trunk/dports/tex/texlive-math-extra/Portfile
trunk/dports/tex/texlive-pictures/Portfile
trunk/dports/textproc/pdfjam/Portfile
Modified: trunk/dports/gnome/atkmm/Portfile
===================================================================
--- trunk/dports/gnome/atkmm/Portfile 2011-06-12 07:40:59 UTC (rev 79384)
+++ trunk/dports/gnome/atkmm/Portfile 2011-06-12 07:59:29 UTC (rev 79385)
@@ -33,7 +33,11 @@
&& ![catch {set vers [lindex [registry_active gtkmm] 0]}]
&& [rpm-vercomp [lindex $vers 1] 2.22.0] < 0} {
- registry_deactivate gtkmm "" [list ports_nodepcheck 1]
+ set deactivate_proc registry_deactivate_composite
+ if {[info commands registry_deactivate_composite] == {}} {
+ set deactivate_proc registry_deactivate
+ }
+ $deactivate_proc gtkmm "" [list ports_nodepcheck 1]
}
}
Modified: trunk/dports/graphics/gdk-pixbuf2/Portfile
===================================================================
--- trunk/dports/graphics/gdk-pixbuf2/Portfile 2011-06-12 07:40:59 UTC (rev 79384)
+++ trunk/dports/graphics/gdk-pixbuf2/Portfile 2011-06-12 07:59:29 UTC (rev 79385)
@@ -41,7 +41,11 @@
&& ![catch {set vers [lindex [registry_active gtk2] 0]}]
&& [rpm-vercomp [lindex $vers 1] 2.22.0] < 0} {
- registry_deactivate gtk2 "" [list ports_nodepcheck 1]
+ set deactivate_proc registry_deactivate_composite
+ if {[info commands registry_deactivate_composite] == {}} {
+ set deactivate_proc registry_deactivate
+ }
+ $deactivate_proc gtk2 "" [list ports_nodepcheck 1]
}
}
Modified: trunk/dports/kde/kdelibs4/Portfile
===================================================================
--- trunk/dports/kde/kdelibs4/Portfile 2011-06-12 07:40:59 UTC (rev 79384)
+++ trunk/dports/kde/kdelibs4/Portfile 2011-06-12 07:59:29 UTC (rev 79385)
@@ -76,7 +76,11 @@
if {[file exists ${prefix}/share/locale/en_US/entry.desktop]
&& ![catch {set vers [lindex [registry_active kdebase4-runtime] 0]}]
&& [rpm-vercomp [lindex $vers 1] 4.6.0] < 0} {
- registry_deactivate kdebase4-runtime "" [list ports_nodepcheck 1]
+ set deactivate_proc registry_deactivate_composite
+ if {[info commands registry_deactivate_composite] == {}} {
+ set deactivate_proc registry_deactivate
+ }
+ $deactivate_proc kdebase4-runtime "" [list ports_nodepcheck 1]
}
}
Modified: trunk/dports/perl/p5-file-listing/Portfile
===================================================================
--- trunk/dports/perl/p5-file-listing/Portfile 2011-06-12 07:40:59 UTC (rev 79384)
+++ trunk/dports/perl/p5-file-listing/Portfile 2011-06-12 07:59:29 UTC (rev 79385)
@@ -25,6 +25,10 @@
&& ![catch {set vers [lindex [registry_active p5-libwww-perl] 0]}]
&& [rpm-vercomp [lindex $vers 1] 6.0] < 0} {
ui_warn "Deactivating old, pre-6.x libwww-perl to activate ${name}"
- registry_deactivate p5-libwww-perl "" [list ports_nodepcheck 1]
+ set deactivate_proc registry_deactivate_composite
+ if {[info commands registry_deactivate_composite] == {}} {
+ set deactivate_proc registry_deactivate
+ }
+ $deactivate_proc p5-libwww-perl "" [list ports_nodepcheck 1]
}
}
Modified: trunk/dports/perl/p5-html-form/Portfile
===================================================================
--- trunk/dports/perl/p5-html-form/Portfile 2011-06-12 07:40:59 UTC (rev 79384)
+++ trunk/dports/perl/p5-html-form/Portfile 2011-06-12 07:59:29 UTC (rev 79385)
@@ -27,6 +27,10 @@
&& ![catch {set vers [lindex [registry_active p5-libwww-perl] 0]}]
&& [rpm-vercomp [lindex $vers 1] 6.0] < 0} {
ui_warn "Deactivating old, pre-6.x libwww-perl to activate ${name}"
- registry_deactivate p5-libwww-perl "" [list ports_nodepcheck 1]
+ set deactivate_proc registry_deactivate_composite
+ if {[info commands registry_deactivate_composite] == {}} {
+ set deactivate_proc registry_deactivate
+ }
+ $deactivate_proc p5-libwww-perl "" [list ports_nodepcheck 1]
}
}
Modified: trunk/dports/perl/p5-http-cookies/Portfile
===================================================================
--- trunk/dports/perl/p5-http-cookies/Portfile 2011-06-12 07:40:59 UTC (rev 79384)
+++ trunk/dports/perl/p5-http-cookies/Portfile 2011-06-12 07:59:29 UTC (rev 79385)
@@ -26,6 +26,10 @@
&& ![catch {set vers [lindex [registry_active p5-libwww-perl] 0]}]
&& [rpm-vercomp [lindex $vers 1] 6.0] < 0} {
ui_warn "Deactivating old, pre-6.x libwww-perl to activate ${name}"
- registry_deactivate p5-libwww-perl "" [list ports_nodepcheck 1]
+ set deactivate_proc registry_deactivate_composite
+ if {[info commands registry_deactivate_composite] == {}} {
+ set deactivate_proc registry_deactivate
+ }
+ $deactivate_proc p5-libwww-perl "" [list ports_nodepcheck 1]
}
}
Modified: trunk/dports/perl/p5-http-daemon/Portfile
===================================================================
--- trunk/dports/perl/p5-http-daemon/Portfile 2011-06-12 07:40:59 UTC (rev 79384)
+++ trunk/dports/perl/p5-http-daemon/Portfile 2011-06-12 07:59:29 UTC (rev 79385)
@@ -27,6 +27,10 @@
&& ![catch {set vers [lindex [registry_active p5-libwww-perl] 0]}]
&& [rpm-vercomp [lindex $vers 1] 6.0] < 0} {
ui_warn "Deactivating old, pre-6.x libwww-perl to activate ${name}"
- registry_deactivate p5-libwww-perl "" [list ports_nodepcheck 1]
+ set deactivate_proc registry_deactivate_composite
+ if {[info commands registry_deactivate_composite] == {}} {
+ set deactivate_proc registry_deactivate
+ }
+ $deactivate_proc p5-libwww-perl "" [list ports_nodepcheck 1]
}
}
Modified: trunk/dports/perl/p5-http-date/Portfile
===================================================================
--- trunk/dports/perl/p5-http-date/Portfile 2011-06-12 07:40:59 UTC (rev 79384)
+++ trunk/dports/perl/p5-http-date/Portfile 2011-06-12 07:59:29 UTC (rev 79385)
@@ -25,6 +25,10 @@
&& ![catch {set vers [lindex [registry_active p5-libwww-perl] 0]}]
&& [rpm-vercomp [lindex $vers 1] 6.0] < 0} {
ui_warn "Deactivating old, pre-6.x libwww-perl to activate ${name}"
- registry_deactivate p5-libwww-perl "" [list ports_nodepcheck 1]
+ set deactivate_proc registry_deactivate_composite
+ if {[info commands registry_deactivate_composite] == {}} {
+ set deactivate_proc registry_deactivate
+ }
+ $deactivate_proc p5-libwww-perl "" [list ports_nodepcheck 1]
}
}
Modified: trunk/dports/perl/p5-http-message/Portfile
===================================================================
--- trunk/dports/perl/p5-http-message/Portfile 2011-06-12 07:40:59 UTC (rev 79384)
+++ trunk/dports/perl/p5-http-message/Portfile 2011-06-12 07:59:29 UTC (rev 79385)
@@ -32,6 +32,10 @@
&& ![catch {set vers [lindex [registry_active p5-libwww-perl] 0]}]
&& [rpm-vercomp [lindex $vers 1] 6.0] < 0} {
ui_warn "Deactivating old, pre-6.x libwww-perl to activate ${name}"
- registry_deactivate p5-libwww-perl "" [list ports_nodepcheck 1]
+ set deactivate_proc registry_deactivate_composite
+ if {[info commands registry_deactivate_composite] == {}} {
+ set deactivate_proc registry_deactivate
+ }
+ $deactivate_proc p5-libwww-perl "" [list ports_nodepcheck 1]
}
}
Modified: trunk/dports/perl/p5-http-negotiate/Portfile
===================================================================
--- trunk/dports/perl/p5-http-negotiate/Portfile 2011-06-12 07:40:59 UTC (rev 79384)
+++ trunk/dports/perl/p5-http-negotiate/Portfile 2011-06-12 07:59:29 UTC (rev 79385)
@@ -25,6 +25,10 @@
&& ![catch {set vers [lindex [registry_active p5-libwww-perl] 0]}]
&& [rpm-vercomp [lindex $vers 1] 6.0] < 0} {
ui_warn "Deactivating old, pre-6.x libwww-perl to activate ${name}"
- registry_deactivate p5-libwww-perl "" [list ports_nodepcheck 1]
+ set deactivate_proc registry_deactivate_composite
+ if {[info commands registry_deactivate_composite] == {}} {
+ set deactivate_proc registry_deactivate
+ }
+ $deactivate_proc p5-libwww-perl "" [list ports_nodepcheck 1]
}
}
Modified: trunk/dports/perl/p5-lwp-mediatypes/Portfile
===================================================================
--- trunk/dports/perl/p5-lwp-mediatypes/Portfile 2011-06-12 07:40:59 UTC (rev 79384)
+++ trunk/dports/perl/p5-lwp-mediatypes/Portfile 2011-06-12 07:59:29 UTC (rev 79385)
@@ -22,6 +22,10 @@
&& ![catch {set vers [lindex [registry_active p5-libwww-perl] 0]}]
&& [rpm-vercomp [lindex $vers 1] 6.0] < 0} {
ui_warn "Deactivating old, pre-6.x libwww-perl to activate ${name}"
- registry_deactivate p5-libwww-perl "" [list ports_nodepcheck 1]
+ set deactivate_proc registry_deactivate_composite
+ if {[info commands registry_deactivate_composite] == {}} {
+ set deactivate_proc registry_deactivate
+ }
+ $deactivate_proc p5-libwww-perl "" [list ports_nodepcheck 1]
}
}
Modified: trunk/dports/perl/p5-lwp-protocol-http10/Portfile
===================================================================
--- trunk/dports/perl/p5-lwp-protocol-http10/Portfile 2011-06-12 07:40:59 UTC (rev 79384)
+++ trunk/dports/perl/p5-lwp-protocol-http10/Portfile 2011-06-12 07:59:29 UTC (rev 79385)
@@ -25,6 +25,10 @@
&& ![catch {set vers [lindex [registry_active p5-libwww-perl] 0]}]
&& [rpm-vercomp [lindex $vers 1] 6.0] < 0} {
ui_warn "Deactivating old, pre-6.x libwww-perl to activate ${name}"
- registry_deactivate p5-libwww-perl "" [list ports_nodepcheck 1]
+ set deactivate_proc registry_deactivate_composite
+ if {[info commands registry_deactivate_composite] == {}} {
+ set deactivate_proc registry_deactivate
+ }
+ $deactivate_proc p5-libwww-perl "" [list ports_nodepcheck 1]
}
}
Modified: trunk/dports/perl/p5-lwp-protocol-https/Portfile
===================================================================
--- trunk/dports/perl/p5-lwp-protocol-https/Portfile 2011-06-12 07:40:59 UTC (rev 79384)
+++ trunk/dports/perl/p5-lwp-protocol-https/Portfile 2011-06-12 07:59:29 UTC (rev 79385)
@@ -32,6 +32,10 @@
&& ![catch {set vers [lindex [registry_active p5-libwww-perl] 0]}]
&& [rpm-vercomp [lindex $vers 1] 6.0] < 0} {
ui_warn "Deactivating old, pre-6.x libwww-perl to activate ${name}"
- registry_deactivate p5-libwww-perl "" [list ports_nodepcheck 1]
+ set deactivate_proc registry_deactivate_composite
+ if {[info commands registry_deactivate_composite] == {}} {
+ set deactivate_proc registry_deactivate
+ }
+ $deactivate_proc p5-libwww-perl "" [list ports_nodepcheck 1]
}
}
Modified: trunk/dports/perl/p5-net-http/Portfile
===================================================================
--- trunk/dports/perl/p5-net-http/Portfile 2011-06-12 07:40:59 UTC (rev 79384)
+++ trunk/dports/perl/p5-net-http/Portfile 2011-06-12 07:59:29 UTC (rev 79385)
@@ -23,6 +23,10 @@
&& ![catch {set vers [lindex [registry_active p5-libwww-perl] 0]}]
&& [rpm-vercomp [lindex $vers 1] 6.0] < 0} {
ui_warn "Deactivating old, pre-6.x libwww-perl to activate ${name}"
- registry_deactivate p5-libwww-perl "" [list ports_nodepcheck 1]
+ set deactivate_proc registry_deactivate_composite
+ if {[info commands registry_deactivate_composite] == {}} {
+ set deactivate_proc registry_deactivate
+ }
+ $deactivate_proc p5-libwww-perl "" [list ports_nodepcheck 1]
}
}
Modified: trunk/dports/perl/p5-www-robotrules/Portfile
===================================================================
--- trunk/dports/perl/p5-www-robotrules/Portfile 2011-06-12 07:40:59 UTC (rev 79384)
+++ trunk/dports/perl/p5-www-robotrules/Portfile 2011-06-12 07:59:29 UTC (rev 79385)
@@ -25,6 +25,10 @@
&& ![catch {set vers [lindex [registry_active p5-libwww-perl] 0]}]
&& [rpm-vercomp [lindex $vers 1] 6.0] < 0} {
ui_warn "Deactivating old, pre-6.x libwww-perl to activate ${name}"
- registry_deactivate p5-libwww-perl "" [list ports_nodepcheck 1]
+ set deactivate_proc registry_deactivate_composite
+ if {[info commands registry_deactivate_composite] == {}} {
+ set deactivate_proc registry_deactivate
+ }
+ $deactivate_proc p5-libwww-perl "" [list ports_nodepcheck 1]
}
}
Modified: trunk/dports/python/py26-roman/Portfile
===================================================================
--- trunk/dports/python/py26-roman/Portfile 2011-06-12 07:40:59 UTC (rev 79384)
+++ trunk/dports/python/py26-roman/Portfile 2011-06-12 07:59:29 UTC (rev 79385)
@@ -26,12 +26,11 @@
if {[file exists ${python.pkgd}/roman.py]
&& ![catch {set vers [lindex [registry_active py26-docutils] 0]}]
&& [rpm-vercomp [lindex $vers 1] 0.6] < 0} {
- # check for arbitrary 1.9 feature
- if {[info exists negated_variants]} {
- registry_deactivate py26-docutils "" [list ports_nodepcheck 1]
- } else {
- return -code error "py26-docutils [lindex $vers 1] conflicts with $name, please deactivate it first."
+ set deactivate_proc registry_deactivate_composite
+ if {[info commands registry_deactivate_composite] == {}} {
+ set deactivate_proc registry_deactivate
}
+ $deactivate_proc py26-docutils "" [list ports_nodepcheck 1]
}
}
Modified: trunk/dports/python/py27-roman/Portfile
===================================================================
--- trunk/dports/python/py27-roman/Portfile 2011-06-12 07:40:59 UTC (rev 79384)
+++ trunk/dports/python/py27-roman/Portfile 2011-06-12 07:59:29 UTC (rev 79385)
@@ -26,12 +26,11 @@
if {[file exists ${python.pkgd}/roman.py]
&& ![catch {set vers [lindex [registry_active py27-docutils] 0]}]
&& [rpm-vercomp [lindex $vers 1] 0.6] < 0} {
- # check for arbitrary 1.9 feature
- if {[info exists negated_variants]} {
- registry_deactivate py27-docutils "" [list ports_nodepcheck 1]
- } else {
- return -code error "py27-docutils [lindex $vers 1] conflicts with $name, please deactivate it first."
+ set deactivate_proc registry_deactivate_composite
+ if {[info commands registry_deactivate_composite] == {}} {
+ set deactivate_proc registry_deactivate
}
+ $deactivate_proc py27-docutils "" [list ports_nodepcheck 1]
}
}
Modified: trunk/dports/tex/latexdiff/Portfile
===================================================================
--- trunk/dports/tex/latexdiff/Portfile 2011-06-12 07:40:59 UTC (rev 79384)
+++ trunk/dports/tex/latexdiff/Portfile 2011-06-12 07:59:29 UTC (rev 79385)
@@ -58,6 +58,10 @@
if {[file exists $prefix/bin/latexdiff]
&& ![catch {set vers [lindex [registry_active texlive-bin-extra] 0]}]
&& [rpm-vercomp [lindex $vers 1] 19536] < 0} {
- registry_deactivate texlive-bin-extra "" [list ports_nodepcheck 1]
+ set deactivate_proc registry_deactivate_composite
+ if {[info commands registry_deactivate_composite] == {}} {
+ set deactivate_proc registry_deactivate
+ }
+ $deactivate_proc texlive-bin-extra "" [list ports_nodepcheck 1]
}
}
Modified: trunk/dports/tex/texlive-basic/Portfile
===================================================================
--- trunk/dports/tex/texlive-basic/Portfile 2011-06-12 07:40:59 UTC (rev 79384)
+++ trunk/dports/tex/texlive-basic/Portfile 2011-06-12 07:59:29 UTC (rev 79385)
@@ -54,19 +54,23 @@
patch-runfiles_texmf_dvipdfmx_dvipdfmx.cfg
pre-activate {
+ set deactivate_proc registry_deactivate_composite
+ if {[info commands registry_deactivate_composite] == {}} {
+ set deactivate_proc registry_deactivate
+ }
# If texlive 2007 metaport is installed, deactivate it to avoid
# conflicts on $prefix/bin/etex etc.
if {[file exists $prefix/bin/etex]
&& ![catch {set vers [lindex [registry_active texlive] 0]}]
&& [rpm-vercomp [lindex $vers 1] 2009] < 0} {
- registry_deactivate texlive "" [list ports_nodepcheck 1]
+ $deactivate_proc texlive "" [list ports_nodepcheck 1]
}
# Deactivate texlive-fontutils to avoid conflicts on mft from the
# 2009->2010 update
if {![catch {set vers [lindex [registry_active texlive-fontutils] 0]}]
&& [rpm-vercomp [lindex $vers 1] 16392] < 0} {
- registry_deactivate texlive-fontutils "" [list ports_nodepcheck 1]
+ $deactivate_proc texlive-fontutils "" [list ports_nodepcheck 1]
}
# Deactivate 2009 version of texlive-lang-mongolian if it's
@@ -75,7 +79,7 @@
if {![catch {set vers [lindex [registry_active texlive-lang-mongolian] 0]}]
&& [rpm-vercomp [lindex $vers 1] 14727] == 0
&& [lindex $vers 2] < 2} {
- registry_deactivate texlive-lang-mongolian "" [list ports_nodepcheck 1]
+ $deactivate_proc texlive-lang-mongolian "" [list ports_nodepcheck 1]
}
}
Modified: trunk/dports/tex/texlive-bin/Portfile
===================================================================
--- trunk/dports/tex/texlive-bin/Portfile 2011-06-12 07:40:59 UTC (rev 79384)
+++ trunk/dports/tex/texlive-bin/Portfile 2011-06-12 07:59:29 UTC (rev 79385)
@@ -157,7 +157,11 @@
&& ![catch {set vers [lindex [registry_active texlive-htmlxml] 0]}]
&& [rpm-vercomp [lindex $vers 1] 13822] == 0
&& [lindex $vers 2] <3} {
- registry_deactivate texlive-htmlxml "" [list ports_nodepcheck 1]
+ set deactivate_proc registry_deactivate_composite
+ if {[info commands registry_deactivate_composite] == {}} {
+ set deactivate_proc registry_deactivate
+ }
+ $deactivate_proc texlive-htmlxml "" [list ports_nodepcheck 1]
}
}
Modified: trunk/dports/tex/texlive-common/Portfile
===================================================================
--- trunk/dports/tex/texlive-common/Portfile 2011-06-12 07:40:59 UTC (rev 79384)
+++ trunk/dports/tex/texlive-common/Portfile 2011-06-12 07:59:29 UTC (rev 79385)
@@ -110,9 +110,13 @@
# Deactivate tetex and any of the texlive 2007 ports. replaced_by
# does not accomplish this because not all of these ports conflict
# with this one (although they will cause problems later).
+ set deactivate_proc registry_deactivate_composite
+ if {[info commands registry_deactivate_composite] == {}} {
+ set deactivate_proc registry_deactivate
+ }
foreach oldport {texlive_base texlive_texmf-full texlive_texmf-minimal texlive_texmf-docs teTeX} {
if {![catch {registry_active $oldport}]} {
- registry_deactivate $oldport "" [list ports_nodepcheck 1]
+ $deactivate_proc $oldport "" [list ports_nodepcheck 1]
}
}
}
Modified: trunk/dports/tex/texlive-fonts-recommended/Portfile
===================================================================
--- trunk/dports/tex/texlive-fonts-recommended/Portfile 2011-06-12 07:40:59 UTC (rev 79384)
+++ trunk/dports/tex/texlive-fonts-recommended/Portfile 2011-06-12 07:59:29 UTC (rev 79385)
@@ -48,7 +48,11 @@
# cmsuper moved from fonts-extra to fonts-recommended in TL2010
if {![catch {set vers [lindex [registry_active texlive-fonts-extra] 0]}]
&& [rpm-vercomp [lindex $vers 1] 19491] < 0} {
- registry_deactivate texlive-fonts-extra "" [list ports_nodepcheck 1]
+ set deactivate_proc registry_deactivate_composite
+ if {[info commands registry_deactivate_composite] == {}} {
+ set deactivate_proc registry_deactivate
+ }
+ $deactivate_proc texlive-fonts-extra "" [list ports_nodepcheck 1]
}
}
Modified: trunk/dports/tex/texlive-generic-recommended/Portfile
===================================================================
--- trunk/dports/tex/texlive-generic-recommended/Portfile 2011-06-12 07:40:59 UTC (rev 79384)
+++ trunk/dports/tex/texlive-generic-recommended/Portfile 2011-06-12 07:59:29 UTC (rev 79385)
@@ -23,7 +23,11 @@
# kastrup moved from texlive-latex-extra to texlive-generic-recommended
if {![catch {set vers [lindex [registry_active texlive-latex-extra] 0]}]
&& [rpm-vercomp [lindex $vers 1] 19548] < 0} {
- registry_deactivate texlive-latex-extra "" [list ports_nodepcheck 1]
+ set deactivate_proc registry_deactivate_composite
+ if {[info commands registry_deactivate_composite] == {}} {
+ set deactivate_proc registry_deactivate
+ }
+ $deactivate_proc texlive-latex-extra "" [list ports_nodepcheck 1]
}
}
Modified: trunk/dports/tex/texlive-latex/Portfile
===================================================================
--- trunk/dports/tex/texlive-latex/Portfile 2011-06-12 07:40:59 UTC (rev 79384)
+++ trunk/dports/tex/texlive-latex/Portfile 2011-06-12 07:59:29 UTC (rev 79385)
@@ -37,7 +37,11 @@
# 2009->2010 update
if {![catch {set vers [lindex [registry_active texlive-context] 0]}]
&& [rpm-vercomp [lindex $vers 1] 18549] < 0} {
- registry_deactivate texlive-context "" [list ports_nodepcheck 1]
+ set deactivate_proc registry_deactivate_composite
+ if {[info commands registry_deactivate_composite] == {}} {
+ set deactivate_proc registry_deactivate
+ }
+ $deactivate_proc texlive-context "" [list ports_nodepcheck 1]
}
}
Modified: trunk/dports/tex/texlive-math-extra/Portfile
===================================================================
--- trunk/dports/tex/texlive-math-extra/Portfile 2011-06-12 07:40:59 UTC (rev 79384)
+++ trunk/dports/tex/texlive-math-extra/Portfile 2011-06-12 07:59:29 UTC (rev 79385)
@@ -30,7 +30,11 @@
# binomexp moved from texlive-latex-extra to texlive-math-extra in TL2010
if {![catch {set vers [lindex [registry_active texlive-latex-extra] 0]}]
&& [rpm-vercomp [lindex $vers 1] 19538] < 0} {
- registry_deactivate texlive-latex-extra "" [list ports_nodepcheck 1]
+ set deactivate_proc registry_deactivate_composite
+ if {[info commands registry_deactivate_composite] == {}} {
+ set deactivate_proc registry_deactivate
+ }
+ $deactivate_proc texlive-latex-extra "" [list ports_nodepcheck 1]
}
}
Modified: trunk/dports/tex/texlive-pictures/Portfile
===================================================================
--- trunk/dports/tex/texlive-pictures/Portfile 2011-06-12 07:40:59 UTC (rev 79384)
+++ trunk/dports/tex/texlive-pictures/Portfile 2011-06-12 07:59:29 UTC (rev 79385)
@@ -31,7 +31,11 @@
pre-activate {
if {![catch {set vers [lindex [registry_active texlive-latex-extra] 0]}]
&& [rpm-vercomp [lindex $vers 1] 19538] < 0} {
- registry_deactivate texlive-latex-extra "" [list ports_nodepcheck 1]
+ set deactivate_proc registry_deactivate_composite
+ if {[info commands registry_deactivate_composite] == {}} {
+ set deactivate_proc registry_deactivate
+ }
+ $deactivate_proc texlive-latex-extra "" [list ports_nodepcheck 1]
}
}
Modified: trunk/dports/textproc/pdfjam/Portfile
===================================================================
--- trunk/dports/textproc/pdfjam/Portfile 2011-06-12 07:40:59 UTC (rev 79384)
+++ trunk/dports/textproc/pdfjam/Portfile 2011-06-12 07:59:29 UTC (rev 79385)
@@ -60,6 +60,10 @@
if {[file exists $prefix/bin/pdfjam]
&& ![catch {set vers [lindex [registry_active texlive-bin-extra] 0]}]
&& [rpm-vercomp [lindex $vers 1] 19536] < 0} {
- registry_deactivate texlive-bin-extra "" [list ports_nodepcheck 1]
+ set deactivate_proc registry_deactivate_composite
+ if {[info commands registry_deactivate_composite] == {}} {
+ set deactivate_proc registry_deactivate
+ }
+ $deactivate_proc texlive-bin-extra "" [list ports_nodepcheck 1]
}
}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110612/e605ad2f/attachment-0001.html>
More information about the macports-changes
mailing list