From 69b65670f997d35454a29aed919e4c9a1b47e4c5 Mon Sep 17 00:00:00 2001
From: Palle Girgensohn <girgen@FreeBSD.org>
Date: Sat, 12 Oct 2013 00:59:50 +0000
Subject: Update PostgreSQL ports to 9.3.1, 9.2.5, 9.1.10, 9.0.14, and 8.4.18.

Note that users of the hstore extension on version 9.3 must take an additional,
post upgrade step of running "ALTER EXTENSION hstore UPDATE" in each database
after update.

URL:	http://www.postgresql.org/about/news/1487/
---
 databases/postgresql84-server/Makefile | 12 ++++++------
 databases/postgresql84-server/distinfo |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'databases/postgresql84-server')

diff --git a/databases/postgresql84-server/Makefile b/databases/postgresql84-server/Makefile
index 8ad0c74a3dcf..93fe02afcfb6 100644
--- a/databases/postgresql84-server/Makefile
+++ b/databases/postgresql84-server/Makefile
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME?=	postgresql
-DISTVERSION?=	8.4.17
-PORTREVISION?=	1
+DISTVERSION?=	8.4.18
+PORTREVISION?=	0
 CATEGORIES?=	databases
 MASTER_SITES=	PGSQL
 MASTER_SITE_SUBDIR=	source/v${DISTVERSION}
@@ -13,10 +13,10 @@ DISTV=	${DISTVERSION:R}
 MAINTAINER?=	pgsql@FreeBSD.org
 COMMENT?=	The most advanced open-source database available anywhere
 
-CONFLICTS?=	${PORTNAME}[^${PORTVERSION:R:R}].*-client.* \
-		${PORTNAME}${COMPONENT}[^${PORTVERSION:R:R}].* \
-		${PORTNAME}8.[^${PORTVERSION:R:E}].*-client.* \
-		${PORTNAME}${COMPONENT}8.[^${PORTVERSION:R:E}].*
+CONFLICTS?=	${PORTNAME}[^${PORTVERSION:R:R}]?-client* \
+		${PORTNAME}${COMPONENT}-[^${PORTVERSION:R:R}].* \
+		${PORTNAME}8[^${PORTVERSION:R:E}]-client* \
+		${PORTNAME}${COMPONENT}-8.[^${PORTVERSION:R:E}].*
 
 WRKSRC=		${WRKDIR}/postgresql-${DISTVERSION}
 DIST_SUBDIR=	postgresql
diff --git a/databases/postgresql84-server/distinfo b/databases/postgresql84-server/distinfo
index 743f8798a269..739ac43cec8a 100644
--- a/databases/postgresql84-server/distinfo
+++ b/databases/postgresql84-server/distinfo
@@ -1,4 +1,4 @@
-SHA256 (postgresql/postgresql-8.4.17.tar.bz2) = dc884c34ec3535d9f8b579155948a703def0574aca47292b97b82a8189cd0436
-SIZE (postgresql/postgresql-8.4.17.tar.bz2) = 14795028
+SHA256 (postgresql/postgresql-8.4.18.tar.bz2) = c08e5e93dac9d484019a07ff91db9f224350b90ef4be1543e33282cc20daf872
+SIZE (postgresql/postgresql-8.4.18.tar.bz2) = 14819294
 SHA256 (postgresql/pg-840-icu-2009-09-15.diff.gz) = c09d3b59340a3bb6ea754e985739d4fbb47f730d1e48a357c5585825034fc72e
 SIZE (postgresql/pg-840-icu-2009-09-15.diff.gz) = 4321
-- 
cgit v1.2.3