[104523] trunk/dports/aqua/TOra
ryandesign at macports.org
ryandesign at macports.org
Tue Mar 26 17:35:15 PDT 2013
Revision: 104523
https://trac.macports.org/changeset/104523
Author: ryandesign at macports.org
Date: 2013-03-26 17:35:15 -0700 (Tue, 26 Mar 2013)
Log Message:
-----------
TOra: revbump and apply upstream patch to rebuild with oracle-instantclient 11 which now allows 64-bit builds even on Lion and up (#37880)
Modified Paths:
--------------
trunk/dports/aqua/TOra/Portfile
Added Paths:
-----------
trunk/dports/aqua/TOra/files/patch-cmake-modules-FindOracle.cmake.diff
Modified: trunk/dports/aqua/TOra/Portfile
===================================================================
--- trunk/dports/aqua/TOra/Portfile 2013-03-27 00:33:15 UTC (rev 104522)
+++ trunk/dports/aqua/TOra/Portfile 2013-03-27 00:35:15 UTC (rev 104523)
@@ -6,7 +6,7 @@
name TOra
version 2.1.3
-revision 3
+revision 4
description GUI tool for Oracle, PostgreSQL, and MySQL
long_description Database developer/DBA frontend for various DB servers.
maintainers scribus.info:petr
@@ -27,13 +27,15 @@
# to spot qt4-mac's dependencies' version bumps.
depends_lib port:qscintilla
-patchfiles patch-osx_tools-Info.plist.in.diff
+patchfiles patch-cmake-modules-FindOracle.cmake.diff \
+ patch-osx_tools-Info.plist.in.diff
configure.cmd cmake
configure.pre_args -DCMAKE_INSTALL_PREFIX=${prefix}/tmprelease/
# -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 \
+ -DCMAKE_VERBOSE_MAKEFILE=ON \
-DUSE_PCH=0 \
-Dmacports_prefix=${prefix} \
-DWANT_BUNDLE=1 \
@@ -83,6 +85,7 @@
#
# Oracle
+# Legacy no_oracle variant to be removed after October 2013.
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
@@ -96,10 +99,6 @@
} 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
Added: trunk/dports/aqua/TOra/files/patch-cmake-modules-FindOracle.cmake.diff
===================================================================
--- trunk/dports/aqua/TOra/files/patch-cmake-modules-FindOracle.cmake.diff (rev 0)
+++ trunk/dports/aqua/TOra/files/patch-cmake-modules-FindOracle.cmake.diff 2013-03-27 00:35:15 UTC (rev 104523)
@@ -0,0 +1,105 @@
+http://sourceforge.net/p/tora/bugs/867/
+http://sourceforge.net/p/tora/code/4555/
+http://sourceforge.net/p/tora/code/4561/
+http://sourceforge.net/p/tora/code/4578/
+--- cmake/modules/FindOracle.cmake.orig 2010-09-19 04:27:37.000000000 -0500
++++ cmake/modules/FindOracle.cmake 2013-03-22 20:48:28.000000000 -0500
+@@ -11,7 +11,7 @@
+ #
+ # copyright (c) 2007 Petr Vanek <petr at scribus.info>
+ # copyright (c) 2009 Ivan Brezina <ibre5041 at ibrezina.net>
+-# Redistribution and use is allowed according to the terms of the GPLv2 license.
++# Redistribution and use is allowed according to the terms of the BSD license.
+ #
+
+ SET(ORACLE_FOUND "NO")
+@@ -30,11 +30,6 @@
+ SET(ORACLE_USE_CLNTSH 1)
+ ENDIF (NOT ORACLE_USE_CLNTSH)
+
+- # it looks like it's mandatory on macosx
+- IF (APPLE)
+- SET(ORACLE_USE_OCIEI 1)
+- ENDIF (APPLE)
+-
+ ENDIF( Oracle_FIND_COMPONENTS )
+
+
+@@ -77,6 +72,43 @@
+ SET(FORCE_ERROR 0)
+
+
++# guess OCI version
++# we need it before lib checking because of OS X bugs in instant client (see below)
++IF (NOT DEFINED ORACLE_OCI_VERSION AND ORACLE_INCLUDES)
++ TRY_RUN(OCIVER_TYPE OCIVER_COMPILED
++ ${CMAKE_BINARY_DIR}
++ ${CMAKE_SOURCE_DIR}/cmake/modules/OCIVersion.c
++ CMAKE_FLAGS "-DINCLUDE_DIRECTORIES:STRING=${ORACLE_INCLUDES}"
++ OUTPUT_VARIABLE OCIVER)
++
++ IF (${OCIVER_TYPE} GREATER "110")
++ SET(ORACLE_OCI_VERSION "11G")
++ ELSEIF (${OCIVER_TYPE} EQUAL "102")
++ SET(ORACLE_OCI_VERSION "10G_R2")
++ ELSEIF (${OCIVER_TYPE} EQUAL "101")
++ SET(ORACLE_OCI_VERSION "10G")
++ ELSEIF (${OCIVER_TYPE} EQUAL "91")
++ SET(ORACLE_OCI_VERSION "9")
++ ELSEIF (${OCIVER_TYPE} EQUAL "92")
++ SET(ORACLE_OCI_VERSION "9")
++ ELSEIF (NOT ${OCIVER_TYPE} GREATER "90")
++ SET(ORACLE_OCI_VERSION "8I")
++ ELSE (${OCIVER_TYPE} GREATER "110")
++ SET(ORACLE_OCI_VERSION "10G_R2")
++ ENDIF (${OCIVER_TYPE} GREATER "110")
++
++ MESSAGE(STATUS "Guessed ORACLE_OCI_VERSION value: ${ORACLE_OCI_VERSION} for ${OCIVER_TYPE}")
++
++ IF (APPLE)
++ IF (${OCIVER_TYPE} LESS 110)
++ SET(ORACLE_USE_OCIEI 1)
++ message(STATUS " APPLE requires libociei for instantclient < 11, enforcing ociei")
++ ENDIF ()
++ ENDIF (APPLE)
++
++ENDIF (NOT DEFINED ORACLE_OCI_VERSION AND ORACLE_INCLUDES)
++
++
+ IF (ORACLE_USE_CLNTSH)
+ FIND_LIBRARY(
+ ORACLE_LIBRARY_CLNTSH
+@@ -171,33 +203,6 @@
+ LIST(APPEND ORACLE_INCLUDES ${ORACLE_INCLUDES_XML})
+ ENDIF (ORACLE_INCLUDES_XML AND ORACLE_LIBRARY_XML)
+
+-# guess OCI version
+-IF (NOT DEFINED ORACLE_OCI_VERSION AND ORACLE_INCLUDES)
+- TRY_RUN(OCIVER_TYPE OCIVER_COMPILED
+- ${CMAKE_BINARY_DIR}
+- ${CMAKE_SOURCE_DIR}/cmake/modules/OCIVersion.c
+- CMAKE_FLAGS "-DINCLUDE_DIRECTORIES:STRING=${ORACLE_INCLUDES}"
+- OUTPUT_VARIABLE OCIVER)
+-
+- IF (${OCIVER_TYPE} GREATER "110")
+- SET(ORACLE_OCI_VERSION "11G")
+- ELSEIF (${OCIVER_TYPE} EQUAL "102")
+- SET(ORACLE_OCI_VERSION "10G_R2")
+- ELSEIF (${OCIVER_TYPE} EQUAL "101")
+- SET(ORACLE_OCI_VERSION "10G")
+- ELSEIF (${OCIVER_TYPE} EQUAL "91")
+- SET(ORACLE_OCI_VERSION "9")
+- ELSEIF (${OCIVER_TYPE} EQUAL "92")
+- SET(ORACLE_OCI_VERSION "9")
+- ELSEIF (NOT ${OCIVER_TYPE} GREATER "90")
+- SET(ORACLE_OCI_VERSION "8I")
+- ELSE (${OCIVER_TYPE} GREATER "110")
+- SET(ORACLE_OCI_VERSION "10G_R2")
+- ENDIF (${OCIVER_TYPE} GREATER "110")
+-
+- MESSAGE(STATUS "Guessed ORACLE_OCI_VERSION value: ${ORACLE_OCI_VERSION} for ${OCIVER_TYPE}")
+-ENDIF (NOT DEFINED ORACLE_OCI_VERSION AND ORACLE_INCLUDES)
+-
+ MESSAGE(STATUS "Found Oracle: ${ORACLE_LIBRARIES} (ORACLE_HOME='${ORACLE_HOME}')")
+ MESSAGE(STATUS " includes: ${ORACLE_INCLUDES}")
+ MESSAGE(STATUS "Found XML Oracle: ${ORACLE_INCLUDES_XML} ${ORACLE_LIBRARY_XML}")
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130326/9fe4d1a7/attachment.html>
More information about the macports-changes
mailing list