[39289] trunk/dports/databases/oracle-instantclient/Portfile

[ryandesign at macports.org]

Revision: 39289
          http://trac.macosforge.org/projects/macports/changeset/39289
Author:   ryandesign at macports.org
Date:     2008-08-15 16:16:25 -0700 (Fri, 15 Aug 2008)
Log Message:
-----------
oracle-instantclient: warn the user that they may have to download the distfiles manually; closes #15951

Modified Paths:
--------------
    trunk/dports/databases/oracle-instantclient/Portfile

Modified: trunk/dports/databases/oracle-instantclient/Portfile
===================================================================
--- trunk/dports/databases/oracle-instantclient/Portfile	2008-08-15 23:02:50 UTC (rev 39288)
+++ trunk/dports/databases/oracle-instantclient/Portfile	2008-08-15 23:16:25 UTC (rev 39289)
@@ -41,12 +41,6 @@
 }
 
 platform i386 {
-    pre-fetch {
-        if {${os.major} < 9} {
-            return -code error "${name} on Intel requires Mac OS X 10.5 or greater."
-        }
-    }
-    
     # This is really awful. Oracle provides different version numbers of the
     # Instant Client library for PowerPC and Intel. You should not change the
     # version number of a port conditionally like this. But I don't know how \
@@ -77,6 +71,17 @@
     livecheck.url       ${homepage}htdocs/intel_macsoft.html
 }
 
+pre-fetch {
+    if {[variant_isset i386]} {
+        if {${os.major} < 9} {
+            return -code error "${name} on Intel requires Mac OS X 10.5 or greater."
+        }
+    }
+    if {![file exists ${distpath}/[lindex ${distfiles} 0]] || ![file exists ${distpath}/[lindex ${distfiles} 1]]} {
+        ui_warn "MacPorts may not be able to download the necessary distfiles for ${name}. If you get a checksum error, please download [join ${distfiles} " and "] manually from ${livecheck.url} and place them in ${distpath}"
+    }
+}
+
 use_configure           no
 universal_variant       no
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080815/7aa5fac2/attachment.html