most recent changes, diff for oracle-instantclient

Index: databases/oracle-instantclient/Portfile
--- databases/oracle-instantclient/Portfile (revision 36864)
+++ databases/oracle-instantclient/Portfile (revision 36865)
@@ -40,7 +40,14 @@
}

platform i386 {
+ pre-fetch {
+ if {${os.major} < 9} {
+ return -code error "${name} on Intel requires Mac OS X 10.5 or greater."
+ }
+ }
+
version 10.2.0.4.0
+ revision 1
worksrcdir instantclient_[join [lrange [split ${version} .] 0 1] _]
set weird_prefix /scratch/plebld/208

@@ -74,18 +81,16 @@
# Annoyingly, I can't do that for the Intel version right now because
# install_name_tool says "malformed object (unknown load command 8)" (or 7).

- if {![variant_isset i386]} {
- # For each dylib in the distribution, change the directory of its own
- # "soname" to our ${lib_dir}.
- foreach lib [glob -directory ${worksrcpath} *.dylib*] {
- system "install_name_tool -id ${lib_dir}/[strsed ${lib} /^.*\\///] ${lib}"
-
- # Then for each dependent dylib with a weird path that this dylib
- # references, fix the reference to use our ${lib_dir}.
- foreach dep [exec otool -L ${lib}] {
- if [string match "${weird_prefix}/*" ${dep}] {
- system "install_name_tool -change ${dep} ${lib_dir}/[strsed ${dep} /^.*\\///] ${lib}"
- }
+ # For each dylib in the distribution, change the directory of its own
+ # "soname" to our ${lib_dir}.
+ foreach lib [glob -directory ${worksrcpath} *.dylib*] {
+ system "install_name_tool -id ${lib_dir}/[strsed ${lib} /^.*\\///] ${lib}"
+
+ # Then for each dependent dylib with a weird path that this dylib
+ # references, fix the reference to use our ${lib_dir}.
+ foreach dep [exec otool -L ${lib}] {
+ if [string match "${weird_prefix}/*" ${dep}] {
+ system "install_name_tool -change ${dep} ${lib_dir}/[strsed ${dep} /^.*\\///] ${lib}"
}
}
}