- Update to 2.0.5

- Fix build with non-standard LOCALBASE
- patch-src_sphinxexpr.cpp removed: incorporated into upstream sources

Submitted by:	Denis <devzone.my at gmail.com>

3 files changed, 9 insertions, 37 deletions

diff --git a/textproc/sphinxsearch/Makefile b/textproc/sphinxsearch/Makefile
index 8c6c2fb064b7..16f7e3c2f831 100644
--- a/textproc/sphinxsearch/Makefile
+++ b/textproc/sphinxsearch/Makefile
@@ -9,7 +9,7 @@
 # See http://www.infracaninophile.co.uk/articles/sphinxse.html
 
 PORTNAME=	sphinxsearch
-PORTVERSION=	2.0.4
+PORTVERSION=	2.0.5
 CATEGORIES=	textproc databases
 MASTER_SITES=	http://sphinxsearch.com/files/
 DISTNAME=	sphinx-${PORTVERSION}-release
@@ -48,14 +48,18 @@ CONFLICTS=	sphinxsearch-devel-[0-9]* dpsearch-[0-9]* rdb-2.6d \
 # simultaneously.  Not sure how useful that is in practice though.
 
 .if ${PORT_OPTIONS:MMYSQL}
-CONFIGURE_ARGS+=	--with-mysql
+CONFIGURE_ARGS+=	--with-mysql \
+			--with-mysql-includes=${LOCALBASE}/include/mysql \
+			--with-mysql-libs=${LOCALBASE}/lib/mysql
 USE_MYSQL=		yes
 .else
 CONFIGURE_ARGS+=	--without-mysql
 .endif
 
 .if ${PORT_OPTIONS:MPGSQL}
-CONFIGURE_ARGS+=	--with-pgsql
+CONFIGURE_ARGS+=	--with-pgsql \
+			--with-pgsql-includes=${LOCALBASE}/include \
+			--with-pgsql-libs=${LOCALBASE}/lib
 USE_PGSQL=		yes
 .else
 CONFIGURE_ARGS+=	--without-pgsql
diff --git a/textproc/sphinxsearch/distinfo b/textproc/sphinxsearch/distinfo
index bbd4d16234c7..21b67a7dd3e0 100644
--- a/textproc/sphinxsearch/distinfo
+++ b/textproc/sphinxsearch/distinfo
@@ -1,4 +1,4 @@
-SHA256 (sphinx-2.0.4-release.tar.gz) = 43c4b62949d8fbd2b6ba93e20cb0f35c14f428be501af47e75a3ef713efa2886
-SIZE (sphinx-2.0.4-release.tar.gz) = 1938089
+SHA256 (sphinx-2.0.5-release.tar.gz) = 45d89b9112cf52adb2a7289df3b6f4d37371bad8f892b9da4b75b574c7e6ba90
+SIZE (sphinx-2.0.5-release.tar.gz) = 1959258
 SHA256 (libstemmer_c.tgz) = e9c3a2c13acf34945054e35ad53b7410c61f046d4044c0ade620fdac253bab46
 SIZE (libstemmer_c.tgz) = 129529
diff --git a/textproc/sphinxsearch/files/patch-src_sphinxexpr.cpp b/textproc/sphinxsearch/files/patch-src_sphinxexpr.cpp
deleted file mode 100644
index b19e04736ed4..000000000000
--- a/textproc/sphinxsearch/files/patch-src_sphinxexpr.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-
-$FreeBSD$
-
---- src/sphinxexpr.cpp.orig
-+++ src/sphinxexpr.cpp
-@@ -1796,7 +1796,7 @@
- 	/// evaluate arg, return interval id
- 	virtual int IntEval ( const CSphMatch & tMatch ) const
- 	{
--		T val = ExprEval ( this->m_pArg, tMatch ); // 'this' fixes gcc braindamage
-+		T val = this->ExprEval ( this->m_pArg, tMatch ); // 'this' fixes gcc braindamage
- 		ARRAY_FOREACH ( i, this->m_dValues ) // FIXME! OPTIMIZE! perform binary search here
- 			if ( val<this->m_dValues[i] )
- 				return i;
-@@ -1827,7 +1827,7 @@
- 	/// evaluate arg, return interval id
- 	virtual int IntEval ( const CSphMatch & tMatch ) const
- 	{
--		T val = ExprEval ( this->m_pArg, tMatch ); // 'this' fixes gcc braindamage
-+		T val = this->ExprEval ( this->m_pArg, tMatch ); // 'this' fixes gcc braindamage
- 		ARRAY_FOREACH ( i, m_dTurnPoints )
- 			if ( val < Expr_ArgVsSet_c<T>::ExprEval ( m_dTurnPoints[i], tMatch ) )
- 				return i;
-@@ -1873,7 +1873,7 @@
- 	/// evaluate arg, check if the value is within set
- 	virtual int IntEval ( const CSphMatch & tMatch ) const
- 	{
--		T val = ExprEval ( this->m_pArg, tMatch ); // 'this' fixes gcc braindamage
-+		T val = this->ExprEval ( this->m_pArg, tMatch ); // 'this' fixes gcc braindamage
- 		return this->m_dValues.BinarySearch ( val )!=NULL;
- 	}
-