summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--databases/slony1/Makefile10
-rw-r--r--databases/slony1/PLIST3
-rw-r--r--databases/slony1/distinfo11
-rw-r--r--databases/slony1/patches/patch-aa6
-rw-r--r--databases/slony1/patches/patch-ab31
5 files changed, 47 insertions, 14 deletions
diff --git a/databases/slony1/Makefile b/databases/slony1/Makefile
index da52daecf39..c3c950fa5b0 100644
--- a/databases/slony1/Makefile
+++ b/databases/slony1/Makefile
@@ -1,17 +1,17 @@
-# $NetBSD: Makefile,v 1.7 2007/04/10 21:59:02 rmind Exp $
+# $NetBSD: Makefile,v 1.8 2008/01/14 18:58:02 adam Exp $
-DISTNAME= slony1-1.2.9
+DISTNAME= slony1-1.2.12
CATEGORIES= databases
-MASTER_SITES= http://www.slony.info/downloads/1.2/source/
+MASTER_SITES= http://slony.info/downloads/1.2/source/
EXTRACT_SUFX= .tar.bz2
MAINTAINER= adam@NetBSD.org
-HOMEPAGE= http://gborg.postgresql.org/project/slony1/projdisplay.php
+HOMEPAGE= http://main.slony.info/
COMMENT= Replication system for PostgreSQL
DEPENDS+= postgresql${PGSQL_VERSION}-server-[0-9]*:../../databases/postgresql${PGSQL_VERSION}-server
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-pgconfigdir=${PGSQL_PREFIX:Q}/bin
CONFIGURE_ARGS+= --with-pgbindir=${PGSQL_PREFIX:Q}/bin
diff --git a/databases/slony1/PLIST b/databases/slony1/PLIST
index abc67c6dfdd..c195b6f5111 100644
--- a/databases/slony1/PLIST
+++ b/databases/slony1/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.2 2007/04/10 21:59:02 rmind Exp $
+@comment $NetBSD: PLIST,v 1.3 2008/01/14 18:58:02 adam Exp $
bin/slon
bin/slonik
+bin/slony_logshipper
lib/postgresql/slony1_funcs.so
lib/postgresql/xxid.so
share/postgresql/slon.conf-sample
diff --git a/databases/slony1/distinfo b/databases/slony1/distinfo
index 1a97d6e8237..b5bcb184eeb 100644
--- a/databases/slony1/distinfo
+++ b/databases/slony1/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.4 2007/04/10 21:59:02 rmind Exp $
+$NetBSD: distinfo,v 1.5 2008/01/14 18:58:02 adam Exp $
-SHA1 (slony1-1.2.9.tar.bz2) = 0dbfce131416ca19bfe72dbb900070c15e4e8520
-RMD160 (slony1-1.2.9.tar.bz2) = e73f824b68c8f7c7a746b91d37990259bf9d0f94
-Size (slony1-1.2.9.tar.bz2) = 837293 bytes
-SHA1 (patch-aa) = 2239b986ee794f5be952d96631d37f3d322af4e7
+SHA1 (slony1-1.2.12.tar.bz2) = fbdbbd76ee4e20c46ee53de8922ceca3ef8de8ac
+RMD160 (slony1-1.2.12.tar.bz2) = 0eeba14b620ae8bde21dd78d3e14a9736ef3d197
+Size (slony1-1.2.12.tar.bz2) = 872677 bytes
+SHA1 (patch-aa) = 0d47e35c562b47afb826f3ee0c2b20f015940269
+SHA1 (patch-ab) = 8a8cc04e5d64be50fea0f2dd1e3da487223d8c45
diff --git a/databases/slony1/patches/patch-aa b/databases/slony1/patches/patch-aa
index f5b875f9c9e..2f252bd73ea 100644
--- a/databases/slony1/patches/patch-aa
+++ b/databases/slony1/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.3 2007/04/10 21:49:55 rmind Exp $
+$NetBSD: patch-aa,v 1.4 2008/01/14 18:58:03 adam Exp $
---- configure.orig 2007-03-23 00:19:26.000000000 +0200
+--- configure.orig 2007-11-12 23:46:59.000000000 +0100
+++ configure
-@@ -1901,6 +1901,7 @@ case $host_os in
+@@ -1904,6 +1904,7 @@ case $host_os in
darwin*) template=darwin ;;
dgux*) template=dgux ;;
freebsd*) template=freebsd ;;
diff --git a/databases/slony1/patches/patch-ab b/databases/slony1/patches/patch-ab
new file mode 100644
index 00000000000..85827effa13
--- /dev/null
+++ b/databases/slony1/patches/patch-ab
@@ -0,0 +1,31 @@
+$NetBSD: patch-ab,v 1.1 2008/01/14 18:58:03 adam Exp $
+
+--- tests/run_test.sh.orig 2008-01-13 22:38:16.000000000 +0100
++++ tests/run_test.sh
+@@ -179,7 +179,7 @@ store_node()
+
+ if [ -n "${db}" -a "${host}" -a "${user}" -a "${port}" ]; then
+ if [ ${alias} -ne ${originnode} ]; then
+- if [ "x${logship}" == "xtrue" ]; then # Don't bother generating nodes used for log shipping
++ if [ "x${logship}" = "xtrue" ]; then # Don't bother generating nodes used for log shipping
+ status "Node ${alias} is a log shipping node - no need for STORE NODE"
+ else
+ echo "STORE NODE (id=${alias}, comment='node ${alias}');" >> $mktmp/slonik.script
+@@ -219,7 +219,7 @@ store_path()
+ eval bport=\$PORT${j}
+ eval blogship=\$LOGSHIP${j}
+ if [ -n "${bdb}" -a "${bhost}" -a "${buser}" -a "${bport}" ]; then
+- if [[ "x${logship}" == "xtrue" || "x${blogship}" == "xtrue" ]]; then
++ if [[ "x${logship}" = "xtrue" || "x${blogship}" = "xtrue" ]]; then
+ # log shipping node - no paths need exist that involve this node
+ status "log shipping between nodes(${i}/${j}) - ls(${logship}/${blogship}) - omit STORE PATH"
+ else
+@@ -499,7 +499,7 @@ launch_slon()
+ fi
+ conninfo="dbname=${db} host=${host} user=${user} port=${port}"
+
+- if [ "x${logship}" == "xtrue" ]; then
++ if [ "x${logship}" = "xtrue" ]; then
+ status "do not launch slon for node ${alias} - it receives data via log shipping"
+ else
+ status "launching: $pgbindir/slon -s500 -g10 -d2 ${archiveparm} $cluster \"$conninfo\""