10 files changed, 62 insertions, 36 deletions

diff --git a/databases/postgresql-libpqxx3/Makefile b/databases/postgresql-libpqxx3/Makefile
index c5b06e3cd41a..f29ab1c5bfc3 100644
--- a/databases/postgresql-libpqxx3/Makefile
+++ b/databases/postgresql-libpqxx3/Makefile
@@ -6,24 +6,24 @@
 #
 
 PORTNAME=	libpqxx
-PORTVERSION=	2.6.9
-PORTREVISION=	1
+PORTVERSION=	3.0.2
 CATEGORIES=	databases
 MASTER_SITES=	http://pqxx.org/download/software/libpqxx/
 PKGNAMEPREFIX=	postgresql-
 DIST_SUBDIR=	postgresql
 
-MAINTAINER=	girgen@FreeBSD.org
+MAINTAINER=	20080111.freebsd.org@ab.ote.we.lv
 COMMENT=	A new C++ interface for PostgreSQL
 
+CONFLICTS=	postgresql-libpqxx-2.*
+LATEST_LINK=	${PKGNAMEPREFIX}${PORTNAME}30
+
 USE_PGSQL=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-PLIST_SUB=	PORTVERSION=${PORTVERSION}
+PLIST_SUB=	SHLIBVERSION=3.0
 
-CONFIGURE_ARGS=	--with-postgres=${LOCALBASE} \
-		--enable-shared \
-		--with-postgres-include=${LOCALBASE}/include/postgresql
+CONFIGURE_ARGS=	--enable-shared
 
 .include <bsd.port.mk>
diff --git a/databases/postgresql-libpqxx3/distinfo b/databases/postgresql-libpqxx3/distinfo
index a2317f085c51..cd7f89a54702 100644
--- a/databases/postgresql-libpqxx3/distinfo
+++ b/databases/postgresql-libpqxx3/distinfo
@@ -1,3 +1,3 @@
-MD5 (postgresql/libpqxx-2.6.9.tar.gz) = 0b0c64af41dfdeea8556dc359994e1cb
-SHA256 (postgresql/libpqxx-2.6.9.tar.gz) = 2b2ef5dfb852667299e50727419075cf333bbbeffadaa398d96dc93bac6f7b6a
-SIZE (postgresql/libpqxx-2.6.9.tar.gz) = 1639557
+MD5 (postgresql/libpqxx-3.0.2.tar.gz) = 3baa257e851b773fa1d693bbe185a418
+SHA256 (postgresql/libpqxx-3.0.2.tar.gz) = de265ab5d397ace7596c3b6d19a0057ce2ba58477315acf9165b0a97facab6ca
+SIZE (postgresql/libpqxx-3.0.2.tar.gz) = 1565644
diff --git a/databases/postgresql-libpqxx3/files/patch-Makefile.in b/databases/postgresql-libpqxx3/files/patch-Makefile.in
index d1dd4d32ceef..414342128af2 100644
--- a/databases/postgresql-libpqxx3/files/patch-Makefile.in
+++ b/databases/postgresql-libpqxx3/files/patch-Makefile.in
@@ -1,9 +1,9 @@
---- Makefile.in~	Sat May 27 12:46:50 2006
-+++ Makefile.in	Sun May 28 17:51:23 2006
-@@ -212,7 +212,7 @@
+--- Makefile.in	2009-08-14 10:16:35.000000000 -0700
++++ Makefile.in.new	2010-01-13 23:09:39.000000000 -0800
+@@ -226,7 +226,7 @@
+ MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.h.in config.log configure \
+ 	stamp-h.in
  
- 
- #includedir=$(prefix)/include
 -pkgconfigdir = $(libdir)/pkgconfig
 +pkgconfigdir = $(prefix)/libdata/pkgconfig
  pkgconfig_DATA = libpqxx.pc
