diff options
| author | seb <seb@pkgsrc.org> | 2004-08-21 17:27:04 +0000 |
|---|---|---|
| committer | seb <seb@pkgsrc.org> | 2004-08-21 17:27:04 +0000 |
| commit | 9d206746ea390f1f1bdc1afc2248f24271781d21 (patch) | |
| tree | 040ed462381939debe41d996f782c718dd12547b | |
| parent | 78e69c83793b10ac5c321384425b5f178abad9a8 (diff) | |
| download | pkgsrc-9d206746ea390f1f1bdc1afc2248f24271781d21.tar.gz | |
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]*'.
| -rw-r--r-- | databases/postgresql73/Makefile.common | 4 | ||||
| -rw-r--r-- | databases/postgresql74/Makefile.common | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/databases/postgresql73/Makefile.common b/databases/postgresql73/Makefile.common index f597bed2c94..0cb9d705e3a 100644 --- a/databases/postgresql73/Makefile.common +++ b/databases/postgresql73/Makefile.common @@ -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 @@ MASTER_SITES?= http://www.postgresql.org/ftpsite/source/v${DIST_VERS}/ \ MAINTAINER?= tech-pkg@NetBSD.org 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 --git a/databases/postgresql74/Makefile.common b/databases/postgresql74/Makefile.common index a89ca92b0ae..04d8e92439b 100644 --- a/databases/postgresql74/Makefile.common +++ b/databases/postgresql74/Makefile.common @@ -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 @@ EXTRACT_SUFX= .tar.bz2 MAINTAINER?= recht@NetBSD.org 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 |