From 0d0efcdc7acbe0155f8408e3e2dde588c8b936cd Mon Sep 17 00:00:00 2001
From: adam <adam>
Date: Sat, 26 Nov 2011 11:49:51 +0000
Subject: Changes 2.1.0: * The first release for Slony-I branch 2.1 has been
 released, in the form of   version 2.1.0. It is a significant new version,
 fixing dozens of reported   bugs, and adding some significant enhancements,
 including:   - Implicit WAIT FOR   - Support for adding tables in bulk   -
 Support for replicating TRUNCATE   - Health checks at startup   - Performance
 improvement in cases of large backlog   - Monitoring thread to provide better
 monitoring data

---
 databases/slony1/Makefile         |  8 ++++----
 databases/slony1/distinfo         | 12 ++++++------
 databases/slony1/patches/patch-aa |  4 ++--
 databases/slony1/patches/patch-ab |  6 +++---
 4 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'databases/slony1')

diff --git a/databases/slony1/Makefile b/databases/slony1/Makefile
index 05a689f476b..0fa3433ce1c 100644
--- a/databases/slony1/Makefile
+++ b/databases/slony1/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2010/12/14 17:57:24 adam Exp $
+# $NetBSD: Makefile,v 1.19 2011/11/26 11:49:51 adam Exp $
 
-DISTNAME=	slony1-2.0.6
+DISTNAME=	slony1-2.1.0
 CATEGORIES=	databases
-MASTER_SITES=	http://slony.info/downloads/2.0/source/
+MASTER_SITES=	http://slony.info/downloads/2.1/source/
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	adam@NetBSD.org
@@ -11,7 +11,7 @@ COMMENT=	Replication system for PostgreSQL
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-PGSQL_VERSIONS_ACCEPTED=90 84 83
+PGSQL_VERSIONS_ACCEPTED=91 90 84 83
 
 DEPENDS+=	postgresql${PGSQL_VERSION}-server-[0-9]*:../../databases/postgresql${PGSQL_VERSION}-server
 
diff --git a/databases/slony1/distinfo b/databases/slony1/distinfo
index 82adcb6f73b..86a1080f10f 100644
--- a/databases/slony1/distinfo
+++ b/databases/slony1/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.12 2010/12/14 17:57:24 adam Exp $
+$NetBSD: distinfo,v 1.13 2011/11/26 11:49:51 adam Exp $
 
-SHA1 (slony1-2.0.6.tar.bz2) = 6e3c8d9bb8ae138c089782836f9b303cadc82b97
-RMD160 (slony1-2.0.6.tar.bz2) = 39ceec9fc823903e6e2c6080558ab5e00a476697
-Size (slony1-2.0.6.tar.bz2) = 979208 bytes
-SHA1 (patch-aa) = 591635aa8badd2690629ffd4ba1d4a619d332fbc
-SHA1 (patch-ab) = de4549aa7fae7aed10f4ebb14de8d5aea5419cb4
+SHA1 (slony1-2.1.0.tar.bz2) = a4c488c1a41aef080fb0c8ed9cbf8264fe34c20d
+RMD160 (slony1-2.1.0.tar.bz2) = 2a7acf8cf48f7d2e3c5a84423ff512471d58b238
+Size (slony1-2.1.0.tar.bz2) = 1442289 bytes
+SHA1 (patch-aa) = 4d384c712e1ba42564eb13ef6a3d08b7360e2298
+SHA1 (patch-ab) = 8937bed61506b48fb15ba76ea30dcd06aa6bd760
diff --git a/databases/slony1/patches/patch-aa b/databases/slony1/patches/patch-aa
index 1c0d9d93168..29db6fcc113 100644
--- a/databases/slony1/patches/patch-aa
+++ b/databases/slony1/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.5 2010/04/15 07:55:32 adam Exp $
+$NetBSD: patch-aa,v 1.6 2011/11/26 11:49:51 adam Exp $
 
 --- configure.orig	2009-05-08 22:10:34.000000000 +0000
 +++ configure
-@@ -2014,6 +2014,7 @@ case $host_os in
+@@ -2010,6 +2010,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
index 407b61eaf1a..a184674611b 100644
--- a/databases/slony1/patches/patch-ab
+++ b/databases/slony1/patches/patch-ab
@@ -1,10 +1,10 @@
-$NetBSD: patch-ab,v 1.2 2010/04/15 07:55:32 adam Exp $
+$NetBSD: patch-ab,v 1.3 2011/11/26 11:49:51 adam Exp $
 
---- tools/start_slon.sh.orig	2010-04-15 09:45:28.000000000 +0000
+--- tools/start_slon.sh.orig	2011-10-11 20:20:52.000000000 +0000
 +++ tools/start_slon.sh
 @@ -16,7 +16,7 @@ test -r "$SLON_CONF" || (echo "No slon c
  
- PID_LINE=`grep pid_file $SLON_CONF | cut -d "#" -f 1 | grep "^[:space:]*pid_file='.*'"`
+ PID_LINE=`grep pid_file $SLON_CONF | cut -d "#" -f 1 | grep "^[[:space:]]*pid_file='.*'"`
  PID_FILE=`echo $PID_LINE | cut -d "=" -f 2 | cut -d "'" -f 2`
 -if [ "x$PID_FILE" == "x" ]; then
 +if [ "x$PID_FILE" = "x" ]; then
-- 
cgit v1.2.3