[103524] trunk/dports/databases

[ryandesign at macports.org]

Revision: 103524
          https://trac.macports.org/changeset/103524
Author:   ryandesign at macports.org
Date:     2013-02-28 04:37:20 -0800 (Thu, 28 Feb 2013)
Log Message:
-----------
soci: new port, version 3.1.0, based on soci-devel port; fix build failure with clang using upstream patch (#36265)

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

Added Paths:
-----------
    trunk/dports/databases/soci/
    trunk/dports/databases/soci/files/patch-cmake-modules-FindOracle.cmake.diff
    trunk/dports/databases/soci/files/patch-core-type-holder.h.diff

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

Modified: trunk/dports/databases/soci/Portfile
===================================================================
--- trunk/dports/databases/soci-devel/Portfile	2013-02-28 12:25:41 UTC (rev 103522)
+++ trunk/dports/databases/soci/Portfile	2013-02-28 12:37:20 UTC (rev 103524)
@@ -4,9 +4,8 @@
 PortSystem                  1.0
 PortGroup                   cmake 1.0
 
-name                        soci-devel
-version                     20110925
-revision                    2
+name                        soci
+version                     3.1.0
 license                     Boost-1
 categories                  databases devel
 platforms                   darwin
@@ -22,15 +21,15 @@
                             distracting, SOCI can be a good alternative.
 
 homepage                    http://soci.sourceforge.net/
+master_sites                sourceforge:project/soci/soci/soci-${version}
+use_zip                     yes
 
-fetch.type                  git
-git.url                     git://git.code.sf.net/p/soci/code-0
-git.branch                  b08381512115ac4422f16aaf4a55896633040dee
+checksums                   rmd160  dd57c0ae4a38f2fcebcfe857f5edc5a16d1e3b34 \
+                            sha256  f7004cb2ac040b1fa6ce3cf7ea36e9fe5cdff92c6444ffd764ab2279d5f72449
 
-patchfiles                  patch-src-cmake-modules-FindOracle.cmake.diff
+patchfiles                  patch-cmake-modules-FindOracle.cmake.diff \
+                            patch-core-type-holder.h.diff
 
-configure.args-append       ./src
-
 configure.args-append       -DWITH_BOOST=OFF \
                             -DWITH_MYSQL=OFF \
                             -DWITH_ODBC=OFF \

Copied: trunk/dports/databases/soci/files/patch-cmake-modules-FindOracle.cmake.diff (from rev 103522, trunk/dports/databases/soci-devel/files/patch-src-cmake-modules-FindOracle.cmake.diff)
===================================================================
--- trunk/dports/databases/soci/files/patch-cmake-modules-FindOracle.cmake.diff	                        (rev 0)
+++ trunk/dports/databases/soci/files/patch-cmake-modules-FindOracle.cmake.diff	2013-02-28 12:37:20 UTC (rev 103524)
@@ -0,0 +1,10 @@
+--- 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
+ 

Added: trunk/dports/databases/soci/files/patch-core-type-holder.h.diff
===================================================================
--- trunk/dports/databases/soci/files/patch-core-type-holder.h.diff	                        (rev 0)
+++ trunk/dports/databases/soci/files/patch-core-type-holder.h.diff	2013-02-28 12:37:20 UTC (rev 103524)
@@ -0,0 +1,12 @@
+https://sourceforge.net/p/soci/code-0/ci/20b3a6a09d9129ccda82023a367ef6ae94a6e51e/
+--- core/type-holder.h.orig
++++ core/type-holder.h
+@@ -33,7 +33,7 @@
+         type_holder<T>* p = dynamic_cast<type_holder<T> *>(this);
+         if (p)
+         {
+-            return p->value<T>();
++            return p->template value<T>();
+         }
+         else
+         {

Deleted: trunk/dports/databases/soci/files/patch-src-cmake-modules-FindOracle.cmake.diff
===================================================================
--- trunk/dports/databases/soci-devel/files/patch-src-cmake-modules-FindOracle.cmake.diff	2013-02-28 12:25:41 UTC (rev 103522)
+++ trunk/dports/databases/soci/files/patch-src-cmake-modules-FindOracle.cmake.diff	2013-02-28 12:37:20 UTC (rev 103524)
@@ -1,10 +0,0 @@
---- src/cmake/modules/FindOracle.cmake.orig	2011-03-30 15:52:46.000000000 +0200
-+++ src/cmake/modules/FindOracle.cmake	2011-03-30 15:53:48.000000000 +0200
-@@ -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/20130228/853fc074/attachment.html>