update to 2.2.7

fix a wrong pkg-config specification position

PR:		ports/69960
Submitted by:	Jie Gao <gaoj@cpsc.ucalgary.ca>
Approved by:	maintainer

12 files changed, 21 insertions, 18 deletions

diff --git a/databases/postgresql-libpqxx/Makefile b/databases/postgresql-libpqxx/Makefile
index f3dd72d..76d2370 100644
--- a/databases/postgresql-libpqxx/Makefile
+++ b/databases/postgresql-libpqxx/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libpqxx
-PORTVERSION=	2.2.3
+PORTVERSION=	2.2.7
 CATEGORIES=	databases
 MASTER_SITES=	ftp://gborg.postgresql.org/pub/libpqxx/stable/
 PKGNAMEPREFIX=	postgresql-
diff --git a/databases/postgresql-libpqxx/distinfo b/databases/postgresql-libpqxx/distinfo
index 9a1f2fa..fcc6352 100644
--- a/databases/postgresql-libpqxx/distinfo
+++ b/databases/postgresql-libpqxx/distinfo
@@ -1,2 +1,2 @@
-MD5 (postgresql/libpqxx-2.2.3.tar.gz) = 02d34b97dc77c51ef8c54eea6965fc91
-SIZE (postgresql/libpqxx-2.2.3.tar.gz) = 744455
+MD5 (postgresql/libpqxx-2.2.7.tar.gz) = 1027218388f64f62213c6c7e4111c3e9
+SIZE (postgresql/libpqxx-2.2.7.tar.gz) = 761117
diff --git a/databases/postgresql-libpqxx/files/patch-Makefile.in b/databases/postgresql-libpqxx/files/patch-Makefile.in
index 730a3b5..ee6a762 100644
--- a/databases/postgresql-libpqxx/files/patch-Makefile.in
+++ b/databases/postgresql-libpqxx/files/patch-Makefile.in
@@ -5,7 +5,7 @@
  	stamp-h.in
  
 -pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(libdir)/libdata/pkgconfig
++pkgconfigdir = $(prefix)/libdata/pkgconfig
  pkgconfig_DATA = libpqxx.pc
  bin_SCRIPTS = pqxx-config
  all: all-recursive
diff --git a/databases/postgresql-libpqxx/pkg-plist b/databases/postgresql-libpqxx/pkg-plist
index 4ead035..8143084 100644
--- a/databases/postgresql-libpqxx/pkg-plist
+++ b/databases/postgresql-libpqxx/pkg-plist
@@ -12,6 +12,8 @@ include/pqxx/connection_base
 include/pqxx/connection_base.hxx
 include/pqxx/connection_base.h
 include/pqxx/connectionitf.h
+include/pqxx/cursor
+include/pqxx/cursor.hxx
 include/pqxx/cursor.h
 include/pqxx/dbtransaction
 include/pqxx/dbtransaction.hxx
@@ -68,6 +70,5 @@ lib/libpqxx.a
 lib/libpqxx.la
 lib/libpqxx.so
 lib/libpqxx-%%PORTVERSION%%.so
-lib/libdata/pkgconfig/libpqxx.pc
+libdata/pkgconfig/libpqxx.pc
 @dirrm include/pqxx
-@unexec rmdir %D/lib/libdata/pkgconfig 2>/dev/null || true
diff --git a/databases/postgresql-libpqxx3/Makefile b/databases/postgresql-libpqxx3/Makefile
index f3dd72d..76d2370 100644
--- a/databases/postgresql-libpqxx3/Makefile
+++ b/databases/postgresql-libpqxx3/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libpqxx
-PORTVERSION=	2.2.3
+PORTVERSION=	2.2.7
 CATEGORIES=	databases
 MASTER_SITES=	ftp://gborg.postgresql.org/pub/libpqxx/stable/
 PKGNAMEPREFIX=	postgresql-
diff --git a/databases/postgresql-libpqxx3/distinfo b/databases/postgresql-libpqxx3/distinfo
index 9a1f2fa..fcc6352 100644
--- a/databases/postgresql-libpqxx3/distinfo
+++ b/databases/postgresql-libpqxx3/distinfo
@@ -1,2 +1,2 @@
-MD5 (postgresql/libpqxx-2.2.3.tar.gz) = 02d34b97dc77c51ef8c54eea6965fc91
-SIZE (postgresql/libpqxx-2.2.3.tar.gz) = 744455
+MD5 (postgresql/libpqxx-2.2.7.tar.gz) = 1027218388f64f62213c6c7e4111c3e9
+SIZE (postgresql/libpqxx-2.2.7.tar.gz) = 761117
diff --git a/databases/postgresql-libpqxx3/files/patch-Makefile.in b/databases/postgresql-libpqxx3/files/patch-Makefile.in
index 730a3b5..ee6a762 100644
--- a/databases/postgresql-libpqxx3/files/patch-Makefile.in
+++ b/databases/postgresql-libpqxx3/files/patch-Makefile.in
@@ -5,7 +5,7 @@
  	stamp-h.in
  
 -pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(libdir)/libdata/pkgconfig
