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

[ryandesign at macports.org]

Revision: 57022
          http://trac.macports.org/changeset/57022
Author:   ryandesign at macports.org
Date:     2009-09-04 14:16:12 -0700 (Fri, 04 Sep 2009)
Log Message:
-----------
oracle-instantclient: Create the libclntsh.dylib symlink after the merging, not before, because merge seems to convert the symlink into a copy of the original file. Also create a libocci.dylib symlink (#20010).

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

Modified: trunk/dports/databases/oracle-instantclient/Portfile
===================================================================
--- trunk/dports/databases/oracle-instantclient/Portfile	2009-09-04 21:06:18 UTC (rev 57021)
+++ trunk/dports/databases/oracle-instantclient/Portfile	2009-09-04 21:16:12 UTC (rev 57022)
@@ -4,7 +4,7 @@
 
 name                    oracle-instantclient
 version                 10.2.0.4.0
-revision                3
+revision                4
 set intel_version       ${version}
 set powerpc_version     10.1.0.3
 categories              databases
@@ -163,9 +163,6 @@
                     [glob -directory ${my_worksrcpath} *.jar] \
                     ${my_destroot}${lib_dir}
                 
-                # php5 +oracle complains without this symlink.
-                ln -s libclntsh.dylib.10.1 ${my_destroot}${lib_dir}/libclntsh.dylib
-                
                 # You would think the includes should go in ${prefix}/include/oracle, but
                 # the instantclient layout wants it in ${prefix}/lib/oracle/sdk/include
                 xinstall -d ${my_destroot}${lib_dir}/sdk
@@ -173,7 +170,14 @@
             }
         }
     }
+    
     merge ${workpath}/pre-dest
+    
+    # php5-oracle complains without a libclntsh.dylib symlink.
+    ln -s libclntsh.dylib.10.1 ${destroot}${lib_dir}/libclntsh.dylib
+    
+    # Add a libocci.dylib symlink too for good measure.
+    ln -s libocci.dylib.10.1 ${destroot}${lib_dir}/libocci.dylib
 }
 
 post-activate {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090904/ff95988f/attachment.html>