diff options
| author | wiz <wiz> | 2013-12-05 14:20:02 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2013-12-05 14:20:02 +0000 |
| commit | c934f941caac275442a458388e52c985cfa35514 (patch) | |
| tree | a53e037a9eb2ad5579b47c06fbe73a13c1f40ea3 /databases | |
| parent | ea3563136084b180ed1c5ae610b4f5155ad96a3d (diff) | |
| download | pkgsrc-c934f941caac275442a458388e52c985cfa35514.tar.gz | |
Remove CONFLICTS with ${PKGBASE}, these are automatic.
Avoids unnecessary pkgin warning.
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/mysql51-client/Makefile | 4 | ||||
| -rw-r--r-- | databases/mysql51-server/Makefile | 4 | ||||
| -rw-r--r-- | databases/mysql55-client/Makefile | 4 | ||||
| -rw-r--r-- | databases/mysql55-server/Makefile | 4 | ||||
| -rw-r--r-- | databases/mysql56-client/Makefile | 4 | ||||
| -rw-r--r-- | databases/mysql56-server/Makefile | 4 |
6 files changed, 12 insertions, 12 deletions
diff --git a/databases/mysql51-client/Makefile b/databases/mysql51-client/Makefile index fc12f2bfa3d..3f0d554bbfb 100644 --- a/databases/mysql51-client/Makefile +++ b/databases/mysql51-client/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.14 2013/08/04 10:20:24 adam Exp $ +# $NetBSD: Makefile,v 1.15 2013/12/05 14:20:02 wiz Exp $ PKGNAME= ${DISTNAME:S/-/-client-/} SVR4_PKGNAME= mysqc COMMENT= MySQL 5, a free SQL database (client) -CONFLICTS= {mysql-client-[0-9]*,mysql3-client-[0-9]*} +CONFLICTS= mysql3-client-[0-9]* .include "Makefile.common" diff --git a/databases/mysql51-server/Makefile b/databases/mysql51-server/Makefile index 52bbc19dd21..5919e1d7906 100644 --- a/databases/mysql51-server/Makefile +++ b/databases/mysql51-server/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.17 2013/08/04 10:20:24 adam Exp $ +# $NetBSD: Makefile,v 1.18 2013/12/05 14:20:02 wiz Exp $ PKGNAME= ${DISTNAME:S/-/-server-/} SVR4_PKGNAME= mysqs COMMENT= MySQL 5, a free SQL database (server) -CONFLICTS= {mysql-server-[0-9]*,mysql3-server-[0-9]*} +CONFLICTS= mysql3-server-[0-9]* .include "../../databases/mysql51-client/Makefile.common" diff --git a/databases/mysql55-client/Makefile b/databases/mysql55-client/Makefile index fcf44ca169d..8a83372e52f 100644 --- a/databases/mysql55-client/Makefile +++ b/databases/mysql55-client/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.13 2013/09/30 18:26:38 adam Exp $ +# $NetBSD: Makefile,v 1.14 2013/12/05 14:20:02 wiz Exp $ PKGNAME= ${DISTNAME:S/-/-client-/} SVR4_PKGNAME= mysqc COMMENT= MySQL 5, a free SQL database (client) -CONFLICTS= {mysql-client-[0-9]*,mysql3-client-[0-9]*} +CONFLICTS= mysql3-client-[0-9]* .include "Makefile.common" diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile index bd8958506ca..4f1de27cb04 100644 --- a/databases/mysql55-server/Makefile +++ b/databases/mysql55-server/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.16 2013/12/03 15:40:19 adam Exp $ +# $NetBSD: Makefile,v 1.17 2013/12/05 14:20:02 wiz Exp $ PKGNAME= ${DISTNAME:S/-/-server-/} SVR4_PKGNAME= mysqs COMMENT= MySQL 5, a free SQL database (server) -CONFLICTS= {mysql-server-[0-9]*,mysql3-server-[0-9]*} +CONFLICTS= mysql3-server-[0-9]* .include "../../databases/mysql55-client/Makefile.common" diff --git a/databases/mysql56-client/Makefile b/databases/mysql56-client/Makefile index 5825c417f0f..9398510fea5 100644 --- a/databases/mysql56-client/Makefile +++ b/databases/mysql56-client/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.8 2013/10/01 10:26:39 adam Exp $ +# $NetBSD: Makefile,v 1.9 2013/12/05 14:20:02 wiz Exp $ PKGNAME= ${DISTNAME:S/-/-client-/} SVR4_PKGNAME= mysqc COMMENT= MySQL 5, a free SQL database (client) -CONFLICTS= {mysql-client-[0-9]*,mysql3-client-[0-9]*} +CONFLICTS= mysql3-client-[0-9]* .include "Makefile.common" diff --git a/databases/mysql56-server/Makefile b/databases/mysql56-server/Makefile index 0d6c95770de..203c9446abd 100644 --- a/databases/mysql56-server/Makefile +++ b/databases/mysql56-server/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.10 2013/12/03 20:02:42 adam Exp $ +# $NetBSD: Makefile,v 1.11 2013/12/05 14:20:02 wiz Exp $ PKGNAME= ${DISTNAME:S/-/-server-/} SVR4_PKGNAME= mysqs COMMENT= MySQL 5, a free SQL database (server) -CONFLICTS= {mysql-server-[0-9]*,mysql3-server-[0-9]*} +CONFLICTS= mysql3-server-[0-9]* .include "../../databases/mysql56-client/Makefile.common" |