[pkgsrc/trunk]: pkgsrc/databases For once it seems that the right package wil...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1964fc169048
branches:  trunk
changeset: 479755:1964fc169048
user:      seb <seb%pkgsrc.org@localhost>
date:      Sat Aug 21 17:27:04 2004 +0000

description:
For once it seems that the right package wildcard for CONFLICT is
'-*' instead of '-[0-9]*'. Otherwise postsgreql74-lib-whatever can be
incorrectly installed alongside postgresql73-lib-whatever because the latter
does not match 'postgresql73-[0-9]*'.

diffstat:

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

diffs (36 lines):

diff -r b4aa47521c2e -r 1964fc169048 databases/postgresql73/Makefile.common
--- a/databases/postgresql73/Makefile.common    Sat Aug 21 16:26:51 2004 +0000
+++ b/databases/postgresql73/Makefile.common    Sat Aug 21 17:27:04 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.1.1.1 2004/07/24 22:14:40 recht Exp $
+# $NetBSD: Makefile.common,v 1.2 2004/08/21 17:27:04 seb 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-[0-9]*
+CONFLICTS+=            postgresql-[0-9]* postgresql74-*
 
 DISTINFO_FILE?=                ${.CURDIR}/../postgresql73/distinfo
 COMMON_FILESDIR?=      ${.CURDIR}/../postgresql73/files
diff -r b4aa47521c2e -r 1964fc169048 databases/postgresql74/Makefile.common
--- a/databases/postgresql74/Makefile.common    Sat Aug 21 16:26:51 2004 +0000
+++ b/databases/postgresql74/Makefile.common    Sat Aug 21 17:27:04 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.10 2004/08/04 22:17:33 recht Exp $
+# $NetBSD: Makefile.common,v 1.11 2004/08/21 17:27:04 seb Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -22,7 +22,7 @@
 MAINTAINER?=           recht%NetBSD.org@localhost
 HOMEPAGE?=             http://www.postgresql.org/
 
-CONFLICTS+=            postgresql-[0-9]* postgresql73-[0-9]*
+CONFLICTS+=            postgresql-[0-9]* postgresql73-*
 
 DISTINFO_FILE?=                ${.CURDIR}/../postgresql74/distinfo
 COMMON_FILESDIR?=      ${.CURDIR}/../postgresql74/files