Upgrade to 1.3.

16 files changed, 40 insertions, 100 deletions

diff --git a/databases/pgpool-II-22/Makefile b/databases/pgpool-II-22/Makefile
index 582d5f2fcf20..0b72e4ae346a 100644
--- a/databases/pgpool-II-22/Makefile
+++ b/databases/pgpool-II-22/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	pgpool-II
-PORTVERSION=	1.0.2
-PORTREVISION=	1
+PORTVERSION=	1.3
 CATEGORIES=	databases
-MASTER_SITES=	http://pgfoundry.org/frs/download.php/1258/
+MASTER_SITES=	http://pgfoundry.org/frs/download.php/1488/
 
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	A connection pool server for PostgreSQL
@@ -19,7 +18,6 @@ GNU_CONFIGURE=	yes
 USE_PGSQL=	yes
 
 CONFLICTS=	pgpool-3.*
-CONFIGURE_ARGS=	--datadir=${DATADIR}
 USE_RC_SUBR=	pgpool
 
 PORTDOCS=	AUTHORS COPYING ChangeLog INSTALL NEWS README README.euc_jp
@@ -33,6 +31,9 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|echo aout|echo elf|g' \
 	${WRKSRC}/configure
 
+pre-install:
+	${MKDIR} ${DATADIR}
+
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
diff --git a/databases/pgpool-II-22/distinfo b/databases/pgpool-II-22/distinfo
index 8df6088eb098..c6560580bc28 100644
--- a/databases/pgpool-II-22/distinfo
+++ b/databases/pgpool-II-22/distinfo
@@ -1,3 +1,3 @@
-MD5 (pgpool-II-1.0.2.tar.gz) = adf88e4b7eb7f3347740a6b54aa09e92
-SHA256 (pgpool-II-1.0.2.tar.gz) = d5d37cf388b5ddca5a4dedde5838dfb8fa84775d30b1d85d07e3163643ce58a6
-SIZE (pgpool-II-1.0.2.tar.gz) = 765193
+MD5 (pgpool-II-1.3.tar.gz) = 1276c4b98a9de6f85f3179380a370144
+SHA256 (pgpool-II-1.3.tar.gz) = 1dee4433685ed21557d25325dd9671b1334e1d6eb9467646acbf6b675a7b24de
+SIZE (pgpool-II-1.3.tar.gz) = 826772
diff --git a/databases/pgpool-II-22/files/patch-pool_process_query.c b/databases/pgpool-II-22/files/patch-pool_process_query.c
deleted file mode 100644
index 58943765d52f..000000000000
--- a/databases/pgpool-II-22/files/patch-pool_process_query.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- pool_process_query.c.orig	Mon Apr 16 12:08:40 2007
-+++ pool_process_query.c	Mon Apr 16 12:09:54 2007
-@@ -3906,10 +3906,13 @@
- 							   i, k, *kind);
- 					pool_send_error_message(frontend, MAJOR(backend), "XX000", 
- 											"kind mismatch between backends", "",
--											"check data consistency between master and secondary", __FILE__, __LINE__);
-+											"check data consistency between master and other db node", __FILE__, __LINE__);
- 
- 					if (pool_config->replication_stop_on_mismatch)
--						return POOL_FATAL;
-+					{
-+						notice_backend_error(i);
-+						child_exit(1);
-+					}
- 					else
- 						return POOL_ERROR;
- 				}
diff --git a/databases/pgpool-II-22/pkg-plist b/databases/pgpool-II-22/pkg-plist
index 6212caf3a56f..3645b15f2d20 100644
--- a/databases/pgpool-II-22/pkg-plist
+++ b/databases/pgpool-II-22/pkg-plist
@@ -11,11 +11,13 @@ bin/pg_md5
 bin/pgpool
 etc/pcp.conf.sample
 etc/pgpool.conf.sample
+etc/pool_hba.conf.sample
 include/pcp.h
 include/pool_type.h
 lib/libpcp.a
 lib/libpcp.la
 lib/libpcp.so
 lib/libpcp.so.0
