[73309] trunk/dports/aqua/TOra/Portfile

[ryandesign at macports.org]

Revision: 73309
          http://trac.macports.org/changeset/73309
Author:   ryandesign at macports.org
Date:     2010-11-09 17:36:26 -0800 (Tue, 09 Nov 2010)
Log Message:
-----------
TOra: maintainer update for changes in qt4-mac; see #27229

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

Modified: trunk/dports/aqua/TOra/Portfile
===================================================================
--- trunk/dports/aqua/TOra/Portfile	2010-11-10 01:36:23 UTC (rev 73308)
+++ trunk/dports/aqua/TOra/Portfile	2010-11-10 01:36:26 UTC (rev 73309)
@@ -6,7 +6,7 @@
 
 name                    TOra
 version                 2.1.3
-revision                1
+revision                2
 description             GUI tool for Oracle, PostgreSQL, and MySQL
 long_description        Database developer/DBA frontend for various DB servers.
 maintainers             scribus.info:petr
@@ -25,8 +25,7 @@
 # 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:postgresql83 \
-                        port:qscintilla \
+depends_lib             port:qscintilla \
                         port:oracle-instantclient
 
 patchfiles              patch-osx_tools-Info.plist.in.diff
@@ -36,31 +35,63 @@
 # -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 \
+                        -DUSE_PCH=0 \
                         -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 \
                         -DWANT_BUNDLE=1 \
-                        -DWANT_BUNDLE_STANDALONE=1 \
+                        -DWANT_BUNDLE_STANDALONE=0 \
                         -DWANT_RPM=0 \
                         -DWANT_INTERNAL_QSCINTILLA=0 \
                         -DENABLE_DB2=0 \
                         ${qt_cmake_defines} .
 
-# qscintilla is not universal
-universal_variant       no
 
-variant no_pgsql description {Disable native PostgreSQL support} {
-    depends_lib-delete          port:postgresql83
+#
+# Postgresql - it should follow qt4-mac variants for this DB
+variant psql83 conflicts psql84 psql90 psql91 \
+description {Enable Postgre SQL Driver version 8.3} {}
+
+variant psql84 conflicts psql83 psql90 psql91 \
+description {Enable Postgre SQL Driver version 8.4} {}
+
+variant psql90 conflicts psql83 psql84 psql91 \
+description {Enable Postgre SQL Driver version 9.0} {}
+
+variant psql91 conflicts psql83 psql84 psql90 \
+description {Enable Postgre SQL Driver version 9.1} {}
+
+set psql_version ""
+if {[variant_isset psql83]} {
+    set psql_version "83"
+} elseif {[variant_isset psql84]} {
+    set psql_version "84"
+} elseif {[variant_isset psql90]} {
+    set psql_version "90"
+} elseif {[variant_isset psql91]} {
+    set psql_version "91"
+}
+
+if {${psql_version} != ""} {
+    depends_lib-append port:postgresql${psql_version}
+    lunshift header_path ${prefix}/include/postgresql${psql_version}
+    lunshift library_path ${prefix}/lib/postgresql${psql_version}
+    configure.pre_args-append   -DENABLE_PGSQL=1 \
+                                -DPOSTGRESQL_PATH_INCLUDES=${prefix}/include/postgresql${psql_version} \
+                                -DPOSTGRESQL_PATH_LIB=${prefix}/lib/postgresql${psql_version}
+} else {
     configure.pre_args-append   -DENABLE_PGSQL=0
 }
 
+#
+# Oracle
 variant no_oracle description {Disable support for Oracle} {
     depends_lib-delete          port:oracle-instantclient
     configure.pre_args-append   -DENABLE_ORACLE=0
 }
 
+#
+# Debug
 variant debug description {provide a debug build in case of difficulties} {
     configure.pre_args-append   -DWANT_DEBUG=1
 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20101109/f2566fb0/attachment.html>