openfst: update to 1.8.2.

OpenFst: Release 1.8
   * Adds farencode (1.8.2)
   * Deletes MakeArcMapFst in favor of CTAD on ArcMapFst (1.8.2)
   * Removes `int64` (etc.) type shims in place of <cstdint> (1.8.2)
   * Expands smart-pointer use (1.8.1)
   * Expands std::string_view use (1.8.1)
   * Removes SymbolTableReadOptions (1.8.1)
   * Adds farconvert (1.8.0)
   * Migration to C++17 (1.8.0)
   * Updates Bazel build (1.8.0)
   * Better handling for empty FARs (1.8.0)
   * Improves to ExpectationWeight (1.8.0)
   * Improves display of properties masks in pywrapfst (1.8.0)
   * Internal reference-counting/smart pointer improvements (1.8.0)
   * Deprecates PROJECT_(IN|OUT)PUT in favor of scoped enum ProjectType (1.8.0)

OpenFst: Release 1.7
   * TokenType is now a scoped enum (1.7.8)
   * pywrapfst is now Python 3-only (1.7.8)
   * fstproject now has --project_type flag (1.7.8)
   * BitmapIndex is now 2x faster for Select0/Select1 (1.7.8)
   * Property testing is now thread-safe (1.7.7)
   * Modernizes random generation (1.7.7)
   * Adds MakeArcMapFst (1.7.6)
   * Adds RealWeight and Real64Weight (1.7.6)
   * Adds a new, idiomatic SymbolTable iterator interface (1.7.6)
   * Improves symbol table lifetime management in pywrapfst (1.7.6)
   * Improves the design of the FST class hierarchy in pywrapfst (1.7.6)
   * Removes unnecessary template parameters in constructors (1.7.5)
   * Converts RmEpsilonFstOptions from class to struct (1.7.5)
   * Eliminates redundant checks in Minimize (1.7.5)
   * CompactFst is now templated on Compactor rather than ArcCompactor (1.7.4)
   * Removes harmful constexpr specifications in the FAR extension (1.7.4)
   * Improved script API support for EncodeMapper (1.7.4)
   * New header format for the EncodeMapper (1.7.4)
   * Many cleanups to the n-gram extension (1.7.4)
   * Improved C++17 compatibility shims (1.7.4)
   * Overloads Arc constructors with default weight argument (1.7.3)
   * Fixes RmEpsilon and Union property checking bugs (1.7.3)
   * Makes Isomorphic more robust to nondeterminism (1.7.3)
   * Adds default weight argument to SetFinal (1.7.3)
   * Cleans up low-level logging (1.7.3)
   * Adds power-weight mappers (1.7.3)
   * Adds expander cache (1.7.3)
   * Fixes bug with coinaccessible states in NaturalAStarEstimate (1.7.2)
   * Optionally allows building with Bazel (1.7.2)
   * Simplifies string printing interface (1.7.2)
   * Marks weight converters const (1.7.2)
   * Adds NoMatchComposeFilter (1.7.2)
   * Removed static assertions that trigger bugs in GCC (1.7.1)
   * Evaluates many weight operations at compile-time (1.7.1)
   * Improved use of move semantics, especially in cache-backed FSTs (1.7.0)
   * Adds configure-time test for float equality reflexivity (1.7.0)
   * Removes volatile qualifiers from float weights (1.7.0)
   * Protections for signedness in string compiler (1.7.0)
   * Adds additional overloads to Equals (1.7.0)
   * Clean-up to weight constructors (1.7.0)

OpenFst: Release 1.6
   * Optimized label lookup in SymbolTable (1.6.9)
   * Fixed HashMatcher issues with SetState() and Find() consistency (1.6.8)
   * Fixed PROGRAM_FLAGS documentation string in binaries (1.6.8)
   * Fixed handling of symbol tables in EpsNormalize (1.6.8)
   * Fixed error reporting when FST arc type unknown (1.6.8)
   * The first_path option to ShortestPath is now optimal for A* (1.6.7)
   * Renames SymbolTable::kNoSymbol to kNoSymbol (1.6.7)
   * Exposes PowerMapper to the scripting API (1.6.7)
   * Fixes linking of the special SOs (1.6.7)
   * Adds kShortestDelta for operations dependent on shortest-distance (1.6.6)
   * Adds Python methods for (un)pickling and (de)serializing FSTs (1.6.6)
   * Adds constructive variants of Invert and Project (1.6.6)
   * Increases code sharing in MemoryPool/MemoryArena (1.6.6)
   * Improves consistency of matcher FST ownership (1.6.6)
   * Fixes error handling in HashMatcher (1.6.6)
   * Adds non-trivial A* estimator class (1.6.6)
   * Prevents unreachable code generation in libfstscript (1.6.5)
   * Adds move constructors for non-trivial weight types (1.6.5)
   * Standardizes method names for tuple weight types (1.6.5)
   * Eliminates undefined behavior in weight hashing (1.6.5)
   * Optimizes binary search in SortedMatcher (1.6.5)
   * Adds SetWeight (1.6.5)
   * Fixes typing error in Python FAR reader (1.6.4)
   * Removes restriction that Prune argument have commutative weights (1.6.3)
   * Improves configuration of CompositeWeight readers and writers (1.6.3)
   * Improves accuracy of ShortestDistance summation (1.6.3)
   * SetFinal now "moves" its weight argument (1.6.3)
   * Exposes ArcIterator and EncodeMapper flags in Python (1.6.3)
   * Properly sets return codes in FST binaries (1.6.3)
   * Eliminates StringWeight macros (1.6.3)
   * Finalizes most virtual method overrides (1.6.2)
   * Adds float format support to FST drawing (1.6.1)
   * Fixes missing includes of <fst/log.h> (1.6.1)
   * Adds the "special" extension and the fstspecial binary; this is similar to
     fstconvert but accepts arguments for specifying special labels (phi, rho,
     and sigma) of FSTs (1.6.0)
   * Exposes allow_negative_label option for Python symbol tables (1.6.0)
   * Many classes and constants moved into an internal namespace (1.6.0)
   * Extensive modernization for C++11 style (1.6.0)
   * Adds Member method to SymbolTable (1.6.0)
   * Adds HashMatcher (1.6.0)

OpenFst: Release 1.5
   * Generalized epsilon normalization to non-functional case (1.5.0)
   * Added multiple pushdown transducer (MPDT) support (1.5.0)
   * Added general gallic (plus is union) semiring (1.5.0)
   * Added p-subsequential determinization (1.5.0)
   * Fixed missing Isomorphic components (1.5.0)
   * Added FST compression extension (1.5.0)
   * Added final method to matchers (1.5.0)
   * Fixed various compiler issues (1.5.0)
   * Fixed Isomorphic function (1.5.0)
   * Added Python extension (1.5.0)
   * Added UnionWeight (1.5.0)
   * Added missing const qualification to (1.5.1):
      - SymbolTableIterator access
      - EncodeMapper writing to file
      - EncodeMapper SymbolTable access
   * Added TrivialComposeFilter for more efficient composition when one
     of the arguments is epsilon-free (1.5.1)
   * Added InputEpsilonMapper and OutputEpsilonMapper arc mappers (1.5.1)
   * Added properties bits kUnweightedCycles and kWeightedCycles (1.5.1)
   * Replaced internal custom reference-counting (RefCounter) with C++11 smart
     pointers where possible, and fixed reference-counting bugs (1.5.1)
   * When calling DeleteStates on a MutableFst with a shared impl, the impl
     is set to a new empty impl rather than copying and deleting (1.5.1)
   * Prepended Pdt to the Expand libraries and classes in the PDT
     extension, and prepended MPdt to the Expand libraries and classes
     in the MPDT extension, so that both can be used in the same compilation
     unit (1.5.1)
   * Added option to PDT Replace for compiling a strongly-regular RTN into a
     bounded-stack PDT (1.5.1)
   * Improved symbol table support for PDT Replace, including automatic
     generation of parentheses symbols (1.5.1)
   * Improvements to scripting API (1.5.1):
      - Added methods for FST access and mutation
      - Added additional checks for arc/weight compatibility
      - WeightClass::One and WeightClass::Zero now require a specified weight
        type at time of construction
      - Improved VectorFstClass constructors
      - Added linear-time check for cyclic dependencies in Replace
      - Added EncodeMapperClass, a template-free box for an EncodeMapper
   * Improvements to the binaries (1.5.1):
      - Fixed no-op --precision flag to fstdraw (1.5.1)
      - Fixed no-op --file_list_input flag to farcreate (1.5.1)
   * Improvements to the Python extension (1.5.1):
      - Adds methods for creating an empty mutable FST
      - Adds methods for FST access via state and arc iteration
      - Adds FST compilation from arclists (cf. fstcompile)
      - Adds FST printing and drawing
      - Adds FarReader and FarWriter classes.
   * Consolidated Python extension into single module (1.5.2)
   * FarReader's GetFst method now returns a pointer (1.5.2)
   * Python add_arc now takes an Arc object (1.5.2)
   * Fixed build flags for dlopen (1.5.2)
   * Fixed FSTERROR macro (1.5.2)
   * Scripting API and Python weight objects now support semiring arithmetic
     (1.5.3)
   * Mutation methods of the Python Fst object now support chaining (1.5.3)
   * Adds optional minimization of non-deterministic FSTs (1.5.3)
   * Adds check for error when opening files when compiling strings into FARs
     (1.5.4)
   * Prevents underflow when using LogProbArcSelector in random generation
     (1.5.4)
   * Adds routines for parsing string flags to the scripting API (1.5.4)
   * Makes random weight generators a single template class (1.5.4)
   * Makes weight Properties constexpr where possible (1.5.4)
   * Adds RemoveSymbol method to SymbolTable (1.5.4)

