[pkgsrc/trunk]: pkgsrc/databases CONFLICTS and PLIST fix

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8d2bced54ba2
branches:  trunk
changeset: 528459:8d2bced54ba2
user:      adam <adam%pkgsrc.org@localhost>
date:      Fri May 04 20:04:06 2007 +0000

description:
CONFLICTS and PLIST fix

diffstat:

 databases/postgresql80-client/PLIST    |   5 ++++-
 databases/postgresql80/Makefile.common |  10 +++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diffs (57 lines):

diff -r 0f55f83cf6c0 -r 8d2bced54ba2 databases/postgresql80-client/PLIST
--- a/databases/postgresql80-client/PLIST       Fri May 04 19:55:21 2007 +0000
+++ b/databases/postgresql80-client/PLIST       Fri May 04 20:04:06 2007 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2007/02/08 20:00:57 adam Exp $
+@comment $NetBSD: PLIST,v 1.16 2007/05/04 20:04:06 adam Exp $
 ${PG_SUBPREFIX}bin/clusterdb
 ${PG_SUBPREFIX}bin/createdb
 ${PG_SUBPREFIX}bin/createlang
@@ -950,6 +950,7 @@
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-7-3-16.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-7-3-17.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-7-3-18.html
+${PG_SUBPREFIX}share/doc/postgresql/html/release-7-3-19.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-7-3-2.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-7-3-3.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-7-3-4.html
@@ -967,6 +968,7 @@
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-7-4-14.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-7-4-15.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-7-4-16.html
+${PG_SUBPREFIX}share/doc/postgresql/html/release-7-4-17.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-7-4-2.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-7-4-3.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-7-4-4.html
@@ -979,6 +981,7 @@
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-0-1.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-0-10.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-0-11.html
+${PG_SUBPREFIX}share/doc/postgresql/html/release-8-0-12.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-0-2.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-0-3.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-0-4.html
diff -r 0f55f83cf6c0 -r 8d2bced54ba2 databases/postgresql80/Makefile.common
--- a/databases/postgresql80/Makefile.common    Fri May 04 19:55:21 2007 +0000
+++ b/databases/postgresql80/Makefile.common    Fri May 04 20:04:06 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.28 2007/04/30 13:37:36 adam Exp $
+# $NetBSD: Makefile.common,v 1.29 2007/05/04 20:04:06 adam Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -23,10 +23,10 @@
 MASTER_SORT_REGEX=     ${MASTER_SORT:S/./\\./g:C/.*/:\/\/[^[\/]*&\/ :\/\/[^\/]*&\\./}
 
 CONFLICTS+=    postgresql-[0-9]*
-CONFLICTS+=    postgresql73-[0-9]*
-CONFLICTS+=    postgresql74-[0-9]*
-CONFLICTS+=    postgresql81-[0-9]*
-CONFLICTS+=    postgresql82-[0-9]*
+CONFLICTS+=    postgresql73-*
+CONFLICTS+=    postgresql74-*
+CONFLICTS+=    postgresql81-*
+CONFLICTS+=    postgresql82-*
 
 DISTINFO_FILE?=                ${.CURDIR}/../postgresql80/distinfo
 COMMON_FILESDIR?=      ${.CURDIR}/../postgresql80/files