diff options
34 files changed, 243 insertions, 220 deletions
diff --git a/databases/Makefile b/databases/Makefile index 33112918382a..2612ea7ee3c7 100644 --- a/databases/Makefile +++ b/databases/Makefile @@ -333,6 +333,7 @@ SUBDIR += pgbash SUBDIR += pgcluster SUBDIR += pgpool + SUBDIR += pgpool-II SUBDIR += pgtop SUBDIR += pgworksheet SUBDIR += php-sqlite3 diff --git a/databases/pgpool-II-22/Makefile b/databases/pgpool-II-22/Makefile index f270cdfb4aba..0d4b4dfc8da7 100644 --- a/databases/pgpool-II-22/Makefile +++ b/databases/pgpool-II-22/Makefile @@ -5,20 +5,26 @@ # $FreeBSD$ # -PORTNAME= pgpool -PORTVERSION= 3.2 +PORTNAME= pgpool-II +PORTVERSION= 1.0.2 CATEGORIES= databases -MASTER_SITES= http://pgfoundry.org/frs/download.php/1254/ +MASTER_SITES= http://pgfoundry.org/frs/download.php/1258/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= kuriyama@FreeBSD.org COMMENT= A connection pool server for PostgreSQL USE_GMAKE= yes GNU_CONFIGURE= yes +USE_PGSQL= yes +CONFLICTS= pgpool-3.* +CONFIGURE_ARGS= --datadir=${DATADIR} USE_RC_SUBR= pgpool -PORTDOCS= README AUTHORS COPYING ChangeLog INSTALL NEWS TODO README.euc_jp +PORTDOCS= AUTHORS COPYING ChangeLog INSTALL NEWS README README.euc_jp +PORTDOCS+= TODO +PORTDOCShtml= pgpool-en.html pgpool-ja.html pgpool.css +PORTDOCShtml+= tutorial-en.html tutorial-ja.html MAN8= pgpool.8 @@ -28,6 +34,10 @@ post-install: .for f in ${PORTDOCS} ${INSTALL_MAN} ${WRKSRC}/$f ${DOCSDIR} .endfor +.for f in ${PORTDOCShtml} + ${INSTALL_MAN} ${WRKSRC}/doc/$f ${DOCSDIR} +.endfor +PORTDOCS+= ${PORTDOCShtml} .endif .include <bsd.port.mk> diff --git a/databases/pgpool-II-22/distinfo b/databases/pgpool-II-22/distinfo index 8c9773b542c8..8df6088eb098 100644 --- a/databases/pgpool-II-22/distinfo +++ b/databases/pgpool-II-22/distinfo @@ -1,3 +1,3 @@ -MD5 (pgpool-3.2.tar.gz) = 1a8f7359a73585698890624ba600bdf8 -SHA256 (pgpool-3.2.tar.gz) = 99eb527a05883863d7ab111438adaf6861d76978e21a5b43ff8103341e329bfa -SIZE (pgpool-3.2.tar.gz) = 199777 +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 diff --git a/databases/pgpool-II-22/files/patch-pool_ip.c b/databases/pgpool-II-22/files/patch-pool_ip.c deleted file mode 100644 index b66fb3653302..000000000000 --- a/databases/pgpool-II-22/files/patch-pool_ip.c +++ /dev/null @@ -1,18 +0,0 @@ ---- pool_ip.c.orig Sat Feb 3 13:22:21 2007 -+++ pool_ip.c Tue Feb 13 17:23:39 2007 -@@ -184,6 +184,7 @@ - } - - -+#if 0 - const char * - gai_strerror(int errcode) - { -@@ -205,6 +206,7 @@ - - return hstrerror(hcode); - } -+#endif - - - /* diff --git a/databases/pgpool-II-22/files/patch-pool_ip.h b/databases/pgpool-II-22/files/patch-pool_ip.h deleted file mode 100644 index cad2862ff096..000000000000 --- a/databases/pgpool-II-22/files/patch-pool_ip.h +++ /dev/null @@ -1,12 +0,0 @@ ---- pool_ip.h.orig Fri Feb 2 00:31:59 2007 -+++ pool_ip.h Tue Feb 13 17:22:46 2007 -@@ -50,7 +50,9 @@ - char *numbits, int family); - - /* imported from PostgreSQL getaddrinfo.c */ -+#if 0 - extern const char * gai_strerror(int errcode); -+#endif - - #ifdef HAVE_IPV6 - extern void promote_v4_to_v6_addr(struct sockaddr_storage * addr); diff --git a/databases/pgpool-II-22/files/patch-pool_process_query.c b/databases/pgpool-II-22/files/patch-pool_process_query.c new file mode 100644 index 000000000000..58943765d52f --- /dev/null +++ b/databases/pgpool-II-22/files/patch-pool_process_query.c @@ -0,0 +1,18 @@ +--- 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/files/patch-pool_type.h b/databases/pgpool-II-22/files/patch-pool_type.h deleted file mode 100644 index 537fd28218bf..000000000000 --- a/databases/pgpool-II-22/files/patch-pool_type.h +++ /dev/null @@ -1,10 +0,0 @@ ---- pool_type.h.orig Sat Feb 10 18:48:12 2007 -+++ pool_type.h Tue Feb 13 17:29:00 2007 -@@ -30,6 +30,7 @@ - - - #include "config.h" -+#include <sys/types.h> - #include <sys/socket.h> - - diff --git a/databases/pgpool-II-22/pkg-descr b/databases/pgpool-II-22/pkg-descr index a636d10f9948..ced45ee00351 100644 --- a/databases/pgpool-II-22/pkg-descr +++ b/databases/pgpool-II-22/pkg-descr @@ -1,8 +1,10 @@ -pgpool is a connection pool server for PostgreSQL. pgpool runs between -PostgreSQL's clients(front ends) and servers(back ends). A PostgreSQL client can -connect to pgpool as if it were a standard PostgreSQL server. +pgpool-II allows multiple PostgreSQL servers (DB nodes) to be +connected, which enables queries to be executed simultaneously on all +servers. -pgpool caches the connection to PostgreSQL server to reduce the overhead to -establish the connection to it. +It enables "parallel query" processing. Also, pgpool-II can be started +as pgpool-I by changing configuration parameters. pgpool-II that is +executed in pgpool-I mode enables multiple DB nodes to be connected, +which was not possible in pgpool-I. -WWW: http://pgpool.projects.postgresql.org/ +WWW: http://pgpool.projects.postgresql.org/pgpool-II/en/ diff --git a/databases/pgpool-II-22/pkg-plist b/databases/pgpool-II-22/pkg-plist index 6eec8ae0b61f..b1c752e0c036 100644 --- a/databases/pgpool-II-22/pkg-plist +++ b/databases/pgpool-II-22/pkg-plist @@ -1,4 +1,19 @@ @comment $FreeBSD$ +bin/pcp_attach_node +bin/pcp_detach_node +bin/pcp_node_count +bin/pcp_node_info +bin/pcp_proc_count +bin/pcp_proc_info +bin/pcp_stop_pgpool +bin/pcp_systemdb_info +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.0.0 +%%DATADIR%%/system_db.sql diff --git a/databases/pgpool-II-23/Makefile b/databases/pgpool-II-23/Makefile index f270cdfb4aba..0d4b4dfc8da7 100644 --- a/databases/pgpool-II-23/Makefile +++ b/databases/pgpool-II-23/Makefile @@ -5,20 +5,26 @@ # $FreeBSD$ # -PORTNAME= pgpool -PORTVERSION= 3.2 +PORTNAME= pgpool-II +PORTVERSION= 1.0.2 CATEGORIES= databases -MASTER_SITES= http://pgfoundry.org/frs/download.php/1254/ +MASTER_SITES= http://pgfoundry.org/frs/download.php/1258/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= kuriyama@FreeBSD.org COMMENT= A connection pool server for PostgreSQL USE_GMAKE= yes GNU_CONFIGURE= yes +USE_PGSQL= yes +CONFLICTS= pgpool-3.* +CONFIGURE_ARGS= --datadir=${DATADIR} USE_RC_SUBR= pgpool -PORTDOCS= README AUTHORS COPYING ChangeLog INSTALL NEWS TODO README.euc_jp +PORTDOCS= AUTHORS COPYING ChangeLog INSTALL NEWS README README.euc_jp +PORTDOCS+= TODO +PORTDOCShtml= pgpool-en.html pgpool-ja.html pgpool.css +PORTDOCShtml+= tutorial-en.html tutorial-ja.html MAN8= pgpool.8 @@ -28,6 +34,10 @@ post-install: .for f in ${PORTDOCS} ${INSTALL_MAN} ${WRKSRC}/$f ${DOCSDIR} .endfor +.for f in ${PORTDOCShtml} + ${INSTALL_MAN} ${WRKSRC}/doc/$f ${DOCSDIR} +.endfor +PORTDOCS+= ${PORTDOCShtml} .endif .include <bsd.port.mk> diff --git a/databases/pgpool-II-23/distinfo b/databases/pgpool-II-23/distinfo index 8c9773b542c8..8df6088eb098 100644 --- a/databases/pgpool-II-23/distinfo +++ b/databases/pgpool-II-23/distinfo @@ -1,3 +1,3 @@ -MD5 (pgpool-3.2.tar.gz) = 1a8f7359a73585698890624ba600bdf8 -SHA256 (pgpool-3.2.tar.gz) = 99eb527a05883863d7ab111438adaf6861d76978e21a5b43ff8103341e329bfa -SIZE (pgpool-3.2.tar.gz) = 199777 +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 diff --git a/databases/pgpool-II-23/files/patch-pool_ip.c b/databases/pgpool-II-23/files/patch-pool_ip.c deleted file mode 100644 index b66fb3653302..000000000000 --- a/databases/pgpool-II-23/files/patch-pool_ip.c +++ /dev/null @@ -1,18 +0,0 @@ ---- pool_ip.c.orig Sat Feb 3 13:22:21 2007 -+++ pool_ip.c Tue Feb 13 17:23:39 2007 -@@ -184,6 +184,7 @@ - } - - -+#if 0 - const char * - gai_strerror(int errcode) - { -@@ -205,6 +206,7 @@ - - return hstrerror(hcode); - } -+#endif - - - /* diff --git a/databases/pgpool-II-23/files/patch-pool_ip.h b/databases/pgpool-II-23/files/patch-pool_ip.h deleted file mode 100644 index cad2862ff096..000000000000 --- a/databases/pgpool-II-23/files/patch-pool_ip.h +++ /dev/null @@ -1,12 +0,0 @@ ---- pool_ip.h.orig Fri Feb 2 00:31:59 2007 -+++ pool_ip.h Tue Feb 13 17:22:46 2007 -@@ -50,7 +50,9 @@ - char *numbits, int family); - - /* imported from PostgreSQL getaddrinfo.c */ -+#if 0 - extern const char * gai_strerror(int errcode); -+#endif - - #ifdef HAVE_IPV6 - extern void promote_v4_to_v6_addr(struct sockaddr_storage * addr); diff --git a/databases/pgpool-II-23/files/patch-pool_process_query.c b/databases/pgpool-II-23/files/patch-pool_process_query.c new file mode 100644 index 000000000000..58943765d52f --- /dev/null +++ b/databases/pgpool-II-23/files/patch-pool_process_query.c @@ -0,0 +1,18 @@ +--- 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/files/patch-pool_type.h b/databases/pgpool-II-23/files/patch-pool_type.h deleted file mode 100644 index 537fd28218bf..000000000000 --- a/databases/pgpool-II-23/files/patch-pool_type.h +++ /dev/null @@ -1,10 +0,0 @@ ---- pool_type.h.orig Sat Feb 10 18:48:12 2007 -+++ pool_type.h Tue Feb 13 17:29:00 2007 -@@ -30,6 +30,7 @@ - - - #include "config.h" -+#include <sys/types.h> - #include <sys/socket.h> - - diff --git a/databases/pgpool-II-23/pkg-descr b/databases/pgpool-II-23/pkg-descr index a636d10f9948..ced45ee00351 100644 --- a/databases/pgpool-II-23/pkg-descr +++ b/databases/pgpool-II-23/pkg-descr @@ -1,8 +1,10 @@ -pgpool is a connection pool server for PostgreSQL. pgpool runs between -PostgreSQL's clients(front ends) and servers(back ends). A PostgreSQL client can -connect to pgpool as if it were a standard PostgreSQL server. +pgpool-II allows multiple PostgreSQL servers (DB nodes) to be +connected, which enables queries to be executed simultaneously on all +servers. -pgpool caches the connection to PostgreSQL server to reduce the overhead to -establish the connection to it. +It enables "parallel query" processing. Also, pgpool-II can be started +as pgpool-I by changing configuration parameters. pgpool-II that is +executed in pgpool-I mode enables multiple DB nodes to be connected, +which was not possible in pgpool-I. -WWW: http://pgpool.projects.postgresql.org/ +WWW: http://pgpool.projects.postgresql.org/pgpool-II/en/ diff --git a/databases/pgpool-II-23/pkg-plist b/databases/pgpool-II-23/pkg-plist index 6eec8ae0b61f..b1c752e0c036 100644 --- a/databases/pgpool-II-23/pkg-plist +++ b/databases/pgpool-II-23/pkg-plist @@ -1,4 +1,19 @@ @comment $FreeBSD$ +bin/pcp_attach_node +bin/pcp_detach_node +bin/pcp_node_count +bin/pcp_node_info +bin/pcp_proc_count +bin/pcp_proc_info +bin/pcp_stop_pgpool +bin/pcp_systemdb_info +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.0.0 +%%DATADIR%%/system_db.sql diff --git a/databases/pgpool-II-30/Makefile b/databases/pgpool-II-30/Makefile index f270cdfb4aba..0d4b4dfc8da7 100644 --- a/databases/pgpool-II-30/Makefile +++ b/databases/pgpool-II-30/Makefile @@ -5,20 +5,26 @@ # $FreeBSD$ # -PORTNAME= pgpool -PORTVERSION= 3.2 +PORTNAME= pgpool-II +PORTVERSION= 1.0.2 CATEGORIES= databases -MASTER_SITES= http://pgfoundry.org/frs/download.php/1254/ +MASTER_SITES= http://pgfoundry.org/frs/download.php/1258/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= kuriyama@FreeBSD.org COMMENT= A connection pool server for PostgreSQL USE_GMAKE= yes GNU_CONFIGURE= yes +USE_PGSQL= yes +CONFLICTS= pgpool-3.* +CONFIGURE_ARGS= --datadir=${DATADIR} USE_RC_SUBR= pgpool -PORTDOCS= README AUTHORS COPYING ChangeLog INSTALL NEWS TODO README.euc_jp +PORTDOCS= AUTHORS COPYING ChangeLog INSTALL NEWS README README.euc_jp +PORTDOCS+= TODO +PORTDOCShtml= pgpool-en.html pgpool-ja.html pgpool.css +PORTDOCShtml+= tutorial-en.html tutorial-ja.html MAN8= pgpool.8 @@ -28,6 +34,10 @@ post-install: .for f in ${PORTDOCS} ${INSTALL_MAN} ${WRKSRC}/$f ${DOCSDIR} .endfor +.for f in ${PORTDOCShtml} + ${INSTALL_MAN} ${WRKSRC}/doc/$f ${DOCSDIR} +.endfor +PORTDOCS+= ${PORTDOCShtml} .endif .include <bsd.port.mk> diff --git a/databases/pgpool-II-30/distinfo b/databases/pgpool-II-30/distinfo index 8c9773b542c8..8df6088eb098 100644 --- a/databases/pgpool-II-30/distinfo +++ b/databases/pgpool-II-30/distinfo @@ -1,3 +1,3 @@ -MD5 (pgpool-3.2.tar.gz) = 1a8f7359a73585698890624ba600bdf8 -SHA256 (pgpool-3.2.tar.gz) = 99eb527a05883863d7ab111438adaf6861d76978e21a5b43ff8103341e329bfa -SIZE (pgpool-3.2.tar.gz) = 199777 +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 diff --git a/databases/pgpool-II-30/files/patch-pool_ip.c b/databases/pgpool-II-30/files/patch-pool_ip.c deleted file mode 100644 index b66fb3653302..000000000000 --- a/databases/pgpool-II-30/files/patch-pool_ip.c +++ /dev/null @@ -1,18 +0,0 @@ ---- pool_ip.c.orig Sat Feb 3 13:22:21 2007 -+++ pool_ip.c Tue Feb 13 17:23:39 2007 -@@ -184,6 +184,7 @@ - } - - -+#if 0 - const char * - gai_strerror(int errcode) - { -@@ -205,6 +206,7 @@ - - return hstrerror(hcode); - } -+#endif - - - /* diff --git a/databases/pgpool-II-30/files/patch-pool_ip.h b/databases/pgpool-II-30/files/patch-pool_ip.h deleted file mode 100644 index cad2862ff096..000000000000 --- a/databases/pgpool-II-30/files/patch-pool_ip.h +++ /dev/null @@ -1,12 +0,0 @@ ---- pool_ip.h.orig Fri Feb 2 00:31:59 2007 -+++ pool_ip.h Tue Feb 13 17:22:46 2007 -@@ -50,7 +50,9 @@ - char *numbits, int family); - - /* imported from PostgreSQL getaddrinfo.c */ -+#if 0 - extern const char * gai_strerror(int errcode); -+#endif - - #ifdef HAVE_IPV6 - extern void promote_v4_to_v6_addr(struct sockaddr_storage * addr); diff --git a/databases/pgpool-II-30/files/patch-pool_process_query.c b/databases/pgpool-II-30/files/patch-pool_process_query.c new file mode 100644 index 000000000000..58943765d52f --- /dev/null +++ b/databases/pgpool-II-30/files/patch-pool_process_query.c @@ -0,0 +1,18 @@ +--- 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/files/patch-pool_type.h b/databases/pgpool-II-30/files/patch-pool_type.h deleted file mode 100644 index 537fd28218bf..000000000000 --- a/databases/pgpool-II-30/files/patch-pool_type.h +++ /dev/null @@ -1,10 +0,0 @@ ---- pool_type.h.orig Sat Feb 10 18:48:12 2007 -+++ pool_type.h Tue Feb 13 17:29:00 2007 -@@ -30,6 +30,7 @@ - - - #include "config.h" -+#include <sys/types.h> - #include <sys/socket.h> - - diff --git a/databases/pgpool-II-30/pkg-descr b/databases/pgpool-II-30/pkg-descr index a636d10f9948..ced45ee00351 100644 --- a/databases/pgpool-II-30/pkg-descr +++ b/databases/pgpool-II-30/pkg-descr @@ -1,8 +1,10 @@ -pgpool is a connection pool server for PostgreSQL. pgpool runs between -PostgreSQL's clients(front ends) and servers(back ends). A PostgreSQL client can -connect to pgpool as if it were a standard PostgreSQL server. +pgpool-II allows multiple PostgreSQL servers (DB nodes) to be +connected, which enables queries to be executed simultaneously on all +servers. -pgpool caches the connection to PostgreSQL server to reduce the overhead to -establish the connection to it. +It enables "parallel query" processing. Also, pgpool-II can be started +as pgpool-I by changing configuration parameters. pgpool-II that is +executed in pgpool-I mode enables multiple DB nodes to be connected, +which was not possible in pgpool-I. -WWW: http://pgpool.projects.postgresql.org/ +WWW: http://pgpool.projects.postgresql.org/pgpool-II/en/ diff --git a/databases/pgpool-II-30/pkg-plist b/databases/pgpool-II-30/pkg-plist index 6eec8ae0b61f..b1c752e0c036 100644 --- a/databases/pgpool-II-30/pkg-plist +++ b/databases/pgpool-II-30/pkg-plist @@ -1,4 +1,19 @@ @comment $FreeBSD$ +bin/pcp_attach_node +bin/pcp_detach_node +bin/pcp_node_count +bin/pcp_node_info +bin/pcp_proc_count +bin/pcp_proc_info +bin/pcp_stop_pgpool +bin/pcp_systemdb_info +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.0.0 +%%DATADIR%%/system_db.sql diff --git a/databases/pgpool-II/Makefile b/databases/pgpool-II/Makefile index f270cdfb4aba..0d4b4dfc8da7 100644 --- a/databases/pgpool-II/Makefile +++ b/databases/pgpool-II/Makefile @@ -5,20 +5,26 @@ # $FreeBSD$ # -PORTNAME= pgpool -PORTVERSION= 3.2 +PORTNAME= pgpool-II +PORTVERSION= 1.0.2 CATEGORIES= databases -MASTER_SITES= http://pgfoundry.org/frs/download.php/1254/ +MASTER_SITES= http://pgfoundry.org/frs/download.php/1258/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= kuriyama@FreeBSD.org COMMENT= A connection pool server for PostgreSQL USE_GMAKE= yes GNU_CONFIGURE= yes +USE_PGSQL= yes +CONFLICTS= pgpool-3.* +CONFIGURE_ARGS= --datadir=${DATADIR} USE_RC_SUBR= pgpool -PORTDOCS= README AUTHORS COPYING ChangeLog INSTALL NEWS TODO README.euc_jp +PORTDOCS= AUTHORS COPYING ChangeLog INSTALL NEWS README README.euc_jp +PORTDOCS+= TODO +PORTDOCShtml= pgpool-en.html pgpool-ja.html pgpool.css +PORTDOCShtml+= tutorial-en.html tutorial-ja.html MAN8= pgpool.8 @@ -28,6 +34,10 @@ post-install: .for f in ${PORTDOCS} ${INSTALL_MAN} ${WRKSRC}/$f ${DOCSDIR} .endfor +.for f in ${PORTDOCShtml} + ${INSTALL_MAN} ${WRKSRC}/doc/$f ${DOCSDIR} +.endfor +PORTDOCS+= ${PORTDOCShtml} .endif .include <bsd.port.mk> diff --git a/databases/pgpool-II/distinfo b/databases/pgpool-II/distinfo index 8c9773b542c8..8df6088eb098 100644 --- a/databases/pgpool-II/distinfo +++ b/databases/pgpool-II/distinfo @@ -1,3 +1,3 @@ -MD5 (pgpool-3.2.tar.gz) = 1a8f7359a73585698890624ba600bdf8 -SHA256 (pgpool-3.2.tar.gz) = 99eb527a05883863d7ab111438adaf6861d76978e21a5b43ff8103341e329bfa -SIZE (pgpool-3.2.tar.gz) = 199777 +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 diff --git a/databases/pgpool-II/files/patch-pool_ip.c b/databases/pgpool-II/files/patch-pool_ip.c deleted file mode 100644 index b66fb3653302..000000000000 --- a/databases/pgpool-II/files/patch-pool_ip.c +++ /dev/null @@ -1,18 +0,0 @@ ---- pool_ip.c.orig Sat Feb 3 13:22:21 2007 -+++ pool_ip.c Tue Feb 13 17:23:39 2007 -@@ -184,6 +184,7 @@ - } - - -+#if 0 - const char * - gai_strerror(int errcode) - { -@@ -205,6 +206,7 @@ - - return hstrerror(hcode); - } -+#endif - - - /* diff --git a/databases/pgpool-II/files/patch-pool_ip.h b/databases/pgpool-II/files/patch-pool_ip.h deleted file mode 100644 index cad2862ff096..000000000000 --- a/databases/pgpool-II/files/patch-pool_ip.h +++ /dev/null @@ -1,12 +0,0 @@ ---- pool_ip.h.orig Fri Feb 2 00:31:59 2007 -+++ pool_ip.h Tue Feb 13 17:22:46 2007 -@@ -50,7 +50,9 @@ - char *numbits, int family); - - /* imported from PostgreSQL getaddrinfo.c */ -+#if 0 - extern const char * gai_strerror(int errcode); -+#endif - - #ifdef HAVE_IPV6 - extern void promote_v4_to_v6_addr(struct sockaddr_storage * addr); diff --git a/databases/pgpool-II/files/patch-pool_process_query.c b/databases/pgpool-II/files/patch-pool_process_query.c new file mode 100644 index 000000000000..58943765d52f --- /dev/null +++ b/databases/pgpool-II/files/patch-pool_process_query.c @@ -0,0 +1,18 @@ +--- 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/files/patch-pool_type.h b/databases/pgpool-II/files/patch-pool_type.h deleted file mode 100644 index 537fd28218bf..000000000000 --- a/databases/pgpool-II/files/patch-pool_type.h +++ /dev/null @@ -1,10 +0,0 @@ ---- pool_type.h.orig Sat Feb 10 18:48:12 2007 -+++ pool_type.h Tue Feb 13 17:29:00 2007 -@@ -30,6 +30,7 @@ - - - #include "config.h" -+#include <sys/types.h> - #include <sys/socket.h> - - diff --git a/databases/pgpool-II/pkg-descr b/databases/pgpool-II/pkg-descr index a636d10f9948..ced45ee00351 100644 --- a/databases/pgpool-II/pkg-descr +++ b/databases/pgpool-II/pkg-descr @@ -1,8 +1,10 @@ -pgpool is a connection pool server for PostgreSQL. pgpool runs between -PostgreSQL's clients(front ends) and servers(back ends). A PostgreSQL client can -connect to pgpool as if it were a standard PostgreSQL server. +pgpool-II allows multiple PostgreSQL servers (DB nodes) to be +connected, which enables queries to be executed simultaneously on all +servers. -pgpool caches the connection to PostgreSQL server to reduce the overhead to -establish the connection to it. +It enables "parallel query" processing. Also, pgpool-II can be started +as pgpool-I by changing configuration parameters. pgpool-II that is +executed in pgpool-I mode enables multiple DB nodes to be connected, +which was not possible in pgpool-I. -WWW: http://pgpool.projects.postgresql.org/ +WWW: http://pgpool.projects.postgresql.org/pgpool-II/en/ diff --git a/databases/pgpool-II/pkg-plist b/databases/pgpool-II/pkg-plist index 6eec8ae0b61f..b1c752e0c036 100644 --- a/databases/pgpool-II/pkg-plist +++ b/databases/pgpool-II/pkg-plist @@ -1,4 +1,19 @@ @comment $FreeBSD$ +bin/pcp_attach_node +bin/pcp_detach_node +bin/pcp_node_count +bin/pcp_node_info +bin/pcp_proc_count +bin/pcp_proc_info +bin/pcp_stop_pgpool +bin/pcp_systemdb_info +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.0.0 +%%DATADIR%%/system_db.sql diff --git a/databases/pgpool/Makefile b/databases/pgpool/Makefile index f270cdfb4aba..22b94d6691bf 100644 --- a/databases/pgpool/Makefile +++ b/databases/pgpool/Makefile @@ -7,6 +7,7 @@ PORTNAME= pgpool PORTVERSION= 3.2 +PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= http://pgfoundry.org/frs/download.php/1254/ @@ -17,6 +18,7 @@ USE_GMAKE= yes GNU_CONFIGURE= yes USE_RC_SUBR= pgpool +CONFLICTS= pgpool-II-1.* PORTDOCS= README AUTHORS COPYING ChangeLog INSTALL NEWS TODO README.euc_jp |