[pkgsrc/trunk]: pkgsrc/databases Fix MESSAGE_SRC for the sphinx option. Bump ...

[fhajny <fhajny%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/60b2e8f00f30
branches:  trunk
changeset: 646325:60b2e8f00f30
user:      fhajny <fhajny%pkgsrc.org@localhost>
date:      Sat Feb 07 16:04:46 2015 +0000

description:
Fix MESSAGE_SRC for the sphinx option. Bump PKGREVISION.

diffstat:

 databases/mysql55-client/options.mk |  4 ++--
 databases/mysql55-server/Makefile   |  3 ++-
 databases/mysql56-client/options.mk |  4 ++--
 databases/mysql56-server/Makefile   |  4 ++--
 4 files changed, 8 insertions(+), 7 deletions(-)

diffs (61 lines):

diff -r 812c48b50979 -r 60b2e8f00f30 databases/mysql55-client/options.mk
--- a/databases/mysql55-client/options.mk       Sat Feb 07 16:01:14 2015 +0000
+++ b/databases/mysql55-client/options.mk       Sat Feb 07 16:04:46 2015 +0000
@@ -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 @@
 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 -r 812c48b50979 -r 60b2e8f00f30 databases/mysql55-server/Makefile
--- a/databases/mysql55-server/Makefile Sat Feb 07 16:01:14 2015 +0000
+++ b/databases/mysql55-server/Makefile Sat Feb 07 16:04:46 2015 +0000
@@ -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 -r 812c48b50979 -r 60b2e8f00f30 databases/mysql56-client/options.mk
--- a/databases/mysql56-client/options.mk       Sat Feb 07 16:01:14 2015 +0000
+++ b/databases/mysql56-client/options.mk       Sat Feb 07 16:04:46 2015 +0000
@@ -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 @@
 .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 -r 812c48b50979 -r 60b2e8f00f30 databases/mysql56-server/Makefile
--- a/databases/mysql56-server/Makefile Sat Feb 07 16:01:14 2015 +0000
+++ b/databases/mysql56-server/Makefile Sat Feb 07 16:04:46 2015 +0000
@@ -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]*