Add optional Sphinx SE plugin support to MySQL 5.5 and 5.6.

Intented as a clean implementation (replacement) of wip/mysql-sphinxse.

SphinxSE is MySQL storage engine which can be compiled into MySQL server 5.x
using its pluggable architecture. Despite the name, SphinxSE does not
actually store any data itself. It is actually a built-in client which
allows MySQL server to talk to searchd, run search queries, and obtain
search results. All indexing and searching happen outside MySQL.

See http://sphinxsearch.com/docs/current.html#sphinxse-overview

8 files changed, 74 insertions, 8 deletions

diff --git a/databases/mysql55-client/distinfo b/databases/mysql55-client/distinfo
index 5c679daa891..f1668f09719 100644
--- a/databases/mysql55-client/distinfo
+++ b/databases/mysql55-client/distinfo
@@ -1,8 +1,11 @@
-$NetBSD: distinfo,v 1.36 2014/10/01 09:17:18 adam Exp $
+$NetBSD: distinfo,v 1.37 2014/10/17 17:07:44 fhajny Exp $
 
 SHA1 (mysql-5.5.40.tar.gz) = b93a1b14ab2de390014e99b4293e7835da133196
 RMD160 (mysql-5.5.40.tar.gz) = a0b6b9a390ba8a3abc889155d756656b28b98f70
 Size (mysql-5.5.40.tar.gz) = 21727672 bytes
+SHA1 (sphinx-2.2.5-release.tar.gz) = 27e1a37fdeff12b866b33d3bb5602894af10bb5e
+RMD160 (sphinx-2.2.5-release.tar.gz) = d37cf615dae556307dbad2bbe00144f59afe7530
+Size (sphinx-2.2.5-release.tar.gz) = 2953899 bytes
 SHA1 (patch-BUILD_compile-pentium-gcov) = a1ac666efa953a98455a726e5db359c903d699b6
 SHA1 (patch-CMakeLists.txt) = 632e036cd9578d0636328c2259a8529c36f2d14a
 SHA1 (patch-client_completion_hash.cc) = e27fd7072a8206380f0a932b1a31d2843c985cbf
diff --git a/databases/mysql55-client/options.mk b/databases/mysql55-client/options.mk
index d225bc067ec..82de2490fde 100644
--- a/databases/mysql55-client/options.mk
+++ b/databases/mysql55-client/options.mk
@@ -1,9 +1,9 @@
-# $NetBSD: options.mk,v 1.4 2014/03/25 13:56:38 jperkin Exp $
+# $NetBSD: options.mk,v 1.5 2014/10/17 17:07:44 fhajny Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.mysql5
 
 # ndb-cluster does not configure with cmake
-PKG_SUPPORTED_OPTIONS+=	dtrace embedded-server ndb-cluster ssl
+PKG_SUPPORTED_OPTIONS+=	dtrace embedded-server ndb-cluster sphinx ssl
 PKG_SUGGESTED_OPTIONS+=	embedded-server ssl
 
 .include "../../mk/bsd.options.mk"
@@ -20,3 +20,18 @@ CMAKE_ARGS+=		-DWITH_SSL=no
 .if !empty(PKG_OPTIONS:Mdtrace)
 CMAKE_ARGS+=		-DENABLE_DTRACE=ON
 .endif
+
+# Enable Sphinx SE support
+# http://sphinxsearch.com/docs/current.html#sphinxse-overview
+PLIST_VARS+=	sphinx
+.if !empty(PKG_OPTIONS:Msphinx)
+SPHINX_VER=	2.2.5
+DISTFILES=	${DEFAULT_DISTFILES} sphinx-${SPHINX_VER}-release${EXTRACT_SUFX}
+.if !empty(PKGPATH:Mserver)
+MESSAGE_SRC=	${PKGDIR}/MESSAGE ${PKGDIR}/MESSAGE.sphinx
+.endif
+PLIST.sphinx=	yes
+
+post-extract:
+	${CP} -R ${WRKDIR}/sphinx-${SPHINX_VER}-release/mysqlse ${WRKSRC}/storage/sphinx
+.endif
diff --git a/databases/mysql55-server/MESSAGE.sphinx b/databases/mysql55-server/MESSAGE.sphinx
new file mode 100644
index 00000000000..0592f2d75c7
--- /dev/null
+++ b/databases/mysql55-server/MESSAGE.sphinx
@@ -0,0 +1,14 @@
+===========================================================================
+$NetBSD: MESSAGE.sphinx,v 1.1 2014/10/17 17:07:44 fhajny Exp $
+
+To install the SphinxSE MySQL plugin, log into your MySQL console
+and issue the following query:
+
+  INSTALL PLUGIN sphinx SONAME 'ha_sphinx.so';
+
+You can verify it has been loaded properly by checking whether
+it shows up in the list when list your engines:
+
+  SHOW ENGINES;
+
+===========================================================================
diff --git a/databases/mysql55-server/PLIST b/databases/mysql55-server/PLIST
index 978ecaf4173..ee7e911c9ca 100644
--- a/databases/mysql55-server/PLIST
+++ b/databases/mysql55-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.31 2014/10/01 09:17:18 adam Exp $
+@comment $NetBSD: PLIST,v 1.32 2014/10/17 17:07:44 fhajny Exp $
 bin/innochecksum
 bin/my_print_defaults
 bin/myisam_ftdump
@@ -25,6 +25,7 @@ lib/mysql/plugin/ha_archive.so
 lib/mysql/plugin/ha_blackhole.so
 lib/mysql/plugin/ha_example.so
 lib/mysql/plugin/ha_federated.so
