[89810] trunk/dports
and.damore at macports.org
and.damore at macports.org
Sat Feb 11 00:55:42 PST 2012
Revision: 89810
http://trac.macports.org/changeset/89810
Author: and.damore at macports.org
Date: 2012-02-11 00:55:39 -0800 (Sat, 11 Feb 2012)
Log Message:
-----------
ports: replacing rpm-vercomp with vercmp in portfiles
Modified Paths:
--------------
trunk/dports/aqua/FScript/Portfile
trunk/dports/cross/i960-rtems-binutils/Portfile
trunk/dports/cross/i960-rtems-gcc/Portfile
trunk/dports/devel/gmp/Portfile
trunk/dports/devel/valgrind-devel/Portfile
trunk/dports/fuse/macfuse/Portfile
trunk/dports/gnome/atkmm/Portfile
trunk/dports/graphics/gdk-pixbuf2/Portfile
trunk/dports/graphics/minidjvu/Portfile
trunk/dports/java/tomcat5/Portfile
trunk/dports/java/tomcat6/Portfile
trunk/dports/kde/kdelibs4/Portfile
trunk/dports/lang/ghc/Portfile
trunk/dports/mail/cclient/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/perl/p5-xml-sax-base/Portfile
trunk/dports/print/ghostscript/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
trunk/dports/x11/pango/Portfile
trunk/dports/x11/pango-devel/Portfile
trunk/dports/x11/xinit/Portfile
Modified: trunk/dports/aqua/FScript/Portfile
===================================================================
--- trunk/dports/aqua/FScript/Portfile 2012-02-11 07:44:33 UTC (rev 89809)
+++ trunk/dports/aqua/FScript/Portfile 2012-02-11 08:55:39 UTC (rev 89810)
@@ -43,7 +43,7 @@
xcode.destroot.settings SKIP_INSTALL=NO
xcode.destroot.type ""
-set is_xcode_4_x [expr [rpm-vercomp $xcodeversion 4] >= 0]
+set is_xcode_4_x [expr [vercmp $xcodeversion 4] >= 0]
if !$is_xcode_4_x {
default_variants +ib_plugin
Modified: trunk/dports/cross/i960-rtems-binutils/Portfile
===================================================================
--- trunk/dports/cross/i960-rtems-binutils/Portfile 2012-02-11 07:44:33 UTC (rev 89809)
+++ trunk/dports/cross/i960-rtems-binutils/Portfile 2012-02-11 08:55:39 UTC (rev 89810)
@@ -129,7 +129,7 @@
# This target has been abandonned upstream.
pre-fetch {
- if {${os.platform} == "darwin" && [rpm-vercomp 9.0 ${os.version}] < 0} {
+ if {${os.platform} == "darwin" && [vercmp 9.0 ${os.version}] < 0} {
ui_warn "i960-rtems-gcc does not build on darwin 9+ (Mac OS X 10.5+) and it has been abandonned upstream."
}
}
Modified: trunk/dports/cross/i960-rtems-gcc/Portfile
===================================================================
--- trunk/dports/cross/i960-rtems-gcc/Portfile 2012-02-11 07:44:33 UTC (rev 89809)
+++ trunk/dports/cross/i960-rtems-gcc/Portfile 2012-02-11 08:55:39 UTC (rev 89810)
@@ -203,7 +203,7 @@
# This target has been abandonned upstream.
pre-fetch {
- if {${os.platform} == "darwin" && [rpm-vercomp 9.0 ${os.version}] < 0} {
+ if {${os.platform} == "darwin" && [vercmp 9.0 ${os.version}] < 0} {
error "This port does not build on darwin 9+ (Mac OS X 10.5+) and it has been abandonned upstream."
}
}
Modified: trunk/dports/devel/gmp/Portfile
===================================================================
--- trunk/dports/devel/gmp/Portfile 2012-02-11 07:44:33 UTC (rev 89809)
+++ trunk/dports/devel/gmp/Portfile 2012-02-11 08:55:39 UTC (rev 89810)
@@ -41,7 +41,7 @@
# llvm-gcc-4.2 fails make check
if {${configure.compiler} == "llvm-gcc-4.2"} {
- if {[rpm-vercomp $xcodeversion 4.1] >= 0} {
+ if {[vercmp $xcodeversion 4.1] >= 0} {
configure.compiler clang
} else {
configure.compiler gcc-4.2
Modified: trunk/dports/devel/valgrind-devel/Portfile
===================================================================
--- trunk/dports/devel/valgrind-devel/Portfile 2012-02-11 07:44:33 UTC (rev 89809)
+++ trunk/dports/devel/valgrind-devel/Portfile 2012-02-11 08:55:39 UTC (rev 89810)
@@ -51,7 +51,7 @@
# Force gcc, see https://bugs.kde.org/show_bug.cgi?id=275168
if {![string match "gcc*" ${configure.compiler}]} {
- if {[rpm-vercomp $xcodeversion 3.2] >= 0 && $macosx_deployment_target != "10.4"} {
+ if {[vercmp $xcodeversion 3.2] >= 0 && $macosx_deployment_target != "10.4"} {
configure.compiler gcc-4.2
} else {
configure.compiler gcc-4.0
Modified: trunk/dports/fuse/macfuse/Portfile
===================================================================
--- trunk/dports/fuse/macfuse/Portfile 2012-02-11 07:44:33 UTC (rev 89809)
+++ trunk/dports/fuse/macfuse/Portfile 2012-02-11 08:55:39 UTC (rev 89810)
@@ -67,7 +67,7 @@
# ensure that user is running OS X 10.5 or higher: MacFUSE requires XCode 3
pre-fetch {
- if {${os.platform} != "darwin" || [rpm-vercomp ${os.version} 9.0.0] < 0} {
+ if {${os.platform} != "darwin" || [vercmp ${os.version} 9.0.0] < 0} {
return -code error "MacFUSE requires at least Mac OS X 10.5 to build"
}
}
Modified: trunk/dports/gnome/atkmm/Portfile
===================================================================
--- trunk/dports/gnome/atkmm/Portfile 2012-02-11 07:44:33 UTC (rev 89809)
+++ trunk/dports/gnome/atkmm/Portfile 2012-02-11 08:55:39 UTC (rev 89810)
@@ -32,7 +32,7 @@
pre-activate {
if { [file exists ${prefix}/lib/pkgconfig/atkmm-1.6.pc]
&& ![catch {set vers [lindex [registry_active gtkmm] 0]}]
- && [rpm-vercomp [lindex $vers 1] 2.22.0] < 0} {
+ && [vercmp [lindex $vers 1] 2.22.0] < 0} {
set deactivate_proc registry_deactivate_composite
if {[info commands registry_deactivate_composite] == {}} {
Modified: trunk/dports/graphics/gdk-pixbuf2/Portfile
===================================================================
--- trunk/dports/graphics/gdk-pixbuf2/Portfile 2012-02-11 07:44:33 UTC (rev 89809)
+++ trunk/dports/graphics/gdk-pixbuf2/Portfile 2012-02-11 08:55:39 UTC (rev 89810)
@@ -37,7 +37,7 @@
pre-activate {
if { [file exists ${prefix}/lib/pkgconfig/gdk-pixbuf-2.0.pc]
&& ![catch {set vers [lindex [registry_active gtk2] 0]}]
- && [rpm-vercomp [lindex $vers 1] 2.22.0] < 0} {
+ && [vercmp [lindex $vers 1] 2.22.0] < 0} {
set deactivate_proc registry_deactivate_composite
if {[info commands registry_deactivate_composite] == {}} {
Modified: trunk/dports/graphics/minidjvu/Portfile
===================================================================
--- trunk/dports/graphics/minidjvu/Portfile 2012-02-11 07:44:33 UTC (rev 89809)
+++ trunk/dports/graphics/minidjvu/Portfile 2012-02-11 08:55:39 UTC (rev 89810)
@@ -26,7 +26,7 @@
rmd160 a89bc883f4ffa9fbb53988c6d27f80880089a973
patchfiles patch-Makefile.in.diff
-if {${os.platform} == "darwin" && [rpm-vercomp ${os.version} 10] < 0} {
+if {${os.platform} == "darwin" && [vercmp ${os.version} 10] < 0} {
patchfiles-append patch-configure.ac.diff
use_autoconf yes
}
Modified: trunk/dports/java/tomcat5/Portfile
===================================================================
--- trunk/dports/java/tomcat5/Portfile 2012-02-11 07:44:33 UTC (rev 89809)
+++ trunk/dports/java/tomcat5/Portfile 2012-02-11 08:55:39 UTC (rev 89810)
@@ -100,7 +100,7 @@
if { [string length [auto_execok ant]] } {
set verOutput [exec ant -version]
regexp {version (\d+(\.\d+)*)} $verOutput -> antVersion
- if { [rpm-vercomp $antVersion "1.6.2"] < 0 } {
+ if { [vercmp $antVersion "1.6.2"] < 0 } {
return -code error "This version of tomcat requires ant version 1.6.2 or better. Please install a newer ant before proceeding."
}
}
Modified: trunk/dports/java/tomcat6/Portfile
===================================================================
--- trunk/dports/java/tomcat6/Portfile 2012-02-11 07:44:33 UTC (rev 89809)
+++ trunk/dports/java/tomcat6/Portfile 2012-02-11 08:55:39 UTC (rev 89810)
@@ -102,7 +102,7 @@
if { [string length [auto_execok ant]] } {
set verOutput [exec ant -version]
regexp {version (\d+(\.\d+)*)} $verOutput -> antVersion
- if { [rpm-vercomp $antVersion "1.6.5"] < 0 } {
+ if { [vercmp $antVersion "1.6.5"] < 0 } {
return -code error "This version of tomcat requires ant version 1.6.5 or better. Please install a newer ant before proceeding."
}
}
Modified: trunk/dports/kde/kdelibs4/Portfile
===================================================================
--- trunk/dports/kde/kdelibs4/Portfile 2012-02-11 07:44:33 UTC (rev 89809)
+++ trunk/dports/kde/kdelibs4/Portfile 2012-02-11 08:55:39 UTC (rev 89810)
@@ -82,7 +82,7 @@
pre-activate {
if {[file exists ${prefix}/share/locale/en_US/entry.desktop]
&& ![catch {set vers [lindex [registry_active kde4-runtime] 0]}]
- && [rpm-vercomp [lindex $vers 1] 4.6.0] < 0} {
+ && [vercmp [lindex $vers 1] 4.6.0] < 0} {
set deactivate_proc registry_deactivate_composite
if {[info commands registry_deactivate_composite] == {}} {
set deactivate_proc registry_deactivate
Modified: trunk/dports/lang/ghc/Portfile
===================================================================
--- trunk/dports/lang/ghc/Portfile 2012-02-11 07:44:33 UTC (rev 89809)
+++ trunk/dports/lang/ghc/Portfile 2012-02-11 08:55:39 UTC (rev 89810)
@@ -123,7 +123,7 @@
pre-fetch {
set minimum_xcodeversion 2.5
set current_xcodeversion [exec defaults read /Developer/Applications/Xcode.app/Contents/Info CFBundleShortVersionString]
- if {[rpm-vercomp ${current_xcodeversion} ${minimum_xcodeversion}] < 0} {
+ if {[vercmp ${current_xcodeversion} ${minimum_xcodeversion}] < 0} {
ui_msg "On Mac OS X ${macosx_version}, ${name} ${version} requires Xcode ${minimum_xcodeversion} but you have Xcode ${current_xcodeversion}."
return -code error "incompatible Xcode version"
}
@@ -149,7 +149,7 @@
pre-fetch {
set minimum_xcodeversion 2.5
set current_xcodeversion [exec defaults read /Developer/Applications/Xcode.app/Contents/Info CFBundleShortVersionString]
- if {[rpm-vercomp ${current_xcodeversion} ${minimum_xcodeversion}] < 0} {
+ if {[vercmp ${current_xcodeversion} ${minimum_xcodeversion}] < 0} {
ui_msg "On Mac OS X ${macosx_version}, ${name} ${version} requires Xcode ${minimum_xcodeversion} but you have Xcode ${current_xcodeversion}."
return -code error "incompatible Xcode version"
}
@@ -177,7 +177,7 @@
pre-fetch {
set minimum_xcodeversion 3.1.2
set current_xcodeversion [exec defaults read /Developer/Applications/Xcode.app/Contents/Info CFBundleShortVersionString]
- if {[rpm-vercomp ${current_xcodeversion} ${minimum_xcodeversion}] < 0} {
+ if {[vercmp ${current_xcodeversion} ${minimum_xcodeversion}] < 0} {
ui_msg "On Mac OS X ${macosx_version}, ${name} ${version} requires Xcode ${minimum_xcodeversion} but you have Xcode ${current_xcodeversion}."
return -code error "incompatible Xcode version"
}
@@ -203,7 +203,7 @@
pre-fetch {
set minimum_xcodeversion 3.1
set current_xcodeversion [exec defaults read /Developer/Applications/Xcode.app/Contents/Info CFBundleShortVersionString]
- if {[rpm-vercomp ${current_xcodeversion} ${minimum_xcodeversion}] < 0} {
+ if {[vercmp ${current_xcodeversion} ${minimum_xcodeversion}] < 0} {
ui_msg "On Mac OS X ${macosx_version}, ${name} ${version} requires Xcode ${minimum_xcodeversion} but you have Xcode ${current_xcodeversion}."
return -code error "incompatible Xcode version"
}
Modified: trunk/dports/mail/cclient/Portfile
===================================================================
--- trunk/dports/mail/cclient/Portfile 2012-02-11 07:44:33 UTC (rev 89809)
+++ trunk/dports/mail/cclient/Portfile 2012-02-11 08:55:39 UTC (rev 89810)
@@ -69,7 +69,7 @@
copy ${worksrcpath}/docs ${destroot}${docdir}
}
-if {[rpm-vercomp ${os.version} 10] >= 0} {
+if {[vercmp ${os.version} 10] >= 0} {
patchfiles-append patch-Makefile-fixpam
}
Modified: trunk/dports/perl/p5-file-listing/Portfile
===================================================================
--- trunk/dports/perl/p5-file-listing/Portfile 2012-02-11 07:44:33 UTC (rev 89809)
+++ trunk/dports/perl/p5-file-listing/Portfile 2012-02-11 08:55:39 UTC (rev 89810)
@@ -25,7 +25,7 @@
pre-activate {
if {[file exists ${perl5.lib}/File/Listing.pm]
&& ![catch {set vers [lindex [registry_active p5-libwww-perl] 0]}]
- && [rpm-vercomp [lindex $vers 1] 6.0] < 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] == {}} {
Modified: trunk/dports/perl/p5-html-form/Portfile
===================================================================
--- trunk/dports/perl/p5-html-form/Portfile 2012-02-11 07:44:33 UTC (rev 89809)
+++ trunk/dports/perl/p5-html-form/Portfile 2012-02-11 08:55:39 UTC (rev 89810)
@@ -27,7 +27,7 @@
pre-activate {
if {[file exists ${perl5.lib}/HTML/Form.pm]
&& ![catch {set vers [lindex [registry_active p5-libwww-perl] 0]}]
- && [rpm-vercomp [lindex $vers 1] 6.0] < 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] == {}} {
Modified: trunk/dports/perl/p5-http-cookies/Portfile
===================================================================
--- trunk/dports/perl/p5-http-cookies/Portfile 2012-02-11 07:44:33 UTC (rev 89809)
+++ trunk/dports/perl/p5-http-cookies/Portfile 2012-02-11 08:55:39 UTC (rev 89810)
@@ -26,7 +26,7 @@
pre-activate {
if {[file exists ${perl5.lib}/HTTP/Cookies.pm]
&& ![catch {set vers [lindex [registry_active p5-libwww-perl] 0]}]
- && [rpm-vercomp [lindex $vers 1] 6.0] < 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] == {}} {
Modified: trunk/dports/perl/p5-http-daemon/Portfile
===================================================================
--- trunk/dports/perl/p5-http-daemon/Portfile 2012-02-11 07:44:33 UTC (rev 89809)
+++ trunk/dports/perl/p5-http-daemon/Portfile 2012-02-11 08:55:39 UTC (rev 89810)
@@ -27,7 +27,7 @@
pre-activate {
if {[file exists ${perl5.lib}/HTTP/Daemon.pm]
&& ![catch {set vers [lindex [registry_active p5-libwww-perl] 0]}]
- && [rpm-vercomp [lindex $vers 1] 6.0] < 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] == {}} {
Modified: trunk/dports/perl/p5-http-date/Portfile
===================================================================
--- trunk/dports/perl/p5-http-date/Portfile 2012-02-11 07:44:33 UTC (rev 89809)
+++ trunk/dports/perl/p5-http-date/Portfile 2012-02-11 08:55:39 UTC (rev 89810)
@@ -25,7 +25,7 @@
pre-activate {
if {[file exists ${perl5.lib}/HTTP/Date.pm]
&& ![catch {set vers [lindex [registry_active p5-libwww-perl] 0]}]
- && [rpm-vercomp [lindex $vers 1] 6.0] < 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] == {}} {
Modified: trunk/dports/perl/p5-http-message/Portfile
===================================================================
--- trunk/dports/perl/p5-http-message/Portfile 2012-02-11 07:44:33 UTC (rev 89809)
+++ trunk/dports/perl/p5-http-message/Portfile 2012-02-11 08:55:39 UTC (rev 89810)
@@ -32,7 +32,7 @@
pre-activate {
if {[file exists ${perl5.lib}/HTTP/Message.pm]
&& ![catch {set vers [lindex [registry_active p5-libwww-perl] 0]}]
- && [rpm-vercomp [lindex $vers 1] 6.0] < 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] == {}} {
Modified: trunk/dports/perl/p5-http-negotiate/Portfile
===================================================================
--- trunk/dports/perl/p5-http-negotiate/Portfile 2012-02-11 07:44:33 UTC (rev 89809)
+++ trunk/dports/perl/p5-http-negotiate/Portfile 2012-02-11 08:55:39 UTC (rev 89810)
@@ -25,7 +25,7 @@
pre-activate {
if {[file exists ${perl5.lib}/HTTP/Negotiate.pm]
&& ![catch {set vers [lindex [registry_active p5-libwww-perl] 0]}]
- && [rpm-vercomp [lindex $vers 1] 6.0] < 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] == {}} {
Modified: trunk/dports/perl/p5-lwp-mediatypes/Portfile
===================================================================
--- trunk/dports/perl/p5-lwp-mediatypes/Portfile 2012-02-11 07:44:33 UTC (rev 89809)
+++ trunk/dports/perl/p5-lwp-mediatypes/Portfile 2012-02-11 08:55:39 UTC (rev 89810)
@@ -21,7 +21,7 @@
pre-activate {
if {[file exists ${perl5.lib}/LWP/MediaTypes.pm]
&& ![catch {set vers [lindex [registry_active p5-libwww-perl] 0]}]
- && [rpm-vercomp [lindex $vers 1] 6.0] < 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] == {}} {
Modified: trunk/dports/perl/p5-lwp-protocol-http10/Portfile
===================================================================
--- trunk/dports/perl/p5-lwp-protocol-http10/Portfile 2012-02-11 07:44:33 UTC (rev 89809)
+++ trunk/dports/perl/p5-lwp-protocol-http10/Portfile 2012-02-11 08:55:39 UTC (rev 89810)
@@ -25,7 +25,7 @@
pre-activate {
if {[file exists ${perl5.lib}/LWP/Protocol/http10.pm]
&& ![catch {set vers [lindex [registry_active p5-libwww-perl] 0]}]
- && [rpm-vercomp [lindex $vers 1] 6.0] < 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] == {}} {
Modified: trunk/dports/perl/p5-lwp-protocol-https/Portfile
===================================================================
--- trunk/dports/perl/p5-lwp-protocol-https/Portfile 2012-02-11 07:44:33 UTC (rev 89809)
+++ trunk/dports/perl/p5-lwp-protocol-https/Portfile 2012-02-11 08:55:39 UTC (rev 89810)
@@ -32,7 +32,7 @@
pre-activate {
if {[file exists ${perl5.lib}/LWP/Protocol/https.pm]
&& ![catch {set vers [lindex [registry_active p5-libwww-perl] 0]}]
- && [rpm-vercomp [lindex $vers 1] 6.0] < 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] == {}} {
Modified: trunk/dports/perl/p5-net-http/Portfile
===================================================================
--- trunk/dports/perl/p5-net-http/Portfile 2012-02-11 07:44:33 UTC (rev 89809)
+++ trunk/dports/perl/p5-net-http/Portfile 2012-02-11 08:55:39 UTC (rev 89810)
@@ -22,7 +22,7 @@
pre-activate {
if {[file exists ${perl5.lib}/Net/HTTP.pm]
&& ![catch {set vers [lindex [registry_active p5-libwww-perl] 0]}]
- && [rpm-vercomp [lindex $vers 1] 6.0] < 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] == {}} {
Modified: trunk/dports/perl/p5-www-robotrules/Portfile
===================================================================
--- trunk/dports/perl/p5-www-robotrules/Portfile 2012-02-11 07:44:33 UTC (rev 89809)
+++ trunk/dports/perl/p5-www-robotrules/Portfile 2012-02-11 08:55:39 UTC (rev 89810)
@@ -25,7 +25,7 @@
pre-activate {
if {[file exists ${perl5.lib}/WWW/RobotRules.pm]
&& ![catch {set vers [lindex [registry_active p5-libwww-perl] 0]}]
- && [rpm-vercomp [lindex $vers 1] 6.0] < 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] == {}} {
Modified: trunk/dports/perl/p5-xml-sax-base/Portfile
===================================================================
--- trunk/dports/perl/p5-xml-sax-base/Portfile 2012-02-11 07:44:33 UTC (rev 89809)
+++ trunk/dports/perl/p5-xml-sax-base/Portfile 2012-02-11 08:55:39 UTC (rev 89810)
@@ -18,9 +18,9 @@
pre-activate {
# XML::SAX::Exception moved to this port from p5-xml-sax
if {![catch {set vers [lindex [registry_active p${perl5.major}-xml-sax] 0]}]
- && [rpm-vercomp [lindex $vers 1] 0.990] < 0} {
+ && [vercmp [lindex $vers 1] 0.990] < 0} {
registry_deactivate_composite p${perl5.major}-xml-sax "" [list ports_nodepcheck 1]
}
}
}
-
\ No newline at end of file
+
Modified: trunk/dports/print/ghostscript/Portfile
===================================================================
--- trunk/dports/print/ghostscript/Portfile 2012-02-11 07:44:33 UTC (rev 89809)
+++ trunk/dports/print/ghostscript/Portfile 2012-02-11 08:55:39 UTC (rev 89810)
@@ -96,7 +96,7 @@
# gs compiled by clang/llvm-gcc-4.2 sometimes produces 'Segmentation fault: 11'
#if {${configure.compiler} == "llvm-gcc-4.2"} {
-# if {[rpm-vercomp $xcodeversion 4.1] >= 0} {
+# if {[vercmp $xcodeversion 4.1] >= 0} {
# configure.compiler clang
# } else {
# configure.compiler gcc-4.2
Modified: trunk/dports/python/py-roman/Portfile
===================================================================
--- trunk/dports/python/py-roman/Portfile 2012-02-11 07:44:33 UTC (rev 89809)
+++ trunk/dports/python/py-roman/Portfile 2012-02-11 08:55:39 UTC (rev 89810)
@@ -29,7 +29,7 @@
pre-activate {
if {[file exists ${python.pkgd}/roman.py]
&& ![catch {set vers [lindex [registry_active py${python.version}-docutils] 0]}]
- && [rpm-vercomp [lindex $vers 1] 0.6] < 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
Modified: trunk/dports/science/lalsimulation/Portfile
===================================================================
--- trunk/dports/science/lalsimulation/Portfile 2012-02-11 07:44:33 UTC (rev 89809)
+++ trunk/dports/science/lalsimulation/Portfile 2012-02-11 08:55:39 UTC (rev 89810)
@@ -40,12 +40,12 @@
pre-activate {
if {[file exists ${prefix}/include/lal/LALSimBurst.h]
&& ![catch {set vers [lindex [registry_active lalburst] 0]}]
- && [rpm-vercomp [lindex $vers 1] 1.0.1] < 0} {
+ && [vercmp [lindex $vers 1] 1.0.1] < 0} {
registry_deactivate lalburst "" [list ports_nodepcheck 1]
}
if {[file exists ${prefix}/include/lal/LALSimInspiral.h]
&& ![catch {set vers [lindex [registry_active lalinspiral] 0]}]
- && [rpm-vercomp [lindex $vers 1] 1.1.0] < 0} {
+ && [vercmp [lindex $vers 1] 1.1.0] < 0} {
registry_deactivate lalinspiral "" [list ports_nodepcheck 1]
}
}
Modified: trunk/dports/tex/dvipng/Portfile
===================================================================
--- trunk/dports/tex/dvipng/Portfile 2012-02-11 07:44:33 UTC (rev 89809)
+++ trunk/dports/tex/dvipng/Portfile 2012-02-11 08:55:39 UTC (rev 89810)
@@ -40,8 +40,8 @@
# into this port; deactivate old version to prevent conflict
pre-activate {
if { ![catch {set vers [lindex [registry_active texlive-bin-extra] 0]}]
- && ([rpm-vercomp [lindex $vers 1] 23089] < 0
- || [rpm-vercomp [lindex $vers 1] 23089] == 0
+ && ([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] == {}} {
Modified: trunk/dports/tex/latexdiff/Portfile
===================================================================
--- trunk/dports/tex/latexdiff/Portfile 2012-02-11 07:44:33 UTC (rev 89809)
+++ trunk/dports/tex/latexdiff/Portfile 2012-02-11 08:55:39 UTC (rev 89810)
@@ -59,7 +59,7 @@
# a conflict.
if {[file exists $prefix/bin/latexdiff]
&& ![catch {set vers [lindex [registry_active texlive-bin-extra] 0]}]
- && [rpm-vercomp [lindex $vers 1] 19536] < 0} {
+ && [vercmp [lindex $vers 1] 19536] < 0} {
set deactivate_proc registry_deactivate_composite
if {[info commands registry_deactivate_composite] == {}} {
set deactivate_proc registry_deactivate
Modified: trunk/dports/tex/texlive-basic/Portfile
===================================================================
--- trunk/dports/tex/texlive-basic/Portfile 2012-02-11 07:44:33 UTC (rev 89809)
+++ trunk/dports/tex/texlive-basic/Portfile 2012-02-11 08:55:39 UTC (rev 89810)
@@ -74,14 +74,14 @@
# 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} {
+ && [vercmp [lindex $vers 1] 2009] < 0} {
$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} {
+ && [vercmp [lindex $vers 1] 16392] < 0} {
$deactivate_proc texlive-fontutils "" [list ports_nodepcheck 1]
}
@@ -89,7 +89,7 @@
# installed; its hyphenation references a file that no longer
# exists, causing format generation to fail (see #27339)
if {![catch {set vers [lindex [registry_active texlive-lang-mongolian] 0]}]
- && [rpm-vercomp [lindex $vers 1] 14727] == 0
+ && [vercmp [lindex $vers 1] 14727] == 0
&& [lindex $vers 2] < 2} {
$deactivate_proc texlive-lang-mongolian "" [list ports_nodepcheck 1]
}
Modified: trunk/dports/tex/texlive-bin/Portfile
===================================================================
--- trunk/dports/tex/texlive-bin/Portfile 2012-02-11 07:44:33 UTC (rev 89809)
+++ trunk/dports/tex/texlive-bin/Portfile 2012-02-11 08:55:39 UTC (rev 89810)
@@ -135,7 +135,7 @@
# llvm-gcc apparently fails on Xcode 4.0.x (#30758)
if {${configure.compiler} == "llvm-gcc-4.2" &&
- [rpm-vercomp $xcodeversion 4.1] < 0} {
+ [vercmp $xcodeversion 4.1] < 0} {
configure.compiler gcc-4.2
}
@@ -237,7 +237,7 @@
pre-activate {
if { [file exists ${texlive_texmfdist}/scripts/tex4ht/ht.sh]
&& ![catch {set vers [lindex [registry_active texlive-htmlxml] 0]}]
- && [rpm-vercomp [lindex $vers 1] 13822] == 0
+ && [vercmp [lindex $vers 1] 13822] == 0
&& [lindex $vers 2] <3} {
set deactivate_proc registry_deactivate_composite
if {[info commands registry_deactivate_composite] == {}} {
@@ -248,7 +248,7 @@
if { [file exists ${texlive_texmfmain}/scripts/tetex/updmap.pl]
&& ![catch {set vers [lindex [registry_active texlive-basic] 0]}]
- && [rpm-vercomp [lindex $vers 1] 23152] < 0} {
+ && [vercmp [lindex $vers 1] 23152] < 0} {
set deactivate_proc registry_deactivate_composite
if {[info commands registry_deactivate_composite] == {}} {
set deactivate_proc registry_deactivate
Modified: trunk/dports/tex/texlive-fonts-recommended/Portfile
===================================================================
--- trunk/dports/tex/texlive-fonts-recommended/Portfile 2012-02-11 07:44:33 UTC (rev 89809)
+++ trunk/dports/tex/texlive-fonts-recommended/Portfile 2012-02-11 08:55:39 UTC (rev 89810)
@@ -53,7 +53,7 @@
pre-activate {
# 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} {
+ && [vercmp [lindex $vers 1] 19491] < 0} {
set deactivate_proc registry_deactivate_composite
if {[info commands registry_deactivate_composite] == {}} {
set deactivate_proc registry_deactivate
Modified: trunk/dports/tex/texlive-generic-recommended/Portfile
===================================================================
--- trunk/dports/tex/texlive-generic-recommended/Portfile 2012-02-11 07:44:33 UTC (rev 89809)
+++ trunk/dports/tex/texlive-generic-recommended/Portfile 2012-02-11 08:55:39 UTC (rev 89810)
@@ -29,7 +29,7 @@
pre-activate {
# 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} {
+ && [vercmp [lindex $vers 1] 19548] < 0} {
set deactivate_proc registry_deactivate_composite
if {[info commands registry_deactivate_composite] == {}} {
set deactivate_proc registry_deactivate
Modified: trunk/dports/tex/texlive-latex/Portfile
===================================================================
--- trunk/dports/tex/texlive-latex/Portfile 2012-02-11 07:44:33 UTC (rev 89809)
+++ trunk/dports/tex/texlive-latex/Portfile 2012-02-11 08:55:39 UTC (rev 89810)
@@ -45,7 +45,7 @@
# Deactivate texlive-context to avoid conflicts on mft from the
# 2009->2010 update
if {![catch {set vers [lindex [registry_active texlive-context] 0]}]
- && [rpm-vercomp [lindex $vers 1] 18549] < 0} {
+ && [vercmp [lindex $vers 1] 18549] < 0} {
set deactivate_proc registry_deactivate_composite
if {[info commands registry_deactivate_composite] == {}} {
set deactivate_proc registry_deactivate
Modified: trunk/dports/tex/texlive-latex-recommended/Portfile
===================================================================
--- trunk/dports/tex/texlive-latex-recommended/Portfile 2012-02-11 07:44:33 UTC (rev 89809)
+++ trunk/dports/tex/texlive-latex-recommended/Portfile 2012-02-11 08:55:39 UTC (rev 89810)
@@ -34,7 +34,7 @@
pre-activate {
# fontspec moved from texlive-xetex in TL2011
if {![catch {set vers [lindex [registry_active texlive-xetex] 0]}]
- && [rpm-vercomp [lindex $vers 1] 23080] < 0} {
+ && [vercmp [lindex $vers 1] 23080] < 0} {
set deactivate_proc registry_deactivate_composite
if {[info commands registry_deactivate_composite] == {}} {
set deactivate_proc registry_deactivate
@@ -44,7 +44,7 @@
# textcase moved from texlive-latex-extra in TL2011
if {![catch {set vers [lindex [registry_active texlive-latex-extra] 0]}]
- && [rpm-vercomp [lindex $vers 1] 22931] < 0} {
+ && [vercmp [lindex $vers 1] 22931] < 0} {
set deactivate_proc registry_deactivate_composite
if {[info commands registry_deactivate_composite] == {}} {
set deactivate_proc registry_deactivate
Modified: trunk/dports/tex/texlive-math-extra/Portfile
===================================================================
--- trunk/dports/tex/texlive-math-extra/Portfile 2012-02-11 07:44:33 UTC (rev 89809)
+++ trunk/dports/tex/texlive-math-extra/Portfile 2012-02-11 08:55:39 UTC (rev 89810)
@@ -38,7 +38,7 @@
pre-activate {
# 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} {
+ && [vercmp [lindex $vers 1] 19538] < 0} {
set deactivate_proc registry_deactivate_composite
if {[info commands registry_deactivate_composite] == {}} {
set deactivate_proc registry_deactivate
Modified: trunk/dports/tex/texlive-pictures/Portfile
===================================================================
--- trunk/dports/tex/texlive-pictures/Portfile 2012-02-11 07:44:33 UTC (rev 89809)
+++ trunk/dports/tex/texlive-pictures/Portfile 2012-02-11 08:55:39 UTC (rev 89810)
@@ -43,7 +43,7 @@
pre-activate {
if {![catch {set vers [lindex [registry_active texlive-latex-extra] 0]}]
- && [rpm-vercomp [lindex $vers 1] 19538] < 0} {
+ && [vercmp [lindex $vers 1] 19538] < 0} {
set deactivate_proc registry_deactivate_composite
if {[info commands registry_deactivate_composite] == {}} {
set deactivate_proc registry_deactivate
Modified: trunk/dports/textproc/chasen-base/Portfile
===================================================================
--- trunk/dports/textproc/chasen-base/Portfile 2012-02-11 07:44:33 UTC (rev 89809)
+++ trunk/dports/textproc/chasen-base/Portfile 2012-02-11 08:55:39 UTC (rev 89810)
@@ -73,9 +73,9 @@
pre-activate {
if {[file exists ${prefix}/bin/chasen]
&& ![catch {set vers [lindex [registry_active chasen] 0]}]
- && ([rpm-vercomp [lindex $vers 1] 2.4.4] < 0 ||
- [rpm-vercomp [lindex $vers 1] 2.4.4] == 0
- && [rpm-vercomp [lindex $vers 2] 1] < 1)} {
+ && ([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]
}
}
Modified: trunk/dports/textproc/mecab-base/Portfile
===================================================================
--- trunk/dports/textproc/mecab-base/Portfile 2012-02-11 07:44:33 UTC (rev 89809)
+++ trunk/dports/textproc/mecab-base/Portfile 2012-02-11 08:55:39 UTC (rev 89810)
@@ -53,9 +53,9 @@
pre-activate {
if {[file exists ${prefix}/bin/mecab]
&& ![catch {set vers [lindex [registry_active mecab] 0]}]
- && ([rpm-vercomp [lindex $vers 1] 0.98] < 0 ||
- [rpm-vercomp [lindex $vers 1] 0.98] == 0
- && [rpm-vercomp [lindex $vers 2] 1] < 1)} {
+ && ([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]
}
}
Modified: trunk/dports/textproc/pdfjam/Portfile
===================================================================
--- trunk/dports/textproc/pdfjam/Portfile 2012-02-11 07:44:33 UTC (rev 89809)
+++ trunk/dports/textproc/pdfjam/Portfile 2012-02-11 08:55:39 UTC (rev 89810)
@@ -58,7 +58,7 @@
# a conflict.
if {[file exists $prefix/bin/pdfjam]
&& ![catch {set vers [lindex [registry_active texlive-bin-extra] 0]}]
- && [rpm-vercomp [lindex $vers 1] 19536] < 0} {
+ && [vercmp [lindex $vers 1] 19536] < 0} {
set deactivate_proc registry_deactivate_composite
if {[info commands registry_deactivate_composite] == {}} {
set deactivate_proc registry_deactivate
Modified: trunk/dports/x11/pango/Portfile
===================================================================
--- trunk/dports/x11/pango/Portfile 2012-02-11 07:44:33 UTC (rev 89809)
+++ trunk/dports/x11/pango/Portfile 2012-02-11 08:55:39 UTC (rev 89810)
@@ -57,14 +57,14 @@
pre-configure {
set glib_minimum_version 2.24.0
set glib_installed_version [exec ${prefix}/bin/pkg-config glib-2.0 --modversion]
- if {[rpm-vercomp ${glib_installed_version} ${glib_minimum_version}] < 0} {
+ if {[vercmp ${glib_installed_version} ${glib_minimum_version}] < 0} {
ui_error "${name} ${version} requires glib2 ${glib_minimum_version} or later but you have glib2 ${glib_installed_version}."
return -code error "incompatible glib2 version"
}
set cairo_minimum_version 1.7.6
set cairo_installed_version [exec ${prefix}/bin/pkg-config cairo --modversion]
- if {[rpm-vercomp ${cairo_installed_version} ${cairo_minimum_version}] < 0} {
+ if {[vercmp ${cairo_installed_version} ${cairo_minimum_version}] < 0} {
ui_error "${name} ${version} requires cairo ${cairo_minimum_version} or later but you have cairo ${cairo_installed_version}."
return -code error "incompatible cairo version"
}
Modified: trunk/dports/x11/pango-devel/Portfile
===================================================================
--- trunk/dports/x11/pango-devel/Portfile 2012-02-11 07:44:33 UTC (rev 89809)
+++ trunk/dports/x11/pango-devel/Portfile 2012-02-11 08:55:39 UTC (rev 89810)
@@ -58,14 +58,14 @@
pre-configure {
set glib_minimum_version 2.31.0
set glib_installed_version [exec ${prefix}/bin/pkg-config glib-2.0 --modversion]
- if {[rpm-vercomp ${glib_installed_version} ${glib_minimum_version}] < 0} {
+ if {[vercmp ${glib_installed_version} ${glib_minimum_version}] < 0} {
ui_error "${name} ${version} requires glib2 ${glib_minimum_version} or later but you have glib2 ${glib_installed_version}."
return -code error "incompatible glib2 version"
}
set cairo_minimum_version 1.7.6
set cairo_installed_version [exec ${prefix}/bin/pkg-config cairo --modversion]
- if {[rpm-vercomp ${cairo_installed_version} ${cairo_minimum_version}] < 0} {
+ if {[vercmp ${cairo_installed_version} ${cairo_minimum_version}] < 0} {
ui_error "${name} ${version} requires cairo ${cairo_minimum_version} or later but you have cairo ${cairo_installed_version}."
return -code error "incompatible cairo version"
}
Modified: trunk/dports/x11/xinit/Portfile
===================================================================
--- trunk/dports/x11/xinit/Portfile 2012-02-11 07:44:33 UTC (rev 89809)
+++ trunk/dports/x11/xinit/Portfile 2012-02-11 08:55:39 UTC (rev 89810)
@@ -40,7 +40,7 @@
configure.args-append RAWCPP=${configure.cpp}
post-destroot {
- if {${os.platform} == "darwin" && [rpm-vercomp ${os.version} 10.3.0] < 0} {
+ if {${os.platform} == "darwin" && [vercmp ${os.version} 10.3.0] < 0} {
file delete -force ${destroot}/Library/LaunchAgents/org.macports.startx.plist
}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120211/6b17444d/attachment-0001.html>
More information about the macports-changes
mailing list