Update libpqxx{,-doc} to version 2.5.4

Changes: Lots of bugfixes and compatibility issues addressed.

6 files changed, 54 insertions, 18 deletions

diff --git a/databases/libpqxx/Makefile b/databases/libpqxx/Makefile
index 24732b4d2ed..1f04415dda8 100644
--- a/databases/libpqxx/Makefile
+++ b/databases/libpqxx/Makefile
@@ -1,26 +1,26 @@
-# $NetBSD: Makefile,v 1.14 2005/04/11 21:45:12 tv Exp $
+# $NetBSD: Makefile,v 1.15 2005/06/27 01:57:26 markd Exp $
 #
 
 .include "../../databases/libpqxx/Makefile.common"
 
-PKGREVISION=		2
 COMMENT=		C++ interface to postgresql-lib
 
 NOT_FOR_PLATFORM=	NetBSD-*-pc532
 
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
-USE_PKGLOCALEDIR=	yes
 PKGCONFIG_OVERRIDE+=	libpqxx.pc.in
-
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--with-postgres-lib=${PGSQL_PREFIX}/lib
-CONFIGURE_ARGS+=	--with-postgres-include=${PGSQL_PREFIX}/include/postgresql
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "NetBSD"
+# No strerror_r
+CONFIGURE_ARGS+=	--disable-thread-safety
+.endif
 
 # Avoid an ICE in gcc2 on sparc64
 CONFIGURE_ENV+=		F77=${FALSE}
 
-PGSQL_VERSION_REQD=	73
-
 .include "../../mk/pgsql.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/libpqxx/Makefile.common b/databases/libpqxx/Makefile.common
index bc13eef8472..b840c487b69 100644
--- a/databases/libpqxx/Makefile.common
+++ b/databases/libpqxx/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.1 2004/01/07 13:32:40 is Exp $
+# $NetBSD: Makefile.common,v 1.2 2005/06/27 01:57:26 markd Exp $
 #
 
-LIBPQXX_VERSION=	2.1.3
+LIBPQXX_VERSION=	2.5.4
 DISTNAME=		libpqxx-${LIBPQXX_VERSION}
 CATEGORIES=		databases
 MASTER_SITES=		ftp://gborg.postgresql.org/pub/libpqxx/stable/
diff --git a/databases/libpqxx/PLIST b/databases/libpqxx/PLIST
index c31b247a5db..a38caf294fc 100644
--- a/databases/libpqxx/PLIST
+++ b/databases/libpqxx/PLIST
@@ -1,10 +1,10 @@
-@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:22 jlam Exp $
+@comment $NetBSD: PLIST,v 1.3 2005/06/27 01:57:26 markd Exp $
+bin/pqxx-config
 include/pqxx/all.h
 include/pqxx/binarystring
 include/pqxx/binarystring.hxx
 include/pqxx/cachedresult.h
-include/pqxx/compiler.h
-include/pqxx/config.h
+include/pqxx/config-public-compiler.h
 include/pqxx/connection
 include/pqxx/connection.h
 include/pqxx/connection.hxx
@@ -12,7 +12,9 @@ include/pqxx/connection_base
 include/pqxx/connection_base.h
 include/pqxx/connection_base.hxx
 include/pqxx/connectionitf.h
+include/pqxx/cursor
 include/pqxx/cursor.h
+include/pqxx/cursor.hxx
 include/pqxx/dbtransaction
 include/pqxx/dbtransaction.h
 include/pqxx/dbtransaction.hxx
@@ -26,10 +28,12 @@ include/pqxx/largeobject
 include/pqxx/largeobject.h
 include/pqxx/largeobject.hxx
 include/pqxx/libcompiler.h
-include/pqxx/libconfig.h
+include/pqxx/libpq-forward.hxx
 include/pqxx/nontransaction
 include/pqxx/nontransaction.h
 include/pqxx/nontransaction.hxx
+include/pqxx/pipeline
+include/pqxx/pipeline.hxx
 include/pqxx/pqxx
 include/pqxx/result
 include/pqxx/result.h
diff --git a/databases/libpqxx/buildlink3.mk b/databases/libpqxx/buildlink3.mk
new file mode 100644
index 00000000000..7fd1e5d855c
--- /dev/null
+++ b/databases/libpqxx/buildlink3.mk
@@ -0,0 +1,18 @@
+# $NetBSD: buildlink3.mk,v 1.1 2005/06/27 01:57:26 markd Exp $
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+LIBPQXX_BUILDLINK3_MK:=	${LIBPQXX_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	libpqxx
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibpqxx}
+BUILDLINK_PACKAGES+=	libpqxx
+
+.if !empty(LIBPQXX_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.libpqxx+=	libpqxx>=2.5.0
+BUILDLINK_PKGSRCDIR.libpqxx?=	../../databases/libpqxx
+.endif	# LIBPQXX_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/databases/libpqxx/distinfo b/databases/libpqxx/distinfo
index d665190d073..cadf2f519cf 100644
--- a/databases/libpqxx/distinfo
+++ b/databases/libpqxx/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 16:33:06 agc Exp $
+$NetBSD: distinfo,v 1.3 2005/06/27 01:57:26 markd Exp $
 
-SHA1 (libpqxx-2.1.3.tar.gz) = e297663acc6210a0217f2d6a75b4ae27c36d6074
-RMD160 (libpqxx-2.1.3.tar.gz) = 72b8bcc9b870e6912bb8bfbb3c2d357a10385168
-Size (libpqxx-2.1.3.tar.gz) = 673575 bytes
+SHA1 (libpqxx-2.5.4.tar.gz) = 257465032ea8b2301c284847fc9372de3dd451d8
+RMD160 (libpqxx-2.5.4.tar.gz) = 23f428d818aa7df9c302e7a486c8a47d2523a418
+Size (libpqxx-2.5.4.tar.gz) = 1564221 bytes
+SHA1 (patch-aa) = fbf80bd805bedf094a79e0ab76e9a7f543e67117
diff --git a/databases/libpqxx/patches/patch-aa b/databases/libpqxx/patches/patch-aa
new file mode 100644
index 00000000000..9d5b900c344
--- /dev/null
+++ b/databases/libpqxx/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1 2005/06/27 01:57:26 markd Exp $
+
+--- configure.orig	2005-06-21 22:51:02.000000000 +1200
++++ configure
+@@ -19403,7 +19403,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+ 
+ 
+ # Add options to compiler command line, if compiler accepts it
+-function add_compiler_opts() {
++add_compiler_opts() {
+ 	for option in $* ; do
+ 		SAVE_CXXFLAGS="$CXXFLAGS"
+ 		CXXFLAGS="$CXXFLAGS $option"