From 54baddf8505dcbb5727790fba79d00b1713cbd5b Mon Sep 17 00:00:00 2001
From: pav <pav@FreeBSD.org>
Date: Mon, 14 Dec 2009 20:44:35 +0000
Subject: - Update to 1.2.18

PR:		ports/141114
Submitted by:	Vick Khera <vivek@khera.org> (maintainer)
---
 databases/slony1/Makefile | 19 ++-----------------
 databases/slony1/distinfo | 12 ++++++------
 2 files changed, 8 insertions(+), 23 deletions(-)

(limited to 'databases/slony1')

diff --git a/databases/slony1/Makefile b/databases/slony1/Makefile
index 987043a23dfc..de8bcc641201 100644
--- a/databases/slony1/Makefile
+++ b/databases/slony1/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	slony1
-PORTVERSION=	1.2.16
+PORTVERSION=	1.2.18
 CATEGORIES=	databases
 MASTER_SITES=	http://main.slony.info/downloads/1.2/source/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
@@ -29,12 +29,10 @@ SUB_LIST+=	NAME=slon
 
 OPTIONS=	PERLTOOLS "Install perl configuration tools" Off
 
-CONFLICTS?=     slony1v2-2*
+CONFLICTS?=	slony1v2-2*
 
 .include <bsd.port.pre.mk>
 
-IGNORE_WITH_PGSQL=	84
-
 .if defined(WITH_PERLTOOLS)
 USE_PERL5=	yes
 CONFIGURE_ARGS+=	--with-perltools=${LOCALBASE}/sbin
@@ -56,19 +54,6 @@ CONFIGURE_ARGS+=--with-pgconfigdir=${LOCALBASE}/bin \
   --with-pgpkglibdir=${LOCALBASE}/lib/postgresql \
   --with-pgsharedir=${LOCALBASE}/share/postgresql
 
-DEFAULT_PGSQL_VER?=80
-
-# Setting/finding PostgreSQL version we want.
-.if exists(${LOCALBASE}/bin/postmaster)
-PGSQL_VER!=	${LOCALBASE}/bin/postmaster -V | \
-		${SED} -En 's/.*PostgreSQL[^0-9]*([0-9]+)\.([0-9]+)\..*/\1\2/p'
-.elif exists(${LOCALBASE}/bin/pg_config)
-PGSQL_VER!=	${LOCALBASE}/bin/pg_config --version | \
-		${SED} -En 's/PostgreSQL[^0-9]*([0-9]*)\.([0-9]+)\..*/\1\2/p'
-.else
-PGSQL_VER=	${DEFAULT_PGSQL_VER}
-.endif
-
 .if ! defined(NO_INSTALL_MANPAGES)
 MAN1=	slon.1 slonik.1
 .endif
diff --git a/databases/slony1/distinfo b/databases/slony1/distinfo
index 751f931d8b9b..b55d19131a1c 100644
--- a/databases/slony1/distinfo
+++ b/databases/slony1/distinfo
@@ -1,6 +1,6 @@
-MD5 (slony1-1.2.16.tar.bz2) = 1b112918a152ce3b6396de17c437fc7e
-SHA256 (slony1-1.2.16.tar.bz2) = 8b6278859a999f38b6ae38e7d991e8988e9dfb86ad15e159e7f1f20ab35380cb
-SIZE (slony1-1.2.16.tar.bz2) = 881560
-MD5 (slony1-1.2.16-docs.tar.bz2) = 47414e8d1b0ad97f023f794d9677d33a
-SHA256 (slony1-1.2.16-docs.tar.bz2) = be9bf2c529164e6f8c5ea68bb9bed9bcdf9ddb9b0023c0fbd6a8376c37b9f90d
-SIZE (slony1-1.2.16-docs.tar.bz2) = 231348
+MD5 (slony1-1.2.18.tar.bz2) = 1fe08b01825e5c978c2a1aeebc956099
+SHA256 (slony1-1.2.18.tar.bz2) = 010588d64eb46ad7860360d1f53661a0b5d01b6d5671d084c6b6925806e4e222
+SIZE (slony1-1.2.18.tar.bz2) = 879298
+MD5 (slony1-1.2.18-docs.tar.bz2) = ea1078c04faa7477f3990310669a2488
+SHA256 (slony1-1.2.18-docs.tar.bz2) = 5502c5e12c9bbeaef7d058971771d5454259124931351ea3d987bc9a7940906c
+SIZE (slony1-1.2.18-docs.tar.bz2) = 232151
-- 
cgit