Ticket #36260: TOra.diff

Portfile

@@ -6 +6 @@
 
 name                    TOra
 version                 2.1.3
-revision                2
+revision                3
 description             GUI tool for Oracle, PostgreSQL, and MySQL
 long_description        Database developer/DBA frontend for various DB servers.
 maintainers             scribus.info:petr
@@ -25 +25 @@
 # WARNING: postgresql83 is there due to qt4-mac's dependency on it.
 # It's dangerous to mix library versions in one binary. It's required
 # to spot qt4-mac's dependencies' version bumps.
-depends_lib             port:qscintilla \
-                        port:oracle-instantclient
+depends_lib             port:qscintilla
 
 patchfiles              patch-osx_tools-Info.plist.in.diff
 
@@ -37 +36 @@
                         -DCMAKE_INCLUDE_PATH=${prefix}/include \
                         -DUSE_PCH=0 \
                         -Dmacports_prefix=${prefix} \
-                        -DORACLE_PATH_INCLUDES=${prefix}/lib/oracle/sdk/include \
-                        -DORACLE_PATH_LIB=${prefix}/lib/oracle \
                         -DWANT_BUNDLE=1 \
                         -DWANT_BUNDLE_STANDALONE=0 \
                         -DWANT_RPM=0 \
                         -DWANT_INTERNAL_QSCINTILLA=0 \
                         -DENABLE_DB2=0 \
+                        -DENABLE_ORACLE=0 \
                         ${qt_cmake_defines} .
 
 
@@ -85 +83 @@
 
 #
 # Oracle
-variant no_oracle description {Disable support for Oracle} {
-    depends_lib-delete          port:oracle-instantclient
-    configure.pre_args-append   -DENABLE_ORACLE=0
+variant no_oracle conflicts oracle description {Legacy compatibility variant} {}
+variant oracle conflicts no_oracle description {Enable support for Oracle} {
+    depends_lib-append          port:oracle-instantclient
+    configure.args-delete       -DENABLE_ORACLE=0
+    configure.args-append       -DENABLE_ORACLE=1 \
+                                -DORACLE_PATH_INCLUDES=${prefix}/lib/oracle/sdk/include \
+                                -DORACLE_PATH_LIB=${prefix}/lib/oracle \
 }
+if {[variant_isset no_oracle]} {
+    default_variants -oracle
+} else {
+    default_variants +oracle
+}
+if {[variant_isset oracle] && ${os.platform} == "darwin" && ${os.major} > 10} {
+    # oracle-instantclient 10.2.0.4.0 crashes in 64-bit mode on Lion and up.
+    supported_archs i386
+}
 
 #
 # Debug