summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--databases/mysql55-client/options.mk4
-rw-r--r--databases/mysql55-server/Makefile3
-rw-r--r--databases/mysql56-client/options.mk4
-rw-r--r--databases/mysql56-server/Makefile4
4 files changed, 8 insertions, 7 deletions
diff --git a/databases/mysql55-client/options.mk b/databases/mysql55-client/options.mk
index e80d5c4266e..7a4c1772fe0 100644
--- a/databases/mysql55-client/options.mk
+++ b/databases/mysql55-client/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.7 2015/02/07 10:13:59 adam Exp $
+# $NetBSD: options.mk,v 1.8 2015/02/07 16:04:46 fhajny Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.mysql5
@@ -28,7 +28,7 @@ PLIST_VARS+= sphinx
SPHINX_VER= 2.2.7
DISTFILES= ${DEFAULT_DISTFILES} sphinx-${SPHINX_VER}-release${EXTRACT_SUFX}
SITES.sphinx-2.2.7-release.tar.gz= http://sphinxsearch.com/files/
-.if !empty(PKGPATH:Mserver)
+.if !empty(PKGPATH:Mdatabases/mysql55-server)
MESSAGE_SRC= ${PKGDIR}/MESSAGE ${PKGDIR}/MESSAGE.sphinx
.endif
PLIST.sphinx= yes
diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile
index 326cc6a3334..081fea46c29 100644
--- a/databases/mysql55-server/Makefile
+++ b/databases/mysql55-server/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2015/02/07 10:13:59 adam Exp $
+# $NetBSD: Makefile,v 1.27 2015/02/07 16:04:46 fhajny Exp $
PKGNAME= ${DISTNAME:S/-/-server-/}
+PKGREVISION= 1
COMMENT= MySQL 5, a free SQL database (server)
CONFLICTS= mysql3-server-[0-9]*
diff --git a/databases/mysql56-client/options.mk b/databases/mysql56-client/options.mk
index 374c6332ce6..3373429109b 100644
--- a/databases/mysql56-client/options.mk
+++ b/databases/mysql56-client/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2015/01/03 16:07:38 fhajny Exp $
+# $NetBSD: options.mk,v 1.6 2015/02/07 16:04:46 fhajny Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.mysql5
@@ -27,7 +27,7 @@ PLIST_VARS+= sphinx
.if !empty(PKG_OPTIONS:Msphinx) || make(distinfo) || make(makesum) || make(mdi)
SPHINX_VER= 2.2.5
DISTFILES= ${DEFAULT_DISTFILES} sphinx-${SPHINX_VER}-release${EXTRACT_SUFX}
-.if !empty(PKGPATH:Mserver)
+.if !empty(PKGPATH:Mdatabases/mysql56-server)
MESSAGE_SRC= ${PKGDIR}/MESSAGE ${PKGDIR}/MESSAGE.sphinx
.endif
PLIST.sphinx= yes
diff --git a/databases/mysql56-server/Makefile b/databases/mysql56-server/Makefile
index a38a5bef62a..dc699509482 100644
--- a/databases/mysql56-server/Makefile
+++ b/databases/mysql56-server/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2014/12/05 17:22:16 schmonz Exp $
+# $NetBSD: Makefile,v 1.21 2015/02/07 16:04:47 fhajny Exp $
PKGNAME= ${DISTNAME:S/-/-server-/}
-PKGREVISION= 1
+PKGREVISION= 2
COMMENT= MySQL 5, a free SQL database (server)
CONFLICTS= mysql3-server-[0-9]*