3 files changed, 50 insertions, 19 deletions

diff --git a/math/openfst/Makefile b/math/openfst/Makefile
index 87a5242b94ef..134835449b9a 100644
--- a/math/openfst/Makefile
+++ b/math/openfst/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	openfst
-PORTVERSION=	1.4.1
-PORTREVISION=	4
+PORTVERSION=	1.5.0
 CATEGORIES=	math
 MASTER_SITES=	http://www.openfst.org/twiki/pub/FST/FstDownload/
 
@@ -15,10 +14,9 @@ LICENSE=	APACHE20
 USES=		compiler:c++11-lib libtool
 USE_LDCONFIG=	${LOCALBASE}/lib/fst
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--enable-compact-fsts --enable-const-fsts --enable-far --enable-linear-fsts --enable-ngram-fsts --enable-lookahead-fsts --enable-pdt
+CONFIGURE_ARGS+=--enable-bin --enable-compact-fsts --enable-compress --enable-const-fsts --enable-far --enable-linear-fsts --enable-lookahead-fsts --enable-mpdt --enable-ngram-fsts --enable-pdt
 
 post-patch:
-	${REINPLACE_CMD} -e s#-ldl## ${WRKSRC}/src/extensions/far/Makefile.in ${WRKSRC}/src/extensions/pdt/Makefile.in ${WRKSRC}/src/bin/Makefile.in ${WRKSRC}/src/test/Makefile.in ${WRKSRC}/src/extensions/linear/Makefile.in
-	${REINPLACE_CMD} -e s#isspace#std::isspace# ${WRKSRC}/src/include/fst/tuple-weight.h ${WRKSRC}/src/include/fst/sparse-tuple-weight.h ${WRKSRC}/src/include/fst/pair-weight.h
+	${REINPLACE_CMD} -e s#-ldl## ${WRKSRC}/src/extensions/far/Makefile.in ${WRKSRC}/src/extensions/pdt/Makefile.in ${WRKSRC}/src/bin/Makefile.in ${WRKSRC}/src/test/Makefile.in ${WRKSRC}/src/extensions/linear/Makefile.in ${WRKSRC}/src/extensions/compress/Makefile.in ${WRKSRC}/src/extensions/mpdt/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/math/openfst/distinfo b/math/openfst/distinfo
index 1c867a4ebd45..10c0ae9cef25 100644
--- a/math/openfst/distinfo
+++ b/math/openfst/distinfo
@@ -1,2 +1,2 @@
-SHA256 (openfst-1.4.1.tar.gz) = e671bf6bd4425a1fed4e7543a024201b74869bfdd029bdf9d10c53a3c2818277
-SIZE (openfst-1.4.1.tar.gz) = 824020
+SHA256 (openfst-1.5.0.tar.gz) = 01c2b810295a942fede5b711bd04bdc9677855c846fedcc999c792604e02177b
+SIZE (openfst-1.5.0.tar.gz) = 1007252
diff --git a/math/openfst/pkg-plist b/math/openfst/pkg-plist
index c1d59f892c0a..c02577331111 100644
--- a/math/openfst/pkg-plist
+++ b/math/openfst/pkg-plist
@@ -3,11 +3,13 @@ bin/farcreate
 bin/farequal
 bin/farextract
 bin/farinfo
+bin/farisomorphic
 bin/farprintstrings
 bin/fstarcsort
 bin/fstclosure
 bin/fstcompile
 bin/fstcompose
+bin/fstcompress
 bin/fstconcat
 bin/fstconnect
 bin/fstconvert
@@ -22,6 +24,7 @@ bin/fstequivalent
 bin/fstinfo
 bin/fstintersect
 bin/fstinvert
+bin/fstisomorphic
 bin/fstlinear
 bin/fstloglinearapply
 bin/fstmap
@@ -31,6 +34,7 @@ bin/fstproject
 bin/fstprune
 bin/fstpush
 bin/fstrandgen
+bin/fstrandmod
 bin/fstrelabel
 bin/fstreplace
 bin/fstreverse
@@ -42,6 +46,10 @@ bin/fstsymbols
 bin/fstsynchronize
 bin/fsttopsort
 bin/fstunion
+bin/mpdtcompose
+bin/mpdtexpand
+bin/mpdtinfo
+bin/mpdtreverse
 bin/pdtcompose
 bin/pdtexpand
 bin/pdtinfo
@@ -77,6 +85,11 @@ include/fst/equal.h
 include/fst/equivalent.h
 include/fst/expanded-fst.h
 include/fst/expectation-weight.h
+include/fst/extensions/compress/compress-script.h
+include/fst/extensions/compress/compress.h
+include/fst/extensions/compress/elias.h
+include/fst/extensions/compress/fstgzfile.h
+include/fst/extensions/compress/randmod.h
 include/fst/extensions/far/compile-strings.h
 include/fst/extensions/far/create.h
 include/fst/extensions/far/equal.h
