- Repocopy 3.0 to pgpool-II-30 and upgrade pgpool-II to 3.1.

- Install user-defined c-functions ([1], partial).
- Add reload command to startup script [2]

PR:		ports/156578 [1], ports/156818 [2]
Submitted by:	Anton Yuzhaninov <ayuzhaninov@team.vega.ru> [1],
	  	Anton Yuzhaninov <citrin@citrin.ru> [2]

5 files changed, 35 insertions, 11 deletions

diff --git a/databases/pgpool-II-30/Makefile b/databases/pgpool-II-30/Makefile
index 2a107dc7a501..ece37269ce67 100644
--- a/databases/pgpool-II-30/Makefile
+++ b/databases/pgpool-II-30/Makefile
@@ -13,13 +13,15 @@ MASTER_SITES=	http://pgfoundry.org/frs/download.php/3076/
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	A connection pool server for PostgreSQL
 
+LICENSE=	BSD
+
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_PGSQL=	yes
 USE_LDCONFIG=	yes
-LICENSE=	BSD
+NO_LATEST_LINK=	yes
 
-CONFLICTS=	pgpool-3.* pgpool-II-*
+CONFLICTS=	pgpool-3.* pgpool-II-2.* pgpool-II-3.1.*
 USE_RC_SUBR=	pgpool
 
 PORTDOCS=	AUTHORS COPYING ChangeLog INSTALL NEWS README README.euc_jp
diff --git a/databases/pgpool-II/Makefile b/databases/pgpool-II/Makefile
index 2a107dc7a501..659c18a3687d 100644
--- a/databases/pgpool-II/Makefile
+++ b/databases/pgpool-II/Makefile
@@ -6,20 +6,21 @@
 #
 
 PORTNAME=	pgpool-II
-PORTVERSION=	3.0.4
+PORTVERSION=	3.1
 CATEGORIES=	databases
-MASTER_SITES=	http://pgfoundry.org/frs/download.php/3076/
+MASTER_SITES=	http://pgfoundry.org/frs/download.php/3114/
 
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	A connection pool server for PostgreSQL
 
+LICENSE=	BSD
+
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_PGSQL=	yes
 USE_LDCONFIG=	yes
-LICENSE=	BSD
 
-CONFLICTS=	pgpool-3.* pgpool-II-*
+CONFLICTS=	pgpool-3.* pgpool-II-2.* pgpool-II-3.0.*
 USE_RC_SUBR=	pgpool
 
 PORTDOCS=	AUTHORS COPYING ChangeLog INSTALL NEWS README README.euc_jp
@@ -29,6 +30,9 @@ PORTDOCShtml+=	tutorial-en.html tutorial-ja.html
 
 MAN8=		pgpool.8
 
+FUNCTIONS=	pgpool-recovery pgpool-regclass
+#FUNCTIONS+=	pgpool-walrecrunning
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|echo aout|echo elf|g' \
 	${WRKSRC}/configure
@@ -36,10 +40,14 @@ post-patch:
 	${WRKSRC}/sql/pgpool-recovery/Makefile
 
 post-build:
-	@cd ${WRKSRC}/sql/pgpool-recovery && ${GMAKE}
+.for f in ${FUNCTIONS}
+	@cd ${WRKSRC}/sql/${f} && ${GMAKE}
+.endfor
 
 post-install:
-	@cd ${WRKSRC}/sql/pgpool-recovery && ${GMAKE} ${INSTALL_TARGET}
+.for f in ${FUNCTIONS}
+	@cd ${WRKSRC}/sql/${f} && ${GMAKE} ${INSTALL_TARGET}
+.endfor
 	${INSTALL_DATA} ${WRKSRC}/sample/dist_def_pgbench.sql ${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/sample/replicate_def_pgbench.sql ${DATADIR}
 	${MKDIR} ${DATADIR} ${EXAMPLESDIR}
diff --git a/databases/pgpool-II/distinfo b/databases/pgpool-II/distinfo
index cbb688c75e00..fddec6fd78ef 100644
--- a/databases/pgpool-II/distinfo
+++ b/databases/pgpool-II/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pgpool-II-3.0.4.tar.gz) = 886e0fa3dec98f4a6c25cc5b4b1fc5aac49258e2669c1ffda178d18711c8b5c1
-SIZE (pgpool-II-3.0.4.tar.gz) = 1211828
+SHA256 (pgpool-II-3.1.tar.gz) = 742114cea9d2babf1c330dd5050ecd23d9a9be53ebe3cbd87142762e8a8ea940
+SIZE (pgpool-II-3.1.tar.gz) = 1354418
diff --git a/databases/pgpool-II/files/pgpool.in b/databases/pgpool-II/files/pgpool.in
index 6566ef9fa3be..e85863d25528 100644
--- a/databases/pgpool-II/files/pgpool.in
+++ b/databases/pgpool-II/files/pgpool.in
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $FreeBSD$
-#        
+#
 # PROVIDE: pgpool
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
@@ -38,6 +38,9 @@ command_args="${pgpool_flags}"
 start_cmd="pgpool_start"
 stop_cmd="${command} ${command_args} stop"
 
+extra_commands="reload"
+reload_cmd="${command} ${command_args} reload"
+
 required_files="${pgpool_conf}"
 
 pgpool_start()
diff --git a/databases/pgpool-II/pkg-plist b/databases/pgpool-II/pkg-plist
index 5f07c633e19f..1292fbd91a32 100644
--- a/databases/pgpool-II/pkg-plist
+++ b/databases/pgpool-II/pkg-plist
@@ -3,8 +3,10 @@ bin/pcp_attach_node
 bin/pcp_detach_node
 bin/pcp_node_count
 bin/pcp_node_info
+bin/pcp_pool_status
 bin/pcp_proc_count
 bin/pcp_proc_info
+bin/pcp_promote_node
 bin/pcp_recovery_node
 bin/pcp_stop_pgpool
 bin/pcp_systemdb_info
@@ -16,13 +18,16 @@ etc/pgpool.conf.sample-master-slave
 etc/pgpool.conf.sample-replication
 etc/pgpool.conf.sample-stream
 etc/pool_hba.conf.sample
+include/libpcp_ext.h
 include/pcp.h
+include/pool_process_reporting.h
 include/pool_type.h
 lib/libpcp.a
 lib/libpcp.la
 lib/libpcp.so
 lib/libpcp.so.0
 %%DATADIR%%/dist_def_pgbench.sql
+%%DATADIR%%/insert_lock.sql
 %%DATADIR%%/pgpool.pam
 %%DATADIR%%/replicate_def_pgbench.sql
 %%DATADIR%%/system_db.sql
@@ -30,7 +35,13 @@ lib/libpcp.so.0
 %%EXAMPLESDIR%%/pgpool_recovery_pitr
 %%EXAMPLESDIR%%/pgpool_remote_start
 share/postgresql/contrib/pgpool-recovery.sql
+share/postgresql/contrib/pgpool-regclass.sql
+@comment share/postgresql/contrib/pgpool-walrecrunning.sql
+share/postgresql/contrib/uninstall_pgpool-recovery.sql
+share/postgresql/contrib/uninstall_pgpool-regclass.sql
 lib/postgresql/pgpool-recovery.so
+lib/postgresql/pgpool-regclass.so
+@comment lib/postgresql/pgpool-walrecrunning.so
 @dirrmtry share/postgresql/contrib
 @dirrm %%EXAMPLESDIR%%
 @dirrm %%DATADIR%%