Update sphinxsearch to 2.2.5.

Changes:
- added OPTION rand_seed which affects ORDER BY RAND()
- fixed #2042, indextool fails with field mask on 32+ fields
- fixed #2031, wrong encoding with UnixODBC/Oracle source
- fixed #2056, several bugs in RLP tokenizer
- fixed #2054, SHOW THREADS hangs if queries in prefork mode
- fixed #2057, WARNING at indexer on duplicated wordforms
- fixed #2066, snippet generation with weight_order enabled
- fixed exception parsing in queries
- fixed crash in config parser
- fixed MySQL protocol response when daemon maxed out

4 files changed, 58 insertions, 96 deletions

diff --git a/textproc/sphinxsearch/patches/patch-Makefile.in b/textproc/sphinxsearch/patches/patch-Makefile.in
deleted file mode 100644
index 0db0958ba14..00000000000
--- a/textproc/sphinxsearch/patches/patch-Makefile.in
+++ /dev/null
@@ -1,90 +0,0 @@
-$NetBSD: patch-Makefile.in,v 1.1 2014/03/05 13:44:23 fhajny Exp $
-
-Force pkgsrc compatible locations.
-
---- Makefile.in.orig	2013-11-11 19:18:55.000000000 +0000
-+++ Makefile.in
-@@ -79,7 +79,7 @@ am__nobase_list = $(am__nobase_strip_set
- am__base_list = \
-   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
--am__installdirs = "$(DESTDIR)$(sysconfdir)"
-+am__installdirs = "$(DESTDIR)$(egdir)"
- DATA = $(sysconf_DATA)
- RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-   distclean-recursive maintainer-clean-recursive
-@@ -225,6 +225,7 @@ sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
-+egdir = @egdir@
- target_alias = @target_alias@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
-@@ -296,24 +297,24 @@ sphinx-min.conf.dist: $(top_builddir)/co
- 	cd $(top_builddir) && $(SHELL) ./config.status $@
- install-sysconfDATA: $(sysconf_DATA)
- 	@$(NORMAL_INSTALL)
--	test -z "$(sysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(sysconfdir)"
-+	test -z "$(egdir)" || $(MKDIR_P) "$(DESTDIR)$(egdir)"
- 	@list='$(sysconf_DATA)'; test -n "$(sysconfdir)" || list=; \
- 	for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  echo "$$d$$p"; \
- 	done | $(am__base_list) | \
- 	while read files; do \
--	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(sysconfdir)'"; \
--	  $(INSTALL_DATA) $$files "$(DESTDIR)$(sysconfdir)" || exit $$?; \
-+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(egdir)'"; \
-+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(egdir)" || exit $$?; \
- 	done
- 
- uninstall-sysconfDATA:
- 	@$(NORMAL_UNINSTALL)
--	@list='$(sysconf_DATA)'; test -n "$(sysconfdir)" || list=; \
-+	@list='$(sysconf_DATA)'; test -n "$(egdir)" || list=; \
- 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- 	test -n "$$files" || exit 0; \
--	echo " ( cd '$(DESTDIR)$(sysconfdir)' && rm -f" $$files ")"; \
--	cd "$(DESTDIR)$(sysconfdir)" && rm -f $$files
-+	echo " ( cd '$(DESTDIR)$(egdir)' && rm -f" $$files ")"; \
-+	cd "$(DESTDIR)$(egdir)" && rm -f $$files
- 
- # This directory's subdirectories are mostly independent; you can cd
- # into them and run `make' without going through this Makefile.
-@@ -630,7 +631,7 @@ check: check-recursive
- all-am: Makefile $(DATA)
- installdirs: installdirs-recursive
- installdirs-am:
--	for dir in "$(DESTDIR)$(sysconfdir)"; do \
-+	for dir in "$(DESTDIR)$(egdir)"; do \
- 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- 	done
- install: install-recursive
-@@ -681,7 +682,6 @@ info-am:
- 
- install-data-am:
- 	@$(NORMAL_INSTALL)
--	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
- install-dvi: install-dvi-recursive
- 
- install-dvi-am:
-@@ -738,7 +738,7 @@ uninstall-am: uninstall-sysconfDATA
- 	distclean distclean-generic distclean-hdr distclean-tags \
- 	distcleancheck distdir distuninstallcheck dvi dvi-am html \
- 	html-am info info-am install install-am install-data \
--	install-data-am install-data-hook install-dvi install-dvi-am \
-+	install-data-am install-dvi install-dvi-am \
- 	install-exec install-exec-am install-html install-html-am \
- 	install-info install-info-am install-man install-pdf \
- 	install-pdf-am install-ps install-ps-am install-strip \
-@@ -748,9 +748,6 @@ uninstall-am: uninstall-sysconfDATA
- 	tags-recursive uninstall uninstall-am uninstall-sysconfDATA
- 
- 
--install-data-hook:
--	mkdir -p $(DESTDIR)$(localstatedir)/data && mkdir -p $(DESTDIR)$(localstatedir)/log
--
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
diff --git a/textproc/sphinxsearch/patches/patch-configure b/textproc/sphinxsearch/patches/patch-configure
new file mode 100644
index 00000000000..a8345208774
--- /dev/null
+++ b/textproc/sphinxsearch/patches/patch-configure
@@ -0,0 +1,52 @@
+$NetBSD: patch-configure,v 1.1 2014/10/17 17:28:15 fhajny Exp $
+
+Portability.
+--- configure.orig	2014-09-02 11:26:02.000000000 +0000
++++ configure
+@@ -6412,8 +6412,8 @@ if test "${enable_dl+set}" = set; then :
+ fi
+ 
+ 
+-if test x$ac_cv_use_dl_libs == xyes ; then
+-	if test x$ac_cv_func_dlopen == xyes ; then
++if test x$ac_cv_use_dl_libs = xyes ; then
++	if test x$ac_cv_func_dlopen = xyes ; then
+ 	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ 		sph_usedl=yes
+@@ -6895,7 +6895,7 @@ fi
+ 
+ 		MYSQL_LIBS=`echo $MYSQL_LIBS | sed -e "sX-lmysqlclientX\$MYSQL_PKGLIBDIR/libmysqlclient.aXg"`
+ 	else
+-		if test x$sph_usedl == xyes ; then
++		if test x$sph_usedl = xyes ; then
+ 			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: runtime dynamic" >&5
+ $as_echo "runtime dynamic" >&6; }
+ 
+@@ -7603,7 +7603,7 @@ fi
+ 
+ 		PGSQL_LIBS=`echo $PGSQL_LIBS | sed -e "sX-lpqX$PGSQL_PKGLIBDIR/libpq.aXg"`
+ 	else
+-		if test x$sph_usedl == xyes ; then
++		if test x$sph_usedl = xyes ; then
+ 			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: runtime dynamic" >&5
+ $as_echo "runtime dynamic" >&6; }
+ 
+@@ -8329,7 +8329,7 @@ if test "$ac_res" != no; then :
+ fi
+ 
+ 	if test $got_expat -eq 1; then
+-		if test x$sph_usedl == xyes ; then
++		if test x$sph_usedl = xyes ; then
+ 			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: runtime dynamic" >&5
+ $as_echo "runtime dynamic" >&6; }
+ 			LIBS="$FOOLIBS"
+@@ -8588,7 +8588,7 @@ fi
+ 	fi
+ 
+ 	if test x$have_libodbc = xyes; then
+-		if test x$sph_usedl == xyes ; then
++		if test x$sph_usedl = xyes ; then
+ 			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: runtime dynamic" >&5
+ $as_echo "runtime dynamic" >&6; }
+ 			LIBS="$FOOLIBS"
diff --git a/textproc/sphinxsearch/patches/patch-src_searchd.cpp b/textproc/sphinxsearch/patches/patch-src_searchd.cpp
index 390e61abf29..6bae72ffe0f 100644
--- a/textproc/sphinxsearch/patches/patch-src_searchd.cpp
+++ b/textproc/sphinxsearch/patches/patch-src_searchd.cpp
@@ -1,15 +1,15 @@
-$NetBSD: patch-src_searchd.cpp,v 1.1 2014/03/05 13:44:23 fhajny Exp $
+$NetBSD: patch-src_searchd.cpp,v 1.2 2014/10/17 17:28:15 fhajny Exp $
 
 Avoid hard-coded paths.
 
