- Update to 3.1.0

PR:             ports/175735
Submitted by:   avg

4 files changed, 61 insertions, 0 deletions

diff --git a/databases/soci/files/patch-CMakeLists.txt b/databases/soci/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..cfd731c1cc4d
--- /dev/null
+++ b/databases/soci/files/patch-CMakeLists.txt
@@ -0,0 +1,11 @@
+--- CMakeLists.txt.orig	2012-06-19 19:38:59.955809070 +0300
++++ CMakeLists.txt	2012-06-19 19:41:10.731806799 +0300
+@@ -68,7 +68,7 @@ include(SociDependencies)
+ # Installation
+ #################################################################################
+ 
+-if(APPLE OR CMAKE_SIZEOF_VOID_P EQUAL 4)
++if(APPLE OR CMAKE_SIZEOF_VOID_P EQUAL 4 OR CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
+   set(SOCI_LIBDIR "lib")
+ else()
+   set(SOCI_LIBDIR "lib64")
diff --git a/databases/soci/files/patch-backends_postgresql_statement.cpp b/databases/soci/files/patch-backends_postgresql_statement.cpp
new file mode 100644
index 000000000000..e01a123475db
--- /dev/null
+++ b/databases/soci/files/patch-backends_postgresql_statement.cpp
@@ -0,0 +1,14 @@
+--- backends/postgresql/statement.cpp.orig	2012-06-19 19:22:42.029810018 +0300
++++ backends/postgresql/statement.cpp	2012-06-19 19:23:24.256806727 +0300
+@@ -445,7 +445,11 @@ long long postgresql_statement_backend::
+ {
+     const char * resultStr = PQcmdTuples(result_);
+     char * end;
++#ifdef __FreeBSD__
++    long long result = strtoq(resultStr, &end, 0);
++#else
+     long long result = strtoll(resultStr, &end, 0);
++#endif
+     if (end != resultStr)
+     {
+         return result;
diff --git a/databases/soci/files/patch-backends_sqlite3_standard-into-type.cpp b/databases/soci/files/patch-backends_sqlite3_standard-into-type.cpp
new file mode 100644
index 000000000000..90d96596d731
--- /dev/null
+++ b/databases/soci/files/patch-backends_sqlite3_standard-into-type.cpp
@@ -0,0 +1,26 @@
+--- backends/sqlite3/standard-into-type.cpp.orig	2012-06-19 19:12:10.168809305 +0300
++++ backends/sqlite3/standard-into-type.cpp	2012-06-19 19:22:12.580359214 +0300
+@@ -113,7 +113,11 @@ void sqlite3_standard_into_type_backend:
+         case x_long_long:
+             {
+                 long long* dest = static_cast<long long*>(data_);
++#ifdef __FreeBSD__
++                *dest = strtoq(buf, NULL, 10);
++#else
+                 *dest = strtoll(buf, NULL, 10);
++#endif
+             }
+             break;
+         case x_unsigned_long_long:
+@@ -142,7 +146,11 @@ void sqlite3_standard_into_type_backend:
+ 
+                 rowid *rid = static_cast<rowid *>(data_);
+                 sqlite3_rowid_backend *rbe = static_cast<sqlite3_rowid_backend *>(rid->get_backend());
++#ifdef __FreeBSD__
++                long long val = strtoq(buf, NULL, 10);
++#else
+                 long long val = strtoll(buf, NULL, 10);
++#endif
+                 rbe->value_ = static_cast<unsigned long>(val);
+             }
+             break;
diff --git a/databases/soci/files/patch-cmake_SociBackend.cmake b/databases/soci/files/patch-cmake_SociBackend.cmake
new file mode 100644
index 000000000000..00738a2e1c42
--- /dev/null
+++ b/databases/soci/files/patch-cmake_SociBackend.cmake
@@ -0,0 +1,10 @@
+--- cmake/SociBackend.cmake.orig	2012-06-19 19:07:03.554808441 +0300
++++ cmake/SociBackend.cmake	2012-06-19 19:07:19.839807427 +0300
+@@ -61,6 +61,7 @@ macro(soci_backend NAME)
+       string(TOUPPER "${dep}" DEPU)
+       list(APPEND THIS_BACKEND_DEPENDS_INCLUDE_DIRS ${${DEPU}_INCLUDE_DIR})
+       list(APPEND THIS_BACKEND_DEPENDS_INCLUDE_DIRS ${${DEPU}_INCLUDE_DIRS})
++      list(APPEND THIS_BACKEND_DEPENDS_INCLUDE_DIRS ${${DEPU}_INCLUDE_DIRECTORIES})
+       list(APPEND THIS_BACKEND_DEPENDS_LIBRARIES ${${DEPU}_LIBRARIES})
+       list(APPEND THIS_BACKEND_DEPENDS_DEFS -DHAVE_${DEPU}=1)
+     endif()