OpenFst: Release 1.4
   * Port to C++11 (1.4.0)
   * Isomorphic function added (1.4.0)
   * Disambiguate function added (1.4.0)
   * Matcher interface augmented with Priority method
   * Special matchers (rho/sigma/phi) can match special symbols
     on both input FSTs in composition/intersection provided at each
     state pair they only match one side (1.4.0)
   * Added ExplicitMatcher to suppress implicit matches (e.g. epsilon
     self-loops) (1.4.0)
   * Linear{Tagger,Classifier}Fst extensions added (1.4.0).
   * Generalized state-reachable to work when input is cyclic (so long as no
     final state is in a cycle). This ensures label-reachable (and hence label
     lookahead) works with cyclic input (1.4.0)
   * Added Condense to build the condensation graph (SCCs condensed to single
     states) of an FST (1.4.0).
   * Added an option to Reverse to specify whether a super-initial state
     should always be created (1.4.0).
   * Fixed bugs in FirstCacheStore, PowerWeight, and StringCompiler (1.4.0).
   * Changed SymbolTable to use faster data structure (1.4.0).
   * Added 'min' disambiguation in determinizaton to keep only the minimum
     output in a non-functional transducer when plus=min/max
     (flag --disambiguate_output) (1.4.1)
   * Compiler issues in linear-fst fixed (1.4.1)

OpenFst: Release 1.3
   * Support for non-fatal exits on errors: (1.3.1)
      - Added FLAGS_fst_error_fatal: FST errors are
        fatal if true (default); o.w. return objects flagged as bad:
        e.g., FSTs - kError
        prop. true, FST weights - not a Member().
      - Added kError property bit signifying bad FST
      - Added  NoWeight() method to FST weight requirements that returns
        weight that is not a Member().
   * Various improvements to the FAR extensions (1.3.1)
      - a single FST is now a FAR type
      - FLAGS_initial_symbols: Uses the symbol table from the
        first FST in the archive for all entries"
      - Input/output to standard input/output for some FAR and arc types
   * --with-icu configuration option no longer needed (1.3.1)
   * Improved flags usage esp. if use SET_FLAGS not SetFlags/InitFst (1.3.2)
   * Added 'fst' as possible far writer type (1.3.2)
   * phi matcher can now accept 0 as the phi label (1.3.2)
   * Added ngram-fst extension (1.3.2)
   * Improved performance of PDT composition (1.3.3)
   * Memory-map support (1.3.3)
   * Fixed cross-FST serialization issues (1.3.3)
   * Fixed NGramFst off-by-one issue (1.3.3)
   * farextract now allows one to specify a list of comma-separated keys,
     including key ranges (1.3.3)
   * Fixed bug in PDT replace that could cause close paren IDs to collide
     with open paren IDs (1.3.4)

OpenFst: Release 1.2
   * Added lookahead matching and filtering for faster composition
   * Added EditFst for mutation of o.w. immutable FSTs
   * Added script sub-namespace defining type FstClass, a non-templated
     Fst<Arc> to hold the arc template type internally. This and FST
     operations on it allow easier I/O and scripting at the cost of some
     runtime dispatching.
   * Added per-arc-iterator control of Fst caching.
   * Added PowerWeight and Power Arc.
   * Added SparsePowerWeight and SparsePowerArc (1.2.4)
   * Added SignedLogWeight and SignedLogArc (1.2.4)
   * Added ExpectationWeight and ExpectationArc (1.2.4)
   * Added AStarQueue, PruneQueue and NaturalPruneQueue disciplines (1.2.6)
   * Added Log64Weight and Log64Arc to FST library throughout, including
     support throughout scripts/bins/dsos (1.2.8)
   * Added delayed RandGenFst that outputs tree of paths weighted
     by count (1.2.8)
   * Added fstsymbols shell-level command
   * Added total weight removal option to pushing
   * Changed methods for symbol table mutation:
     use MutableInputSymbols()/MutableOutputSymbols().
   * Numerous efficiency improvements esp in composition, replace, and caching
   * Made "fstmap" handle semiring conversion by adding "to_std", "to_log"
     and "to_log64" as supported 'map_type' arguments (1.2.8).
   * Made the destructive implementation of RmEpsilon skip over states
     admitting no non-epsilon incoming transition (1.2.8).
   * Fixed numerous bugs (1.2 through 1.2.9) including:
      - improper types of some approximation deltas
      - sub-optimal hashing functions
      - issues in internal reuse of shortest distance
      - hashing bug in FloatWeight
      - bug in shortest path queue
      - symbol table checksumming issues
      - various C++ standards issues
      - Visit() behavior when visitation aborted
      - Decode() hash performance bug (1.2.1)
      - EditFst::Copy(bool) method when the boolean parameter is true (1.2.7)
      - SymbolTable memory leak in Invert() (1.2.8)
      - Added escaping of " and \ in labels in fstdraw, needed for dot to
        function properly (1.2.8)
      - Fixed handling of final weight of start state in fstpush (1.2.8)
      - Added FST_LL_FORMAT to fix 64-bit integer printf issues (1.2.9)
      - Fixed missing <functional> includes (1.2.9)
      - Fixed reused local variable names (1.2.9)
      - Fixed passing string by reference in FstDraw args (1.2.9)
   * Added extensions directories including:
      - finite-state archive (FAR) utilities,
        added stlist format supporting writing/reading to/from standard out/in
        at the library-level (1.2.8)
      - compact FSTs
      - lookahead FSTs
      - pushdown transducers (improved in 1.2.1 through 1.2.7).
   * Added StateMap/StateMapFst; renamed Map/MapFst to ArcMap/ArcMapFst;
     map/MapFst retained (but deprecated) (1.2.9)
   * Deleted ArcSum() and ArcMerge; use StateMap w/ ArcSumMapper and
     ArcUniqueMapper (1.2.9).
   * Incremented version of ConstFst/CompactFsts to stop memory alignment
     that fails on pipes. Made old version raises errors when read on
     pipes (1.2.9).
   * Improved determinize hash (1.2.9)
   * Removed stdio uses (1.2.10)
   * Fixed library ordering issues esp. with newer GNU build tools (1.2.10)

24 files changed, 109 insertions, 839 deletions

diff --git a/math/openfst/Makefile b/math/openfst/Makefile
index 6eee1d01409..a6c350b3a76 100644
--- a/math/openfst/Makefile
+++ b/math/openfst/Makefile
@@ -1,21 +1,18 @@
-# $NetBSD: Makefile,v 1.5 2019/11/02 16:16:20 rillig Exp $
-#
+# $NetBSD: Makefile,v 1.6 2022/06/07 07:58:23 wiz Exp $
 
-DISTNAME=	openfst-1.1
+DISTNAME=	openfst-1.8.2
 CATEGORIES=	math
 MASTER_SITES=	http://www.openfst.org/twiki/pub/FST/FstDownload/
 
 MAINTAINER=	pallegra@gmail.com
 HOMEPAGE=	http://www.openfst.org/
-COMMENT=	OpenFst is a library for manipulating transducers
+COMMENT=	Library for manipulating transducers
 LICENSE=	apache-2.0
 
