[pkgsrc/trunk]: pkgsrc/databases conflict with postgres81

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a9a09e1604ff
branches:  trunk
changeset: 505838:a9a09e1604ff
user:      abs <abs%pkgsrc.org@localhost>
date:      Sun Jan 08 13:41:29 2006 +0000

description:
conflict with postgres81

diffstat:

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

diffs (36 lines):

diff -r 89f4df6ad25b -r a9a09e1604ff databases/postgresql73/Makefile.common
--- a/databases/postgresql73/Makefile.common    Sun Jan 08 13:29:14 2006 +0000
+++ b/databases/postgresql73/Makefile.common    Sun Jan 08 13:41:29 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.13 2005/12/05 23:55:04 rillig Exp $
+# $NetBSD: Makefile.common,v 1.14 2006/01/08 13:41:29 abs Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -21,7 +21,7 @@
 MAINTAINER?=           tech-pkg%NetBSD.org@localhost
 HOMEPAGE?=             http://www.postgresql.org/
 
-CONFLICTS+=            postgresql-[0-9]* postgresql74-* postgresql80-*
+CONFLICTS+=    postgresql-[0-9]* postgresql74-* postgresql80-* postgresql81-*
 
 DISTINFO_FILE?=                ${.CURDIR}/../postgresql73/distinfo
 COMMON_FILESDIR?=      ${.CURDIR}/../postgresql73/files
diff -r 89f4df6ad25b -r a9a09e1604ff databases/postgresql74/Makefile.common
--- a/databases/postgresql74/Makefile.common    Sun Jan 08 13:29:14 2006 +0000
+++ b/databases/postgresql74/Makefile.common    Sun Jan 08 13:41:29 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.28 2005/12/05 23:55:04 rillig Exp $
+# $NetBSD: Makefile.common,v 1.29 2006/01/08 13:41:29 abs Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -24,7 +24,7 @@
 MAINTAINER?=           recht%NetBSD.org@localhost
 HOMEPAGE?=             http://www.postgresql.org/
 
-CONFLICTS+=            postgresql-[0-9]* postgresql73-* postgresql80-*
+CONFLICTS+=    postgresql-[0-9]* postgresql73-* postgresql80-* postgresql81-*
 
 DISTINFO_FILE?=                ${.CURDIR}/../postgresql74/distinfo
 COMMON_FILESDIR?=      ${.CURDIR}/../postgresql74/files