[pkgsrc/trunk]: pkgsrc/databases/postgresql80 Revert typo: this version confl...

[cjs <cjs%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/cc42aa1fbcaf
branches:  trunk
changeset: 506488:cc42aa1fbcaf
user:      cjs <cjs%pkgsrc.org@localhost>
date:      Tue Jan 17 08:11:19 2006 +0000

description:
Revert typo: this version conflicts with postgresql74,
not the (non-existent) postgresql84.

diffstat:

 databases/postgresql80/Makefile.common |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (18 lines):

diff -r e91590b2b550 -r cc42aa1fbcaf databases/postgresql80/Makefile.common
--- a/databases/postgresql80/Makefile.common    Tue Jan 17 08:10:24 2006 +0000
+++ b/databases/postgresql80/Makefile.common    Tue Jan 17 08:11:19 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.14 2006/01/08 12:51:45 abs Exp $
+# $NetBSD: Makefile.common,v 1.15 2006/01/17 08:11:19 cjs Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -19,7 +19,7 @@
 MAINTAINER?=   jlam%pkgsrc.org@localhost
 HOMEPAGE?=     http://www.postgresql.org/
 
-CONFLICTS+=    postgresql-[0-9]* postgresql73-* postgresql84-* postgresql81-*
+CONFLICTS+=    postgresql-[0-9]* postgresql73-* postgresql74-* postgresql81-*
 
 DISTINFO_FILE?=                ${.CURDIR}/../postgresql80/distinfo
 COMMON_FILESDIR?=      ${.CURDIR}/../postgresql80/files