-USE_LANGUAGES=	c c++03
+USE_LANGUAGES=	c c++17
 USE_LIBTOOL=	yes
 GNU_CONFIGURE=	yes
 
 .include "../../mk/dlopen.buildlink3.mk"
-
 BUILDLINK_TRANSFORM+=	opt:-ldl:${BUILDLINK_LDADD.dl:M*}
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/openfst/PLIST b/math/openfst/PLIST
index 2f297e79d5b..1194de16570 100644
--- a/math/openfst/PLIST
+++ b/math/openfst/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2009/11/03 17:53:44 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2022/06/07 07:58:23 wiz Exp $
 bin/fstarcsort
 bin/fstclosure
 bin/fstcompile
@@ -8,6 +8,7 @@ bin/fstconnect
 bin/fstconvert
 bin/fstdeterminize
 bin/fstdifference
+bin/fstdisambiguate
 bin/fstdraw
 bin/fstencode
 bin/fstepsnormalize
@@ -16,6 +17,7 @@ bin/fstequivalent
 bin/fstinfo
 bin/fstintersect
 bin/fstinvert
+bin/fstisomorphic
 bin/fstmap
 bin/fstminimize
 bin/fstprint
@@ -30,14 +32,18 @@ bin/fstreweight
 bin/fstrmepsilon
 bin/fstshortestdistance
 bin/fstshortestpath
+bin/fstsymbols
 bin/fstsynchronize
 bin/fsttopsort
 bin/fstunion
+include/fst/accumulator.h
+include/fst/add-on.h
+include/fst/arc-arena.h
+include/fst/arc-map.h
 include/fst/arc.h
 include/fst/arcfilter.h
-include/fst/arcmerge.h
 include/fst/arcsort.h
-include/fst/arcsum.h
+include/fst/bi-table.h
 include/fst/cache.h
 include/fst/closure.h
 include/fst/compact-fst.h
@@ -46,37 +52,51 @@ include/fst/complement.h
 include/fst/compose-filter.h
 include/fst/compose.h
 include/fst/concat.h
-include/fst/config.h
 include/fst/connect.h
 include/fst/const-fst.h
 include/fst/determinize.h
 include/fst/dfs-visit.h
 include/fst/difference.h
+include/fst/disambiguate.h
+include/fst/edit-fst.h
 include/fst/encode.h
 include/fst/epsnormalize.h
 include/fst/equal.h
 include/fst/equivalent.h
+include/fst/error-weight.h
 include/fst/expanded-fst.h
+include/fst/expander-cache.h
+include/fst/expectation-weight.h
 include/fst/factor-weight.h
+include/fst/filter-state.h
 include/fst/flags.h
 include/fst/float-weight.h
 include/fst/fst-decl.h
 include/fst/fst.h
 include/fst/fstlib.h
+include/fst/generic-register.h
 include/fst/heap.h
+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
 include/fst/log.h
-include/fst/main.h
-include/fst/mains.h
-include/fst/map.h
+include/fst/lookahead-filter.h
+include/fst/lookahead-matcher.h
+include/fst/mapped-file.h
+include/fst/matcher-fst.h
 include/fst/matcher.h
+include/fst/memory.h
 include/fst/minimize.h
 include/fst/mutable-fst.h
 include/fst/pair-weight.h
 include/fst/partition.h
+include/fst/power-weight-mappers.h
+include/fst/power-weight.h
 include/fst/product-weight.h
 include/fst/project.h
 include/fst/properties.h
@@ -85,32 +105,102 @@ include/fst/push.h
 include/fst/queue.h
 include/fst/randequivalent.h
 include/fst/randgen.h
-include/fst/random-weight.h
 include/fst/rational.h
 include/fst/register.h
 include/fst/relabel.h
+include/fst/replace-util.h
 include/fst/replace.h
 include/fst/reverse.h
 include/fst/reweight.h
 include/fst/rmepsilon.h
 include/fst/rmfinalepsilon.h
+include/fst/script/arc-class.h
+include/fst/script/arcfilter-impl.h
+include/fst/script/arciterator-class.h
+include/fst/script/arcsort.h
+include/fst/script/arg-packs.h
+include/fst/script/closure.h
+include/fst/script/compile-impl.h
+include/fst/script/compile.h
+include/fst/script/compose.h
+include/fst/script/concat.h
+include/fst/script/connect.h
+include/fst/script/convert.h
+include/fst/script/decode.h
+include/fst/script/determinize.h
+include/fst/script/difference.h
+include/fst/script/disambiguate.h
+include/fst/script/draw-impl.h
+include/fst/script/draw.h
+include/fst/script/encode.h
+include/fst/script/encodemapper-class.h
+include/fst/script/epsnormalize.h
+include/fst/script/equal.h
+include/fst/script/equivalent.h
+include/fst/script/fst-class.h
+include/fst/script/fstscript-decl.h
+include/fst/script/fstscript.h
+include/fst/script/getters.h
+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
+include/fst/script/print.h
+include/fst/script/project.h
+include/fst/script/prune.h
+include/fst/script/push.h
+include/fst/script/randequivalent.h
+include/fst/script/randgen.h
+include/fst/script/relabel.h
+include/fst/script/replace.h
+include/fst/script/reverse.h
+include/fst/script/reweight.h
+include/fst/script/rmepsilon.h
+include/fst/script/script-impl.h
+include/fst/script/shortest-distance.h
+include/fst/script/shortest-path.h
+include/fst/script/stateiterator-class.h
+include/fst/script/synchronize.h
+include/fst/script/text-io.h
+include/fst/script/topsort.h
+include/fst/script/union.h
+include/fst/script/verify.h
+include/fst/script/weight-class.h
+include/fst/set-weight.h
 include/fst/shortest-distance.h
 include/fst/shortest-path.h
-include/fst/slist.h
+include/fst/signed-log-weight.h
+include/fst/sparse-power-weight.h
+include/fst/sparse-tuple-weight.h
+include/fst/state-map.h
+include/fst/state-reachable.h
 include/fst/state-table.h
 include/fst/statesort.h
 include/fst/string-weight.h
+include/fst/string.h
+include/fst/symbol-table-ops.h
 include/fst/symbol-table.h
 include/fst/synchronize.h
 include/fst/test-properties.h
-include/fst/text-io.h
+include/fst/test/algo_test.h
+include/fst/test/compactors.h
+include/fst/test/fst_test.h
+include/fst/test/rand-fst.h
+include/fst/test/weight-tester.h
 include/fst/topsort.h
+include/fst/tuple-weight.h
 include/fst/union-find.h
+include/fst/union-weight.h
 include/fst/union.h
 include/fst/util.h
 include/fst/vector-fst.h
 include/fst/verify.h
 include/fst/visit.h
 include/fst/weight.h
+include/fst/windows_defs.inc
 lib/libfst.la
-lib/libfstmain.la
+lib/libfstscript.la
diff --git a/math/openfst/distinfo b/math/openfst/distinfo
index 8ac54f8545c..b1a9e34da75 100644
--- a/math/openfst/distinfo
+++ b/math/openfst/distinfo
@@ -1,26 +1,5 @@
-$NetBSD: distinfo,v 1.6 2021/10/26 10:55:51 nia Exp $
+$NetBSD: distinfo,v 1.7 2022/06/07 07:58:23 wiz Exp $
 
