From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Jan 31 15:10:01 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id AFCDDB7E for ; Thu, 31 Jan 2013 15:10:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id 93651D2F for ; Thu, 31 Jan 2013 15:10:01 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.6/8.14.6) with ESMTP id r0VFA1mp048217 for ; Thu, 31 Jan 2013 15:10:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.6/8.14.6/Submit) id r0VFA13Y048216; Thu, 31 Jan 2013 15:10:01 GMT (envelope-from gnats) Resent-Date: Thu, 31 Jan 2013 15:10:01 GMT Resent-Message-Id: <201301311510.r0VFA13Y048216@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Andriy Gapon Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id A9724B4B; Thu, 31 Jan 2013 15:08:11 +0000 (UTC) (envelope-from avg@starpoint.kiev.ua) Received: from citadel.icyb.net.ua (citadel.icyb.net.ua [212.40.38.140]) by mx1.freebsd.org (Postfix) with ESMTP id 8003BD0D; Thu, 31 Jan 2013 15:08:09 +0000 (UTC) Received: from odyssey.starpoint.kiev.ua (alpha-e.starpoint.kiev.ua [212.40.38.101]) by citadel.icyb.net.ua (8.8.8p3/ICyb-2.3exp) with ESMTP id RAA09675; Thu, 31 Jan 2013 17:08:08 +0200 (EET) (envelope-from avg@starpoint.kiev.ua) Received: from odyssey.starpoint.kiev.ua (localhost [127.0.0.1]) by odyssey.starpoint.kiev.ua (8.14.5/8.14.5) with ESMTP id r0VF88jj010730; Thu, 31 Jan 2013 17:08:08 +0200 (EET) (envelope-from avg@odyssey.starpoint.kiev.ua) Received: (from root@localhost) by odyssey.starpoint.kiev.ua (8.14.5/8.14.5/Submit) id r0VF87Pi010729; Thu, 31 Jan 2013 17:08:07 +0200 (EET) (envelope-from avg) Message-Id: <201301311508.r0VF87Pi010729@odyssey.starpoint.kiev.ua> Date: Thu, 31 Jan 2013 17:08:07 +0200 (EET) From: Andriy Gapon To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.113 Subject: ports/175735: [PATCH] databases/soci: update to 3.1.0 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 31 Jan 2013 15:10:01 -0000 >Number: 175735 >Category: ports >Synopsis: [PATCH] databases/soci: update to 3.1.0 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Thu Jan 31 15:10:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Andriy Gapon >Release: FreeBSD 10.0-CURRENT amd64 >Organization: >Environment: System: FreeBSD 10.0-CURRENT >Description: - Update to 3.1.0 Added file(s): - files/patch-CMakeLists.txt - files/patch-backends_postgresql_statement.cpp - files/patch-backends_sqlite3_standard-into-type.cpp - files/patch-cmake_SociBackend.cmake Port maintainer (jlaffaye@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.99_6 (mode: update, diff: suffix) >How-To-Repeat: >Fix: --- soci-3.1.0.patch begins here --- diff -ruN --exclude=CVS ../soci.orig/Makefile ./Makefile --- ../soci.orig/Makefile 2013-01-06 23:46:47.000000000 +0200 +++ ./Makefile 2013-01-31 17:06:32.951215570 +0200 @@ -2,8 +2,7 @@ # $FreeBSD: ports/databases/soci/Makefile,v 1.6 2013/01/06 21:46:47 svnexp Exp $ PORTNAME= soci -PORTVERSION= 3.0.0 -PORTREVISION= 1 +PORTVERSION= 3.1.0 CATEGORIES= databases MASTER_SITES= SF MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} @@ -11,45 +10,79 @@ MAINTAINER= jlaffaye@FreeBSD.org COMMENT= The C++ Database Access Library -LICENSE= MIT +LICENSE= BSL LICENSE_FILE= ${WRKSRC}/LICENSE_1_0.txt +USE_ZIP= yes +USE_CMAKE= yes +CMAKE_ARGS+= -DWITH_ORACLE:BOOL=OFF MAKE_JOBS_SAFE= yes USE_LDCONFIG= yes -USE_TCL_BUILD= 85 -HAS_CONFIGURE= yes -CONFIGURE_ARGS= --include-prefix=${PREFIX}/include/soci \ - --lib-prefix=${PREFIX}/lib -ALL_TARGET= build_libs + SUB_FILES= pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message -OPTIONS_DEFINE= MYSQL PGSQL -OPTIONS_DEFAULT= MYSQL PGSQL +OPTIONS_DEFINE= MYSQL PGSQL SQLITE ODBC BOOST +BOOST_DESC= Enable support for additional types using Boost +OPTIONS_SINGLE= ODBCDRV +ODBCDRV_DESC= ODBC driver to use +OPTIONS_SINGLE_ODBCDRV= IODBC UODBC +IODBC_DESC= use iODBC driver +UODBC_DESC= use unixODBC driver +OPTIONS_DEFAULT=MYSQL PGSQL SQLITE ODBC IODBC BOOST .include .if ${PORT_OPTIONS:MMYSQL} USE_MYSQL= yes PLIST_SUB+= MYSQL="" -CONFIGURE_ARGS+=--mysql-include=${LOCALBASE}/include/mysql \ - --mysql-lib=${LOCALBASE}/lib/mysql +CMAKE_ARGS+= -DWITH_MYSQL:BOOL=ON .else PLIST_SUB+= MYSQL="@comment " +CMAKE_ARGS+= -DWITH_MYSQL:BOOL=OFF .endif .if ${PORT_OPTIONS:MPGSQL} USE_PGSQL= yes PLIST_SUB+= PGSQL="" -CONFIGURE_ARGS+=--postgresql-include=${LOCALBASE}/include \ - --postgresql-lib=${LOCALBASE}/lib +CMAKE_ARGS+= -DWITH_POSTGRESQL:BOOL=ON .else PLIST_SUB+= PGSQL="@comment " +CMAKE_ARGS+= -DWITH_POSTGRESQL:BOOL=OFF +.endif + +.if ${PORT_OPTIONS:MSQLITE} +USE_SQLITE= yes +PLIST_SUB+= SQLITE="" +CMAKE_ARGS+= -DWITH_SQLITE3:BOOL=ON +.else +PLIST_SUB+= SQLITE="@comment " +CMAKE_ARGS+= -DWITH_SQLITE3:BOOL=OFF +.endif + +.if ${PORT_OPTIONS:MODBC} +PLIST_SUB+= ODBC="" +CMAKE_ARGS+= -DWITH_ODBC:BOOL=ON +.if ${PORT_OPTIONS:MUODBC} +LIB_DEPENDS+= odbc:${PORTSDIR}/databases/unixODBC +CMAKE_ARGS+= -DODBC_LIBRARY:FILE_PATH=${LOCALBASE}/lib/libodbc.so +.elif ${PORT_OPTIONS:MIODBC} +LIB_DEPENDS+= iodbc:${PORTSDIR}/databases/libiodbc +CMAKE_ARGS+= -DODBC_LIBRARY:FILE_PATH=${LOCALBASE}/lib/libiodbc.so +.endif +.else +PLIST_SUB+= ODBC="@comment " +CMAKE_ARGS+= -DWITH_ODBC:BOOL=OFF .endif -post-patch: - @${REINPLACE_CMD} -e "s|/usr/local|${LOCALBASE}|" ${WRKSRC}/configure - @${REINPLACE_CMD} -e "s/ldconfig/true/" ${WRKSRC}/build/unix/install.tcl +. if ${PORT_OPTIONS:MBOOST} +LIB_DEPENDS+= boost_date_time:${PORTSDIR}/devel/boost-libs +PLIST_SUB+= BOOST="" +CMAKE_ARGS+= -DWITH_BOOST:BOOL=ON +.else +PLIST_SUB+= BOOST="@comment " +CMAKE_ARGS+= -DWITH_BOOST:BOOL=OFF +.endif post-install: @${CAT} ${PKGMESSAGE} diff -ruN --exclude=CVS ../soci.orig/distinfo ./distinfo --- ../soci.orig/distinfo 2011-03-20 14:48:05.000000000 +0200 +++ ./distinfo 2012-06-19 18:11:46.035807000 +0300 @@ -1,2 +1,2 @@ -SHA256 (soci-3.0.0.tar.gz) = 896a79cbf1859971f4887eec8fa9519b17749c930d6901a6aa1701e556d26ece -SIZE (soci-3.0.0.tar.gz) = 195545 +SHA256 (soci-3.1.0.zip) = f7004cb2ac040b1fa6ce3cf7ea36e9fe5cdff92c6444ffd764ab2279d5f72449 +SIZE (soci-3.1.0.zip) = 418596 diff -ruN --exclude=CVS ../soci.orig/files/patch-CMakeLists.txt ./files/patch-CMakeLists.txt --- ../soci.orig/files/patch-CMakeLists.txt 1970-01-01 03:00:00.000000000 +0300 +++ ./files/patch-CMakeLists.txt 2012-06-19 19:41:29.907185000 +0300 @@ -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 -ruN --exclude=CVS ../soci.orig/files/patch-backends_postgresql_statement.cpp ./files/patch-backends_postgresql_statement.cpp --- ../soci.orig/files/patch-backends_postgresql_statement.cpp 1970-01-01 03:00:00.000000000 +0300 +++ ./files/patch-backends_postgresql_statement.cpp 2012-06-19 19:25:44.274806000 +0300 @@ -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 -ruN --exclude=CVS ../soci.orig/files/patch-backends_sqlite3_standard-into-type.cpp ./files/patch-backends_sqlite3_standard-into-type.cpp --- ../soci.orig/files/patch-backends_sqlite3_standard-into-type.cpp 1970-01-01 03:00:00.000000000 +0300 +++ ./files/patch-backends_sqlite3_standard-into-type.cpp 2012-06-19 19:25:41.618806000 +0300 @@ -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(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(data_); + sqlite3_rowid_backend *rbe = static_cast(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(val); + } + break; diff -ruN --exclude=CVS ../soci.orig/files/patch-cmake_SociBackend.cmake ./files/patch-cmake_SociBackend.cmake --- ../soci.orig/files/patch-cmake_SociBackend.cmake 1970-01-01 03:00:00.000000000 +0300 +++ ./files/patch-cmake_SociBackend.cmake 2012-06-19 19:07:23.767806000 +0300 @@ -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() diff -ruN --exclude=CVS ../soci.orig/pkg-plist ./pkg-plist --- ../soci.orig/pkg-plist 2010-09-15 16:27:01.000000000 +0300 +++ ./pkg-plist 2012-06-19 19:48:50.347806000 +0300 @@ -1,16 +1,23 @@ include/soci/backend-loader.h include/soci/blob-exchange.h include/soci/blob.h -include/soci/boost-fusion.h -include/soci/boost-gregorian-date.h -include/soci/boost-optional.h -include/soci/boost-tuple.h +%%BOOST%%include/soci/boost-fusion.h +%%BOOST%%include/soci/boost-gregorian-date.h +%%BOOST%%include/soci/boost-optional.h +%%BOOST%%include/soci/boost-tuple.h include/soci/connection-pool.h +include/soci/empty/soci-empty.h include/soci/error.h include/soci/exchange-traits.h include/soci/into-type.h include/soci/into.h +%%MYSQL%%include/soci/mysql/common.h +%%MYSQL%%include/soci/mysql/soci-mysql.h +%%ODBC%%include/soci/odbc/soci-odbc.h +%%ODBC%%include/soci/odbc/utility.h include/soci/once-temp-type.h +%%PGSQL%%include/soci/postgresql/common.h +%%PGSQL%%include/soci/postgresql/soci-postgresql.h include/soci/prepare-temp-type.h include/soci/procedure.h include/soci/ref-counted-prepare-info.h @@ -23,31 +30,50 @@ include/soci/session.h include/soci/soci-backend.h include/soci/soci-config.h -%%MYSQL%%include/soci/soci-mysql.h include/soci/soci-platform.h -%%PGSQL%%include/soci/soci-postgresql.h include/soci/soci-simple.h include/soci/soci.h +%%SQLITE%%include/soci/sqlite3/common.h +%%SQLITE%%include/soci/sqlite3/soci-sqlite3.h include/soci/statement.h include/soci/transaction.h include/soci/type-conversion-traits.h include/soci/type-conversion.h include/soci/type-holder.h include/soci/type-ptr.h +include/soci/unsigned-types.h include/soci/use-type.h include/soci/use.h include/soci/values-exchange.h include/soci/values.h -lib/libsoci_core-3.0.0.so -lib/libsoci_core-3.so +include/soci/version.h lib/libsoci_core.a lib/libsoci_core.so -%%MYSQL%%lib/libsoci_mysql-3.0.0.so -%%MYSQL%%lib/libsoci_mysql-3.so +lib/libsoci_core.so.3.1 +lib/libsoci_core.so.3.1.0 +lib/libsoci_empty.a +lib/libsoci_empty.so +lib/libsoci_empty.so.3.1 +lib/libsoci_empty.so.3.1.0 %%MYSQL%%lib/libsoci_mysql.a %%MYSQL%%lib/libsoci_mysql.so -%%PGSQL%%lib/libsoci_postgresql-3.0.0.so -%%PGSQL%%lib/libsoci_postgresql-3.so +%%MYSQL%%lib/libsoci_mysql.so.3.1 +%%MYSQL%%lib/libsoci_mysql.so.3.1.0 +%%ODBC%%lib/libsoci_odbc.a +%%ODBC%%lib/libsoci_odbc.so +%%ODBC%%lib/libsoci_odbc.so.3.1 +%%ODBC%%lib/libsoci_odbc.so.3.1.0 %%PGSQL%%lib/libsoci_postgresql.a %%PGSQL%%lib/libsoci_postgresql.so +%%PGSQL%%lib/libsoci_postgresql.so.3.1 +%%PGSQL%%lib/libsoci_postgresql.so.3.1.0 +%%SQLITE%%lib/libsoci_sqlite3.a +%%SQLITE%%lib/libsoci_sqlite3.so +%%SQLITE%%lib/libsoci_sqlite3.so.3.1 +%%SQLITE%%lib/libsoci_sqlite3.so.3.1.0 +@dirrm include/soci/sqlite3 +@dirrm include/soci/postgresql +@dirrm include/soci/odbc +@dirrm include/soci/mysql +@dirrm include/soci/empty @dirrm include/soci --- soci-3.1.0.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: