diff options
| author | adam <adam@pkgsrc.org> | 2007-05-04 20:04:06 +0000 |
|---|---|---|
| committer | adam <adam@pkgsrc.org> | 2007-05-04 20:04:06 +0000 |
| commit | db63a72851351a9a1b0e2506624518dcdc5d4a8d (patch) | |
| tree | fbec291b57dbea43e5b001aed342583f8b1bf74e /databases | |
| parent | 30df350add030521af589dc22a5c89b3771bb831 (diff) | |
| download | pkgsrc-db63a72851351a9a1b0e2506624518dcdc5d4a8d.tar.gz | |
CONFLICTS and PLIST fix
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/postgresql80-client/PLIST | 5 | ||||
| -rw-r--r-- | databases/postgresql80/Makefile.common | 10 |
2 files changed, 9 insertions, 6 deletions
diff --git a/databases/postgresql80-client/PLIST b/databases/postgresql80-client/PLIST index 113b7225155..af9c18f97cb 100644 --- a/databases/postgresql80-client/PLIST +++ b/databases/postgresql80-client/PLIST @@ -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-15.html ${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-13.html ${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-7-4.html ${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 --git a/databases/postgresql80/Makefile.common b/databases/postgresql80/Makefile.common index 35e1ed88473..b5bc11b03b7 100644 --- a/databases/postgresql80/Makefile.common +++ b/databases/postgresql80/Makefile.common @@ -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 @@ HOMEPAGE?= http://www.postgresql.org/ 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 |