---- src/searchd.cpp.orig	2014-02-19 19:13:38.000000000 +0000
+--- src/searchd.cpp.orig	2014-09-26 17:59:01.000000000 +0000
 +++ src/searchd.cpp
-@@ -19128,7 +19128,7 @@ void ShowHelp ()
+@@ -21264,7 +21264,7 @@ void ShowHelp ()
  		"--safetrace\t\tonly use system backtrace() call in crash reports\n"
  		"\n"
  		"Examples:\n"
 -		"searchd --config /usr/local/sphinx/etc/sphinx.conf\n"
-+		"searchd --config @PKG_SYSCONFDIR@/sphinx.conf\n"
++		"searchd --config /opt/local/etc/sphinx.conf\n"
  #if USE_WINDOWS
  		"searchd --install --config c:\\sphinx\\sphinx.conf\n"
  #endif
diff --git a/textproc/sphinxsearch/patches/patch-src_sphinxstd.h b/textproc/sphinxsearch/patches/patch-src_sphinxstd.h
index 0d97e1e84cc..595f38b4fa9 100644
--- a/textproc/sphinxsearch/patches/patch-src_sphinxstd.h
+++ b/textproc/sphinxsearch/patches/patch-src_sphinxstd.h
@@ -1,8 +1,8 @@
-$NetBSD: patch-src_sphinxstd.h,v 1.1 2014/03/05 13:44:23 fhajny Exp $
+$NetBSD: patch-src_sphinxstd.h,v 1.2 2014/10/17 17:28:15 fhajny Exp $
 
 Portability fixes.
 
---- src/sphinxstd.h.orig	2014-01-22 15:16:21.000000000 +0000
+--- src/sphinxstd.h.orig	2014-09-26 17:21:01.000000000 +0000
 +++ src/sphinxstd.h
 @@ -75,6 +75,13 @@ typedef int __declspec("SAL_nokernel") _
  #endif