summaryrefslogtreecommitdiff
path: root/databases/mysql55-server
diff options
context:
space:
mode:
authorwiz <wiz>2013-12-05 14:20:02 +0000
committerwiz <wiz>2013-12-05 14:20:02 +0000
commit0a4e8d2895877b4cae550d90d8ad9af3c3866f84 (patch)
treea53e037a9eb2ad5579b47c06fbe73a13c1f40ea3 /databases/mysql55-server
parentbdbbfeee3ceed3da7e79c78fb947d82121cc68ec (diff)
downloadpkgsrc-0a4e8d2895877b4cae550d90d8ad9af3c3866f84.tar.gz
Remove CONFLICTS with ${PKGBASE}, these are automatic.
Avoids unnecessary pkgin warning.
Diffstat (limited to 'databases/mysql55-server')
-rw-r--r--databases/mysql55-server/Makefile4
1 files changed, 2 insertions, 2 deletions
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"