* The Snowball project has rerolled libstemmer_c.tgz as they

  occasionally do.  This time they've actually changed the code, so
  patching is now required in order to compile.[1]

* Add option to link against re2 regular expression library.[2]

* PGSQL_USE -> PGSQL_USES

Submitted by:	Daniel Ylitalo <daniel@blodan.se>[1]
Submitted by:	Alex Storn <devzone.my@gmail.com>[2]

3 files changed, 97 insertions, 4 deletions

diff --git a/textproc/sphinxsearch/Makefile b/textproc/sphinxsearch/Makefile
index c03beb9215a3..167ee5147e01 100644
--- a/textproc/sphinxsearch/Makefile
+++ b/textproc/sphinxsearch/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	sphinxsearch
 PORTVERSION=	2.1.9
+PORTREVISION=	1
 CATEGORIES=	textproc databases
 MASTER_SITES=	http://sphinxsearch.com/files/ \
 		http://snowball.tartarus.org/dist/:libstemmer
@@ -24,7 +25,7 @@ LICENSE=	GPLv2
 LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
 
 OPTIONS_DEFINE=	ICONV ID64 LIBSTEMMER MYSQL OPTIMIZED_CFLAGS PGSQL \
-		SYSLOG UNIXODBC DOCS
+		RE2 SYSLOG UNIXODBC DOCS
 OPTIONS_DEFAULT=ICONV MYSQL SYSLOG
 
 ICONV_CONFIGURE_WITH=	iconv
@@ -72,7 +73,13 @@ OPTIMIZED_CFLAGS_CXXFLAGS=-O3 -fomit-frame-pointer
 PGSQL_CONFIGURE_WITH=	pgsql
 PGSQL_CONFIGURE_ON=	--with-pgsql-includes=${LOCALBASE}/include \
 			--with-pgsql-libs=${LOCALBASE}/lib
-PGSQL_USE=		pgsql
+PGSQL_USES=		pgsql
+
+# Why does this insist on linking against the libre2.a static library?
+
+RE2_DESC=		Enable re2 regular expression library
+RE2_CONFIGURE_WITH=	re2
+RE2_BUILD_DEPENDS=	${LOCALBASE}/lib/libre2.a:${PORTSDIR}/devel/re2
 
 SYSLOG_DESC=		Enable logging via syslog
 SYSLOG_CONFIGURE_WITH=	syslog
diff --git a/textproc/sphinxsearch/distinfo b/textproc/sphinxsearch/distinfo
index a5818c719bc2..92d506a9fc22 100644
--- a/textproc/sphinxsearch/distinfo
+++ b/textproc/sphinxsearch/distinfo
@@ -1,4 +1,4 @@
 SHA256 (sphinx-2.1.9-release.tar.gz) = 6289aa0ac3e1456a0c9181ce6bce2287778b5a163f685a1376e181fc87eb7c03
 SIZE (sphinx-2.1.9-release.tar.gz) = 2443797
