Update to version 1.3.1

5 files changed, 28 insertions, 15 deletions

diff --git a/textproc/opengrm-ngram/Makefile b/textproc/opengrm-ngram/Makefile
index 0dfcc370874d..667b7d64b402 100644
--- a/textproc/opengrm-ngram/Makefile
+++ b/textproc/opengrm-ngram/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	opengrm-ngram
-PORTVERSION=	1.2.2
+PORTVERSION=	1.3.1
 CATEGORIES=	textproc
 MASTER_SITES=	http://openfst.cs.nyu.edu/twiki/pub/GRM/NGramDownload/
 
diff --git a/textproc/opengrm-ngram/distinfo b/textproc/opengrm-ngram/distinfo
index 48c517a2612c..ca749a0022f2 100644
--- a/textproc/opengrm-ngram/distinfo
+++ b/textproc/opengrm-ngram/distinfo
@@ -1,2 +1,3 @@
-SHA256 (opengrm-ngram-1.2.2.tar.gz) = 12bba4c1345f3933e161859cc9cb5d21b772d2b46173b4511fc778c67ada233b
-SIZE (opengrm-ngram-1.2.2.tar.gz) = 15307289
+TIMESTAMP = 1471695211
+SHA256 (opengrm-ngram-1.3.1.tar.gz) = fd862680405000bbc789d0826237cca3295d0b778e5c0e2fa5e7762d33d3fbf2
+SIZE (opengrm-ngram-1.3.1.tar.gz) = 14695197
diff --git a/textproc/opengrm-ngram/files/patch-src-bin-Makefile.in b/textproc/opengrm-ngram/files/patch-src-bin-Makefile.in
index 03f9cb344ab0..0e30db2bc8be 100644
--- a/textproc/opengrm-ngram/files/patch-src-bin-Makefile.in
+++ b/textproc/opengrm-ngram/files/patch-src-bin-Makefile.in
@@ -1,11 +1,11 @@
---- src/bin/Makefile.in.orig	2014-10-20 15:50:21.000000000 +0400
-+++ src/bin/Makefile.in	2014-10-20 15:50:35.000000000 +0400
-@@ -255,7 +255,7 @@
+--- src/bin/Makefile.in.orig	2016-08-20 15:15:24.687217000 +0300
++++ src/bin/Makefile.in	2016-08-20 15:15:27.844638000 +0300
+@@ -351,7 +351,7 @@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  AM_CPPFLAGS = -I$(srcdir)/../include
 -AM_LDFLAGS = -L/usr/local/lib/fst -lfstfar -lfst -lm -ldl
 +AM_LDFLAGS = -L/usr/local/lib/fst -lfstfar -lfst -lm
- dist_noinst_SCRIPTS = ngram.sh
- ngramapply_SOURCES = ngramapply.cc
+ dist_noinst_SCRIPTS = ngram.sh ngramfrac.sh
+ ngramapply_SOURCES = ngramapply_main.cc
  ngramapply_LDADD = ../lib/libngram.la
diff --git a/textproc/opengrm-ngram/files/patch-src-test-Makefile.in b/textproc/opengrm-ngram/files/patch-src-test-Makefile.in
index 8c69f347b278..564ffddf2eb1 100644
--- a/textproc/opengrm-ngram/files/patch-src-test-Makefile.in
+++ b/textproc/opengrm-ngram/files/patch-src-test-Makefile.in
@@ -1,11 +1,11 @@
---- src/test/Makefile.in.orig	2014-10-20 16:03:57.000000000 +0400
-+++ src/test/Makefile.in	2014-10-20 16:04:02.000000000 +0400
-@@ -192,7 +192,7 @@
+--- src/test/Makefile.in.orig	2016-08-20 15:16:41.132906000 +0300
++++ src/test/Makefile.in	2016-08-20 15:16:48.256944000 +0300
+@@ -494,7 +494,7 @@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  AM_CPPFLAGS = -I$(srcdir)/../include
 -AM_LDFLAGS = -L/usr/local/lib/fst -lfstfar -lfst -lm -ldl
 +AM_LDFLAGS = -L/usr/local/lib/fst -lfstfar -lfst -lm
+ ngramhisttest_SOURCES = ngramhisttest.cc
+ ngramhisttest_LDADD = -lfstscript ../lib/libngram.la ../lib/libngramhist.la
  ngramrandtest_SOURCES = ngramrandtest.cc
- ngramrandtest_LDADD = ../lib/libngram.la
- dist_check_SCRIPTS = ngramprint_test.sh ngramcount_test.sh \
diff --git a/textproc/opengrm-ngram/pkg-plist b/textproc/opengrm-ngram/pkg-plist
index cce4f4dc0649..6775f4ac6ae5 100644
--- a/textproc/opengrm-ngram/pkg-plist
+++ b/textproc/opengrm-ngram/pkg-plist
@@ -1,6 +1,7 @@
 bin/ngramapply
 bin/ngramcontext
 bin/ngramcount
+bin/ngramhisttest
 bin/ngraminfo
 bin/ngrammake
 bin/ngrammarginalize
@@ -15,6 +16,11 @@ bin/ngramsort
 bin/ngramsplit
 bin/ngramsymbols
 bin/ngramtransfer
+include/ngram/hist-arc.h
+include/ngram/hist-mapper.h
+include/ngram/ngram-bayes-model-merge.h
+include/ngram/ngram-hist-merge.h
+include/ngram/util.h
 include/ngram/lexicographic-map.h
 include/ngram/ngram-absolute.h
 include/ngram/ngram-complete.h
@@ -44,6 +50,12 @@ include/ngram/ngram-transfer.h
 include/ngram/ngram-unsmoothed.h
 include/ngram/ngram-witten-bell.h
 include/ngram/ngram.h
+lib/hist-arc.so
+lib/hist-arc.so.0
+lib/hist-arc.so.0.0.0
 lib/libngram.so
-lib/libngram.so.1
-lib/libngram.so.1.0.0
+lib/libngram.so.2
+lib/libngram.so.2.0.0
+lib/libngramhist.so
+lib/libngramhist.so.2
+lib/libngramhist.so.2.0.0