diff options
| author | adam <adam@pkgsrc.org> | 2007-05-04 19:44:52 +0000 |
|---|---|---|
| committer | adam <adam@pkgsrc.org> | 2007-05-04 19:44:52 +0000 |
| commit | 5cc6c05802b0646b3a2929eda71d79d157ca0a21 (patch) | |
| tree | 8d028d5ff4f80f468114d1cc8dc9fcc8c8cf9a86 /databases | |
| parent | 52bdd17275ef778413eaa04ffe42b76cd1e38c73 (diff) | |
| download | pkgsrc-5cc6c05802b0646b3a2929eda71d79d157ca0a21.tar.gz | |
CONFLICTS fix
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/postgresql81/Makefile.common | 8 | ||||
| -rw-r--r-- | databases/postgresql82/Makefile.common | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/databases/postgresql81/Makefile.common b/databases/postgresql81/Makefile.common index 0353bc753e0..d1c3ba30da2 100644 --- a/databases/postgresql81/Makefile.common +++ b/databases/postgresql81/Makefile.common @@ -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 @@ MAINTAINER?= jlam@NetBSD.org 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 --git a/databases/postgresql82/Makefile.common b/databases/postgresql82/Makefile.common index ff9af012203..711adfe86b7 100644 --- a/databases/postgresql82/Makefile.common +++ b/databases/postgresql82/Makefile.common @@ -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 @@ MAINTAINER?= adam@NetBSD.org 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 |