+${PLIST.sphinx}lib/mysql/plugin/ha_sphinx.so
 lib/mysql/plugin/libdaemon_example.so
 lib/mysql/plugin/mypluglib.so
 lib/mysql/plugin/qa_auth_client.so
diff --git a/databases/mysql56-client/distinfo b/databases/mysql56-client/distinfo
index 454f7f38d06..e1b93073907 100644
--- a/databases/mysql56-client/distinfo
+++ b/databases/mysql56-client/distinfo
@@ -1,8 +1,11 @@
-$NetBSD: distinfo,v 1.17 2014/10/01 08:34:23 adam Exp $
+$NetBSD: distinfo,v 1.18 2014/10/17 17:07:44 fhajny Exp $
 
 SHA1 (mysql-5.6.21.tar.gz) = be068ba90953aecdb3f448b4ba1d35796eb799eb
 RMD160 (mysql-5.6.21.tar.gz) = 549b3476c3bbe6ca6b459b5970fc59a345334cd7
 Size (mysql-5.6.21.tar.gz) = 33009070 bytes
+SHA1 (sphinx-2.2.5-release.tar.gz) = 27e1a37fdeff12b866b33d3bb5602894af10bb5e
+RMD160 (sphinx-2.2.5-release.tar.gz) = d37cf615dae556307dbad2bbe00144f59afe7530
+Size (sphinx-2.2.5-release.tar.gz) = 2953899 bytes
 SHA1 (patch-CMakeLists.txt) = 1b5dd5a965f87027a03c5f2eaa1c7e6a43395cff
 SHA1 (patch-client_completion_hash.cc) = b86ec80beac624b2aa21c7587e351ff126400ecb
 SHA1 (patch-client_mysqladmin.cc) = e1650ef3695675bcc01375bacdebcb7318218b93
diff --git a/databases/mysql56-client/options.mk b/databases/mysql56-client/options.mk
index 88dbb38d1ae..13812e1dae7 100644
--- a/databases/mysql56-client/options.mk
+++ b/databases/mysql56-client/options.mk
@@ -1,9 +1,9 @@
-# $NetBSD: options.mk,v 1.3 2014/03/25 13:56:38 jperkin Exp $
+# $NetBSD: options.mk,v 1.4 2014/10/17 17:07:44 fhajny Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.mysql5
 
 # ndb-cluster does not configure with cmake
-PKG_SUPPORTED_OPTIONS+=	dtrace embedded-server ndb-cluster ssl
+PKG_SUPPORTED_OPTIONS+=	dtrace embedded-server ndb-cluster sphinx ssl
 PKG_SUGGESTED_OPTIONS+=	embedded-server ssl
 
 .include "../../mk/bsd.options.mk"
@@ -20,3 +20,18 @@ CMAKE_ARGS+=		-DWITH_SSL=no
 .if !empty(PKG_OPTIONS:Mdtrace)
 CMAKE_ARGS+=		-DENABLE_DTRACE=ON
 .endif
+
+# Enable Sphinx SE support
+# http://sphinxsearch.com/docs/current.html#sphinxse-overview
+PLIST_VARS+=	sphinx
+.if !empty(PKG_OPTIONS:Msphinx)
+SPHINX_VER=	2.2.5
+DISTFILES=	${DEFAULT_DISTFILES} sphinx-${SPHINX_VER}-release${EXTRACT_SUFX}
+.if !empty(PKGPATH:Mserver)
+MESSAGE_SRC=	${PKGDIR}/MESSAGE ${PKGDIR}/MESSAGE.sphinx
+.endif
+PLIST.sphinx=	yes
+
+post-extract:
+	${CP} -R ${WRKDIR}/sphinx-${SPHINX_VER}-release/mysqlse ${WRKSRC}/storage/sphinx
+.endif
diff --git a/databases/mysql56-server/MESSAGE.sphinx b/databases/mysql56-server/MESSAGE.sphinx
new file mode 100644
index 00000000000..9033e331ff3
--- /dev/null
+++ b/databases/mysql56-server/MESSAGE.sphinx
@@ -0,0 +1,14 @@
+===========================================================================
+$NetBSD: MESSAGE.sphinx,v 1.1 2014/10/17 17:07:45 fhajny Exp $
+
+To install the SphinxSE MySQL plugin, log into your MySQL console
+and issue the following query:
+
+  INSTALL PLUGIN sphinx SONAME 'ha_sphinx.so';
+
+You can verify it has been loaded properly by checking whether
+it shows up in the list when list your engines:
+
+  SHOW ENGINES;
+
+===========================================================================
diff --git a/databases/mysql56-server/PLIST b/databases/mysql56-server/PLIST
index 098c5e03ce2..e31d572edd1 100644
--- a/databases/mysql56-server/PLIST
+++ b/databases/mysql56-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2014/10/01 08:34:23 adam Exp $
+@comment $NetBSD: PLIST,v 1.13 2014/10/17 17:07:45 fhajny Exp $
 bin/innochecksum
 bin/my_print_defaults
 bin/myisam_ftdump
@@ -21,6 +21,7 @@ lib/mysql/plugin/auth.so
 ${PLIST.auth_socket}lib/mysql/plugin/auth_socket.so
 lib/mysql/plugin/auth_test_plugin.so
 lib/mysql/plugin/daemon_example.ini
+${PLIST.sphinx}lib/mysql/plugin/ha_sphinx.so
 lib/mysql/plugin/libdaemon_example.so
 lib/mysql/plugin/mypluglib.so
 lib/mysql/plugin/qa_auth_client.so