Revision

39630

Author

ryandesign@macports.org

Date

2008-08-26 23:02:33 -0700 (Tue, 26 Aug 2008)

Log Message

pure, pure-devel: refine text of llvm version check message, and make it show up pre-configure, not pre-fetch, since this isn't a fatal error and the user might want to pre-fetch ports to be installed later

Modified Paths

• trunk/dports/lang/pure/Portfile
• trunk/dports/lang/pure-devel/Portfile

Diff

--- trunk/dports/lang/pure/Portfile	2008-08-27 05:56:29 UTC (rev 39629)
+++ trunk/dports/lang/pure/Portfile	2008-08-27 06:02:33 UTC (rev 39630)
@@ -35,11 +35,11 @@
     path:${prefix}/bin/llvm-config:llvm-devel \
     port:readline
 
-pre-fetch {
+pre-configure {
     set llvm_minimum_version 2.4
     set llvm_installed_version [exec llvm-config --version]
     if {[rpm-vercomp ${llvm_installed_version} ${llvm_minimum_version}] < 0} {
-        return -code error "${name} ${version} requires llvm ${llvm_minimum_version} or later but you have llvm ${llvm_installed_version}. Please deactivate llvm and install llvm-devel and try again."
+        return -code error "pure ${version} requires llvm ${llvm_minimum_version} or later but you have llvm ${llvm_installed_version}. Please deactivate llvm and install llvm-devel, then try again."
     }
 }
 

--- trunk/dports/lang/pure-devel/Portfile	2008-08-27 05:56:29 UTC (rev 39629)
+++ trunk/dports/lang/pure-devel/Portfile	2008-08-27 06:02:33 UTC (rev 39630)
@@ -42,11 +42,11 @@
     path:${prefix}/bin/llvm-config:llvm-devel \
     port:readline
 
-pre-fetch {
+pre-configure {
     set llvm_minimum_version 2.4
     set llvm_installed_version [exec llvm-config --version]
     if {[rpm-vercomp ${llvm_installed_version} ${llvm_minimum_version}] < 0} {
-        return -code error "${name} ${version} requires llvm ${llvm_minimum_version} or later but you have llvm ${llvm_installed_version}. Please deactivate llvm and install llvm-devel and try again."
+        return -code error "pure ${version} requires llvm ${llvm_minimum_version} or later but you have llvm ${llvm_installed_version}. Please deactivate llvm and install llvm-devel, then try again."
     }
 }