+%%DATADIR%%/pgpool.pam
 %%DATADIR%%/system_db.sql
 @dirrm %%DATADIR%%
diff --git a/databases/pgpool-II-23/Makefile b/databases/pgpool-II-23/Makefile
index 582d5f2fcf20..0b72e4ae346a 100644
--- a/databases/pgpool-II-23/Makefile
+++ b/databases/pgpool-II-23/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	pgpool-II
-PORTVERSION=	1.0.2
-PORTREVISION=	1
+PORTVERSION=	1.3
 CATEGORIES=	databases
-MASTER_SITES=	http://pgfoundry.org/frs/download.php/1258/
+MASTER_SITES=	http://pgfoundry.org/frs/download.php/1488/
 
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	A connection pool server for PostgreSQL
@@ -19,7 +18,6 @@ GNU_CONFIGURE=	yes
 USE_PGSQL=	yes
 
 CONFLICTS=	pgpool-3.*
-CONFIGURE_ARGS=	--datadir=${DATADIR}
 USE_RC_SUBR=	pgpool
 
 PORTDOCS=	AUTHORS COPYING ChangeLog INSTALL NEWS README README.euc_jp
@@ -33,6 +31,9 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|echo aout|echo elf|g' \
 	${WRKSRC}/configure
 
+pre-install:
+	${MKDIR} ${DATADIR}
+
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
diff --git a/databases/pgpool-II-23/distinfo b/databases/pgpool-II-23/distinfo
index 8df6088eb098..c6560580bc28 100644
--- a/databases/pgpool-II-23/distinfo
+++ b/databases/pgpool-II-23/distinfo
@@ -1,3 +1,3 @@
-MD5 (pgpool-II-1.0.2.tar.gz) = adf88e4b7eb7f3347740a6b54aa09e92
-SHA256 (pgpool-II-1.0.2.tar.gz) = d5d37cf388b5ddca5a4dedde5838dfb8fa84775d30b1d85d07e3163643ce58a6
-SIZE (pgpool-II-1.0.2.tar.gz) = 765193
+MD5 (pgpool-II-1.3.tar.gz) = 1276c4b98a9de6f85f3179380a370144
+SHA256 (pgpool-II-1.3.tar.gz) = 1dee4433685ed21557d25325dd9671b1334e1d6eb9467646acbf6b675a7b24de
+SIZE (pgpool-II-1.3.tar.gz) = 826772
diff --git a/databases/pgpool-II-23/files/patch-pool_process_query.c b/databases/pgpool-II-23/files/patch-pool_process_query.c
deleted file mode 100644
index 58943765d52f..000000000000
--- a/databases/pgpool-II-23/files/patch-pool_process_query.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- pool_process_query.c.orig	Mon Apr 16 12:08:40 2007
-+++ pool_process_query.c	Mon Apr 16 12:09:54 2007
-@@ -3906,10 +3906,13 @@
- 							   i, k, *kind);
- 					pool_send_error_message(frontend, MAJOR(backend), "XX000", 
- 											"kind mismatch between backends", "",
--											"check data consistency between master and secondary", __FILE__, __LINE__);
-+											"check data consistency between master and other db node", __FILE__, __LINE__);
- 
- 					if (pool_config->replication_stop_on_mismatch)
--						return POOL_FATAL;
-+					{
-+						notice_backend_error(i);
-+						child_exit(1);
-+					}
- 					else
- 						return POOL_ERROR;
- 				}
diff --git a/databases/pgpool-II-23/pkg-plist b/databases/pgpool-II-23/pkg-plist
index 6212caf3a56f..3645b15f2d20 100644
--- a/databases/pgpool-II-23/pkg-plist
+++ b/databases/pgpool-II-23/pkg-plist
@@ -11,11 +11,13 @@ bin/pg_md5
 bin/pgpool
 etc/pcp.conf.sample
 etc/pgpool.conf.sample
+etc/pool_hba.conf.sample
 include/pcp.h
 include/pool_type.h
 lib/libpcp.a
 lib/libpcp.la
 lib/libpcp.so
 lib/libpcp.so.0
