summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJun Kuriyama <kuriyama@FreeBSD.org>2010-10-13 11:49:12 +0000
committerJun Kuriyama <kuriyama@FreeBSD.org>2010-10-13 11:49:12 +0000
commit7cddfe7e59718e2c262cbf93df855cd3d0b8fe11 (patch)
treef231ef88b1e327b2b548ff44cdd6cb58a0cabe66
parent- Listen in daemon mode by default (diff)
- Upgrade to 3.0 after repocopied to pgpool-II-23.
PR: ports/150907 Submitted by: Mikhail Tsatsenko <m.tsatsenko@mail.ru>
Diffstat
-rw-r--r--databases/Makefile1
-rw-r--r--databases/pgpool-II-22/Makefile2
-rw-r--r--databases/pgpool-II-23/Makefile2
-rw-r--r--databases/pgpool-II-30/Makefile6
-rw-r--r--databases/pgpool-II-30/distinfo6
-rw-r--r--databases/pgpool-II-30/files/patch-recovery.c20
-rw-r--r--databases/pgpool-II-30/pkg-plist1
-rw-r--r--databases/pgpool-II/Makefile6
-rw-r--r--databases/pgpool-II/distinfo6
-rw-r--r--databases/pgpool-II/files/patch-recovery.c20
-rw-r--r--databases/pgpool-II/pkg-plist1
-rw-r--r--databases/pgpool/Makefile2
12 files changed, 38 insertions, 35 deletions
diff --git a/databases/Makefile b/databases/Makefile
index 89f08a06f3f6..b728f00d1423 100644
--- a/databases/Makefile
+++ b/databases/Makefile
@@ -490,6 +490,7 @@
SUBDIR += pgpool
SUBDIR += pgpool-II
SUBDIR += pgpool-II-22
+ SUBDIR += pgpool-II-23
SUBDIR += pgpoolAdmin
SUBDIR += pgsphere
SUBDIR += pgtcl
diff --git a/databases/pgpool-II-22/Makefile b/databases/pgpool-II-22/Makefile
index f135a7a362b0..80dc9224139a 100644
--- a/databases/pgpool-II-22/Makefile
+++ b/databases/pgpool-II-22/Makefile
@@ -20,7 +20,7 @@ USE_PGSQL= yes
USE_LDCONFIG= yes
NO_LATEST_LINK= yes
-CONFLICTS= pgpool-3.* pgpool-II-2.3*
+CONFLICTS= pgpool-3.* pgpool-II-*
USE_RC_SUBR= pgpool
PORTDOCS= AUTHORS COPYING ChangeLog INSTALL NEWS README README.euc_jp
diff --git a/databases/pgpool-II-23/Makefile b/databases/pgpool-II-23/Makefile
index b1764c35bc69..db07c382d64e 100644
--- a/databases/pgpool-II-23/Makefile
+++ b/databases/pgpool-II-23/Makefile
@@ -18,7 +18,7 @@ GNU_CONFIGURE= yes
USE_PGSQL= yes
USE_LDCONFIG= yes
-CONFLICTS= pgpool-3.* pgpool-II-2.2.*
+CONFLICTS= pgpool-3.* pgpool-II-*
USE_RC_SUBR= pgpool
PORTDOCS= AUTHORS COPYING ChangeLog INSTALL NEWS README README.euc_jp
diff --git a/databases/pgpool-II-30/Makefile b/databases/pgpool-II-30/Makefile
index b1764c35bc69..d7b8b5b40218 100644
--- a/databases/pgpool-II-30/Makefile
+++ b/databases/pgpool-II-30/Makefile
@@ -6,9 +6,9 @@
#
PORTNAME= pgpool-II
-PORTVERSION= 2.3.3
+PORTVERSION= 3.0
CATEGORIES= databases
-MASTER_SITES= http://pgfoundry.org/frs/download.php/2664/
+MASTER_SITES= http://pgfoundry.org/frs/download.php/2798/
MAINTAINER= kuriyama@FreeBSD.org
COMMENT= A connection pool server for PostgreSQL
@@ -18,7 +18,7 @@ GNU_CONFIGURE= yes
USE_PGSQL= yes
USE_LDCONFIG= yes
-CONFLICTS= pgpool-3.* pgpool-II-2.2.*
+CONFLICTS= pgpool-3.* pgpool-II-*
USE_RC_SUBR= pgpool
PORTDOCS= AUTHORS COPYING ChangeLog INSTALL NEWS README README.euc_jp
diff --git a/databases/pgpool-II-30/distinfo b/databases/pgpool-II-30/distinfo
index cd731bc52998..aee8073ce24e 100644
--- a/databases/pgpool-II-30/distinfo
+++ b/databases/pgpool-II-30/distinfo
@@ -1,3 +1,3 @@
-MD5 (pgpool-II-2.3.3.tar.gz) = fae5a3b50eab995d15a18f80fee2e92b
-SHA256 (pgpool-II-2.3.3.tar.gz) = c9b6b0d743812f68376dd675fd0481d44aa12bb8324c6bc24522c0b857e4fa53
-SIZE (pgpool-II-2.3.3.tar.gz) = 1150695
+MD5 (pgpool-II-3.0.tar.gz) = d93a896ce185bff7920d4b603a4e9111
+SHA256 (pgpool-II-3.0.tar.gz) = b1f3f2fb84b06e8d6f0691deac324e90f5d82fbf5c143c1f53d55f50bee6c466
+SIZE (pgpool-II-3.0.tar.gz) = 1223872
diff --git a/databases/pgpool-II-30/files/patch-recovery.c b/databases/pgpool-II-30/files/patch-recovery.c
index a6ac0c6bceca..9833155123fc 100644
--- a/databases/pgpool-II-30/files/patch-recovery.c
+++ b/databases/pgpool-II-30/files/patch-recovery.c
@@ -1,15 +1,15 @@
---- recovery.c.orig 2009-08-14 15:15:08.000000000 +0900
-+++ recovery.c 2009-08-14 18:00:38.000000000 +0900
-@@ -91,7 +91,7 @@
+--- recovery.c.orig 2010-10-12 08:12:18.155163331 +0900
++++ recovery.c 2010-10-12 08:13:21.347257609 +0900
+@@ -96,7 +96,7 @@
- pool_log("1st stage is done");
+ if (REPLICATION)
+ {
+- pool_log("starting 2nd stage");
++ pool_log("starting 2nd stage. waiting connections from clients to be closed");
-- pool_log("starting 2nd stage");
-+ pool_log("starting 2nd stage. waiting connections from clients to be closed");
-
- /* 2nd stage */
- *InRecovery = 1;
-@@ -332,6 +332,6 @@
+ /* 2nd stage */
+ *InRecovery = 1;
+@@ -384,6 +384,6 @@
sleep(3);
} while (i++ < WAIT_RETRY_COUNT);
diff --git a/databases/pgpool-II-30/pkg-plist b/databases/pgpool-II-30/pkg-plist
index 758fbd1e497e..5f07c633e19f 100644
--- a/databases/pgpool-II-30/pkg-plist
+++ b/databases/pgpool-II-30/pkg-plist
@@ -14,6 +14,7 @@ etc/pcp.conf.sample
etc/pgpool.conf.sample
etc/pgpool.conf.sample-master-slave
etc/pgpool.conf.sample-replication
+etc/pgpool.conf.sample-stream
etc/pool_hba.conf.sample
include/pcp.h
include/pool_type.h
diff --git a/databases/pgpool-II/Makefile b/databases/pgpool-II/Makefile
index b1764c35bc69..d7b8b5b40218 100644
--- a/databases/pgpool-II/Makefile
+++ b/databases/pgpool-II/Makefile
@@ -6,9 +6,9 @@
#
PORTNAME= pgpool-II
-PORTVERSION= 2.3.3
+PORTVERSION= 3.0
CATEGORIES= databases
-MASTER_SITES= http://pgfoundry.org/frs/download.php/2664/
+MASTER_SITES= http://pgfoundry.org/frs/download.php/2798/
MAINTAINER= kuriyama@FreeBSD.org
COMMENT= A connection pool server for PostgreSQL
@@ -18,7 +18,7 @@ GNU_CONFIGURE= yes
USE_PGSQL= yes
USE_LDCONFIG= yes
-CONFLICTS= pgpool-3.* pgpool-II-2.2.*
+CONFLICTS= pgpool-3.* pgpool-II-*
USE_RC_SUBR= pgpool
PORTDOCS= AUTHORS COPYING ChangeLog INSTALL NEWS README README.euc_jp
diff --git a/databases/pgpool-II/distinfo b/databases/pgpool-II/distinfo
index cd731bc52998..aee8073ce24e 100644
--- a/databases/pgpool-II/distinfo
+++ b/databases/pgpool-II/distinfo
@@ -1,3 +1,3 @@
-MD5 (pgpool-II-2.3.3.tar.gz) = fae5a3b50eab995d15a18f80fee2e92b
-SHA256 (pgpool-II-2.3.3.tar.gz) = c9b6b0d743812f68376dd675fd0481d44aa12bb8324c6bc24522c0b857e4fa53
-SIZE (pgpool-II-2.3.3.tar.gz) = 1150695
+MD5 (pgpool-II-3.0.tar.gz) = d93a896ce185bff7920d4b603a4e9111
+SHA256 (pgpool-II-3.0.tar.gz) = b1f3f2fb84b06e8d6f0691deac324e90f5d82fbf5c143c1f53d55f50bee6c466
+SIZE (pgpool-II-3.0.tar.gz) = 1223872
diff --git a/databases/pgpool-II/files/patch-recovery.c b/databases/pgpool-II/files/patch-recovery.c
index a6ac0c6bceca..9833155123fc 100644
--- a/databases/pgpool-II/files/patch-recovery.c
+++ b/databases/pgpool-II/files/patch-recovery.c
@@ -1,15 +1,15 @@
---- recovery.c.orig 2009-08-14 15:15:08.000000000 +0900
-+++ recovery.c 2009-08-14 18:00:38.000000000 +0900
-@@ -91,7 +91,7 @@
+--- recovery.c.orig 2010-10-12 08:12:18.155163331 +0900
++++ recovery.c 2010-10-12 08:13:21.347257609 +0900
+@@ -96,7 +96,7 @@
- pool_log("1st stage is done");
+ if (REPLICATION)
+ {
+- pool_log("starting 2nd stage");
++ pool_log("starting 2nd stage. waiting connections from clients to be closed");
-- pool_log("starting 2nd stage");
-+ pool_log("starting 2nd stage. waiting connections from clients to be closed");
-
- /* 2nd stage */
- *InRecovery = 1;
-@@ -332,6 +332,6 @@
+ /* 2nd stage */
+ *InRecovery = 1;
+@@ -384,6 +384,6 @@
sleep(3);
} while (i++ < WAIT_RETRY_COUNT);
diff --git a/databases/pgpool-II/pkg-plist b/databases/pgpool-II/pkg-plist
index 758fbd1e497e..5f07c633e19f 100644
--- a/databases/pgpool-II/pkg-plist
+++ b/databases/pgpool-II/pkg-plist
@@ -14,6 +14,7 @@ etc/pcp.conf.sample
etc/pgpool.conf.sample
etc/pgpool.conf.sample-master-slave
etc/pgpool.conf.sample-replication
+etc/pgpool.conf.sample-stream
etc/pool_hba.conf.sample
include/pcp.h
include/pool_type.h
diff --git a/databases/pgpool/Makefile b/databases/pgpool/Makefile
index 30c17ba6eec5..fba8f68db003 100644
--- a/databases/pgpool/Makefile
+++ b/databases/pgpool/Makefile
@@ -18,7 +18,7 @@ USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_RC_SUBR= pgpool
-CONFLICTS= pgpool-II-1.*
+CONFLICTS= pgpool-II-*
PORTDOCS= README AUTHORS COPYING ChangeLog INSTALL NEWS TODO README.euc_jp
generated by cgit v1.2.3 (git 2.25.1) at 2026-03-02 12:41:58 +0000