diff --git a/databases/postgresql-libpqxx3/files/patch-libpqxx.spec.in b/databases/postgresql-libpqxx3/files/patch-libpqxx.spec.in
new file mode 100644
index 000000000000..3e9e115743bb
--- /dev/null
+++ b/databases/postgresql-libpqxx3/files/patch-libpqxx.spec.in
@@ -0,0 +1,12 @@
+diff -urN libpqxx-3.0.2.dist/libpqxx.spec.in libpqxx-3.0.2/libpqxx.spec.in
+--- libpqxx.spec.in	2009-07-03 22:38:38.000000000 -0700
++++ libpqxx.spec.in.new	2010-01-13 21:24:41.000000000 -0800
+@@ -58,7 +58,7 @@
+ %files devel
+ %defattr(-, root, root)
+ %{_libdir}/*a
+-%{_libdir}/pkgconfig/libpqxx.pc
++%{_prefix}/libdata/pkgconfig/libpqxx.pc
+ %{_includedir}/*
+ %{_bindir}/pqxx-config
+ 
diff --git a/databases/postgresql-libpqxx3/pkg-plist b/databases/postgresql-libpqxx3/pkg-plist
index 9ae9e250a3eb..9d4d8b5c4cd1 100644
--- a/databases/postgresql-libpqxx3/pkg-plist
+++ b/databases/postgresql-libpqxx3/pkg-plist
@@ -3,7 +3,6 @@ include/pqxx/basic_connection
 include/pqxx/basic_connection.hxx
 include/pqxx/binarystring
 include/pqxx/binarystring.hxx
-include/pqxx/cachedresult.h
 include/pqxx/compiler-internal-post.hxx
 include/pqxx/compiler-internal-pre.hxx
 include/pqxx/compiler-public.hxx
@@ -15,7 +14,6 @@ include/pqxx/connection_base.hxx
 include/pqxx/connectionpolicy
 include/pqxx/connectionpolicy.hxx
 include/pqxx/cursor
-include/pqxx/cursor.h
 include/pqxx/cursor.hxx
 include/pqxx/dbtransaction
 include/pqxx/dbtransaction.hxx
@@ -28,6 +26,8 @@ include/pqxx/largeobject.hxx
 include/pqxx/libpq-forward.hxx
 include/pqxx/nontransaction
 include/pqxx/nontransaction.hxx
+include/pqxx/notify-listen
+include/pqxx/notify-listen.hxx
 include/pqxx/pipeline
 include/pqxx/pipeline.hxx
 include/pqxx/pqxx
@@ -55,7 +55,8 @@ include/pqxx/trigger
 include/pqxx/trigger.hxx
 include/pqxx/util
 include/pqxx/util.hxx
-lib/libpqxx-%%PORTVERSION%%.so
+include/pqxx/version.hxx
+lib/libpqxx-%%SHLIBVERSION%%.so
 lib/libpqxx.a
 lib/libpqxx.la
 lib/libpqxx.so
diff --git a/databases/postgresql-libpqxx30/Makefile b/databases/postgresql-libpqxx30/Makefile
index c5b06e3cd41a..f29ab1c5bfc3 100644
--- a/databases/postgresql-libpqxx30/Makefile
+++ b/databases/postgresql-libpqxx30/Makefile
@@ -6,24 +6,24 @@
 #
 
 PORTNAME=	libpqxx
-PORTVERSION=	2.6.9
-PORTREVISION=	1
+PORTVERSION=	3.0.2
 CATEGORIES=	databases
 MASTER_SITES=	http://pqxx.org/download/software/libpqxx/
 PKGNAMEPREFIX=	postgresql-
 DIST_SUBDIR=	postgresql
 
-MAINTAINER=	girgen@FreeBSD.org
+MAINTAINER=	20080111.freebsd.org@ab.ote.we.lv
 COMMENT=	A new C++ interface for PostgreSQL
 
+CONFLICTS=	postgresql-libpqxx-2.*
+LATEST_LINK=	${PKGNAMEPREFIX}${PORTNAME}30
+
 USE_PGSQL=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-PLIST_SUB=	PORTVERSION=${PORTVERSION}
+PLIST_SUB=	SHLIBVERSION=3.0
 
-CONFIGURE_ARGS=	--with-postgres=${LOCALBASE} \
-		--enable-shared \
-		--with-postgres-include=${LOCALBASE}/include/postgresql
+CONFIGURE_ARGS=	--enable-shared
 
 .include <bsd.port.mk>
diff --git a/databases/postgresql-libpqxx30/distinfo b/databases/postgresql-libpqxx30/distinfo
index a2317f085c51..cd7f89a54702 100644
--- a/databases/postgresql-libpqxx30/distinfo
+++ b/databases/postgresql-libpqxx30/distinfo
@@ -1,3 +1,3 @@
-MD5 (postgresql/libpqxx-2.6.9.tar.gz) = 0b0c64af41dfdeea8556dc359994e1cb
-SHA256 (postgresql/libpqxx-2.6.9.tar.gz) = 2b2ef5dfb852667299e50727419075cf333bbbeffadaa398d96dc93bac6f7b6a
-SIZE (postgresql/libpqxx-2.6.9.tar.gz) = 1639557
+MD5 (postgresql/libpqxx-3.0.2.tar.gz) = 3baa257e851b773fa1d693bbe185a418
+SHA256 (postgresql/libpqxx-3.0.2.tar.gz) = de265ab5d397ace7596c3b6d19a0057ce2ba58477315acf9165b0a97facab6ca
+SIZE (postgresql/libpqxx-3.0.2.tar.gz) = 1565644
diff --git a/databases/postgresql-libpqxx30/files/patch-Makefile.in b/databases/postgresql-libpqxx30/files/patch-Makefile.in
index d1dd4d32ceef..414342128af2 100644
--- a/databases/postgresql-libpqxx30/files/patch-Makefile.in
+++ b/databases/postgresql-libpqxx30/files/patch-Makefile.in
@@ -1,9 +1,9 @@
---- Makefile.in~	Sat May 27 12:46:50 2006
-+++ Makefile.in	Sun May 28 17:51:23 2006
-@@ -212,7 +212,7 @@
+--- Makefile.in	2009-08-14 10:16:35.000000000 -0700
++++ Makefile.in.new	2010-01-13 23:09:39.000000000 -0800
+@@ -226,7 +226,7 @@
+ MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.h.in config.log configure \
+ 	stamp-h.in
  
- 
- #includedir=$(prefix)/include
 -pkgconfigdir = $(libdir)/pkgconfig
 +pkgconfigdir = $(prefix)/libdata/pkgconfig
  pkgconfig_DATA = libpqxx.pc
diff --git a/databases/postgresql-libpqxx30/files/patch-libpqxx.spec.in b/databases/postgresql-libpqxx30/files/patch-libpqxx.spec.in
new file mode 100644
index 000000000000..3e9e115743bb
--- /dev/null
+++ b/databases/postgresql-libpqxx30/files/patch-libpqxx.spec.in
@@ -0,0 +1,12 @@
+diff -urN libpqxx-3.0.2.dist/libpqxx.spec.in libpqxx-3.0.2/libpqxx.spec.in
+--- libpqxx.spec.in	2009-07-03 22:38:38.000000000 -0700
++++ libpqxx.spec.in.new	2010-01-13 21:24:41.000000000 -0800
+@@ -58,7 +58,7 @@
+ %files devel
+ %defattr(-, root, root)
+ %{_libdir}/*a
+-%{_libdir}/pkgconfig/libpqxx.pc
++%{_prefix}/libdata/pkgconfig/libpqxx.pc
+ %{_includedir}/*
+ %{_bindir}/pqxx-config
+ 
diff --git a/databases/postgresql-libpqxx30/pkg-plist b/databases/postgresql-libpqxx30/pkg-plist
index 9ae9e250a3eb..9d4d8b5c4cd1 100644
--- a/databases/postgresql-libpqxx30/pkg-plist
+++ b/databases/postgresql-libpqxx30/pkg-plist
@@ -3,7 +3,6 @@ include/pqxx/basic_connection
 include/pqxx/basic_connection.hxx
 include/pqxx/binarystring
 include/pqxx/binarystring.hxx
-include/pqxx/cachedresult.h
 include/pqxx/compiler-internal-post.hxx
 include/pqxx/compiler-internal-pre.hxx
 include/pqxx/compiler-public.hxx
@@ -15,7 +14,6 @@ include/pqxx/connection_base.hxx
 include/pqxx/connectionpolicy
 include/pqxx/connectionpolicy.hxx
 include/pqxx/cursor
-include/pqxx/cursor.h
 include/pqxx/cursor.hxx
 include/pqxx/dbtransaction
 include/pqxx/dbtransaction.hxx
@@ -28,6 +26,8 @@ include/pqxx/largeobject.hxx
 include/pqxx/libpq-forward.hxx
 include/pqxx/nontransaction
 include/pqxx/nontransaction.hxx
+include/pqxx/notify-listen
+include/pqxx/notify-listen.hxx
 include/pqxx/pipeline
 include/pqxx/pipeline.hxx
 include/pqxx/pqxx
@@ -55,7 +55,8 @@ include/pqxx/trigger
 include/pqxx/trigger.hxx
 include/pqxx/util
 include/pqxx/util.hxx
-lib/libpqxx-%%PORTVERSION%%.so
+include/pqxx/version.hxx
+lib/libpqxx-%%SHLIBVERSION%%.so
 lib/libpqxx.a
 lib/libpqxx.la
 lib/libpqxx.so