Date: Tue, 17 Sep 2013 03:55:58 GMT From: Steve Wills <swills@freebsd.org> To: FreeBSD-gnats-submit@freebsd.org Cc: 20080111.freebsd.org@ab.ote.we.lv Subject: ports/182178: [PATCH] databases/postgresql-libpqxx: update to 3.1.1, fix build on 10.0-ALPHA1 Message-ID: <201309170355.r8H3tw7f046761@meatwad.mouf.net> Resent-Message-ID: <201309170400.r8H401F8064667@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 182178 >Category: ports >Synopsis: [PATCH] databases/postgresql-libpqxx: update to 3.1.1, fix build on 10.0-ALPHA1 >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: Tue Sep 17 04:00:01 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Steve Wills >Release: FreeBSD 10.0-ALPHA1 amd64 >Organization: >Environment: System: FreeBSD meatwad.mouf.net 10.0-ALPHA1 FreeBSD 10.0-ALPHA1 #6 r255605M: Mon Sep 16 02:19:42 UTC >Description: - Update to 3.1.1 - Fix build on 10.0-ALPHA1 Port maintainer (20080111.freebsd.org@ab.ote.we.lv) is cc'd. Generated with FreeBSD Port Tools 0.99_8 (mode: update, diff: SVN) >How-To-Repeat: >Fix: --- postgresql-libpqxx-3.1.1.patch begins here --- Index: Makefile =================================================================== --- Makefile (revision 327448) +++ Makefile (working copy) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= libpqxx -PORTVERSION= 3.1 +PORTVERSION= 3.1.1 CATEGORIES= databases MASTER_SITES= http://pqxx.org/download/software/${PORTNAME}/ PKGNAMEPREFIX= postgresql- @@ -20,9 +20,10 @@ GNU_CONFIGURE= yes USE_LDCONFIG= yes PLIST_SUB= PORTVERSION=${PORTVERSION} +USE_PYTHON_BUILD= yes +USES=shebangfix +SHEBANG_FILES= tools/splitconfig -CONFIGURE_ARGS= --with-postgres=${LOCALBASE} \ - --enable-shared \ - --with-postgres-include=${LOCALBASE}/include/postgresql +CONFIGURE_ARGS= --enable-shared .include <bsd.port.mk> Index: distinfo =================================================================== --- distinfo (revision 327448) +++ distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (postgresql/libpqxx-3.1.tar.gz) = 8950433f193e118cfd36ab91391eb174ef48897bacc26197da596988e66796a0 -SIZE (postgresql/libpqxx-3.1.tar.gz) = 1771846 +SHA256 (postgresql/libpqxx-3.1.1.tar.gz) = ce443c7c515623b4a68de5f0657460344b6b6320982d8f8efc657c3746e1ee90 +SIZE (postgresql/libpqxx-3.1.1.tar.gz) = 1563338 Index: files/patch-svn_1665 =================================================================== --- files/patch-svn_1665 (revision 327448) +++ files/patch-svn_1665 (working copy) @@ -1,22 +0,0 @@ -Index: /trunk/include/pqxx/util.hxx -=================================================================== ---- ./include/pqxx/util.hxx (revision 1638) -+++ ./include/pqxx/util.hxx (revision 1665) -@@ -33,4 +33,6 @@ - #include <memory> - #endif -+ -+#include "pqxx/strconv" - - -Index: /trunk/include/pqxx/cursor.hxx -=================================================================== ---- ./include/pqxx/cursor.hxx (revision 1559) -+++ ./include/pqxx/cursor.hxx (revision 1665) -@@ -308,5 +308,5 @@ - transaction_base &trans, - const PGSTD::string adopted_cursor) : -- m_cur(trans, adopted_cursor, up, op) -+ m_cur(trans, adopted_cursor, op) - { - // Put cursor in known position Index: files/patch-svn_1833 =================================================================== --- files/patch-svn_1833 (revision 0) +++ files/patch-svn_1833 (working copy) @@ -0,0 +1,42 @@ +--- include/pqxx/largeobject.hxx (revision 1706) ++++ include/pqxx/largeobject.hxx (revision 1833) +@@ -397,5 +397,5 @@ + size_type BufSize=512) : //[t48] + m_BufSize(BufSize), +- m_Obj(T, O), ++ m_Obj(T, O, mode), + m_G(0), + m_P(0) +@@ -407,5 +407,5 @@ + size_type BufSize=512) : //[t48] + m_BufSize(BufSize), +- m_Obj(T, O), ++ m_Obj(T, O, mode), + m_G(0), + m_P(0) +--- ChangeLog (revision 1825) ++++ ChangeLog (revision 1833) +@@ -1,2 +1,7 @@ ++2012-08-03 Jeroen T. Vermeulen <jtv@xs4all.nl> ++ include/pqxx/largeobject.hxx: ++ - Backported fix for #252: clang++ 3.2 compile error. Thanks Amy Troschinetz. ++ src/strconv.cxx: ++ - Backported fix for #253: clang++ 3.2 compile error. Thanks Amy Troschinetz. + 2012-03-25 Jeroen T. Vermeulen <jtv@xs4all.nl> + test/test002.cxx, test/test007.cxx, test/test011.cxx, test/test012.cxx, +--- src/strconv.cxx (revision 1724) ++++ src/strconv.cxx (revision 1833) +@@ -7,5 +7,5 @@ + * implementation of string conversions + * +- * Copyright (c) 2008, Jeroen T. Vermeulen <jtv@xs4all.nl> ++ * Copyright (c) 2008-2012, Jeroen T. Vermeulen <jtv@xs4all.nl> + * + * See COPYING for copyright license. If you did not receive a file called +@@ -193,5 +193,5 @@ + S.imbue(locale("C")); + #endif +- ok = (S >> result); ++ ok = static_cast<bool>(S >> result); + } + break; Property changes on: files/patch-svn_1833 ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: pkg-plist =================================================================== --- pkg-plist (revision 327448) +++ pkg-plist (working copy) @@ -81,7 +81,7 @@ include/pqxx/util.hxx include/pqxx/version include/pqxx/version.hxx -lib/libpqxx-%%PORTVERSION%%.so +lib/libpqxx-3.1.so lib/libpqxx.a lib/libpqxx.la lib/libpqxx.so --- postgresql-libpqxx-3.1.1.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309170355.r8H3tw7f046761>