+%%DATADIR%%/pgpool.pam
 %%DATADIR%%/system_db.sql
 @dirrm %%DATADIR%%
diff --git a/databases/pgpool-II-30/Makefile b/databases/pgpool-II-30/Makefile
index 582d5f2fcf20..0b72e4ae346a 100644
--- a/databases/pgpool-II-30/Makefile
+++ b/databases/pgpool-II-30/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	pgpool-II
-PORTVERSION=	1.0.2
-PORTREVISION=	1
+PORTVERSION=	1.3
 CATEGORIES=	databases
-MASTER_SITES=	http://pgfoundry.org/frs/download.php/1258/
+MASTER_SITES=	http://pgfoundry.org/frs/download.php/1488/
 
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	A connection pool server for PostgreSQL
@@ -19,7 +18,6 @@ GNU_CONFIGURE=	yes
 USE_PGSQL=	yes
 
 CONFLICTS=	pgpool-3.*
-CONFIGURE_ARGS=	--datadir=${DATADIR}
 USE_RC_SUBR=	pgpool
 
 PORTDOCS=	AUTHORS COPYING ChangeLog INSTALL NEWS README README.euc_jp
@@ -33,6 +31,9 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|echo aout|echo elf|g' \
 	${WRKSRC}/configure
 
+pre-install:
+	${MKDIR} ${DATADIR}
+
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
diff --git a/databases/pgpool-II-30/distinfo b/databases/pgpool-II-30/distinfo
index 8df6088eb098..c6560580bc28 100644
--- a/databases/pgpool-II-30/distinfo
+++ b/databases/pgpool-II-30/distinfo
@@ -1,3 +1,3 @@
-MD5 (pgpool-II-1.0.2.tar.gz) = adf88e4b7eb7f3347740a6b54aa09e92
-SHA256 (pgpool-II-1.0.2.tar.gz) = d5d37cf388b5ddca5a4dedde5838dfb8fa84775d30b1d85d07e3163643ce58a6
-SIZE (pgpool-II-1.0.2.tar.gz) = 765193
+MD5 (pgpool-II-1.3.tar.gz) = 1276c4b98a9de6f85f3179380a370144
+SHA256 (pgpool-II-1.3.tar.gz) = 1dee4433685ed21557d25325dd9671b1334e1d6eb9467646acbf6b675a7b24de
+SIZE (pgpool-II-1.3.tar.gz) = 826772
diff --git a/databases/pgpool-II-30/files/patch-pool_process_query.c b/databases/pgpool-II-30/files/patch-pool_process_query.c
deleted file mode 100644
index 58943765d52f..000000000000
--- a/databases/pgpool-II-30/files/patch-pool_process_query.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- pool_process_query.c.orig	Mon Apr 16 12:08:40 2007
-+++ pool_process_query.c	Mon Apr 16 12:09:54 2007
-@@ -3906,10 +3906,13 @@
- 							   i, k, *kind);
- 					pool_send_error_message(frontend, MAJOR(backend), "XX000", 
- 											"kind mismatch between backends", "",
--											"check data consistency between master and secondary", __FILE__, __LINE__);
-+											"check data consistency between master and other db node", __FILE__, __LINE__);
- 
- 					if (pool_config->replication_stop_on_mismatch)
--						return POOL_FATAL;
-+					{
-+						notice_backend_error(i);
-+						child_exit(1);
-+					}
- 					else
- 						return POOL_ERROR;
- 				}
diff --git a/databases/pgpool-II-30/pkg-plist b/databases/pgpool-II-30/pkg-plist
index 6212caf3a56f..3645b15f2d20 100644
--- a/databases/pgpool-II-30/pkg-plist
+++ b/databases/pgpool-II-30/pkg-plist
@@ -11,11 +11,13 @@ bin/pg_md5
 bin/pgpool
 etc/pcp.conf.sample
 etc/pgpool.conf.sample
+etc/pool_hba.conf.sample
 include/pcp.h
 include/pool_type.h
 lib/libpcp.a
 lib/libpcp.la
 lib/libpcp.so
 lib/libpcp.so.0