@@ -85,6 +98,7 @@ include/fst/extensions/far/far.h
 include/fst/extensions/far/farlib.h
 include/fst/extensions/far/farscript.h
 include/fst/extensions/far/info.h
+include/fst/extensions/far/isomorphic.h
 include/fst/extensions/far/main.h
 include/fst/extensions/far/print-strings.h
 include/fst/extensions/far/stlist.h
@@ -95,6 +109,13 @@ include/fst/extensions/linear/linear-fst.h
 include/fst/extensions/linear/linearscript.h
 include/fst/extensions/linear/loglinear-apply.h
 include/fst/extensions/linear/trie.h
+include/fst/extensions/mpdt/compose.h
+include/fst/extensions/mpdt/expand.h
+include/fst/extensions/mpdt/info.h
+include/fst/extensions/mpdt/mpdt.h
+include/fst/extensions/mpdt/mpdtscript.h
+include/fst/extensions/mpdt/read_write_utils.h
+include/fst/extensions/mpdt/reverse.h
 include/fst/extensions/ngram/bitmap-index.h
 include/fst/extensions/ngram/ngram-fst.h
 include/fst/extensions/ngram/nthbit.h
@@ -122,6 +143,7 @@ include/fst/icu.h
 include/fst/intersect.h
 include/fst/interval-set.h
 include/fst/invert.h
+include/fst/isomorphic.h
 include/fst/label-reachable.h
 include/fst/lexicographic-weight.h
 include/fst/lock.h
@@ -182,6 +204,7 @@ include/fst/script/info-impl.h
 include/fst/script/info.h
 include/fst/script/intersect.h
 include/fst/script/invert.h
+include/fst/script/isomorphic.h
 include/fst/script/map.h
 include/fst/script/minimize.h
 include/fst/script/print-impl.h
@@ -226,6 +249,7 @@ include/fst/topsort.h
 include/fst/tuple-weight.h
 include/fst/types.h
 include/fst/union-find.h
+include/fst/union-weight.h
 include/fst/union.h
 include/fst/util.h
 include/fst/vector-fst.h
@@ -294,28 +318,37 @@ lib/fst/ilabel_lookahead-fst.so.0
 lib/fst/ilabel_lookahead-fst.so.0.0.0
 lib/fst/libfstcompact.so
 lib/fst/libfstcompact.so.1
-lib/fst/libfstcompact.so.1.0.0
+lib/fst/libfstcompact.so.1.0.5
+lib/fst/libfstcompressscript.so
+lib/fst/libfstcompressscript.so.1
+lib/fst/libfstcompressscript.so.1.0.5
 lib/fst/libfstconst.so
 lib/fst/libfstconst.so.1
-lib/fst/libfstconst.so.1.0.0
+lib/fst/libfstconst.so.1.0.5
 lib/fst/libfstfar.so
 lib/fst/libfstfar.so.1
-lib/fst/libfstfar.so.1.0.0
+lib/fst/libfstfar.so.1.0.5
 lib/fst/libfstfarscript.so
 lib/fst/libfstfarscript.so.1
-lib/fst/libfstfarscript.so.1.0.0
+lib/fst/libfstfarscript.so.1.0.5
+lib/fst/libfstgzfile.so
+lib/fst/libfstgzfile.so.1
+lib/fst/libfstgzfile.so.1.0.5
 lib/fst/libfstlinearscript.so
 lib/fst/libfstlinearscript.so.1
-lib/fst/libfstlinearscript.so.1.0.0
+lib/fst/libfstlinearscript.so.1.0.5
 lib/fst/libfstlookahead.so
-lib/fst/libfstlookahead.so.0
-lib/fst/libfstlookahead.so.0.0.0
+lib/fst/libfstlookahead.so.1
+lib/fst/libfstlookahead.so.1.0.5
+lib/fst/libfstmpdtscript.so
+lib/fst/libfstmpdtscript.so.1
+lib/fst/libfstmpdtscript.so.1.0.5
 lib/fst/libfstngram.so
 lib/fst/libfstngram.so.1
-lib/fst/libfstngram.so.1.0.0
+lib/fst/libfstngram.so.1.0.5
 lib/fst/libfstpdtscript.so
 lib/fst/libfstpdtscript.so.1
-lib/fst/libfstpdtscript.so.1.0.0
+lib/fst/libfstpdtscript.so.1.0.5
 lib/fst/linear_classifier-fst.so
 lib/fst/linear_classifier-fst.so.0
 lib/fst/linear_classifier-fst.so.0.0.0
@@ -329,8 +362,8 @@ lib/fst/olabel_lookahead-fst.so
 lib/fst/olabel_lookahead-fst.so.0
 lib/fst/olabel_lookahead-fst.so.0.0.0
 lib/libfst.so
-lib/libfst.so.3
-lib/libfst.so.3.0.0
+lib/libfst.so.1
+lib/libfst.so.1.0.5
 lib/libfstscript.so
 lib/libfstscript.so.1
-lib/libfstscript.so.1.0.0
+lib/libfstscript.so.1.0.5