[67615] trunk/dports/aqua/TOra

[ryandesign at macports.org]

Revision: 67615
          http://trac.macports.org/changeset/67615
Author:   ryandesign at macports.org
Date:     2010-05-14 23:58:53 -0700 (Fri, 14 May 2010)
Log Message:
-----------
TOra: try to fix linking with MacPorts libraries; see #23892

Modified Paths:
--------------
    trunk/dports/aqua/TOra/Portfile

Added Paths:
-----------
    trunk/dports/aqua/TOra/files/
    trunk/dports/aqua/TOra/files/patch-osx_tools-Info.plist.in.diff

Modified: trunk/dports/aqua/TOra/Portfile
===================================================================
--- trunk/dports/aqua/TOra/Portfile	2010-05-15 06:50:36 UTC (rev 67614)
+++ trunk/dports/aqua/TOra/Portfile	2010-05-15 06:58:53 UTC (rev 67615)
@@ -5,6 +5,7 @@
 
 name                    TOra
 version                 2.1.1
+revision                1
 description             GUI tool for Oracle, PostgreSQL, and MySQL
 long_description        Database developer/DBA frontend for various DB servers.
 maintainers             scribus.info:petr
@@ -28,9 +29,15 @@
                         port:qscintilla \
                         port:oracle-instantclient
 
+patchfiles              patch-osx_tools-Info.plist.in.diff
+
 configure.cmd           cmake
 configure.pre_args      -DCMAKE_INSTALL_PREFIX=${prefix}/tmprelease/
-configure.args          -DORACLE_PATH_INCLUDES=${prefix}/lib/oracle/sdk/include \
+# -Dmacports_prefix is there due to the patch for the Info.plist file
+configure.args          -DCMAKE_LIBRARY_PATH=${prefix}/lib \
+                        -DCMAKE_INCLUDE_PATH=${prefix}/include \
+                        -Dmacports_prefix=${prefix} \
+                        -DORACLE_PATH_INCLUDES=${prefix}/lib/oracle/sdk/include \
                         -DORACLE_PATH_LIB=${prefix}/lib/oracle \
                         -DPOSTGRESQL_PATH_INCLUDES=${prefix}/include/postgresql83 \
                         -DPOSTGRESQL_PATH_LIB=${prefix}/lib/postgresql83 \

Added: trunk/dports/aqua/TOra/files/patch-osx_tools-Info.plist.in.diff
===================================================================
--- trunk/dports/aqua/TOra/files/patch-osx_tools-Info.plist.in.diff	                        (rev 0)
+++ trunk/dports/aqua/TOra/files/patch-osx_tools-Info.plist.in.diff	2010-05-15 06:58:53 UTC (rev 67615)
@@ -0,0 +1,13 @@
+Index: osx_tools/Info.plist.in
+===================================================================
+--- osx_tools/Info.plist.in	(revision 3456)
++++ osx_tools/Info.plist.in	(working copy)
+@@ -5,7 +5,7 @@
+ 	<key>LSEnvironment</key>
+ 	<dict>
+ 		<key>DYLD_LIBRARY_PATH</key>
+-		<string>${EXE_NAME}.app/Contents/MacOS:${EXE_NAME}.app/Contents/Libraries</string>
++		<string>${EXE_NAME}.app/Contents/MacOS:${EXE_NAME}.app/Contents/Libraries:${macports_prefix}/lib/oracle</string>
+ 	</dict>
+ 	<key>CFBundleDevelopmentRegion</key>
+ 	<string>English</string>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100514/b4858a0f/attachment.html>