[104524] trunk/dports/databases/soci

[ryandesign at macports.org]

Revision: 104524
          https://trac.macports.org/changeset/104524
Author:   ryandesign at macports.org
Date:     2013-03-26 17:37:39 -0700 (Tue, 26 Mar 2013)
Log Message:
-----------
soci: update to 3.2.0 which now builds with oracle-instantclient 11 which now allows 64-bit builds even on Lion and up (#37880); fix livecheck

Modified Paths:
--------------
    trunk/dports/databases/soci/Portfile

Removed Paths:
-------------
    trunk/dports/databases/soci/files/patch-cmake-modules-FindOracle.cmake.diff

Modified: trunk/dports/databases/soci/Portfile
===================================================================
--- trunk/dports/databases/soci/Portfile	2013-03-27 00:35:15 UTC (rev 104523)
+++ trunk/dports/databases/soci/Portfile	2013-03-27 00:37:39 UTC (rev 104524)
@@ -5,7 +5,7 @@
 PortGroup                   cmake 1.0
 
 name                        soci
-version                     3.1.0
+version                     3.2.0
 license                     Boost-1
 categories                  databases devel
 platforms                   darwin
@@ -22,14 +22,10 @@
 
 homepage                    http://soci.sourceforge.net/
 master_sites                sourceforge:project/soci/soci/soci-${version}
-use_zip                     yes
 
-checksums                   rmd160  dd57c0ae4a38f2fcebcfe857f5edc5a16d1e3b34 \
-                            sha256  f7004cb2ac040b1fa6ce3cf7ea36e9fe5cdff92c6444ffd764ab2279d5f72449
+checksums                   rmd160  9dd5f9ac9d5364606f4fc7bc988f6f700a965361 \
+                            sha256  5ee765fdb65e50f2f5109b484417506d5550ba69b51f9a15bdce0f471e550e32
 
-patchfiles                  patch-cmake-modules-FindOracle.cmake.diff \
-                            patch-core-type-holder.h.diff
-
 configure.args-append       -DWITH_BOOST=OFF \
                             -DWITH_MYSQL=OFF \
                             -DWITH_ODBC=OFF \
@@ -68,10 +64,6 @@
     configure.args-delete       -DWITH_ORACLE=OFF
     configure.env-append        ORACLE_HOME=${prefix}/lib/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
-}
 
 variant postgresql84 conflicts postgresql90 \
         description {Build PostgreSQL 8.4 backend, using MacPorts postgresql84 port} {
@@ -95,3 +87,5 @@
     depends_lib-append          port:sqlite3
     configure.args-delete       -DWITH_SQLITE3=OFF
 }
+
+livecheck.regex             /${name}-(\[0-9.\]+)${extract.suffix}

Deleted: trunk/dports/databases/soci/files/patch-cmake-modules-FindOracle.cmake.diff
===================================================================
--- trunk/dports/databases/soci/files/patch-cmake-modules-FindOracle.cmake.diff	2013-03-27 00:35:15 UTC (rev 104523)
+++ trunk/dports/databases/soci/files/patch-cmake-modules-FindOracle.cmake.diff	2013-03-27 00:37:39 UTC (rev 104524)
@@ -1,10 +0,0 @@
---- cmake/modules/FindOracle.cmake.orig	2011-09-24 17:53:43.000000000 -0500
-+++ cmake/modules/FindOracle.cmake	2013-02-28 06:21:34.000000000 -0600
-@@ -40,6 +40,7 @@
-   set(ORACLE_OCCI_NAMES libocci occi oraocci10 oraocci11)
- 
-   set(ORACLE_LIB_DIR 
-+    ${ORACLE_HOME}
-     ${ORACLE_HOME}/lib
-     ${ORACLE_HOME}/OCI/lib/MSVC) # Oracle XE on Windows
- 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130326/6a678cce/attachment.html>