sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Update to 3.1.1

Browse source 
- Fix build on 10.0

PR:		ports/182178
Approved by:	maintainer timeout (20080111.freebsd.org@ab.ote.we.lv, >2 months)
This commit is contained in:
Steve Wills 2013-10-26 13:05:42 +00:00
parent 7e996d3ae7
commit 499cb82d0f
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=331683
5 changed files with 50 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
databases/postgresql-libpqxx3/Makefile
View file

@ -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,10 +20,11 @@ USES= gmake pkgconfig
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
NO_STAGE= yes
.include <bsd.port.mk>

4
databases/postgresql-libpqxx3/distinfo
View file

@ -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

22
databases/postgresql-libpqxx3/files/patch-svn_1665
View file

@ -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

42
databases/postgresql-libpqxx3/files/patch-svn_1833 Normal file
View file

@ -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;

2
databases/postgresql-libpqxx3/pkg-plist
View file

@ -81,7 +81,7 @@ include/pqxx/util
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