++pkgconfigdir = $(prefix)/libdata/pkgconfig
  pkgconfig_DATA = libpqxx.pc
  bin_SCRIPTS = pqxx-config
  all: all-recursive
diff --git a/databases/postgresql-libpqxx3/pkg-plist b/databases/postgresql-libpqxx3/pkg-plist
index 4ead035..8143084 100644
--- a/databases/postgresql-libpqxx3/pkg-plist
+++ b/databases/postgresql-libpqxx3/pkg-plist
@@ -12,6 +12,8 @@ include/pqxx/connection_base
 include/pqxx/connection_base.hxx
 include/pqxx/connection_base.h
 include/pqxx/connectionitf.h
+include/pqxx/cursor
+include/pqxx/cursor.hxx
 include/pqxx/cursor.h
 include/pqxx/dbtransaction
 include/pqxx/dbtransaction.hxx
@@ -68,6 +70,5 @@ lib/libpqxx.a
 lib/libpqxx.la
 lib/libpqxx.so
 lib/libpqxx-%%PORTVERSION%%.so
-lib/libdata/pkgconfig/libpqxx.pc
+libdata/pkgconfig/libpqxx.pc
 @dirrm include/pqxx
-@unexec rmdir %D/lib/libdata/pkgconfig 2>/dev/null || true
diff --git a/databases/postgresql-libpqxx30/Makefile b/databases/postgresql-libpqxx30/Makefile
index f3dd72d..76d2370 100644
--- a/databases/postgresql-libpqxx30/Makefile
+++ b/databases/postgresql-libpqxx30/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libpqxx
-PORTVERSION=	2.2.3
+PORTVERSION=	2.2.7
 CATEGORIES=	databases
 MASTER_SITES=	ftp://gborg.postgresql.org/pub/libpqxx/stable/
 PKGNAMEPREFIX=	postgresql-
diff --git a/databases/postgresql-libpqxx30/distinfo b/databases/postgresql-libpqxx30/distinfo
index 9a1f2fa..fcc6352 100644
--- a/databases/postgresql-libpqxx30/distinfo
+++ b/databases/postgresql-libpqxx30/distinfo
@@ -1,2 +1,2 @@
-MD5 (postgresql/libpqxx-2.2.3.tar.gz) = 02d34b97dc77c51ef8c54eea6965fc91
-SIZE (postgresql/libpqxx-2.2.3.tar.gz) = 744455
+MD5 (postgresql/libpqxx-2.2.7.tar.gz) = 1027218388f64f62213c6c7e4111c3e9
+SIZE (postgresql/libpqxx-2.2.7.tar.gz) = 761117
diff --git a/databases/postgresql-libpqxx30/files/patch-Makefile.in b/databases/postgresql-libpqxx30/files/patch-Makefile.in
index 730a3b5..ee6a762 100644
--- a/databases/postgresql-libpqxx30/files/patch-Makefile.in
+++ b/databases/postgresql-libpqxx30/files/patch-Makefile.in
@@ -5,7 +5,7 @@
  	stamp-h.in
  
 -pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(libdir)/libdata/pkgconfig
++pkgconfigdir = $(prefix)/libdata/pkgconfig
  pkgconfig_DATA = libpqxx.pc
  bin_SCRIPTS = pqxx-config
  all: all-recursive
diff --git a/databases/postgresql-libpqxx30/pkg-plist b/databases/postgresql-libpqxx30/pkg-plist
index 4ead035..8143084 100644
--- a/databases/postgresql-libpqxx30/pkg-plist
+++ b/databases/postgresql-libpqxx30/pkg-plist
@@ -12,6 +12,8 @@ include/pqxx/connection_base
 include/pqxx/connection_base.hxx
 include/pqxx/connection_base.h
 include/pqxx/connectionitf.h
+include/pqxx/cursor
+include/pqxx/cursor.hxx
 include/pqxx/cursor.h
 include/pqxx/dbtransaction
 include/pqxx/dbtransaction.hxx
@@ -68,6 +70,5 @@ lib/libpqxx.a
 lib/libpqxx.la
 lib/libpqxx.so
 lib/libpqxx-%%PORTVERSION%%.so
-lib/libdata/pkgconfig/libpqxx.pc
+libdata/pkgconfig/libpqxx.pc
 @dirrm include/pqxx
-@unexec rmdir %D/lib/libdata/pkgconfig 2>/dev/null || true