+%%DATADIR%%/pgpool.pam
 %%DATADIR%%/system_db.sql
 @dirrm %%DATADIR%%
diff --git a/databases/pgpool-II/Makefile b/databases/pgpool-II/Makefile
index 582d5f2fcf20..0b72e4ae346a 100644
--- a/databases/pgpool-II/Makefile
+++ b/databases/pgpool-II/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	pgpool-II
-PORTVERSION=	1.0.2
-PORTREVISION=	1
+PORTVERSION=	1.3
 CATEGORIES=	databases
-MASTER_SITES=	http://pgfoundry.org/frs/download.php/1258/
+MASTER_SITES=	http://pgfoundry.org/frs/download.php/1488/
 
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	A connection pool server for PostgreSQL
@@ -19,7 +18,6 @@ GNU_CONFIGURE=	yes
 USE_PGSQL=	yes
 
 CONFLICTS=	pgpool-3.*
-CONFIGURE_ARGS=	--datadir=${DATADIR}
 USE_RC_SUBR=	pgpool
 
 PORTDOCS=	AUTHORS COPYING ChangeLog INSTALL NEWS README README.euc_jp
@@ -33,6 +31,9 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|echo aout|echo elf|g' \
 	${WRKSRC}/configure
 
+pre-install:
+	${MKDIR} ${DATADIR}
+
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
diff --git a/databases/pgpool-II/distinfo b/databases/pgpool-II/distinfo
index 8df6088eb098..c6560580bc28 100644
--- a/databases/pgpool-II/distinfo
+++ b/databases/pgpool-II/distinfo
@@ -1,3 +1,3 @@
-MD5 (pgpool-II-1.0.2.tar.gz) = adf88e4b7eb7f3347740a6b54aa09e92
-SHA256 (pgpool-II-1.0.2.tar.gz) = d5d37cf388b5ddca5a4dedde5838dfb8fa84775d30b1d85d07e3163643ce58a6
-SIZE (pgpool-II-1.0.2.tar.gz) = 765193
+MD5 (pgpool-II-1.3.tar.gz) = 1276c4b98a9de6f85f3179380a370144
+SHA256 (pgpool-II-1.3.tar.gz) = 1dee4433685ed21557d25325dd9671b1334e1d6eb9467646acbf6b675a7b24de
+SIZE (pgpool-II-1.3.tar.gz) = 826772
diff --git a/databases/pgpool-II/files/patch-pool_process_query.c b/databases/pgpool-II/files/patch-pool_process_query.c
deleted file mode 100644
index 58943765d52f..000000000000
--- a/databases/pgpool-II/files/patch-pool_process_query.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- pool_process_query.c.orig	Mon Apr 16 12:08:40 2007
-+++ pool_process_query.c	Mon Apr 16 12:09:54 2007
-@@ -3906,10 +3906,13 @@
- 							   i, k, *kind);
- 					pool_send_error_message(frontend, MAJOR(backend), "XX000", 
- 											"kind mismatch between backends", "",
--											"check data consistency between master and secondary", __FILE__, __LINE__);
-+											"check data consistency between master and other db node", __FILE__, __LINE__);
- 
- 					if (pool_config->replication_stop_on_mismatch)
--						return POOL_FATAL;
-+					{
-+						notice_backend_error(i);
-+						child_exit(1);
-+					}
- 					else
- 						return POOL_ERROR;
- 				}
diff --git a/databases/pgpool-II/pkg-plist b/databases/pgpool-II/pkg-plist
index 6212caf3a56f..3645b15f2d20 100644
--- a/databases/pgpool-II/pkg-plist
+++ b/databases/pgpool-II/pkg-plist
@@ -11,11 +11,13 @@ bin/pg_md5
 bin/pgpool
 etc/pcp.conf.sample
 etc/pgpool.conf.sample
+etc/pool_hba.conf.sample
 include/pcp.h
 include/pool_type.h
 lib/libpcp.a
 lib/libpcp.la
 lib/libpcp.so
 lib/libpcp.so.0
+%%DATADIR%%/pgpool.pam
 %%DATADIR%%/system_db.sql
 @dirrm %%DATADIR%%