From owner-svn-ports-all@FreeBSD.ORG Mon Mar 3 20:36:14 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D4760AFD; Mon, 3 Mar 2014 20:36:14 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id C034BA74; Mon, 3 Mar 2014 20:36:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s23KaENG007402; Mon, 3 Mar 2014 20:36:14 GMT (envelope-from gerald@svn.freebsd.org) Received: (from gerald@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s23KaD9N007394; Mon, 3 Mar 2014 20:36:13 GMT (envelope-from gerald@svn.freebsd.org) Message-Id: <201403032036.s23KaD9N007394@svn.freebsd.org> From: Gerald Pfeifer Date: Mon, 3 Mar 2014 20:36:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r346961 - in head/databases/libdbi: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 Mar 2014 20:36:14 -0000 Author: gerald Date: Mon Mar 3 20:36:13 2014 New Revision: 346961 URL: http://svnweb.freebsd.org/changeset/ports/346961 QAT: https://qat.redports.org/buildarchive/r346961/ Log: Update to libdbi version 0.9.0. [1] This supports multiple independent "instances", which permits programs to use several dlopen()ed modules which are linked against libdbi. Support for transactions and savepoints has been added, and drivers now receive additional hints to optimize sequential reads from result sets. Convert to staging (simplifying PORTDOCS handling). PR: 178779 [1] Submitted by: Douglas Carmichael [1] Approved by: maintainer timeout (clsung, >9 months) [1] Added: head/databases/libdbi/files/patch-src__dbi_result.c (contents, props changed) Modified: head/databases/libdbi/Makefile head/databases/libdbi/distinfo head/databases/libdbi/files/patch-Makefile.in head/databases/libdbi/pkg-plist Modified: head/databases/libdbi/Makefile ============================================================================== --- head/databases/libdbi/Makefile Mon Mar 3 20:34:11 2014 (r346960) +++ head/databases/libdbi/Makefile Mon Mar 3 20:36:13 2014 (r346961) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= libdbi -PORTVERSION= 0.8.4 +PORTVERSION= 0.9.0 CATEGORIES= databases devel MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} @@ -13,21 +13,17 @@ USE_AUTOTOOLS= libtool GNU_CONFIGURE= yes USE_LDCONFIG= yes -NO_STAGE= yes post-patch: @${REINPLACE_CMD} -e "s|-O20|${CFLAGS}|g" -e "s|-std=gnu99||g" \ ${WRKSRC}/configure post-install: -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/doc/*.pdf ${DOCSDIR} - @${MKDIR} ${DOCSDIR}/driver-guide + @${MKDIR} ${STAGEDIR}${DOCSDIR}/driver-guide + @${MKDIR} ${STAGEDIR}${DOCSDIR}/programmers-guide + ${INSTALL_DATA} ${WRKSRC}/doc/*.pdf ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/doc/driver-guide/*.html \ - ${DOCSDIR}/driver-guide - @${MKDIR} ${DOCSDIR}/programmers-guide + ${STAGEDIR}${DOCSDIR}/driver-guide ${INSTALL_DATA} ${WRKSRC}/doc/programmers-guide/*.html \ - ${DOCSDIR}/programmers-guide -.endif + ${STAGEDIR}${DOCSDIR}/programmers-guide .include Modified: head/databases/libdbi/distinfo ============================================================================== --- head/databases/libdbi/distinfo Mon Mar 3 20:34:11 2014 (r346960) +++ head/databases/libdbi/distinfo Mon Mar 3 20:36:13 2014 (r346961) @@ -1,2 +1,2 @@ -SHA256 (libdbi-0.8.4.tar.gz) = ef38db616f0752ccb09b8ba2eac471722369b8ded50b153c25e238cac2c8de99 -SIZE (libdbi-0.8.4.tar.gz) = 1045247 +SHA256 (libdbi-0.9.0.tar.gz) = dafb6cdca524c628df832b6dd0bf8fabceb103248edb21762c02d3068fca4503 +SIZE (libdbi-0.9.0.tar.gz) = 1194284 Modified: head/databases/libdbi/files/patch-Makefile.in ============================================================================== --- head/databases/libdbi/files/patch-Makefile.in Mon Mar 3 20:34:11 2014 (r346960) +++ head/databases/libdbi/files/patch-Makefile.in Mon Mar 3 20:36:13 2014 (r346961) @@ -1,11 +1,19 @@ ---- Makefile.in.orig 2010-09-01 07:22:52.000000000 +0800 -+++ Makefile.in 2011-03-07 14:25:30.000000000 +0800 -@@ -195,7 +195,7 @@ - top_srcdir = @top_srcdir@ - AUTOMAKE_OPTIONS = foreign dist-zip - ACLOCAL_AMFLAGS = -I m4 --SUBDIRS = src include @docs_subdirs@ -+SUBDIRS = src include - EXTRA_DIST = AUTHORS COPYING ChangeLog INSTALL README README.win32 README.osx TODO NEWS libdbi.spec.in config.h.in Makefile.w32 autogen.sh drivers/example/AUTHORS drivers/example/Makefile.am drivers/example/README drivers/example/TODO drivers/example/.cvsignore drivers/example/dbd_example.c drivers/example/dbd_example.h drivers/example/dbd_example.sgml - all: config.h - $(MAKE) $(AM_MAKEFLAGS) all-recursive +*** Makefile.in.orig Sun May 19 23:08:33 2013 +--- Makefile.in Sun May 19 23:08:47 2013 +*************** +*** 291,297 **** + top_srcdir = @top_srcdir@ + AUTOMAKE_OPTIONS = foreign dist-zip + ACLOCAL_AMFLAGS = -I m4 +! SUBDIRS = src include @docs_subdirs@ + EXTRA_DIST = AUTHORS COPYING ChangeLog INSTALL README README.win32 README.osx TODO NEWS UPGRADING libdbi.spec.in config.h.in Makefile.w32 autogen.sh drivers/example/AUTHORS drivers/example/Makefile.am drivers/example/README drivers/example/TODO drivers/example/.cvsignore drivers/example/dbd_example.c drivers/example/dbd_example.h drivers/example/dbd_example.sgml + + # we use exec here to install the .pc file with the library, not with +--- 291,297 ---- + top_srcdir = @top_srcdir@ + AUTOMAKE_OPTIONS = foreign dist-zip + ACLOCAL_AMFLAGS = -I m4 +! SUBDIRS = src include + EXTRA_DIST = AUTHORS COPYING ChangeLog INSTALL README README.win32 README.osx TODO NEWS UPGRADING libdbi.spec.in config.h.in Makefile.w32 autogen.sh drivers/example/AUTHORS drivers/example/Makefile.am drivers/example/README drivers/example/TODO drivers/example/.cvsignore drivers/example/dbd_example.c drivers/example/dbd_example.h drivers/example/dbd_example.sgml + + # we use exec here to install the .pc file with the library, not with Added: head/databases/libdbi/files/patch-src__dbi_result.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/libdbi/files/patch-src__dbi_result.c Mon Mar 3 20:36:13 2014 (r346961) @@ -0,0 +1,25 @@ +*** ./src/dbi_result.c.orig Mon May 20 00:19:40 2013 +--- ./src/dbi_result.c Mon May 20 00:20:19 2013 +*************** +*** 1470,1479 **** + switch (RESULT->field_attribs[fieldidx] & DBI_INTEGER_SIZEMASK) { + case DBI_INTEGER_SIZE1: + if (RESULT->field_attribs[fieldidx] & DBI_INTEGER_UNSIGNED) { +! snprintf(newstring, 32, "%hu", RESULT->rows[RESULT->currowidx]->field_values[fieldidx].d_char); + } + else { +! snprintf(newstring, 32, "%hd", RESULT->rows[RESULT->currowidx]->field_values[fieldidx].d_char); + } + break; + case DBI_INTEGER_SIZE2: +--- 1470,1479 ---- + switch (RESULT->field_attribs[fieldidx] & DBI_INTEGER_SIZEMASK) { + case DBI_INTEGER_SIZE1: + if (RESULT->field_attribs[fieldidx] & DBI_INTEGER_UNSIGNED) { +! snprintf(newstring, 32, "%hhu", RESULT->rows[RESULT->currowidx]->field_values[fieldidx].d_char); + } + else { +! snprintf(newstring, 32, "%hhd", RESULT->rows[RESULT->currowidx]->field_values[fieldidx].d_char); + } + break; + case DBI_INTEGER_SIZE2: Modified: head/databases/libdbi/pkg-plist ============================================================================== --- head/databases/libdbi/pkg-plist Mon Mar 3 20:34:11 2014 (r346960) +++ head/databases/libdbi/pkg-plist Mon Mar 3 20:36:13 2014 (r346961) @@ -4,24 +4,27 @@ include/dbi/dbi.h lib/libdbi.a lib/libdbi.la lib/libdbi.so -lib/libdbi.so.1 +lib/libdbi.so.2 %%PORTDOCS%%%%DOCSDIR%%/driver-guide.pdf %%PORTDOCS%%%%DOCSDIR%%/driver-guide/contact.html %%PORTDOCS%%%%DOCSDIR%%/driver-guide/copying-fdl.html +%%PORTDOCS%%%%DOCSDIR%%/driver-guide/databasedirectories.html %%PORTDOCS%%%%DOCSDIR%%/driver-guide/description.html %%PORTDOCS%%%%DOCSDIR%%/driver-guide/drivercaps.html +%%PORTDOCS%%%%DOCSDIR%%/driver-guide/driverdata.html %%PORTDOCS%%%%DOCSDIR%%/driver-guide/driverfuncs-dbquery.html %%PORTDOCS%%%%DOCSDIR%%/driver-guide/driverfuncs-infrastructure.html %%PORTDOCS%%%%DOCSDIR%%/driver-guide/driverfuncs-publicdbquery.html %%PORTDOCS%%%%DOCSDIR%%/driver-guide/driverfuncs.html +%%PORTDOCS%%%%DOCSDIR%%/driver-guide/driverinfrastructure.html %%PORTDOCS%%%%DOCSDIR%%/driver-guide/gnugpl.html %%PORTDOCS%%%%DOCSDIR%%/driver-guide/helperfuncs.html %%PORTDOCS%%%%DOCSDIR%%/driver-guide/index.html %%PORTDOCS%%%%DOCSDIR%%/driver-guide/intro.html -%%PORTDOCS%%%%DOCSDIR%%/driver-guide/requireddrivercaps.html -%%PORTDOCS%%%%DOCSDIR%%/driver-guide/settingdrivercaps.html %%PORTDOCS%%%%DOCSDIR%%/driver-guide/terminology.html %%PORTDOCS%%%%DOCSDIR%%/programmers-guide.pdf +%%PORTDOCS%%%%DOCSDIR%%/programmers-guide/addtoproject.html +%%PORTDOCS%%%%DOCSDIR%%/programmers-guide/buildinstall.html %%PORTDOCS%%%%DOCSDIR%%/programmers-guide/connerrors.html %%PORTDOCS%%%%DOCSDIR%%/programmers-guide/contact.html %%PORTDOCS%%%%DOCSDIR%%/programmers-guide/copying-fdl.html @@ -31,6 +34,9 @@ lib/libdbi.so.1 %%PORTDOCS%%%%DOCSDIR%%/programmers-guide/gnugpl.html %%PORTDOCS%%%%DOCSDIR%%/programmers-guide/index.html %%PORTDOCS%%%%DOCSDIR%%/programmers-guide/intro.html +%%PORTDOCS%%%%DOCSDIR%%/programmers-guide/libdbi-and-drivers-versions.html +%%PORTDOCS%%%%DOCSDIR%%/programmers-guide/loadinglibdbi.html +%%PORTDOCS%%%%DOCSDIR%%/programmers-guide/package-library-version.html %%PORTDOCS%%%%DOCSDIR%%/programmers-guide/quickstart-code.html %%PORTDOCS%%%%DOCSDIR%%/programmers-guide/quickstart-debriefing.html %%PORTDOCS%%%%DOCSDIR%%/programmers-guide/quickstart.html @@ -44,9 +50,13 @@ lib/libdbi.so.1 %%PORTDOCS%%%%DOCSDIR%%/programmers-guide/reference-query.html %%PORTDOCS%%%%DOCSDIR%%/programmers-guide/reference-results.html %%PORTDOCS%%%%DOCSDIR%%/programmers-guide/reference.html +%%PORTDOCS%%%%DOCSDIR%%/programmers-guide/savepoints.html %%PORTDOCS%%%%DOCSDIR%%/programmers-guide/terminology.html -%%PORTDOCS%%%%DOCSDIR%%/programmers-guide/x267.html -%%PORTDOCS%%%%DOCSDIR%%/programmers-guide/x276.html +%%PORTDOCS%%%%DOCSDIR%%/programmers-guide/threads.html +%%PORTDOCS%%%%DOCSDIR%%/programmers-guide/transactions.html +%%PORTDOCS%%%%DOCSDIR%%/programmers-guide/transactions-savepoints.html +%%PORTDOCS%%%%DOCSDIR%%/programmers-guide/version-at-runtime.html +%%PORTDOCS%%%%DOCSDIR%%/programmers-guide/versioning.html %%PORTDOCS%%@dirrm %%DOCSDIR%%/programmers-guide %%PORTDOCS%%@dirrm %%DOCSDIR%%/driver-guide %%PORTDOCS%%@dirrm %%DOCSDIR%%