5 files changed, 37 insertions, 16 deletions

diff --git a/textproc/mifluz/Makefile b/textproc/mifluz/Makefile
index 8863519006e1..3cb4ecda9f96 100644
--- a/textproc/mifluz/Makefile
+++ b/textproc/mifluz/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mifluz
-PORTVERSION=	0.25.0
-PORTREVISION=	1
+PORTVERSION=	0.26.0
 CATEGORIES=	textproc
 MASTER_SITES=	GNU
 
@@ -12,22 +11,22 @@ COMMENT=	C++ library to build and query a full text inverted index
 
 LICENSE=	GPLv3
 
-USE_GCC=	any
 USES=		bison iconv libtool makeinfo pathfix
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--without-unac
+CONFIGURE_ARGS=	--enable-posixmutexes \
+		--without-unac
+INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+
 SUB_FILES=	pkg-message
 
 INFO=		mifluz
 
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-
 post-patch:
-	@${REINPLACE_CMD} -e 's|-D_THREAD_SAFE -pthread|${PTHREAD_CFLAGS}|g' \
-		${WRKSRC}/configure
-
+	@${REINPLACE_CMD} -e \
+		'/^#ifndef HAVE_ALLOCA/s|_H||' ${WRKSRC}/clib/strncoll2.c
 
 .include <bsd.port.mk>
diff --git a/textproc/mifluz/distinfo b/textproc/mifluz/distinfo
index 80f16130d884..fbd15e1f780f 100644
--- a/textproc/mifluz/distinfo
+++ b/textproc/mifluz/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mifluz-0.25.0.tar.gz) = b6f52648e259c41dc07df667cd7ebced4e0b7e3f8193a0efbc7414b98457524d
-SIZE (mifluz-0.25.0.tar.gz) = 1632279
+SHA256 (mifluz-0.26.0.tar.gz) = e220ad4a23a972acfffedb05d63e8c7b13a422f9008bd6af95fdb4339f94b6a4
+SIZE (mifluz-0.26.0.tar.gz) = 1648324
diff --git a/textproc/mifluz/files/patch-Makefile.in b/textproc/mifluz/files/patch-Makefile.in
index f50b8c5c55c5..7679808b0693 100644
--- a/textproc/mifluz/files/patch-Makefile.in
+++ b/textproc/mifluz/files/patch-Makefile.in
@@ -1,6 +1,16 @@
 --- ./Makefile.in.orig	2013-01-16 13:41:40.786389684 +0800
 +++ ./Makefile.in	2013-01-16 13:51:11.373721235 +0800
-@@ -957,6 +957,6 @@
+@@ -363,7 +363,7 @@
+ # or the GNU General Public License version 2 or later
+ # <http://www.gnu.org/copyleft/gpl.html>
+ #
+-SUBDIRS = clib db mifluz htdb search man doc test examples
++SUBDIRS = clib db mifluz htdb search man doc test
+ DISTCLEANFILES = autom4te.cache
+ EXTRA_DIST = .version acconfig.h Makefile.config mifluz.conf acinclude.m4
+ bin_SCRIPTS = mifluz-config
+@@ -956,7 +956,7 @@
+ 	mkdir -p ${DESTDIR}${localstatedir}/cache/mifluz
  	@if [ ! -d ${DESTDIR}${sysconfdir} ] ; then mkdir -p ${DESTDIR}${sysconfdir} ; fi
  	@if [ ! -f ${DESTDIR}${sysconfdir}/mifluz.conf ] ; \
 -	then a="cp ${srcdir}/mifluz.conf ${DESTDIR}${sysconfdir}/mifluz.conf" ; echo $$a ; $$a ; \
diff --git a/textproc/mifluz/files/patch-db__mut_pthread.c b/textproc/mifluz/files/patch-db__mut_pthread.c
new file mode 100644
index 000000000000..322b6b22187e
--- /dev/null
+++ b/textproc/mifluz/files/patch-db__mut_pthread.c
@@ -0,0 +1,13 @@
+--- db/mut_pthread.c.orig
++++ db/mut_pthread.c
+@@ -50,6 +50,10 @@
+ #define	pthread_self		thr_self
+ #endif
+ 
++#ifndef ETIME
++#define ETIME ETIMEDOUT
++#endif
++
+ /*
+  * __db_pthread_mutex_init --
+  *	Initialize a MUTEX.
diff --git a/textproc/mifluz/pkg-plist b/textproc/mifluz/pkg-plist
index d2618291b818..3724e87a6fa3 100644
--- a/textproc/mifluz/pkg-plist
+++ b/textproc/mifluz/pkg-plist
@@ -6,7 +6,7 @@ bin/mifluzdict
 bin/mifluzdump
 bin/mifluzload
 bin/mifluzsearch
-etc/mifluz.conf.sample
+@sample etc/mifluz.conf.sample
 include/mifluz.h
 include/mifluz/Configuration.h
 include/mifluz/Dictionary.h
@@ -59,7 +59,6 @@ include/mifluz/db_upgrade.h
 include/mifluz/db_verify.h
 include/mifluz/debug.h
 include/mifluz/env_ext.h
-include/mifluz/example1.h
 include/mifluz/hash.h
 include/mifluz/hash_auto.h
 include/mifluz/hash_ext.h
@@ -93,7 +92,7 @@ include/mifluz/xa_ext.h
 lib/libmifluz.a
 lib/libmifluz.so
 lib/libmifluz.so.0
-lib/libmifluz.so.0.0.25
+lib/libmifluz.so.0.0.26
 man/man1/htdb_dump.1.gz
 man/man1/htdb_load.1.gz
 man/man1/htdb_stat.1.gz