[pkgsrc/trunk]: pkgsrc/databases CONFLICTS fix

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7eaa5fdd6a4a
branches:  trunk
changeset: 528455:7eaa5fdd6a4a
user:      adam <adam%pkgsrc.org@localhost>
date:      Fri May 04 19:44:52 2007 +0000

description:
CONFLICTS fix

diffstat:

 databases/postgresql81/Makefile.common |   8 ++++----
 databases/postgresql82/Makefile.common |  10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diffs (46 lines):

diff -r 999e289df46e -r 7eaa5fdd6a4a databases/postgresql81/Makefile.common
--- a/databases/postgresql81/Makefile.common    Fri May 04 10:18:17 2007 +0000
+++ b/databases/postgresql81/Makefile.common    Fri May 04 19:44:52 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.11 2007/04/30 13:37:22 adam Exp $
+# $NetBSD: Makefile.common,v 1.12 2007/05/04 19:44:52 adam Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -20,9 +20,9 @@
 HOMEPAGE?=     http://www.postgresql.org/
 
 CONFLICTS+=    postgresql-[0-9]*
-CONFLICTS+=    postgresql73-[0-9]*
-CONFLICTS+=    postgresql80-[0-9]*
-CONFLICTS+=    postgresql82-[0-9]*
+CONFLICTS+=    postgresql73-*
+CONFLICTS+=    postgresql80-*
+CONFLICTS+=    postgresql82-*
 
 DISTINFO_FILE?=                ${.CURDIR}/../postgresql81/distinfo
 COMMON_FILESDIR?=      ${.CURDIR}/../postgresql81/files
diff -r 999e289df46e -r 7eaa5fdd6a4a databases/postgresql82/Makefile.common
--- a/databases/postgresql82/Makefile.common    Fri May 04 10:18:17 2007 +0000
+++ b/databases/postgresql82/Makefile.common    Fri May 04 19:44:52 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.5 2007/04/30 13:37:00 adam Exp $
+# $NetBSD: Makefile.common,v 1.6 2007/05/04 19:45:52 adam Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -20,10 +20,10 @@
 HOMEPAGE?=     http://www.postgresql.org/
 
 CONFLICTS+=    postgresql-[0-9]*
-CONFLICTS+=    postgresql73-[0-9]*
-CONFLICTS+=    postgresql74-[0-9]*
-CONFLICTS+=    postgresql80-[0-9]*
-CONFLICTS+=    postgresql81-[0-9]*
+CONFLICTS+=    postgresql73-*
+CONFLICTS+=    postgresql74-*
+CONFLICTS+=    postgresql80-*
+CONFLICTS+=    postgresql81-*
 
 DISTINFO_FILE?=                ${.CURDIR}/../postgresql82/distinfo
 COMMON_FILESDIR?=      ${.CURDIR}/../postgresql82/files