-SHA256 (libstemmer_c.tgz) = 7694b0ec0a380670470587a559abb219c224b8047ed9e3078dccb8898a4a4afb
-SIZE (libstemmer_c.tgz) = 129506
+SHA256 (libstemmer_c.tgz) = 469f5d16e23437c313541a579b1cdfb10dcd75a32b589edb283b3d1ecbe7e098
+SIZE (libstemmer_c.tgz) = 129592
diff --git a/textproc/sphinxsearch/files/patch-libstemmer_c__Makefile.in b/textproc/sphinxsearch/files/patch-libstemmer_c__Makefile.in
new file mode 100644
index 000000000000..7e1cfa83a9c8
--- /dev/null
+++ b/textproc/sphinxsearch/files/patch-libstemmer_c__Makefile.in
@@ -0,0 +1,86 @@
+--- libstemmer_c/Makefile.in.orig	2013-11-11 19:18:55 UTC
++++ libstemmer_c/Makefile.in
+@@ -65,7 +65,7 @@
+ 	src_c/stem_UTF_8_english.c src_c/stem_ISO_8859_1_finnish.c \
+ 	src_c/stem_UTF_8_finnish.c src_c/stem_ISO_8859_1_french.c \
+ 	src_c/stem_UTF_8_french.c src_c/stem_ISO_8859_1_german.c \
+-	src_c/stem_UTF_8_german.c src_c/stem_ISO_8859_1_hungarian.c \
++	src_c/stem_UTF_8_german.c src_c/stem_ISO_8859_2_hungarian.c \
+ 	src_c/stem_UTF_8_hungarian.c src_c/stem_ISO_8859_1_italian.c \
+ 	src_c/stem_UTF_8_italian.c src_c/stem_ISO_8859_1_norwegian.c \
+ 	src_c/stem_UTF_8_norwegian.c src_c/stem_ISO_8859_1_porter.c \
+@@ -88,7 +88,7 @@
+ @USE_LIBSTEMMER_TRUE@	stem_UTF_8_french.$(OBJEXT) \
+ @USE_LIBSTEMMER_TRUE@	stem_ISO_8859_1_german.$(OBJEXT) \
+ @USE_LIBSTEMMER_TRUE@	stem_UTF_8_german.$(OBJEXT) \
+-@USE_LIBSTEMMER_TRUE@	stem_ISO_8859_1_hungarian.$(OBJEXT) \
++@USE_LIBSTEMMER_TRUE@	stem_ISO_8859_2_hungarian.$(OBJEXT) \
+ @USE_LIBSTEMMER_TRUE@	stem_UTF_8_hungarian.$(OBJEXT) \
+ @USE_LIBSTEMMER_TRUE@	stem_ISO_8859_1_italian.$(OBJEXT) \
+ @USE_LIBSTEMMER_TRUE@	stem_UTF_8_italian.$(OBJEXT) \
+@@ -127,7 +127,7 @@
+ 	src_c/stem_UTF_8_english.h src_c/stem_ISO_8859_1_finnish.h \
+ 	src_c/stem_UTF_8_finnish.h src_c/stem_ISO_8859_1_french.h \
+ 	src_c/stem_UTF_8_french.h src_c/stem_ISO_8859_1_german.h \
+-	src_c/stem_UTF_8_german.h src_c/stem_ISO_8859_1_hungarian.h \
++	src_c/stem_UTF_8_german.h src_c/stem_ISO_8859_2_hungarian.h \
+ 	src_c/stem_UTF_8_hungarian.h src_c/stem_ISO_8859_1_italian.h \
+ 	src_c/stem_UTF_8_italian.h src_c/stem_ISO_8859_1_norwegian.h \
+ 	src_c/stem_UTF_8_norwegian.h src_c/stem_ISO_8859_1_porter.h \
+@@ -261,7 +261,7 @@
+ @USE_LIBSTEMMER_TRUE@  src_c/stem_UTF_8_french.c \
+ @USE_LIBSTEMMER_TRUE@  src_c/stem_ISO_8859_1_german.c \
+ @USE_LIBSTEMMER_TRUE@  src_c/stem_UTF_8_german.c \
+-@USE_LIBSTEMMER_TRUE@  src_c/stem_ISO_8859_1_hungarian.c \
++@USE_LIBSTEMMER_TRUE@  src_c/stem_ISO_8859_2_hungarian.c \
+ @USE_LIBSTEMMER_TRUE@  src_c/stem_UTF_8_hungarian.c \
+ @USE_LIBSTEMMER_TRUE@  src_c/stem_ISO_8859_1_italian.c \
+ @USE_LIBSTEMMER_TRUE@  src_c/stem_UTF_8_italian.c \
+@@ -297,7 +297,7 @@
+ @USE_LIBSTEMMER_TRUE@  src_c/stem_UTF_8_french.h \
+ @USE_LIBSTEMMER_TRUE@  src_c/stem_ISO_8859_1_german.h \
+ @USE_LIBSTEMMER_TRUE@  src_c/stem_UTF_8_german.h \
+-@USE_LIBSTEMMER_TRUE@  src_c/stem_ISO_8859_1_hungarian.h \
++@USE_LIBSTEMMER_TRUE@  src_c/stem_ISO_8859_2_hungarian.h \
+ @USE_LIBSTEMMER_TRUE@  src_c/stem_UTF_8_hungarian.h \
+ @USE_LIBSTEMMER_TRUE@  src_c/stem_ISO_8859_1_italian.h \
+ @USE_LIBSTEMMER_TRUE@  src_c/stem_UTF_8_italian.h \
+@@ -379,7 +379,7 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stem_ISO_8859_1_finnish.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stem_ISO_8859_1_french.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stem_ISO_8859_1_german.Po@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stem_ISO_8859_1_hungarian.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stem_ISO_8859_2_hungarian.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stem_ISO_8859_1_italian.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stem_ISO_8859_1_norwegian.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stem_ISO_8859_1_porter.Po@am__quote@
+@@ -588,19 +588,19 @@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o stem_UTF_8_german.obj `if test -f 'src_c/stem_UTF_8_german.c'; then $(CYGPATH_W) 'src_c/stem_UTF_8_german.c'; else $(CYGPATH_W) '$(srcdir)/src_c/stem_UTF_8_german.c'; fi`
+ 
+-stem_ISO_8859_1_hungarian.o: src_c/stem_ISO_8859_1_hungarian.c
+-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT stem_ISO_8859_1_hungarian.o -MD -MP -MF $(DEPDIR)/stem_ISO_8859_1_hungarian.Tpo -c -o stem_ISO_8859_1_hungarian.o `test -f 'src_c/stem_ISO_8859_1_hungarian.c' || echo '$(srcdir)/'`src_c/stem_ISO_8859_1_hungarian.c
+-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/stem_ISO_8859_1_hungarian.Tpo $(DEPDIR)/stem_ISO_8859_1_hungarian.Po
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src_c/stem_ISO_8859_1_hungarian.c' object='stem_ISO_8859_1_hungarian.o' libtool=no @AMDEPBACKSLASH@
++stem_ISO_8859_2_hungarian.o: src_c/stem_ISO_8859_2_hungarian.c
++@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT stem_ISO_8859_2_hungarian.o -MD -MP -MF $(DEPDIR)/stem_ISO_8859_2_hungarian.Tpo -c -o stem_ISO_8859_2_hungarian.o `test -f 'src_c/stem_ISO_8859_2_hungarian.c' || echo '$(srcdir)/'`src_c/stem_ISO_8859_2_hungarian.c
++@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/stem_ISO_8859_2_hungarian.Tpo $(DEPDIR)/stem_ISO_8859_2_hungarian.Po
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src_c/stem_ISO_8859_2_hungarian.c' object='stem_ISO_8859_2_hungarian.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o stem_ISO_8859_1_hungarian.o `test -f 'src_c/stem_ISO_8859_1_hungarian.c' || echo '$(srcdir)/'`src_c/stem_ISO_8859_1_hungarian.c
++@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o stem_ISO_8859_2_hungarian.o `test -f 'src_c/stem_ISO_8859_2_hungarian.c' || echo '$(srcdir)/'`src_c/stem_ISO_8859_2_hungarian.c
+ 
+-stem_ISO_8859_1_hungarian.obj: src_c/stem_ISO_8859_1_hungarian.c
+-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT stem_ISO_8859_1_hungarian.obj -MD -MP -MF $(DEPDIR)/stem_ISO_8859_1_hungarian.Tpo -c -o stem_ISO_8859_1_hungarian.obj `if test -f 'src_c/stem_ISO_8859_1_hungarian.c'; then $(CYGPATH_W) 'src_c/stem_ISO_8859_1_hungarian.c'; else $(CYGPATH_W) '$(srcdir)/src_c/stem_ISO_8859_1_hungarian.c'; fi`
+-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/stem_ISO_8859_1_hungarian.Tpo $(DEPDIR)/stem_ISO_8859_1_hungarian.Po
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src_c/stem_ISO_8859_1_hungarian.c' object='stem_ISO_8859_1_hungarian.obj' libtool=no @AMDEPBACKSLASH@
++stem_ISO_8859_2_hungarian.obj: src_c/stem_ISO_8859_2_hungarian.c
++@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT stem_ISO_8859_2_hungarian.obj -MD -MP -MF $(DEPDIR)/stem_ISO_8859_2_hungarian.Tpo -c -o stem_ISO_8859_2_hungarian.obj `if test -f 'src_c/stem_ISO_8859_2_hungarian.c'; then $(CYGPATH_W) 'src_c/stem_ISO_8859_2_hungarian.c'; else $(CYGPATH_W) '$(srcdir)/src_c/stem_ISO_8859_2_hungarian.c'; fi`
++@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/stem_ISO_8859_2_hungarian.Tpo $(DEPDIR)/stem_ISO_8859_2_hungarian.Po
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src_c/stem_ISO_8859_2_hungarian.c' object='stem_ISO_8859_2_hungarian.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o stem_ISO_8859_1_hungarian.obj `if test -f 'src_c/stem_ISO_8859_1_hungarian.c'; then $(CYGPATH_W) 'src_c/stem_ISO_8859_1_hungarian.c'; else $(CYGPATH_W) '$(srcdir)/src_c/stem_ISO_8859_1_hungarian.c'; fi`
++@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o stem_ISO_8859_2_hungarian.obj `if test -f 'src_c/stem_ISO_8859_2_hungarian.c'; then $(CYGPATH_W) 'src_c/stem_ISO_8859_2_hungarian.c'; else $(CYGPATH_W) '$(srcdir)/src_c/stem_ISO_8859_2_hungarian.c'; fi`
+ 
+ stem_UTF_8_hungarian.o: src_c/stem_UTF_8_hungarian.c
+ @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT stem_UTF_8_hungarian.o -MD -MP -MF $(DEPDIR)/stem_UTF_8_hungarian.Tpo -c -o stem_UTF_8_hungarian.o `test -f 'src_c/stem_UTF_8_hungarian.c' || echo '$(srcdir)/'`src_c/stem_UTF_8_hungarian.c