-BLAKE2s (openfst-1.1.tar.gz) = d8b79b30f749d74afdbf35328d542c233de7310c5cc4075bfc49058a062d707d
-SHA512 (openfst-1.1.tar.gz) = dce835b2be5a805ba2927e36536ada1ad2d49c4bea2fed65bd7c09320626a4ba9f159c5b720ddee4f6e67c53f873496c3c7bf80fe826d7eeb31a898d2b2198b8
-Size (openfst-1.1.tar.gz) = 513404 bytes
-SHA1 (patch-src_bin_compile-main.h) = b0f77cf8876acea5597b0ddb622dcddc52103cf0
-SHA1 (patch-src_include_fst_cache.h) = 6a29b49f07b61a0ed9d9e2349805b836c45a25bc
-SHA1 (patch-src_include_fst_compact-fst.h) = f1a2b9ec65d3c8be4d0574c96fa5e5a52c9e680c
-SHA1 (patch-src_include_fst_compose.h) = 4fb25482929aecf37e69d9b6c23491f5512554f8
-SHA1 (patch-src_include_fst_config.h.in) = 6c1eba23afe7d30026b37b9e7cf7c6552778c3e4
-SHA1 (patch-src_include_fst_const-fst.h) = 758b60a5238f9f6f4a1a5a05c5abc41d81faa3a2
-SHA1 (patch-src_include_fst_determinize.h) = c0ec374166a57c3df97cab25b5ec87231ec86df5
-SHA1 (patch-src_include_fst_difference.h) = e66c128b621d1be4f9b7501d969cd2097f32aa04
-SHA1 (patch-src_include_fst_encode.h) = ad9c3662b63dc40a40fa827fa011ea8332f04962
-SHA1 (patch-src_include_fst_epsnormalize.h) = 1bee82d16fab4bdb4d635eb27aa22f9573d57fb9
-SHA1 (patch-src_include_fst_equivalent.h) = dbc925b9de2b859a0a5493db4e5823dc8ed57e6c
-SHA1 (patch-src_include_fst_factor-weight.h) = 311911d8308cdc073cffa2a2d0a52202330c4324
-SHA1 (patch-src_include_fst_map.h) = 61faf469de577c944d2e66c10f1b877619ae0889
-SHA1 (patch-src_include_fst_relabel.h) = 6fce070b426dfbcfb2aa89c05daec96b03cd6349
-SHA1 (patch-src_include_fst_replace.h) = 2f8984463d5f083d3bc1fa439dc1a88e27f1954f
-SHA1 (patch-src_include_fst_rmepsilon.h) = e371a2145c571378a49b707710b9ab5cc592f352
-SHA1 (patch-src_include_fst_rmfinalepsilon.h) = fb1834d54a343982eb433f6c7ffddf1315a2b797
-SHA1 (patch-src_include_fst_slist.h) = c63321cf232ec861ec07dc0c26a9c5c773c35f49
-SHA1 (patch-src_include_fst_synchronize.h) = aed6efedd865bda3a881d5516487c4abdac36217
-SHA1 (patch-src_include_fst_test-properties.h) = d82a8e542a8afbe10a7232c12a22a724a9fe0a0c
-SHA1 (patch-src_include_fst_vector-fst.h) = 51178b6757e89e5c18807ec8521223dacaeb6c16
+BLAKE2s (openfst-1.8.2.tar.gz) = 6889e3afcbd841e313e730ebf6a0deccd8cc85cd47364290dca7f7672cb1c694
+SHA512 (openfst-1.8.2.tar.gz) = ca7f9f19e24141e1f1d0bbabf43795e6e278bce3887c14261d9ce204a0e01b1588eaf982755a9105247510a19f67da2f566e9b14b1d869497148f95b55606d5c
+Size (openfst-1.8.2.tar.gz) = 1342793 bytes
diff --git a/math/openfst/patches/patch-src_bin_compile-main.h b/math/openfst/patches/patch-src_bin_compile-main.h
deleted file mode 100644
index 766a85e7b87..00000000000
--- a/math/openfst/patches/patch-src_bin_compile-main.h
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-src_bin_compile-main.h,v 1.1 2013/05/06 14:53:16 joerg Exp $
-
---- src/bin/compile-main.h.orig	2013-05-03 17:26:20.000000000 +0000
-+++ src/bin/compile-main.h
-@@ -22,8 +22,15 @@
- #ifndef FST_COMPILE_MAIN_H__
- #define FST_COMPILE_MAIN_H__
- 
-+#include <ciso646>
-+
-+#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L
-+#include <unordered_map>
-+using std::unordered_map;
-+#else
- #include <tr1/unordered_map>
- using std::tr1::unordered_map;
-+#endif
- #include <sstream>
- #include <string>
- #include <vector>
diff --git a/math/openfst/patches/patch-src_include_fst_cache.h b/math/openfst/patches/patch-src_include_fst_cache.h
deleted file mode 100644
index 01dc7934b6b..00000000000
--- a/math/openfst/patches/patch-src_include_fst_cache.h
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-src_include_fst_cache.h,v 1.1 2012/07/03 17:42:05 joerg Exp $
-
---- src/include/fst/cache.h.orig	2012-07-03 09:45:36.000000000 +0000
-+++ src/include/fst/cache.h
-@@ -138,11 +138,11 @@ class CacheBaseImpl : public VectorFstBa
-       while (NumStates() <= s)                     // Add state to main cache
-         AddState(0);
-       if (!VectorFstBaseImpl<S>::GetState(s)) {
--        SetState(s, new S);
-+        this->SetState(s, new S);
-         if (cache_first_state_id_ != kNoStateId) {  // Forget 1st cached state
-           while (NumStates() <= cache_first_state_id_)
-             AddState(0);
--          SetState(cache_first_state_id_, cache_first_state_);
-+          this->SetState(cache_first_state_id_, cache_first_state_);
-           if (cache_gc_) {
-             cache_states_.push_back(cache_first_state_id_);
-             cache_size_ += sizeof(S) +
-@@ -296,7 +296,7 @@ class CacheBaseImpl : public VectorFstBa
-           (free_recent || !(state->flags & kCacheRecent)) && s != current) {
-         cache_size_ -= sizeof(S) + state->arcs.capacity() * sizeof(Arc);
-         delete state;
--        SetState(s, 0);
-+        this->SetState(s, 0);
-         cache_states_.erase(siter++);
-       } else {
-         state->flags &= ~kCacheRecent;
diff --git a/math/openfst/patches/patch-src_include_fst_compact-fst.h b/math/openfst/patches/patch-src_include_fst_compact-fst.h
deleted file mode 100644
index f9ba484907c..00000000000
--- a/math/openfst/patches/patch-src_include_fst_compact-fst.h
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-src_include_fst_compact-fst.h,v 1.1 2012/07/03 17:42:05 joerg Exp $
-
---- src/include/fst/compact-fst.h.orig	2012-07-03 09:45:14.000000000 +0000
-+++ src/include/fst/compact-fst.h
-@@ -484,7 +484,7 @@ class CompactFstImpl : public CacheImpl<
- 
-   StateId Start() {
-     if (!HasStart()) {
--      SetStart(data_->Start());
-+      this->SetStart(data_->Start());
-     }
-     return CacheImpl<A>::Start();
-   }
-@@ -497,7 +497,7 @@ class CompactFstImpl : public CacheImpl<
-         arc = compactor_->Expand(s, data_->Compacts(compactor_->Size() == -1
-                                                     ? data_->States(s)
-                                                     : s * compactor_->Size()));
--      SetFinal(s, arc.ilabel == kNoLabel ? arc.weight : Weight::Zero());
-+      this->SetFinal(s, arc.ilabel == kNoLabel ? arc.weight : Weight::Zero());
-     }
-     return CacheImpl<A>::Final(s);
-   }
-@@ -566,9 +566,9 @@ class CompactFstImpl : public CacheImpl<
-     for (size_t i = begin; i < end; ++i) {
-       const Arc &arc = compactor_->Expand(s, data_->Compacts(i));
-       if (arc.ilabel == kNoLabel) continue;
--      AddArc(s, arc);
-+      this->AddArc(s, arc);
-     }
--    SetArcs(s);
-+    this->SetArcs(s);
-   }
- 
-  private:
diff --git a/math/openfst/patches/patch-src_include_fst_compose.h b/math/openfst/patches/patch-src_include_fst_compose.h
deleted file mode 100644
index b55ef7f1af9..00000000000
--- a/math/openfst/patches/patch-src_include_fst_compose.h
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-src_include_fst_compose.h,v 1.1 2012/07/03 17:42:05 joerg Exp $
-
---- src/include/fst/compose.h.orig	2012-07-03 09:50:13.000000000 +0000
-+++ src/include/fst/compose.h
-@@ -114,7 +114,7 @@ class ComposeFstImplBase : public CacheI
-     if (!HasStart()) {
-       StateId start = ComputeStart();
-       if (start != kNoStateId) {
--        SetStart(start);
-+        this->SetStart(start);
-       }
-     }
-     return CacheImpl<A>::Start();
-@@ -123,7 +123,7 @@ class ComposeFstImplBase : public CacheI
-   Weight Final(StateId s) {
-     if (!HasFinal(s)) {
-       Weight final = ComputeFinal(s);
--      SetFinal(s, final);
-+      this->SetFinal(s, final);
-     }
-     return CacheImpl<A>::Final(s);
-   }
-@@ -266,7 +266,7 @@ class ComposeFstImpl : public ComposeFst
-     for (ArcIterator< Fst<A> > iterb(*fstb, sb); !iterb.Done(); iterb.Next())
-       MatchArc(s, matchera, iterb.Value(), match_input);
- 
--    SetArcs(s);
-+    this->SetArcs(s);
-   }
- 
-   // Matches a single transition from 'fstb' against 'fata' at 's'.
diff --git a/math/openfst/patches/patch-src_include_fst_config.h.in b/math/openfst/patches/patch-src_include_fst_config.h.in
deleted file mode 100644
index c1beb21f63b..00000000000
--- a/math/openfst/patches/patch-src_include_fst_config.h.in
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-src_include_fst_config.h.in,v 1.1 2013/05/06 14:53:16 joerg Exp $
-
---- src/include/fst/config.h.in.orig	2013-05-03 17:47:24.000000000 +0000
-+++ src/include/fst/config.h.in
-@@ -2,7 +2,7 @@
- 
- /* Define to 1 if the system has the type `std::tr1::hash<long long
-    unsigned>'. */
--#define HAVE_STD__TR1__HASH_LONG_LONG_UNSIGNED_ 1
-+#undef HAVE_STD__TR1__HASH_LONG_LONG_UNSIGNED_
- 
- /* Define to 1 if the system has the type `__gnu_cxx::slist<int>'. */
--#define HAVE___GNU_CXX__SLIST_INT_ 1
-+#undef HAVE___GNU_CXX__SLIST_INT_
diff --git a/math/openfst/patches/patch-src_include_fst_const-fst.h b/math/openfst/patches/patch-src_include_fst_const-fst.h
deleted file mode 100644
index ea055cc8fab..00000000000
--- a/math/openfst/patches/patch-src_include_fst_const-fst.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_include_fst_const-fst.h,v 1.1 2012/07/03 17:42:05 joerg Exp $
-
---- src/include/fst/const-fst.h.orig	2012-07-03 09:46:39.000000000 +0000
-+++ src/include/fst/const-fst.h
-@@ -139,8 +139,8 @@ ConstFstImpl<A, U>::ConstFstImpl(const F
-   SetType(type);
-   uint64 copy_properties = fst.Properties(kCopyProperties, true);
-   SetProperties(copy_properties | kStaticProperties);
--  SetInputSymbols(fst.InputSymbols());
--  SetOutputSymbols(fst.OutputSymbols());
-+  this->SetInputSymbols(fst.InputSymbols());
-+  this->SetOutputSymbols(fst.OutputSymbols());
-   start_ = fst.Start();
- 
-   // Count # of states and arcs.
diff --git a/math/openfst/patches/patch-src_include_fst_determinize.h b/math/openfst/patches/patch-src_include_fst_determinize.h
deleted file mode 100644
index 86e8c5b304f..00000000000
--- a/math/openfst/patches/patch-src_include_fst_determinize.h
+++ /dev/null
@@ -1,50 +0,0 @@
-$NetBSD: patch-src_include_fst_determinize.h,v 1.2 2013/05/06 14:52:54 joerg Exp $
-
---- src/include/fst/determinize.h.orig	2009-03-21 03:35:33.000000000 +0000
-+++ src/include/fst/determinize.h
-@@ -21,9 +21,17 @@
- #ifndef FST_LIB_DETERMINIZE_H__
- #define FST_LIB_DETERMINIZE_H__
- 
--#include <algorithm>
-+#include <ciso646>
-+
-+#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L
-+#include <unordered_map>
-+using std::unordered_map;
-+#else
- #include <tr1/unordered_map>
- using std::tr1::unordered_map;
-+#endif
-+
-+#include <algorithm>
- #include <map>
- #include <fst/slist.h>
- #include <string>
-@@ -171,7 +179,7 @@ class DeterminizeFstImplBase : public Ca
-     if (!HasStart()) {
-       StateId start = ComputeStart();
-       if (start != kNoStateId) {
--        SetStart(start);
-+        this->SetStart(start);
-       }
-     }
-     return CacheImpl<A>::Start();
-@@ -180,7 +188,7 @@ class DeterminizeFstImplBase : public Ca
-   Weight Final(StateId s) {
-     if (!HasFinal(s)) {
-       Weight final = ComputeFinal(s);
--      SetFinal(s, final);
-+      this->SetFinal(s, final);
-     }
-     return CacheImpl<A>::Final(s);
-   }
-@@ -363,7 +371,7 @@ class DeterminizeFsaImpl : public Determ
-          liter != label_map.end();
-          ++liter)
-       AddArc(s, liter->first, liter->second);
--    SetArcs(s);
-+    this->SetArcs(s);
-   }
- 
-  private:
diff --git a/math/openfst/patches/patch-src_include_fst_difference.h b/math/openfst/patches/patch-src_include_fst_difference.h
deleted file mode 100644
index 5e4e94d8639..00000000000
--- a/math/openfst/patches/patch-src_include_fst_difference.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-src_include_fst_difference.h,v 1.1 2012/07/03 17:42:05 joerg Exp $
-
---- src/include/fst/difference.h.orig	2012-07-03 09:58:16.000000000 +0000
-+++ src/include/fst/difference.h
-@@ -95,7 +95,7 @@ class DifferenceFst : public ComposeFst<
-     copts.matcher2 = new R(cfst, MATCH_INPUT, ComplementFst<A>::kRhoLabel,
-                            opts.matcher2);
- 
--    SetImpl(Init(fst1, cfst, copts));
-+    this->SetImpl(this->Init(fst1, cfst, copts));
- 
-     uint64 props1 = fst1.Properties(kFstProperties, false);
-     uint64 props2 = fst2.Properties(kFstProperties, false);
diff --git a/math/openfst/patches/patch-src_include_fst_encode.h b/math/openfst/patches/patch-src_include_fst_encode.h
deleted file mode 100644
index 0b024c9ae8e..00000000000
--- a/math/openfst/patches/patch-src_include_fst_encode.h
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-src_include_fst_encode.h,v 1.1 2013/05/06 14:53:16 joerg Exp $
-
---- src/include/fst/encode.h.orig	2013-05-03 17:23:12.000000000 +0000
-+++ src/include/fst/encode.h
-@@ -20,8 +20,15 @@
- #ifndef FST_LIB_ENCODE_H__
- #define FST_LIB_ENCODE_H__
- 
-+#include <ciso646>
-+
-+#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L
-+#include <unordered_map>
-+using std::unordered_map;
-+#else
- #include <tr1/unordered_map>
- using std::tr1::unordered_map;
-+#endif
- #include <string>
- #include <vector>
- #include <fst/map.h>
diff --git a/math/openfst/patches/patch-src_include_fst_epsnormalize.h b/math/openfst/patches/patch-src_include_fst_epsnormalize.h
deleted file mode 100644
index 51ff66c5b54..00000000000
--- a/math/openfst/patches/patch-src_include_fst_epsnormalize.h
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-src_include_fst_epsnormalize.h,v 1.1 2013/05/06 14:53:16 joerg Exp $
-
---- src/include/fst/epsnormalize.h.orig	2013-05-03 17:30:15.000000000 +0000
-+++ src/include/fst/epsnormalize.h
-@@ -20,8 +20,16 @@
- #ifndef FST_LIB_EPSNORMALIZE_H__
- #define FST_LIB_EPSNORMALIZE_H__
- 
-+#include <ciso646>
-+
-+#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L
-+#include <unordered_map>
-+using std::unordered_map;
-+#else
- #include <tr1/unordered_map>
- using std::tr1::unordered_map;
-+#endif
-+
- #include <fst/slist.h>
- 
- #include <fst/factor-weight.h>
diff --git a/math/openfst/patches/patch-src_include_fst_equivalent.h b/math/openfst/patches/patch-src_include_fst_equivalent.h
deleted file mode 100644
index f1fcfaf4361..00000000000
--- a/math/openfst/patches/patch-src_include_fst_equivalent.h
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-src_include_fst_equivalent.h,v 1.1 2013/05/06 14:53:16 joerg Exp $
-
---- src/include/fst/equivalent.h.orig	2013-05-03 17:31:26.000000000 +0000
-+++ src/include/fst/equivalent.h
-@@ -22,8 +22,15 @@
- 
- #include <algorithm>
- #include <deque>
-+#include <ciso646>
-+
-+#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L
-+#include <unordered_map>
-+using std::unordered_map;
-+#else
- #include <tr1/unordered_map>
- using std::tr1::unordered_map;
-+#endif
- #include <utility>
- #include <vector>
- #include <fst/encode.h>
diff --git a/math/openfst/patches/patch-src_include_fst_factor-weight.h b/math/openfst/patches/patch-src_include_fst_factor-weight.h
deleted file mode 100644
index 7c863a86601..00000000000
--- a/math/openfst/patches/patch-src_include_fst_factor-weight.h
+++ /dev/null
@@ -1,73 +0,0 @@
-$NetBSD: patch-src_include_fst_factor-weight.h,v 1.2 2013/05/06 14:52:54 joerg Exp $
-
---- src/include/fst/factor-weight.h.orig	2009-03-21 03:35:33.000000000 +0000
-+++ src/include/fst/factor-weight.h
-@@ -20,9 +20,17 @@
- #ifndef FST_LIB_FACTOR_WEIGHT_H__
- #define FST_LIB_FACTOR_WEIGHT_H__
- 
--#include <algorithm>
-+#include <ciso646>
-+
-+#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L
-+#include <unordered_map>
-+using std::unordered_map;
-+#else
- #include <tr1/unordered_map>
- using std::tr1::unordered_map;
-+#endif
-+
-+#include <algorithm>
- #include <fst/slist.h>
- #include <string>
- #include <utility>
-@@ -215,7 +223,7 @@ class FactorWeightFstImpl
-       if (s == kNoStateId)
-         return kNoStateId;
-       StateId start = FindState(Element(fst_->Start(), Weight::One()));
--      SetStart(start);
-+      this->SetStart(start);
-     }
-     return CacheImpl<A>::Start();
-   }
-@@ -229,9 +237,9 @@ class FactorWeightFstImpl
-                  : (Weight) Times(e.weight, fst_->Final(e.state));
-       FactorIterator f(w);
-       if (!(mode_ & kFactorFinalWeights) || f.Done())
--        SetFinal(s, w);
-+        this->SetFinal(s, w);
-       else
--        SetFinal(s, Weight::Zero());
-+        this->SetFinal(s, Weight::Zero());
-     }
-     return CacheImpl<A>::Final(s);
-   }
-@@ -298,13 +306,13 @@ class FactorWeightFstImpl
-         FactorIterator fit(w);
-         if (!(mode_ & kFactorArcWeights) || fit.Done()) {
-           StateId d = FindState(Element(arc.nextstate, Weight::One()));
--          AddArc(s, Arc(arc.ilabel, arc.olabel, w, d));
-+          this->AddArc(s, Arc(arc.ilabel, arc.olabel, w, d));
-         } else {
-           for (; !fit.Done(); fit.Next()) {
-             const pair<Weight, Weight> &p = fit.Value();
-             StateId d = FindState(Element(arc.nextstate,
-                                           p.second.Quantize(delta_)));
--            AddArc(s, Arc(arc.ilabel, arc.olabel, p.first, d));
-+            this->AddArc(s, Arc(arc.ilabel, arc.olabel, p.first, d));
-           }
-         }
-       }
-@@ -322,10 +330,10 @@ class FactorWeightFstImpl
-         const pair<Weight, Weight> &p = fit.Value();
-         StateId d = FindState(Element(kNoStateId,
-                                       p.second.Quantize(delta_)));
--        AddArc(s, Arc(final_ilabel_, final_olabel_, p.first, d));
-+        this->AddArc(s, Arc(final_ilabel_, final_olabel_, p.first, d));
-       }
-     }
--    SetArcs(s);
-+    this->SetArcs(s);
-   }
- 
-  private:
diff --git a/math/openfst/patches/patch-src_include_fst_map.h b/math/openfst/patches/patch-src_include_fst_map.h
deleted file mode 100644
index d09787aadf4..00000000000
--- a/math/openfst/patches/patch-src_include_fst_map.h
+++ /dev/null
@@ -1,100 +0,0 @@
-$NetBSD: patch-src_include_fst_map.h,v 1.2 2013/05/06 14:52:54 joerg Exp $
-
---- src/include/fst/map.h.orig	2009-03-21 03:35:34.000000000 +0000
-+++ src/include/fst/map.h
-@@ -21,8 +21,15 @@
- #ifndef FST_LIB_MAP_H__
- #define FST_LIB_MAP_H__
- 
-+#include <ciso646>
-+
-+#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L
-+#include <unordered_map>
-+using std::unordered_map;
-+#else
- #include <tr1/unordered_map>
- using std::tr1::unordered_map;
-+#endif
- #include <string>
- #include <utility>
- #include <fst/cache.h>
-@@ -336,7 +343,7 @@ class MapFstImpl : public CacheImpl<B> {
- 
-   StateId Start() {
-     if (!HasStart())
--      SetStart(FindOState(fst_->Start()));
-+      this->SetStart(FindOState(fst_->Start()));
-     return CacheImpl<B>::Start();
-   }
- 
-@@ -348,24 +355,24 @@ class MapFstImpl : public CacheImpl<B> {
-           B final_arc = (*mapper_)(A(0, 0, fst_->Final(FindIState(s)),
-                                         kNoStateId));
-           CHECK(final_arc.ilabel == 0 && final_arc.olabel == 0);
--          SetFinal(s, final_arc.weight);
-+          this->SetFinal(s, final_arc.weight);
-           break;
-         }
-         case MAP_ALLOW_SUPERFINAL: {
-           if (s == superfinal_) {
--            SetFinal(s, Weight::One());
-+            this->SetFinal(s, Weight::One());
-           } else {
-             B final_arc = (*mapper_)(A(0, 0, fst_->Final(FindIState(s)),
-                                           kNoStateId));
-             if (final_arc.ilabel == 0 && final_arc.olabel == 0)
--              SetFinal(s, final_arc.weight);
-+              this->SetFinal(s, final_arc.weight);
-             else
--              SetFinal(s, Weight::Zero());
-+              this->SetFinal(s, Weight::Zero());
-           }
-           break;
-         }
-         case MAP_REQUIRE_SUPERFINAL: {
--          SetFinal(s, s == superfinal_ ? Weight::One() : Weight::Zero());
-+          this->SetFinal(s, s == superfinal_ ? Weight::One() : Weight::Zero());
-           break;
-         }
-       }
-@@ -399,14 +406,14 @@ class MapFstImpl : public CacheImpl<B> {
- 
-   void Expand(StateId s) {
-     // Add exiting arcs.
--    if (s == superfinal_) { SetArcs(s); return; }
-+    if (s == superfinal_) { this->SetArcs(s); return; }
- 
-     for (ArcIterator< Fst<A> > aiter(*fst_, FindIState(s));
-          !aiter.Done(); aiter.Next()) {
-       A aarc(aiter.Value());
-       aarc.nextstate = FindOState(aarc.nextstate);
-       const B& barc = (*mapper_)(aarc);
--      AddArc(s, barc);
-+      this->AddArc(s, barc);
-     }
- 
-     // Check for superfinal arcs.
-@@ -422,7 +429,7 @@ class MapFstImpl : public CacheImpl<B> {
-             if (superfinal_ == kNoStateId)
-               superfinal_ = nstates_++;
-             final_arc.nextstate = superfinal_;
--            AddArc(s, final_arc);
-+            this->AddArc(s, final_arc);
-           }
-           break;
-         }
-@@ -431,12 +438,12 @@ class MapFstImpl : public CacheImpl<B> {
-                                       kNoStateId));
-         if (final_arc.ilabel != 0 || final_arc.olabel != 0 ||
-             final_arc.weight != B::Weight::Zero())
--          AddArc(s, B(final_arc.ilabel, final_arc.olabel,
-+          this->AddArc(s, B(final_arc.ilabel, final_arc.olabel,
-                       final_arc.weight, superfinal_));
-         break;
-       }
-     }
--    SetArcs(s);
-+    this->SetArcs(s);
-   }
- 
-  private:
diff --git a/math/openfst/patches/patch-src_include_fst_relabel.h b/math/openfst/patches/patch-src_include_fst_relabel.h
deleted file mode 100644
index 556a892d849..00000000000
--- a/math/openfst/patches/patch-src_include_fst_relabel.h
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-src_include_fst_relabel.h,v 1.1 2013/05/06 14:53:16 joerg Exp $
-
---- src/include/fst/relabel.h.orig	2013-05-03 17:35:08.000000000 +0000
-+++ src/include/fst/relabel.h
-@@ -20,8 +20,15 @@
- #ifndef FST_LIB_RELABEL_H__
- #define FST_LIB_RELABEL_H__
- 
-+#include <ciso646>
-+
-+#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L
-+#include <unordered_map>
-+using std::unordered_map;
-+#else
- #include <tr1/unordered_map>
- using std::tr1::unordered_map;
-+#endif
- #include <string>
- #include <utility>
- #include <vector>
diff --git a/math/openfst/patches/patch-src_include_fst_replace.h b/math/openfst/patches/patch-src_include_fst_replace.h
deleted file mode 100644
index 2c42f8ee40c..00000000000
--- a/math/openfst/patches/patch-src_include_fst_replace.h
+++ /dev/null
@@ -1,88 +0,0 @@
-$NetBSD: patch-src_include_fst_replace.h,v 1.2 2013/05/06 14:52:54 joerg Exp $
-
---- src/include/fst/replace.h.orig	2009-03-21 03:35:34.000000000 +0000
-+++ src/include/fst/replace.h
-@@ -21,8 +21,15 @@
- #ifndef FST_LIB_REPLACE_H__
- #define FST_LIB_REPLACE_H__
- 
-+#include <ciso646>
-+
-+#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L
-+#include <unordered_map>
-+using std::unordered_map;
-+#else
- #include <tr1/unordered_map>
- using std::tr1::unordered_map;
-+#endif
- #include <string>
- #include <utility>
- #include <vector>
-@@ -424,16 +431,16 @@ class ReplaceFstImpl : public CacheImpl<
- 
-   // return final weight of state (kInfWeight means state is not final)
-   Weight Final(StateId s) {
--    if (!HasFinal(s)) {
-+    if (!this->HasFinal(s)) {
-       const StateTuple& tuple  = state_table_->Tuple(s);
-       const StackPrefix& stack = stackprefix_array_[tuple.prefix_id];
-       const Fst<A>* fst = fst_array_[tuple.fst_id];
-       StateId fst_state = tuple.fst_state;
- 
-       if (fst->Final(fst_state) != Weight::Zero() && stack.Depth() == 0)
--        SetFinal(s, fst->Final(fst_state));
-+        this->SetFinal(s, fst->Final(fst_state));
-       else
--        SetFinal(s, Weight::Zero());
-+        this->SetFinal(s, Weight::Zero());
-     }
-     return CacheImpl<A>::Final(s);
-   }
-@@ -471,7 +478,7 @@ class ReplaceFstImpl : public CacheImpl<
-     const Fst<A>* fst = fst_array_[tuple.fst_id];
-     StateId fst_state = tuple.fst_state;
-     if (fst_state == kNoStateId) {
--      SetArcs(s);
-+      this->SetArcs(s);
-       return;
-     }
- 
-@@ -483,7 +490,7 @@ class ReplaceFstImpl : public CacheImpl<
- 
-       StateId nextstate = state_table_->FindState(
-           StateTuple(prefix_id, top.fst_id, top.nextstate));
--      AddArc(s, A(0, 0, fst->Final(fst_state), nextstate));
-+      this->AddArc(s, A(0, 0, fst->Final(fst_state), nextstate));
-     }
- 
-     // extend arcs leaving the state
-@@ -493,7 +500,7 @@ class ReplaceFstImpl : public CacheImpl<
-       if (arc.olabel == 0) {  // expand local fst
-         StateId nextstate = state_table_->FindState(
-             StateTuple(tuple.prefix_id, tuple.fst_id, arc.nextstate));
--        AddArc(s, A(arc.ilabel, arc.olabel, arc.weight, nextstate));
-+        this->AddArc(s, A(arc.ilabel, arc.olabel, arc.weight, nextstate));
-       } else {
-         // check for non terminal
-         typename NonTerminalHash::const_iterator it =
-@@ -511,17 +518,17 @@ class ReplaceFstImpl : public CacheImpl<
-             StateId nt_nextstate = state_table_->FindState(
-                 StateTuple(nt_prefix, nonterminal, nt_start));
-             Label ilabel = (epsilon_on_replace_) ? 0 : arc.ilabel;
--            AddArc(s, A(ilabel, 0, arc.weight, nt_nextstate));
-+            this->AddArc(s, A(ilabel, 0, arc.weight, nt_nextstate));
-           }
-         } else {
-           StateId nextstate =  state_table_->FindState(
-                 StateTuple(tuple.prefix_id, tuple.fst_id, arc.nextstate));
--          AddArc(s, A(arc.ilabel, arc.olabel, arc.weight, nextstate));
-+          this->AddArc(s, A(arc.ilabel, arc.olabel, arc.weight, nextstate));
-         }
-       }
-     }
- 
--    SetArcs(s);
-+    this->SetArcs(s);
-   }
- 
- 
diff --git a/math/openfst/patches/patch-src_include_fst_rmepsilon.h b/math/openfst/patches/patch-src_include_fst_rmepsilon.h
deleted file mode 100644
index 6b33625a354..00000000000
--- a/math/openfst/patches/patch-src_include_fst_rmepsilon.h
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-src_include_fst_rmepsilon.h,v 1.1 2013/05/06 14:53:17 joerg Exp $
-
---- src/include/fst/rmepsilon.h.orig	2013-05-03 17:30:43.000000000 +0000
-+++ src/include/fst/rmepsilon.h
-@@ -20,8 +20,15 @@
- #ifndef FST_LIB_RMEPSILON_H__
- #define FST_LIB_RMEPSILON_H__
- 
-+#include <ciso646>
-+
-+#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L
-+#include <unordered_map>
-+using std::unordered_map;
-+#else
- #include <tr1/unordered_map>
- using std::tr1::unordered_map;
-+#endif
- #include <fst/slist.h>
- #include <stack>
- #include <string>
diff --git a/math/openfst/patches/patch-src_include_fst_rmfinalepsilon.h b/math/openfst/patches/patch-src_include_fst_rmfinalepsilon.h
deleted file mode 100644
index 0486a422eb4..00000000000
--- a/math/openfst/patches/patch-src_include_fst_rmfinalepsilon.h
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-src_include_fst_rmfinalepsilon.h,v 1.1 2013/05/06 14:53:17 joerg Exp $
-
---- src/include/fst/rmfinalepsilon.h.orig	2013-05-03 17:24:31.000000000 +0000
-+++ src/include/fst/rmfinalepsilon.h
-@@ -20,8 +20,15 @@
- #ifndef FST_LIB_RMFINALEPSILON_H__
- #define FST_LIB_RMFINALEPSILON_H__
- 
-+#include <ciso646>
-+
-+#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L
-+#include <unordered_set>
-+using std::unordered_set;
-+#else
- #include <tr1/unordered_set>
- using std::tr1::unordered_set;
-+#endif
- #include <vector>
- 
- #include <fst/connect.h>
diff --git a/math/openfst/patches/patch-src_include_fst_slist.h b/math/openfst/patches/patch-src_include_fst_slist.h
deleted file mode 100644
index 58fb833080c..00000000000
--- a/math/openfst/patches/patch-src_include_fst_slist.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-src_include_fst_slist.h,v 1.1 2013/05/06 14:53:17 joerg Exp $
-
---- src/include/fst/slist.h.orig	2013-05-03 17:49:34.000000000 +0000
-+++ src/include/fst/slist.h
-@@ -47,7 +47,7 @@ template <typename T> class slist : publ
- 
-   iterator erase_after(iterator pos) {
-     iterator npos = pos;
--    erase(++npos);
-+    this->erase(++npos);
-     return pos;
-   }
- };
diff --git a/math/openfst/patches/patch-src_include_fst_synchronize.h b/math/openfst/patches/patch-src_include_fst_synchronize.h
deleted file mode 100644
index e4448167b81..00000000000
--- a/math/openfst/patches/patch-src_include_fst_synchronize.h
+++ /dev/null
@@ -1,76 +0,0 @@
-$NetBSD: patch-src_include_fst_synchronize.h,v 1.2 2013/05/06 14:52:54 joerg Exp $
-
---- src/include/fst/synchronize.h.orig	2009-03-21 03:35:34.000000000 +0000
-+++ src/include/fst/synchronize.h
-@@ -20,11 +20,21 @@
- #ifndef FST_LIB_SYNCHRONIZE_H__
- #define FST_LIB_SYNCHRONIZE_H__
- 
--#include <algorithm>
-+#include <ciso646>
-+
-+#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L
-+#include <unordered_map>
-+using std::unordered_map;
-+#include <unordered_set>
-+using std::unordered_set;
-+#else
- #include <tr1/unordered_map>
- using std::tr1::unordered_map;
- #include <tr1/unordered_set>
- using std::tr1::unordered_set;
-+#endif
-+
-+#include <algorithm>
- #include <string>
- #include <utility>
- #include <vector>
-@@ -111,7 +121,7 @@ class SynchronizeFstImpl
-         return kNoStateId;
-       const String *empty = FindString(new String());
-       StateId start = FindState(Element(fst_->Start(), empty, empty));
--      SetStart(start);
-+      this->SetStart(start);
-     }
-     return CacheImpl<A>::Start();
-   }
-@@ -121,9 +131,9 @@ class SynchronizeFstImpl
-       const Element &e = elements_[s];
-       Weight w = e.state == kNoStateId ? Weight::One() : fst_->Final(e.state);
-       if ((w != Weight::Zero()) && (e.istring)->empty() && (e.ostring)->empty())
--        SetFinal(s, w);
-+        this->SetFinal(s, w);
-       else
--        SetFinal(s, Weight::Zero());
-+        this->SetFinal(s, Weight::Zero());
-     }
-     return CacheImpl<A>::Final(s);
-   }
-@@ -230,13 +240,13 @@ class SynchronizeFstImpl
-           const String *istring = Cdr(e.istring, arc.ilabel);
-           const String *ostring = Cdr(e.ostring, arc.olabel);
-           StateId d = FindState(Element(arc.nextstate, istring, ostring));
--          AddArc(s, Arc(Car(e.istring, arc.ilabel),
-+          this->AddArc(s, Arc(Car(e.istring, arc.ilabel),
-                         Car(e.ostring, arc.olabel), arc.weight, d));
-         } else {
-           const String *istring = Concat(e.istring, arc.ilabel);
-           const String *ostring = Concat(e.ostring, arc.olabel);
-           StateId d = FindState(Element(arc.nextstate, istring, ostring));
--          AddArc(s, Arc(0 , 0, arc.weight, d));
-+          this->AddArc(s, Arc(0 , 0, arc.weight, d));
-         }
-       }
- 
-@@ -246,9 +256,9 @@ class SynchronizeFstImpl
-       const String *istring = Cdr(e.istring);
-       const String *ostring = Cdr(e.ostring);
-       StateId d = FindState(Element(kNoStateId, istring, ostring));
--      AddArc(s, Arc(Car(e.istring), Car(e.ostring), w, d));
-+      this->AddArc(s, Arc(Car(e.istring), Car(e.ostring), w, d));
-     }
--    SetArcs(s);
-+    this->SetArcs(s);
-   }
- 
-  private:
diff --git a/math/openfst/patches/patch-src_include_fst_test-properties.h b/math/openfst/patches/patch-src_include_fst_test-properties.h
deleted file mode 100644
index c0a69753513..00000000000
--- a/math/openfst/patches/patch-src_include_fst_test-properties.h
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-src_include_fst_test-properties.h,v 1.1 2013/05/06 14:53:17 joerg Exp $
-
---- src/include/fst/test-properties.h.orig	2013-05-03 17:21:06.000000000 +0000
-+++ src/include/fst/test-properties.h
-@@ -20,8 +20,15 @@
- #ifndef FST_LIB_TEST_PROPERTIES_H__
- #define FST_LIB_TEST_PROPERTIES_H__
- 
-+#include <ciso646>
-+
-+#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L
-+#include <unordered_set>
-+using std::unordered_set;
-+#else
- #include <tr1/unordered_set>
- using std::tr1::unordered_set;
-+#endif
- #include <fst/mutable-fst.h>
- #include <fst/dfs-visit.h>
- #include <fst/connect.h>
diff --git a/math/openfst/patches/patch-src_include_fst_vector-fst.h b/math/openfst/patches/patch-src_include_fst_vector-fst.h
deleted file mode 100644
index 85c1345ca4f..00000000000
--- a/math/openfst/patches/patch-src_include_fst_vector-fst.h
+++ /dev/null
@@ -1,101 +0,0 @@
-$NetBSD: patch-src_include_fst_vector-fst.h,v 1.1 2012/07/03 17:42:05 joerg Exp $
-
---- src/include/fst/vector-fst.h.orig	2012-07-03 09:43:16.000000000 +0000
-+++ src/include/fst/vector-fst.h
-@@ -199,9 +199,9 @@ class VectorFstImpl : public VectorFstBa
- 
-   static VectorFstImpl<A> *Read(istream &strm, const FstReadOptions &opts);
- 
--  size_t NumInputEpsilons(StateId s) const { return GetState(s)->niepsilons; }
-+  size_t NumInputEpsilons(StateId s) const { return this->GetState(s)->niepsilons; }
- 
--  size_t NumOutputEpsilons(StateId s) const { return GetState(s)->noepsilons; }
-+  size_t NumOutputEpsilons(StateId s) const { return this->GetState(s)->noepsilons; }
- 
-   bool Write(ostream &strm, const FstWriteOptions &opts) const;
- 
-@@ -213,7 +213,7 @@ class VectorFstImpl : public VectorFstBa
-   }
- 
-   void SetFinal(StateId s, Weight w) {
--    Weight ow = Final(s);
-+    Weight ow = this->Final(s);
-     if (ow != Weight::Zero() && ow != Weight::One())
-       SetProperties(Properties() & ~kWeighted);
-     BaseImpl::SetFinal(s, w);
-@@ -232,7 +232,7 @@ class VectorFstImpl : public VectorFstBa
-   }
- 
-   void AddArc(StateId s, const A &arc) {
--    VectorState<A> *state = GetState(s);
-+    VectorState<A> *state = this->GetState(s);
-     if (arc.ilabel != arc.olabel) {
-       SetProperties(Properties() | kNotAcceptor);
-       SetProperties(Properties() & ~kAcceptor);
-@@ -290,21 +290,21 @@ class VectorFstImpl : public VectorFstBa
-   }
- 
-   void DeleteArcs(StateId s, size_t n) {
--    const vector<A> &arcs = GetState(s)->arcs;
-+    const vector<A> &arcs = this->GetState(s)->arcs;
-     for (size_t i = 0; i < n; ++i) {
-       size_t j = arcs.size() - i - 1;
-       if (arcs[j].ilabel == 0)
--        --GetState(s)->niepsilons;
-+        --this->GetState(s)->niepsilons;
-       if (arcs[j].olabel == 0)
--        --GetState(s)->noepsilons;
-+        --this->GetState(s)->noepsilons;
-     }
-     BaseImpl::DeleteArcs(s, n);
-     SetProperties(Properties() & kDeleteArcsProperties);
-   }
- 
-   void DeleteArcs(StateId s) {
--    GetState(s)->niepsilons = 0;
--    GetState(s)->noepsilons = 0;
-+    this->GetState(s)->niepsilons = 0;
-+    this->GetState(s)->noepsilons = 0;
-     BaseImpl::DeleteArcs(s);
-     SetProperties(Properties() & kDeleteArcsProperties);
-   }
-@@ -324,8 +324,8 @@ template <class A>
- VectorFstImpl<A>::VectorFstImpl(const Fst<A> &fst) {
-   SetType("vector");
-   SetProperties(fst.Properties(kCopyProperties, false) | kStaticProperties);
--  SetInputSymbols(fst.InputSymbols());
--  SetOutputSymbols(fst.OutputSymbols());
-+  this->SetInputSymbols(fst.InputSymbols());
-+  this->SetOutputSymbols(fst.OutputSymbols());
-   BaseImpl::SetStart(fst.Start());
- 
-   for (StateIterator< Fst<A> > siter(fst);
-@@ -334,16 +334,16 @@ VectorFstImpl<A>::VectorFstImpl(const Fs
-     StateId s = siter.Value();
-     BaseImpl::AddState();
-     BaseImpl::SetFinal(s, fst.Final(s));
--    ReserveArcs(s, fst.NumArcs(s));
-+    this->ReserveArcs(s, fst.NumArcs(s));
-     for (ArcIterator< Fst<A> > aiter(fst, s);
-          !aiter.Done();
-          aiter.Next()) {
-       const A &arc = aiter.Value();
-       BaseImpl::AddArc(s, arc);
-       if (arc.ilabel == 0)
--        ++GetState(s)->niepsilons;
-+        ++this->GetState(s)->niepsilons;
-       if (arc.olabel == 0)
--        ++GetState(s)->noepsilons;
-+        ++this->GetState(s)->noepsilons;
-     }
-   }
- }
-@@ -427,7 +427,7 @@ bool VectorFstImpl<A>::Write(ostream &st
-   WriteHeader(strm, opts, kFileVersion, &hdr);
- 
-   for (StateId s = 0; s < NumStates(); ++s) {
--    const VectorState<A> *state = GetState(s);
-+    const VectorState<A> *state = this->GetState(s);
-     state->final.Write(strm);
-     int64 narcs = state->arcs.size();
-     WriteType(strm, narcs);