[pkgsrc/trunk]: pkgsrc/databases conflicts also with pg80

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0a954d74fdb8
branches:  trunk
changeset: 488705:0a954d74fdb8
user:      dan <dan%pkgsrc.org@localhost>
date:      Mon Feb 07 04:27:27 2005 +0000

description:
conflicts also with pg80

diffstat:

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

diffs (36 lines):

diff -r adf1a7118fed -r 0a954d74fdb8 databases/postgresql73/Makefile.common
--- a/databases/postgresql73/Makefile.common    Mon Feb 07 04:12:49 2005 +0000
+++ b/databases/postgresql73/Makefile.common    Mon Feb 07 04:27:27 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.6 2005/02/05 14:49:03 jdolecek Exp $
+# $NetBSD: Makefile.common,v 1.7 2005/02/07 04:27:27 dan 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-*
+CONFLICTS+=            postgresql-[0-9]* postgresql74-* postgresql80-*
 
 DISTINFO_FILE?=                ${.CURDIR}/../postgresql73/distinfo
 COMMON_FILESDIR?=      ${.CURDIR}/../postgresql73/files
diff -r adf1a7118fed -r 0a954d74fdb8 databases/postgresql74/Makefile.common
--- a/databases/postgresql74/Makefile.common    Mon Feb 07 04:12:49 2005 +0000
+++ b/databases/postgresql74/Makefile.common    Mon Feb 07 04:27:27 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.20 2005/02/05 14:50:52 jdolecek Exp $
+# $NetBSD: Makefile.common,v 1.21 2005/02/07 04:27:28 dan 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-*
+CONFLICTS+=            postgresql-[0-9]* postgresql73-* postgresql80-*
 
 DISTINFO_FILE?=                ${.CURDIR}/../postgresql74/distinfo
 COMMON_FILESDIR?=      ${.CURDIR}/../postgresql74/files