[99736] trunk/dports
jmr at macports.org
jmr at macports.org
Thu Nov 15 07:13:11 PST 2012
Revision: 99736
https://trac.macports.org/changeset/99736
Author: jmr at macports.org
Date: 2012-11-15 07:13:11 -0800 (Thu, 15 Nov 2012)
Log Message:
-----------
fix incorrect deactivate hacks, and simplify others by removing compatibility with old base versions
Modified Paths:
--------------
trunk/dports/databases/mariadb/Portfile
trunk/dports/databases/mysql51/Portfile
trunk/dports/databases/mysql55/Portfile
trunk/dports/databases/percona/Portfile
trunk/dports/devel/zmq22/Portfile
trunk/dports/games/simutrans/Portfile
trunk/dports/gnome/atkmm/Portfile
trunk/dports/kde/dragon/Portfile
trunk/dports/kde/ffmpegthumbs/Portfile
trunk/dports/kde/juk/Portfile
trunk/dports/kde/kdelibs4/Portfile
trunk/dports/kde/libkcddb/Portfile
trunk/dports/kde/libkcompactdisc/Portfile
trunk/dports/kde/mplayerthumbs/Portfile
trunk/dports/kde/nepomuk-core/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/py-roman/Portfile
trunk/dports/science/lalsimulation/Portfile
trunk/dports/tex/dvipng/Portfile
trunk/dports/tex/latexdiff/Portfile
trunk/dports/tex/texlive-basic/Portfile
trunk/dports/tex/texlive-bin/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-latex-recommended/Portfile
trunk/dports/tex/texlive-math-extra/Portfile
trunk/dports/tex/texlive-pictures/Portfile
trunk/dports/textproc/chasen-base/Portfile
trunk/dports/textproc/mecab-base/Portfile
trunk/dports/textproc/pdfjam/Portfile
Modified: trunk/dports/databases/mariadb/Portfile
===================================================================
--- trunk/dports/databases/mariadb/Portfile 2012-11-15 14:46:45 UTC (rev 99735)
+++ trunk/dports/databases/mariadb/Portfile 2012-11-15 15:13:11 UTC (rev 99736)
@@ -152,12 +152,8 @@
if { [file exists ${prefix}/etc/${name_mysql}/macports-default.cnf]
&& ![catch {set vers [lindex [registry_active ${name_mysql}-server] 0]}]
&& [vercmp [lindex $vers 1] 5.5.24] < 0 } {
-
- set deactivate_proc registry_deactivate_composite
- if {[info commands registry_deactivate_composite] == {}} {
- set deactivate_proc registry_deactivate
- }
- $deactivate_proc ${name_mysql}-server "" [list ports_nodepcheck 1]
+
+ registry_deactivate_composite ${name_mysql}-server "" [list ports_nodepcheck 1]
}
}
Modified: trunk/dports/databases/mysql51/Portfile
===================================================================
--- trunk/dports/databases/mysql51/Portfile 2012-11-15 14:46:45 UTC (rev 99735)
+++ trunk/dports/databases/mysql51/Portfile 2012-11-15 15:13:11 UTC (rev 99736)
@@ -168,12 +168,8 @@
&& ![catch {set vers [lindex [registry_active ${name_mysql}-server] 0]}]
&& [vercmp [lindex $vers 1] 5.1.63] < 1
&& [vercmp [lindex $vers 2] 3] < 0 } {
-
- set deactivate_proc registry_deactivate_composite
- if {[info commands registry_deactivate_composite] == {}} {
- set deactivate_proc registry_deactivate
- }
- $deactivate_proc ${name_mysql}-server "" [list ports_nodepcheck 1]
+
+ registry_deactivate_composite ${name_mysql}-server "" [list ports_nodepcheck 1]
}
}
Modified: trunk/dports/databases/mysql55/Portfile
===================================================================
--- trunk/dports/databases/mysql55/Portfile 2012-11-15 14:46:45 UTC (rev 99735)
+++ trunk/dports/databases/mysql55/Portfile 2012-11-15 15:13:11 UTC (rev 99736)
@@ -144,12 +144,8 @@
if { [file exists ${prefix}/etc/${name_mysql}/macports-default.cnf]
&& ![catch {set vers [lindex [registry_active ${name_mysql}-server] 0]}]
&& [vercmp [lindex $vers 1] 5.5.25] < 0 } {
-
- set deactivate_proc registry_deactivate_composite
- if {[info commands registry_deactivate_composite] == {}} {
- set deactivate_proc registry_deactivate
- }
- $deactivate_proc ${name_mysql}-server "" [list ports_nodepcheck 1]
+
+ registry_deactivate_composite ${name_mysql}-server "" [list ports_nodepcheck 1]
}
}
Modified: trunk/dports/databases/percona/Portfile
===================================================================
--- trunk/dports/databases/percona/Portfile 2012-11-15 14:46:45 UTC (rev 99735)
+++ trunk/dports/databases/percona/Portfile 2012-11-15 15:13:11 UTC (rev 99736)
@@ -159,12 +159,8 @@
if { [file exists ${prefix}/etc/${name_mysql}/macports-default.cnf]
&& ![catch {set vers [lindex [registry_active ${name_mysql}-server] 0]}]
&& [vercmp [lindex $vers 1] 5.5.24-26.0] < 0 } {
-
- set deactivate_proc registry_deactivate_composite
- if {[info commands registry_deactivate_composite] == {}} {
- set deactivate_proc registry_deactivate
- }
- $deactivate_proc ${name_mysql}-server "" [list ports_nodepcheck 1]
+
+ registry_deactivate_composite ${name_mysql}-server "" [list ports_nodepcheck 1]
}
}
Modified: trunk/dports/devel/zmq22/Portfile
===================================================================
--- trunk/dports/devel/zmq22/Portfile 2012-11-15 14:46:45 UTC (rev 99735)
+++ trunk/dports/devel/zmq22/Portfile 2012-11-15 15:13:11 UTC (rev 99736)
@@ -36,11 +36,7 @@
if {[vercmp $version 3.2] < 0} {
pre-activate {
# provide an upgrade path for the zmq-update to 3.2
- set deactivate_proc registry_deactivate_composite
- if {[info commands registry_deactivate_composite] == {}} {
- set deactivate_proc registry_deactivate
- }
- $deactivate_proc zmq "" [list ports_nodepcheck 1]
+ registry_deactivate_composite zmq "" [list ports_nodepcheck 1]
}
} else {
conflicts zmq
Modified: trunk/dports/games/simutrans/Portfile
===================================================================
--- trunk/dports/games/simutrans/Portfile 2012-11-15 14:46:45 UTC (rev 99735)
+++ trunk/dports/games/simutrans/Portfile 2012-11-15 15:13:11 UTC (rev 99736)
@@ -141,7 +141,7 @@
if {[file exists ${prefix}/bin/simutrans]
&& ![catch {set vers [lindex [registry_active simutrans] 0]}]
&& [vercmp [lindex $vers 1] 111.2.2] < 0} {
- registry_deactivate simutrans "" [list ports_nodepcheck 1]
+ registry_deactivate_composite simutrans "" [list ports_nodepcheck 1]
}
}
}
Modified: trunk/dports/gnome/atkmm/Portfile
===================================================================
--- trunk/dports/gnome/atkmm/Portfile 2012-11-15 14:46:45 UTC (rev 99735)
+++ trunk/dports/gnome/atkmm/Portfile 2012-11-15 15:13:11 UTC (rev 99736)
@@ -33,12 +33,8 @@
if { [file exists ${prefix}/lib/pkgconfig/atkmm-1.6.pc]
&& ![catch {set vers [lindex [registry_active gtkmm] 0]}]
&& [vercmp [lindex $vers 1] 2.22.0] < 0} {
-
- set deactivate_proc registry_deactivate_composite
- if {[info commands registry_deactivate_composite] == {}} {
- set deactivate_proc registry_deactivate
- }
- $deactivate_proc gtkmm "" [list ports_nodepcheck 1]
+
+ registry_deactivate_composite gtkmm "" [list ports_nodepcheck 1]
}
}
Modified: trunk/dports/kde/dragon/Portfile
===================================================================
--- trunk/dports/kde/dragon/Portfile 2012-11-15 14:46:45 UTC (rev 99735)
+++ trunk/dports/kde/dragon/Portfile 2012-11-15 15:13:11 UTC (rev 99736)
@@ -30,7 +30,7 @@
if {[file exists ${applications_dir}/KDE4/dragon.app/Contents/Info.plist]
&& ![catch {set vers [lindex [registry_active kdemultimedia4] 0]}]
&& [rpm-vercomp [lindex $vers 1] 4.9.3] < 0} {
- registry_deactivate kdemultimedia4 "" [list ports_nodepcheck 1]
+ registry_deactivate_composite kdemultimedia4 "" [list ports_nodepcheck 1]
}
}
Modified: trunk/dports/kde/ffmpegthumbs/Portfile
===================================================================
--- trunk/dports/kde/ffmpegthumbs/Portfile 2012-11-15 14:46:45 UTC (rev 99735)
+++ trunk/dports/kde/ffmpegthumbs/Portfile 2012-11-15 15:13:11 UTC (rev 99736)
@@ -26,7 +26,7 @@
if {[file exists ${prefix}/lib/kde4/ffmpegthumbs.so]
&& ![catch {set vers [lindex [registry_active kdemultimedia4] 0]}]
&& [rpm-vercomp [lindex $vers 1] 4.9.3] < 0} {
- registry_deactivate kdemultimedia4 "" [list ports_nodepcheck 1]
+ registry_deactivate_composite kdemultimedia4 "" [list ports_nodepcheck 1]
}
}
Modified: trunk/dports/kde/juk/Portfile
===================================================================
--- trunk/dports/kde/juk/Portfile 2012-11-15 14:46:45 UTC (rev 99735)
+++ trunk/dports/kde/juk/Portfile 2012-11-15 15:13:11 UTC (rev 99736)
@@ -33,7 +33,7 @@
if {[file exists ${applications_dir}/KDE4/juk.app/Contents/Info.plist]
&& ![catch {set vers [lindex [registry_active kdemultimedia4] 0]}]
&& [rpm-vercomp [lindex $vers 1] 4.9.3] < 0} {
- registry_deactivate kdemultimedia4 "" [list ports_nodepcheck 1]
+ registry_deactivate_composite kdemultimedia4 "" [list ports_nodepcheck 1]
}
}
Modified: trunk/dports/kde/kdelibs4/Portfile
===================================================================
--- trunk/dports/kde/kdelibs4/Portfile 2012-11-15 14:46:45 UTC (rev 99735)
+++ trunk/dports/kde/kdelibs4/Portfile 2012-11-15 15:13:11 UTC (rev 99736)
@@ -80,11 +80,7 @@
pre-activate {
if {![catch {set vers [lindex [registry_active kde4-runtime] 0]}]
&& [vercmp [lindex $vers 1] 4.8.1] < 0} {
- set deactivate_proc registry_deactivate_composite
- if {[info commands registry_deactivate_composite] == {}} {
- set deactivate_proc registry_deactivate
- }
- $deactivate_proc kde4-runtime "" [list ports_nodepcheck 1]
+ registry_deactivate_composite kde4-runtime "" [list ports_nodepcheck 1]
}
}
Modified: trunk/dports/kde/libkcddb/Portfile
===================================================================
--- trunk/dports/kde/libkcddb/Portfile 2012-11-15 14:46:45 UTC (rev 99735)
+++ trunk/dports/kde/libkcddb/Portfile 2012-11-15 15:13:11 UTC (rev 99736)
@@ -29,7 +29,7 @@
if {[file exists ${prefix}/include/libkcddb/cdinfo.h]
&& ![catch {set vers [lindex [registry_active kdemultimedia4] 0]}]
&& [rpm-vercomp [lindex $vers 1] 4.9.3] < 0} {
- registry_deactivate kdemultimedia4 "" [list ports_nodepcheck 1]
+ registry_deactivate_composite kdemultimedia4 "" [list ports_nodepcheck 1]
}
}
Modified: trunk/dports/kde/libkcompactdisc/Portfile
===================================================================
--- trunk/dports/kde/libkcompactdisc/Portfile 2012-11-15 14:46:45 UTC (rev 99735)
+++ trunk/dports/kde/libkcompactdisc/Portfile 2012-11-15 15:13:11 UTC (rev 99736)
@@ -25,7 +25,7 @@
if {[file exists ${prefix}/include/libkcompactdisc/kcompactdisc.h]
&& ![catch {set vers [lindex [registry_active kdemultimedia4] 0]}]
&& [rpm-vercomp [lindex $vers 1] 4.9.3] < 0} {
- registry_deactivate kdemultimedia4 "" [list ports_nodepcheck 1]
+ registry_deactivate_composite kdemultimedia4 "" [list ports_nodepcheck 1]
}
}
Modified: trunk/dports/kde/mplayerthumbs/Portfile
===================================================================
--- trunk/dports/kde/mplayerthumbs/Portfile 2012-11-15 14:46:45 UTC (rev 99735)
+++ trunk/dports/kde/mplayerthumbs/Portfile 2012-11-15 15:13:11 UTC (rev 99736)
@@ -25,7 +25,7 @@
if {[file exists ${applications_dir}/KDE4/mplayerthumbsconfig.app/Contents/Info.plist]
&& ![catch {set vers [lindex [registry_active kdemultimedia4] 0]}]
&& [rpm-vercomp [lindex $vers 1] 4.9.3] < 0} {
- registry_deactivate kdemultimedia4 "" [list ports_nodepcheck 1]
+ registry_deactivate_composite kdemultimedia4 "" [list ports_nodepcheck 1]
}
}
Modified: trunk/dports/kde/nepomuk-core/Portfile
===================================================================
--- trunk/dports/kde/nepomuk-core/Portfile 2012-11-15 14:46:45 UTC (rev 99735)
+++ trunk/dports/kde/nepomuk-core/Portfile 2012-11-15 15:13:11 UTC (rev 99736)
@@ -35,7 +35,7 @@
if {[file exists ${applications_dir}/KDE4/nepomukbackup.app/Contents/Info.plist]
&& ![catch {set vers [lindex [registry_active kde4-runtime] 0]}]
&& [rpm-vercomp [lindex $vers 1] 4.9.3] < 0} {
- registry_deactivate kde4-runtime "" [list ports_nodepcheck 1]
+ registry_deactivate_composite kde4-runtime "" [list ports_nodepcheck 1]
}
}
Modified: trunk/dports/perl/p5-file-listing/Portfile
===================================================================
--- trunk/dports/perl/p5-file-listing/Portfile 2012-11-15 14:46:45 UTC (rev 99735)
+++ trunk/dports/perl/p5-file-listing/Portfile 2012-11-15 15:13:11 UTC (rev 99736)
@@ -28,10 +28,6 @@
&& ![catch {set vers [lindex [registry_active p5-libwww-perl] 0]}]
&& [vercmp [lindex $vers 1] 6.0] < 0} {
ui_warn "Deactivating old, pre-6.x libwww-perl to activate ${name}"
- 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]
+ registry_deactivate_composite p5-libwww-perl "" [list ports_nodepcheck 1]
}
}
Modified: trunk/dports/perl/p5-html-form/Portfile
===================================================================
--- trunk/dports/perl/p5-html-form/Portfile 2012-11-15 14:46:45 UTC (rev 99735)
+++ trunk/dports/perl/p5-html-form/Portfile 2012-11-15 15:13:11 UTC (rev 99736)
@@ -30,10 +30,6 @@
&& ![catch {set vers [lindex [registry_active p5-libwww-perl] 0]}]
&& [vercmp [lindex $vers 1] 6.0] < 0} {
ui_warn "Deactivating old, pre-6.x libwww-perl to activate ${name}"
- 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]
+ registry_deactivate_composite p5-libwww-perl "" [list ports_nodepcheck 1]
}
}
Modified: trunk/dports/perl/p5-http-cookies/Portfile
===================================================================
--- trunk/dports/perl/p5-http-cookies/Portfile 2012-11-15 14:46:45 UTC (rev 99735)
+++ trunk/dports/perl/p5-http-cookies/Portfile 2012-11-15 15:13:11 UTC (rev 99736)
@@ -28,10 +28,6 @@
&& ![catch {set vers [lindex [registry_active p5-libwww-perl] 0]}]
&& [vercmp [lindex $vers 1] 6.0] < 0} {
ui_warn "Deactivating old, pre-6.x libwww-perl to activate ${name}"
- 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]
+ registry_deactivate_composite p5-libwww-perl "" [list ports_nodepcheck 1]
}
}
Modified: trunk/dports/perl/p5-http-daemon/Portfile
===================================================================
--- trunk/dports/perl/p5-http-daemon/Portfile 2012-11-15 14:46:45 UTC (rev 99735)
+++ trunk/dports/perl/p5-http-daemon/Portfile 2012-11-15 15:13:11 UTC (rev 99736)
@@ -29,10 +29,6 @@
&& ![catch {set vers [lindex [registry_active p5-libwww-perl] 0]}]
&& [vercmp [lindex $vers 1] 6.0] < 0} {
ui_warn "Deactivating old, pre-6.x libwww-perl to activate ${name}"
- 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]
+ registry_deactivate_composite p5-libwww-perl "" [list ports_nodepcheck 1]
}
}
Modified: trunk/dports/perl/p5-http-date/Portfile
===================================================================
--- trunk/dports/perl/p5-http-date/Portfile 2012-11-15 14:46:45 UTC (rev 99735)
+++ trunk/dports/perl/p5-http-date/Portfile 2012-11-15 15:13:11 UTC (rev 99736)
@@ -27,10 +27,6 @@
&& ![catch {set vers [lindex [registry_active p5-libwww-perl] 0]}]
&& [vercmp [lindex $vers 1] 6.0] < 0} {
ui_warn "Deactivating old, pre-6.x libwww-perl to activate ${name}"
- 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]
+ registry_deactivate_composite p5-libwww-perl "" [list ports_nodepcheck 1]
}
}
Modified: trunk/dports/perl/p5-http-message/Portfile
===================================================================
--- trunk/dports/perl/p5-http-message/Portfile 2012-11-15 14:46:45 UTC (rev 99735)
+++ trunk/dports/perl/p5-http-message/Portfile 2012-11-15 15:13:11 UTC (rev 99736)
@@ -34,10 +34,6 @@
&& ![catch {set vers [lindex [registry_active p5-libwww-perl] 0]}]
&& [vercmp [lindex $vers 1] 6.0] < 0} {
ui_warn "Deactivating old, pre-6.x libwww-perl to activate ${name}"
- 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]
+ registry_deactivate_composite p5-libwww-perl "" [list ports_nodepcheck 1]
}
}
Modified: trunk/dports/perl/p5-http-negotiate/Portfile
===================================================================
--- trunk/dports/perl/p5-http-negotiate/Portfile 2012-11-15 14:46:45 UTC (rev 99735)
+++ trunk/dports/perl/p5-http-negotiate/Portfile 2012-11-15 15:13:11 UTC (rev 99736)
@@ -27,10 +27,6 @@
&& ![catch {set vers [lindex [registry_active p5-libwww-perl] 0]}]
&& [vercmp [lindex $vers 1] 6.0] < 0} {
ui_warn "Deactivating old, pre-6.x libwww-perl to activate ${name}"
- 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]
+ registry_deactivate_composite p5-libwww-perl "" [list ports_nodepcheck 1]
}
}
Modified: trunk/dports/perl/p5-lwp-mediatypes/Portfile
===================================================================
--- trunk/dports/perl/p5-lwp-mediatypes/Portfile 2012-11-15 14:46:45 UTC (rev 99735)
+++ trunk/dports/perl/p5-lwp-mediatypes/Portfile 2012-11-15 15:13:11 UTC (rev 99736)
@@ -24,10 +24,6 @@
&& ![catch {set vers [lindex [registry_active p5-libwww-perl] 0]}]
&& [vercmp [lindex $vers 1] 6.0] < 0} {
ui_warn "Deactivating old, pre-6.x libwww-perl to activate ${name}"
- 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]
+ registry_deactivate_composite p5-libwww-perl "" [list ports_nodepcheck 1]
}
}
Modified: trunk/dports/perl/p5-lwp-protocol-http10/Portfile
===================================================================
--- trunk/dports/perl/p5-lwp-protocol-http10/Portfile 2012-11-15 14:46:45 UTC (rev 99735)
+++ trunk/dports/perl/p5-lwp-protocol-http10/Portfile 2012-11-15 15:13:11 UTC (rev 99736)
@@ -28,10 +28,6 @@
&& ![catch {set vers [lindex [registry_active p5-libwww-perl] 0]}]
&& [vercmp [lindex $vers 1] 6.0] < 0} {
ui_warn "Deactivating old, pre-6.x libwww-perl to activate ${name}"
- 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]
+ registry_deactivate_composite p5-libwww-perl "" [list ports_nodepcheck 1]
}
}
Modified: trunk/dports/perl/p5-lwp-protocol-https/Portfile
===================================================================
--- trunk/dports/perl/p5-lwp-protocol-https/Portfile 2012-11-15 14:46:45 UTC (rev 99735)
+++ trunk/dports/perl/p5-lwp-protocol-https/Portfile 2012-11-15 15:13:11 UTC (rev 99736)
@@ -35,10 +35,6 @@
&& ![catch {set vers [lindex [registry_active p5-libwww-perl] 0]}]
&& [vercmp [lindex $vers 1] 6.0] < 0} {
ui_warn "Deactivating old, pre-6.x libwww-perl to activate ${name}"
- 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]
+ registry_deactivate_composite p5-libwww-perl "" [list ports_nodepcheck 1]
}
}
Modified: trunk/dports/perl/p5-net-http/Portfile
===================================================================
--- trunk/dports/perl/p5-net-http/Portfile 2012-11-15 14:46:45 UTC (rev 99735)
+++ trunk/dports/perl/p5-net-http/Portfile 2012-11-15 15:13:11 UTC (rev 99736)
@@ -25,10 +25,6 @@
&& ![catch {set vers [lindex [registry_active p5-libwww-perl] 0]}]
&& [vercmp [lindex $vers 1] 6.0] < 0} {
ui_warn "Deactivating old, pre-6.x libwww-perl to activate ${name}"
- 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]
+ registry_deactivate_composite p5-libwww-perl "" [list ports_nodepcheck 1]
}
}
Modified: trunk/dports/perl/p5-www-robotrules/Portfile
===================================================================
--- trunk/dports/perl/p5-www-robotrules/Portfile 2012-11-15 14:46:45 UTC (rev 99735)
+++ trunk/dports/perl/p5-www-robotrules/Portfile 2012-11-15 15:13:11 UTC (rev 99736)
@@ -28,10 +28,6 @@
&& ![catch {set vers [lindex [registry_active p5-libwww-perl] 0]}]
&& [vercmp [lindex $vers 1] 6.0] < 0} {
ui_warn "Deactivating old, pre-6.x libwww-perl to activate ${name}"
- 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]
+ registry_deactivate_composite p5-libwww-perl "" [list ports_nodepcheck 1]
}
}
Modified: trunk/dports/python/py-roman/Portfile
===================================================================
--- trunk/dports/python/py-roman/Portfile 2012-11-15 14:46:45 UTC (rev 99735)
+++ trunk/dports/python/py-roman/Portfile 2012-11-15 15:13:11 UTC (rev 99736)
@@ -30,11 +30,7 @@
if {[file exists ${python.pkgd}/roman.py]
&& ![catch {set vers [lindex [registry_active py${python.version}-docutils] 0]}]
&& [vercmp [lindex $vers 1] 0.6] < 0} {
- set deactivate_proc registry_deactivate_composite
- if {[info commands registry_deactivate_composite] == {}} {
- set deactivate_proc registry_deactivate
- }
- $deactivate_proc py${python.version}-docutils "" [list ports_nodepcheck 1]
+ registry_deactivate_composite py${python.version}-docutils "" [list ports_nodepcheck 1]
}
}
}
Modified: trunk/dports/science/lalsimulation/Portfile
===================================================================
--- trunk/dports/science/lalsimulation/Portfile 2012-11-15 14:46:45 UTC (rev 99735)
+++ trunk/dports/science/lalsimulation/Portfile 2012-11-15 15:13:11 UTC (rev 99736)
@@ -40,12 +40,12 @@
if {[file exists ${prefix}/include/lal/LALSimBurst.h]
&& ![catch {set vers [lindex [registry_active lalburst] 0]}]
&& [vercmp [lindex $vers 1] 1.0.1] < 0} {
- registry_deactivate lalburst "" [list ports_nodepcheck 1]
+ registry_deactivate_composite lalburst "" [list ports_nodepcheck 1]
}
if {[file exists ${prefix}/include/lal/LALSimInspiral.h]
&& ![catch {set vers [lindex [registry_active lalinspiral] 0]}]
&& [vercmp [lindex $vers 1] 1.1.0] < 0} {
- registry_deactivate lalinspiral "" [list ports_nodepcheck 1]
+ registry_deactivate_composite lalinspiral "" [list ports_nodepcheck 1]
}
}
Modified: trunk/dports/tex/dvipng/Portfile
===================================================================
--- trunk/dports/tex/dvipng/Portfile 2012-11-15 14:46:45 UTC (rev 99735)
+++ trunk/dports/tex/dvipng/Portfile 2012-11-15 15:13:11 UTC (rev 99736)
@@ -43,10 +43,6 @@
&& ([vercmp [lindex $vers 1] 23089] < 0
|| [vercmp [lindex $vers 1] 23089] == 0
&& [lindex $vers 2] < 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]
+ registry_deactivate_composite texlive-bin-extra "" [list ports_nodepcheck 1]
}
}
Modified: trunk/dports/tex/latexdiff/Portfile
===================================================================
--- trunk/dports/tex/latexdiff/Portfile 2012-11-15 14:46:45 UTC (rev 99735)
+++ trunk/dports/tex/latexdiff/Portfile 2012-11-15 15:13:11 UTC (rev 99736)
@@ -60,10 +60,6 @@
if {[file exists $prefix/bin/latexdiff]
&& ![catch {set vers [lindex [registry_active texlive-bin-extra] 0]}]
&& [vercmp [lindex $vers 1] 19536] < 0} {
- 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]
+ registry_deactivate_composite texlive-bin-extra "" [list ports_nodepcheck 1]
}
}
Modified: trunk/dports/tex/texlive-basic/Portfile
===================================================================
--- trunk/dports/tex/texlive-basic/Portfile 2012-11-15 14:46:45 UTC (rev 99735)
+++ trunk/dports/tex/texlive-basic/Portfile 2012-11-15 15:13:11 UTC (rev 99736)
@@ -68,23 +68,19 @@
patch-runfiles_texmf_dvipdfmx_dvipdfmx.cfg.diff
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]}]
&& [vercmp [lindex $vers 1] 2009] < 0} {
- $deactivate_proc texlive "" [list ports_nodepcheck 1]
+ registry_deactivate_composite 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]}]
&& [vercmp [lindex $vers 1] 16392] < 0} {
- $deactivate_proc texlive-fontutils "" [list ports_nodepcheck 1]
+ registry_deactivate_composite texlive-fontutils "" [list ports_nodepcheck 1]
}
# Deactivate 2009 version of texlive-lang-mongolian if it's
@@ -93,7 +89,7 @@
if {![catch {set vers [lindex [registry_active texlive-lang-mongolian] 0]}]
&& [vercmp [lindex $vers 1] 14727] == 0
&& [lindex $vers 2] < 2} {
- $deactivate_proc texlive-lang-mongolian "" [list ports_nodepcheck 1]
+ registry_deactivate_composite texlive-lang-mongolian "" [list ports_nodepcheck 1]
}
}
Modified: trunk/dports/tex/texlive-bin/Portfile
===================================================================
--- trunk/dports/tex/texlive-bin/Portfile 2012-11-15 14:46:45 UTC (rev 99735)
+++ trunk/dports/tex/texlive-bin/Portfile 2012-11-15 15:13:11 UTC (rev 99736)
@@ -236,21 +236,13 @@
&& ![catch {set vers [lindex [registry_active texlive-htmlxml] 0]}]
&& [vercmp [lindex $vers 1] 13822] == 0
&& [lindex $vers 2] <3} {
- 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]
+ registry_deactivate_composite texlive-htmlxml "" [list ports_nodepcheck 1]
}
if { [file exists ${texlive_texmfmain}/scripts/tetex/updmap.pl]
&& ![catch {set vers [lindex [registry_active texlive-basic] 0]}]
&& [vercmp [lindex $vers 1] 23152] < 0} {
- set deactivate_proc registry_deactivate_composite
- if {[info commands registry_deactivate_composite] == {}} {
- set deactivate_proc registry_deactivate
- }
- $deactivate_proc texlive-basic "" [list ports_nodepcheck 1]
+ registry_deactivate_composite texlive-basic "" [list ports_nodepcheck 1]
}
# TL2012: some scripts in texmf are now installed by this port
Modified: trunk/dports/tex/texlive-fonts-recommended/Portfile
===================================================================
--- trunk/dports/tex/texlive-fonts-recommended/Portfile 2012-11-15 14:46:45 UTC (rev 99735)
+++ trunk/dports/tex/texlive-fonts-recommended/Portfile 2012-11-15 15:13:11 UTC (rev 99736)
@@ -54,11 +54,7 @@
# cmsuper moved from fonts-extra to fonts-recommended in TL2010
if {![catch {set vers [lindex [registry_active texlive-fonts-extra] 0]}]
&& [vercmp [lindex $vers 1] 19491] < 0} {
- 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]
+ registry_deactivate_composite texlive-fonts-extra "" [list ports_nodepcheck 1]
}
}
Modified: trunk/dports/tex/texlive-generic-recommended/Portfile
===================================================================
--- trunk/dports/tex/texlive-generic-recommended/Portfile 2012-11-15 14:46:45 UTC (rev 99735)
+++ trunk/dports/tex/texlive-generic-recommended/Portfile 2012-11-15 15:13:11 UTC (rev 99736)
@@ -30,11 +30,7 @@
# kastrup moved from texlive-latex-extra to texlive-generic-recommended
if {![catch {set vers [lindex [registry_active texlive-latex-extra] 0]}]
&& [vercmp [lindex $vers 1] 19548] < 0} {
- 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]
+ registry_deactivate_composite texlive-latex-extra "" [list ports_nodepcheck 1]
}
}
Modified: trunk/dports/tex/texlive-latex/Portfile
===================================================================
--- trunk/dports/tex/texlive-latex/Portfile 2012-11-15 14:46:45 UTC (rev 99735)
+++ trunk/dports/tex/texlive-latex/Portfile 2012-11-15 15:13:11 UTC (rev 99736)
@@ -46,11 +46,7 @@
# 2009->2010 update
if {![catch {set vers [lindex [registry_active texlive-context] 0]}]
&& [vercmp [lindex $vers 1] 18549] < 0} {
- 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]
+ registry_deactivate_composite texlive-context "" [list ports_nodepcheck 1]
}
}
Modified: trunk/dports/tex/texlive-latex-recommended/Portfile
===================================================================
--- trunk/dports/tex/texlive-latex-recommended/Portfile 2012-11-15 14:46:45 UTC (rev 99735)
+++ trunk/dports/tex/texlive-latex-recommended/Portfile 2012-11-15 15:13:11 UTC (rev 99736)
@@ -35,21 +35,13 @@
# fontspec moved from texlive-xetex in TL2011
if {![catch {set vers [lindex [registry_active texlive-xetex] 0]}]
&& [vercmp [lindex $vers 1] 23080] < 0} {
- set deactivate_proc registry_deactivate_composite
- if {[info commands registry_deactivate_composite] == {}} {
- set deactivate_proc registry_deactivate
- }
- $deactivate_proc texlive-xetex "" [list ports_nodepcheck 1]
+ registry_deactivate_composite texlive-xetex "" [list ports_nodepcheck 1]
}
# textcase moved from texlive-latex-extra in TL2011
if {![catch {set vers [lindex [registry_active texlive-latex-extra] 0]}]
&& [vercmp [lindex $vers 1] 22931] < 0} {
- 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]
+ registry_deactivate_composite texlive-latex-extra "" [list ports_nodepcheck 1]
}
}
Modified: trunk/dports/tex/texlive-math-extra/Portfile
===================================================================
--- trunk/dports/tex/texlive-math-extra/Portfile 2012-11-15 14:46:45 UTC (rev 99735)
+++ trunk/dports/tex/texlive-math-extra/Portfile 2012-11-15 15:13:11 UTC (rev 99736)
@@ -39,11 +39,7 @@
# binomexp moved from texlive-latex-extra to texlive-math-extra in TL2010
if {![catch {set vers [lindex [registry_active texlive-latex-extra] 0]}]
&& [vercmp [lindex $vers 1] 19538] < 0} {
- 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]
+ registry_deactivate_composite texlive-latex-extra "" [list ports_nodepcheck 1]
}
}
Modified: trunk/dports/tex/texlive-pictures/Portfile
===================================================================
--- trunk/dports/tex/texlive-pictures/Portfile 2012-11-15 14:46:45 UTC (rev 99735)
+++ trunk/dports/tex/texlive-pictures/Portfile 2012-11-15 15:13:11 UTC (rev 99736)
@@ -44,11 +44,7 @@
pre-activate {
if {![catch {set vers [lindex [registry_active texlive-latex-extra] 0]}]
&& [vercmp [lindex $vers 1] 19538] < 0} {
- 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]
+ registry_deactivate_composite texlive-latex-extra "" [list ports_nodepcheck 1]
}
}
Modified: trunk/dports/textproc/chasen-base/Portfile
===================================================================
--- trunk/dports/textproc/chasen-base/Portfile 2012-11-15 14:46:45 UTC (rev 99735)
+++ trunk/dports/textproc/chasen-base/Portfile 2012-11-15 15:13:11 UTC (rev 99736)
@@ -76,7 +76,7 @@
&& ([vercmp [lindex $vers 1] 2.4.4] < 0 ||
[vercmp [lindex $vers 1] 2.4.4] == 0
&& [vercmp [lindex $vers 2] 1] < 1)} {
- registry_deactivate chasen "" [list ports_nodepcheck 1]
+ registry_deactivate_composite chasen "" [list ports_nodepcheck 1]
}
}
Modified: trunk/dports/textproc/mecab-base/Portfile
===================================================================
--- trunk/dports/textproc/mecab-base/Portfile 2012-11-15 14:46:45 UTC (rev 99735)
+++ trunk/dports/textproc/mecab-base/Portfile 2012-11-15 15:13:11 UTC (rev 99736)
@@ -57,7 +57,7 @@
&& ([vercmp [lindex $vers 1] 0.98] < 0 ||
[vercmp [lindex $vers 1] 0.98] == 0
&& [vercmp [lindex $vers 2] 1] < 1)} {
- registry_deactivate mecab "" [list ports_nodepcheck 1]
+ registry_deactivate_composite mecab "" [list ports_nodepcheck 1]
}
}
Modified: trunk/dports/textproc/pdfjam/Portfile
===================================================================
--- trunk/dports/textproc/pdfjam/Portfile 2012-11-15 14:46:45 UTC (rev 99735)
+++ trunk/dports/textproc/pdfjam/Portfile 2012-11-15 15:13:11 UTC (rev 99736)
@@ -59,10 +59,6 @@
if {[file exists $prefix/bin/pdfjam]
&& ![catch {set vers [lindex [registry_active texlive-bin-extra] 0]}]
&& [vercmp [lindex $vers 1] 19536] < 0} {
- 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]
+ registry_deactivate_composite texlive-bin-extra "" [list ports_nodepcheck 1]
}
}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20121115/aedfa779/attachment-0001.html>
More information about the macports-changes
mailing list