[113460] trunk/dports/devel/openfst

hum at macports.org hum at macports.org
Sat Nov 16 07:49:40 PST 2013


Revision: 113460
          https://trac.macports.org/changeset/113460
Author:   hum at macports.org
Date:     2013-11-16 07:49:40 -0800 (Sat, 16 Nov 2013)
Log Message:
-----------
openfst: update to 1.3.4; add patchfiles to build on Mavericks.

Modified Paths:
--------------
    trunk/dports/devel/openfst/Portfile

Added Paths:
-----------
    trunk/dports/devel/openfst/files/
    trunk/dports/devel/openfst/files/patch-c++11.diff
    trunk/dports/devel/openfst/files/patch-src-include-fst-config.h.in.diff

Modified: trunk/dports/devel/openfst/Portfile
===================================================================
--- trunk/dports/devel/openfst/Portfile	2013-11-16 14:21:58 UTC (rev 113459)
+++ trunk/dports/devel/openfst/Portfile	2013-11-16 15:49:40 UTC (rev 113460)
@@ -4,7 +4,7 @@
 PortSystem          1.0
 
 name                openfst
-version             1.3.3
+version             1.3.4
 categories          devel
 maintainers         hum openmaintainer
 
@@ -19,9 +19,11 @@
 license             Apache-2
 
 master_sites        ${homepage}twiki/pub/FST/FstDownload/
-checksums           rmd160  197e49ac1bd1b956dcc04eecb9cd9147022c9815 \
-                    sha256  b3672384056999abdbce861d2065074cbca471a23c4a89072460fddd0c33e3f6
+checksums           rmd160  5f9c9c059150dd5afb894ea1edc7dd4d7d22a166 \
+                    sha256  e95fa96674e1c9d6866bbf79b9cd755c5121ad165b76224c7c6bbfa139399a61
 
+patchfiles          patch-c++11.diff patch-src-include-fst-config.h.in.diff
+
 # OpenFst doesn't like Xcode's compiler before Snow Leopard.
 # See http://www.openfst.org/twiki/bin/view/FST/CompilingOnMacOSX
 # TODO: Change this to compiler.blacklist
@@ -43,27 +45,15 @@
     }
 }
 
-platform darwin {
-    if {${os.major} >= 13} {
-        # This project needs to be updated to build with clang++ against libc++
-        depends_lib
-        depends_run
-        pre-fetch {
-            ui_error "$name does not build on Mavericks or later."
-            error "unsupported platform"
-        }
-    }
-}
-
 post-destroot {
-    set docdir ${destroot}${prefix}/share/doc/${name}
-    xinstall -d ${docdir}
+    set dest_doc ${destroot}${prefix}/share/doc/${name}
+    xinstall -d ${dest_doc}
     xinstall -m 644 -W ${worksrcpath} \
         AUTHORS \
         COPYING \
         NEWS \
         README \
-        ${docdir}
+        ${dest_doc}
 }
 
 livecheck.type      regex

Added: trunk/dports/devel/openfst/files/patch-c++11.diff
===================================================================
--- trunk/dports/devel/openfst/files/patch-c++11.diff	                        (rev 0)
+++ trunk/dports/devel/openfst/files/patch-c++11.diff	2013-11-16 15:49:40 UTC (rev 113460)
@@ -0,0 +1,556 @@
+--- ./src/include/fst/accumulator.h.orig	2013-01-24 11:36:22.000000000 +0900
++++ ./src/include/fst/accumulator.h	2013-11-17 00:23:01.000000000 +0900
+@@ -23,9 +23,15 @@
+ 
+ #include <algorithm>
+ #include <functional>
++#if __cplusplus >= 201103L || defined(_LIBCPP_VERSION)
++#include <unordered_map>
++using std::unordered_map;
++using std::unordered_multimap;
++#else
+ #include <tr1/unordered_map>
+ using std::tr1::unordered_map;
+ using std::tr1::unordered_multimap;
++#endif
+ #include <vector>
+ using std::vector;
+ 
+--- ./src/include/fst/arc-map.h.orig	2013-01-24 11:36:22.000000000 +0900
++++ ./src/include/fst/arc-map.h	2013-11-17 00:23:01.000000000 +0900
+@@ -23,9 +23,15 @@
+ #ifndef FST_LIB_ARC_MAP_H__
+ #define FST_LIB_ARC_MAP_H__
+ 
++#if __cplusplus >= 201103L || defined(_LIBCPP_VERSION)
++#include <unordered_map>
++using std::unordered_map;
++using std::unordered_multimap;
++#else
+ #include <tr1/unordered_map>
+ using std::tr1::unordered_map;
+ using std::tr1::unordered_multimap;
++#endif
+ #include <string>
+ #include <utility>
+ using std::pair; using std::make_pair;
+--- ./src/include/fst/bi-table.h.orig	2013-01-24 11:36:22.000000000 +0900
++++ ./src/include/fst/bi-table.h	2013-11-17 00:23:01.000000000 +0900
+@@ -28,9 +28,15 @@
+ #include <vector>
+ using std::vector;
+ 
++#if __cplusplus >= 201103L || defined(_LIBCPP_VERSION)
++#include <unordered_set>
++using std::unordered_set;
++using std::unordered_multiset;
++#else
+ #include <tr1/unordered_set>
+ using std::tr1::unordered_set;
+ using std::tr1::unordered_multiset;
++#endif
+ 
+ namespace fst {
+ 
+--- ./src/include/fst/determinize.h.orig	2013-01-24 11:36:22.000000000 +0900
++++ ./src/include/fst/determinize.h	2013-11-17 00:23:01.000000000 +0900
+@@ -24,9 +24,15 @@
+ 
+ #include <algorithm>
+ #include <climits>
++#if __cplusplus >= 201103L || defined(_LIBCPP_VERSION)
++#include <unordered_map>
++using std::unordered_map;
++using std::unordered_multimap;
++#else
+ #include <tr1/unordered_map>
+ using std::tr1::unordered_map;
+ using std::tr1::unordered_multimap;
++#endif
+ #include <map>
+ #include <fst/slist.h>
+ #include <string>
+--- ./src/include/fst/edit-fst.h.orig	2013-01-24 11:36:22.000000000 +0900
++++ ./src/include/fst/edit-fst.h	2013-11-17 00:23:01.000000000 +0900
+@@ -25,9 +25,15 @@
+ 
+ #include <fst/cache.h>
+ 
++#if __cplusplus >= 201103L || defined(_LIBCPP_VERSION)
++#include <unordered_map>
++using std::unordered_map;
++using std::unordered_multimap;
++#else
+ #include <tr1/unordered_map>
+ using std::tr1::unordered_map;
+ using std::tr1::unordered_multimap;
++#endif
+ 
+ namespace fst {
+ 
+--- ./src/include/fst/encode.h.orig	2013-01-24 11:36:22.000000000 +0900
++++ ./src/include/fst/encode.h	2013-11-17 00:23:01.000000000 +0900
+@@ -22,9 +22,15 @@
+ #define FST_LIB_ENCODE_H__
+ 
+ #include <climits>
++#if __cplusplus >= 201103L || defined(_LIBCPP_VERSION)
++#include <unordered_map>
++using std::unordered_map;
++using std::unordered_multimap;
++#else
+ #include <tr1/unordered_map>
+ using std::tr1::unordered_map;
+ using std::tr1::unordered_multimap;
++#endif
+ #include <string>
+ #include <vector>
+ using std::vector;
+--- ./src/include/fst/epsnormalize.h.orig	2013-01-24 11:36:22.000000000 +0900
++++ ./src/include/fst/epsnormalize.h	2013-11-17 00:23:01.000000000 +0900
+@@ -21,9 +21,15 @@
+ #ifndef FST_LIB_EPSNORMALIZE_H__
+ #define FST_LIB_EPSNORMALIZE_H__
+ 
++#if __cplusplus >= 201103L || defined(_LIBCPP_VERSION)
++#include <unordered_map>
++using std::unordered_map;
++using std::unordered_multimap;
++#else
+ #include <tr1/unordered_map>
+ using std::tr1::unordered_map;
+ using std::tr1::unordered_multimap;
++#endif
+ 
+ 
+ #include <fst/factor-weight.h>
+--- ./src/include/fst/equivalent.h.orig	2013-01-24 11:36:22.000000000 +0900
++++ ./src/include/fst/equivalent.h	2013-11-17 00:23:01.000000000 +0900
+@@ -24,9 +24,15 @@
+ #include <algorithm>
+ #include <deque>
+ using std::deque;
++#if __cplusplus >= 201103L || defined(_LIBCPP_VERSION)
++#include <unordered_map>
++using std::unordered_map;
++using std::unordered_multimap;
++#else
+ #include <tr1/unordered_map>
+ using std::tr1::unordered_map;
+ using std::tr1::unordered_multimap;
++#endif
+ #include <utility>
+ using std::pair; using std::make_pair;
+ #include <vector>
+--- ./src/include/fst/extensions/pdt/info.h.orig	2013-01-24 11:36:25.000000000 +0900
++++ ./src/include/fst/extensions/pdt/info.h	2013-11-17 00:23:01.000000000 +0900
+@@ -21,12 +21,21 @@
+ #ifndef FST_EXTENSIONS_PDT_INFO_H__
+ #define FST_EXTENSIONS_PDT_INFO_H__
+ 
++#if __cplusplus >= 201103L || defined(_LIBCPP_VERSION)
++#include <unordered_map>
++using std::unordered_map;
++using std::unordered_multimap;
++#include <unordered_set>
++using std::unordered_set;
++using std::unordered_multiset;
++#else
+ #include <tr1/unordered_map>
+ using std::tr1::unordered_map;
+ using std::tr1::unordered_multimap;
+ #include <tr1/unordered_set>
+ using std::tr1::unordered_set;
+ using std::tr1::unordered_multiset;
++#endif
+ #include <vector>
+ using std::vector;
+ 
+--- ./src/include/fst/extensions/pdt/paren.h.orig	2013-01-24 11:36:25.000000000 +0900
++++ ./src/include/fst/extensions/pdt/paren.h	2013-11-17 00:23:01.000000000 +0900
+@@ -23,12 +23,21 @@
+ #define FST_EXTENSIONS_PDT_PAREN_H_
+ 
+ #include <algorithm>
++#if __cplusplus >= 201103L || defined(_LIBCPP_VERSION)
++#include <unordered_map>
++using std::unordered_map;
++using std::unordered_multimap;
++#include <unordered_set>
++using std::unordered_set;
++using std::unordered_multiset;
++#else
+ #include <tr1/unordered_map>
+ using std::tr1::unordered_map;
+ using std::tr1::unordered_multimap;
+ #include <tr1/unordered_set>
+ using std::tr1::unordered_set;
+ using std::tr1::unordered_multiset;
++#endif
+ #include <set>
+ 
+ #include <fst/extensions/pdt/pdt.h>
+--- ./src/include/fst/extensions/pdt/pdt.h.orig	2013-01-24 11:36:25.000000000 +0900
++++ ./src/include/fst/extensions/pdt/pdt.h	2013-11-17 00:23:01.000000000 +0900
+@@ -21,9 +21,15 @@
+ #ifndef FST_EXTENSIONS_PDT_PDT_H__
+ #define FST_EXTENSIONS_PDT_PDT_H__
+ 
++#if __cplusplus >= 201103L || defined(_LIBCPP_VERSION)
++#include <unordered_map>
++using std::unordered_map;
++using std::unordered_multimap;
++#else
+ #include <tr1/unordered_map>
+ using std::tr1::unordered_map;
+ using std::tr1::unordered_multimap;
++#endif
+ #include <map>
+ #include <set>
+ 
+--- ./src/include/fst/extensions/pdt/replace.h.orig	2013-11-02 10:14:35.000000000 +0900
++++ ./src/include/fst/extensions/pdt/replace.h	2013-11-17 00:23:01.000000000 +0900
+@@ -21,9 +21,15 @@
+ #ifndef FST_EXTENSIONS_PDT_REPLACE_H__
+ #define FST_EXTENSIONS_PDT_REPLACE_H__
+ 
++#if __cplusplus >= 201103L || defined(_LIBCPP_VERSION)
++#include <unordered_map>
++using std::unordered_map;
++using std::unordered_multimap;
++#else
+ #include <tr1/unordered_map>
+ using std::tr1::unordered_map;
+ using std::tr1::unordered_multimap;
++#endif
+ 
+ #include <fst/replace.h>
+ 
+--- ./src/include/fst/extensions/pdt/reverse.h.orig	2013-01-24 11:36:25.000000000 +0900
++++ ./src/include/fst/extensions/pdt/reverse.h	2013-11-17 00:23:01.000000000 +0900
+@@ -21,9 +21,15 @@
+ #ifndef FST_EXTENSIONS_PDT_REVERSE_H__
+ #define FST_EXTENSIONS_PDT_REVERSE_H__
+ 
++#if __cplusplus >= 201103L || defined(_LIBCPP_VERSION)
++#include <unordered_map>
++using std::unordered_map;
++using std::unordered_multimap;
++#else
+ #include <tr1/unordered_map>
+ using std::tr1::unordered_map;
+ using std::tr1::unordered_multimap;
++#endif
+ #include <vector>
+ using std::vector;
+ 
+--- ./src/include/fst/extensions/pdt/shortest-path.h.orig	2013-01-24 11:36:25.000000000 +0900
++++ ./src/include/fst/extensions/pdt/shortest-path.h	2013-11-17 00:23:01.000000000 +0900
+@@ -25,12 +25,21 @@
+ #include <fst/extensions/pdt/paren.h>
+ #include <fst/extensions/pdt/pdt.h>
+ 
++#if __cplusplus >= 201103L || defined(_LIBCPP_VERSION)
++#include <unordered_map>
++using std::unordered_map;
++using std::unordered_multimap;
++#include <unordered_set>
++using std::unordered_set;
++using std::unordered_multiset;
++#else
+ #include <tr1/unordered_map>
+ using std::tr1::unordered_map;
+ using std::tr1::unordered_multimap;
+ #include <tr1/unordered_set>
+ using std::tr1::unordered_set;
+ using std::tr1::unordered_multiset;
++#endif
+ #include <stack>
+ #include <vector>
+ using std::vector;
+--- ./src/include/fst/factor-weight.h.orig	2013-01-24 11:36:23.000000000 +0900
++++ ./src/include/fst/factor-weight.h	2013-11-17 00:23:01.000000000 +0900
+@@ -22,9 +22,15 @@
+ #define FST_LIB_FACTOR_WEIGHT_H__
+ 
+ #include <algorithm>
++#if __cplusplus >= 201103L || defined(_LIBCPP_VERSION)
++#include <unordered_map>
++using std::unordered_map;
++using std::unordered_multimap;
++#else
+ #include <tr1/unordered_map>
+ using std::tr1::unordered_map;
+ using std::tr1::unordered_multimap;
++#endif
+ #include <string>
+ #include <utility>
+ using std::pair; using std::make_pair;
+--- ./src/include/fst/label-reachable.h.orig	2013-01-24 11:36:23.000000000 +0900
++++ ./src/include/fst/label-reachable.h	2013-11-17 00:23:01.000000000 +0900
+@@ -23,9 +23,15 @@
+ #ifndef FST_LIB_LABEL_REACHABLE_H__
+ #define FST_LIB_LABEL_REACHABLE_H__
+ 
++#if __cplusplus >= 201103L || defined(_LIBCPP_VERSION)
++#include <unordered_map>
++using std::unordered_map;
++using std::unordered_multimap;
++#else
+ #include <tr1/unordered_map>
+ using std::tr1::unordered_map;
+ using std::tr1::unordered_multimap;
++#endif
+ #include <vector>
+ using std::vector;
+ 
+--- ./src/include/fst/relabel.h.orig	2013-01-24 11:36:23.000000000 +0900
++++ ./src/include/fst/relabel.h	2013-11-17 00:23:01.000000000 +0900
+@@ -21,9 +21,15 @@
+ #ifndef FST_LIB_RELABEL_H__
+ #define FST_LIB_RELABEL_H__
+ 
++#if __cplusplus >= 201103L || defined(_LIBCPP_VERSION)
++#include <unordered_map>
++using std::unordered_map;
++using std::unordered_multimap;
++#else
+ #include <tr1/unordered_map>
+ using std::tr1::unordered_map;
+ using std::tr1::unordered_multimap;
++#endif
+ #include <string>
+ #include <utility>
+ using std::pair; using std::make_pair;
+@@ -34,9 +40,15 @@
+ #include <fst/test-properties.h>
+ 
+ 
++#if __cplusplus >= 201103L || defined(_LIBCPP_VERSION)
++#include <unordered_map>
++using std::unordered_map;
++using std::unordered_multimap;
++#else
+ #include <tr1/unordered_map>
+ using std::tr1::unordered_map;
+ using std::tr1::unordered_multimap;
++#endif
+ 
+ namespace fst {
+ 
+--- ./src/include/fst/replace-util.h.orig	2013-01-24 11:36:24.000000000 +0900
++++ ./src/include/fst/replace-util.h	2013-11-17 00:23:01.000000000 +0900
+@@ -25,12 +25,21 @@
+ 
+ #include <vector>
+ using std::vector;
++#if __cplusplus >= 201103L || defined(_LIBCPP_VERSION)
++#include <unordered_map>
++using std::unordered_map;
++using std::unordered_multimap;
++#include <unordered_set>
++using std::unordered_set;
++using std::unordered_multiset;
++#else
+ #include <tr1/unordered_map>
+ using std::tr1::unordered_map;
+ using std::tr1::unordered_multimap;
+ #include <tr1/unordered_set>
+ using std::tr1::unordered_set;
+ using std::tr1::unordered_multiset;
++#endif
+ #include <map>
+ 
+ #include <fst/connect.h>
+--- ./src/include/fst/replace.h.orig	2013-01-24 11:36:24.000000000 +0900
++++ ./src/include/fst/replace.h	2013-11-17 00:23:01.000000000 +0900
+@@ -22,9 +22,15 @@
+ #ifndef FST_LIB_REPLACE_H__
+ #define FST_LIB_REPLACE_H__
+ 
++#if __cplusplus >= 201103L || defined(_LIBCPP_VERSION)
++#include <unordered_map>
++using std::unordered_map;
++using std::unordered_multimap;
++#else
+ #include <tr1/unordered_map>
+ using std::tr1::unordered_map;
+ using std::tr1::unordered_multimap;
++#endif
+ #include <set>
+ #include <string>
+ #include <utility>
+--- ./src/include/fst/rmepsilon.h.orig	2013-01-24 11:36:24.000000000 +0900
++++ ./src/include/fst/rmepsilon.h	2013-11-17 00:23:01.000000000 +0900
+@@ -21,9 +21,15 @@
+ #ifndef FST_LIB_RMEPSILON_H__
+ #define FST_LIB_RMEPSILON_H__
+ 
++#if __cplusplus >= 201103L || defined(_LIBCPP_VERSION)
++#include <unordered_map>
++using std::unordered_map;
++using std::unordered_multimap;
++#else
+ #include <tr1/unordered_map>
+ using std::tr1::unordered_map;
+ using std::tr1::unordered_multimap;
++#endif
+ #include <fst/slist.h>
+ #include <stack>
+ #include <string>
+--- ./src/include/fst/rmfinalepsilon.h.orig	2013-01-24 11:36:24.000000000 +0900
++++ ./src/include/fst/rmfinalepsilon.h	2013-11-17 00:23:01.000000000 +0900
+@@ -21,9 +21,15 @@
+ #ifndef FST_LIB_RMFINALEPSILON_H__
+ #define FST_LIB_RMFINALEPSILON_H__
+ 
++#if __cplusplus >= 201103L || defined(_LIBCPP_VERSION)
++#include <unordered_set>
++using std::unordered_set;
++using std::unordered_multiset;
++#else
+ #include <tr1/unordered_set>
+ using std::tr1::unordered_set;
+ using std::tr1::unordered_multiset;
++#endif
+ #include <vector>
+ using std::vector;
+ 
+--- ./src/include/fst/script/compile-impl.h.orig	2013-01-24 11:36:26.000000000 +0900
++++ ./src/include/fst/script/compile-impl.h	2013-11-17 00:23:01.000000000 +0900
+@@ -21,9 +21,15 @@
+ #ifndef FST_SCRIPT_COMPILE_IMPL_H_
+ #define FST_SCRIPT_COMPILE_IMPL_H_
+ 
++#if __cplusplus >= 201103L || defined(_LIBCPP_VERSION)
++#include <unordered_map>
++using std::unordered_map;
++using std::unordered_multimap;
++#else
+ #include <tr1/unordered_map>
+ using std::tr1::unordered_map;
+ using std::tr1::unordered_multimap;
++#endif
+ #include <sstream>
+ #include <string>
+ #include <vector>
+--- ./src/include/fst/sparse-tuple-weight.h.orig	2013-01-24 11:36:24.000000000 +0900
++++ ./src/include/fst/sparse-tuple-weight.h	2013-11-17 00:23:01.000000000 +0900
+@@ -33,9 +33,15 @@
+ #include<string>
+ #include<list>
+ #include<stack>
++#if __cplusplus >= 201103L || defined(_LIBCPP_VERSION)
++#include<unordered_map>
++using std::unordered_map;
++using std::unordered_multimap;
++#else
+ #include<tr1/unordered_map>
+ using std::tr1::unordered_map;
+ using std::tr1::unordered_multimap;
++#endif
+ 
+ #include <fst/weight.h>
+ 
+--- ./src/include/fst/state-map.h.orig	2013-01-24 11:36:24.000000000 +0900
++++ ./src/include/fst/state-map.h	2013-11-17 00:23:01.000000000 +0900
+@@ -23,9 +23,15 @@
+ #define FST_LIB_STATE_MAP_H__
+ 
+ #include <algorithm>
++#if __cplusplus >= 201103L || defined(_LIBCPP_VERSION)
++#include <unordered_map>
++using std::unordered_map;
++using std::unordered_multimap;
++#else
+ #include <tr1/unordered_map>
+ using std::tr1::unordered_map;
+ using std::tr1::unordered_multimap;
++#endif
+ #include <string>
+ #include <utility>
+ using std::pair; using std::make_pair;
+--- ./src/include/fst/symbol-table-ops.h.orig	2013-01-24 11:36:24.000000000 +0900
++++ ./src/include/fst/symbol-table-ops.h	2013-11-17 00:23:01.000000000 +0900
+@@ -20,9 +20,15 @@
+ #include <vector>
+ using std::vector;
+ #include <string>
++#if __cplusplus >= 201103L || defined(_LIBCPP_VERSION)
++#include <unordered_set>
++using std::unordered_set;
++using std::unordered_multiset;
++#else
+ #include <tr1/unordered_set>
+ using std::tr1::unordered_set;
+ using std::tr1::unordered_multiset;
++#endif
+ 
+ 
+ #include <fst/fst.h>
+--- ./src/include/fst/synchronize.h.orig	2013-01-24 11:36:24.000000000 +0900
++++ ./src/include/fst/synchronize.h	2013-11-17 00:23:01.000000000 +0900
+@@ -22,12 +22,21 @@
+ #define FST_LIB_SYNCHRONIZE_H__
+ 
+ #include <algorithm>
++#if __cplusplus >= 201103L || defined(_LIBCPP_VERSION)
++#include <unordered_map>
++using std::unordered_map;
++using std::unordered_multimap;
++#include <unordered_set>
++using std::unordered_set;
++using std::unordered_multiset;
++#else
+ #include <tr1/unordered_map>
+ using std::tr1::unordered_map;
+ using std::tr1::unordered_multimap;
+ #include <tr1/unordered_set>
+ using std::tr1::unordered_set;
+ using std::tr1::unordered_multiset;
++#endif
+ #include <string>
+ #include <utility>
+ using std::pair; using std::make_pair;
+--- ./src/include/fst/test-properties.h.orig	2013-01-24 11:36:24.000000000 +0900
++++ ./src/include/fst/test-properties.h	2013-11-17 00:23:01.000000000 +0900
+@@ -21,9 +21,15 @@
+ #ifndef FST_LIB_TEST_PROPERTIES_H__
+ #define FST_LIB_TEST_PROPERTIES_H__
+ 
++#if __cplusplus >= 201103L || defined(_LIBCPP_VERSION)
++#include <unordered_set>
++using std::unordered_set;
++using std::unordered_multiset;
++#else
+ #include <tr1/unordered_set>
+ using std::tr1::unordered_set;
+ using std::tr1::unordered_multiset;
++#endif
+ 
+ #include <fst/dfs-visit.h>
+ #include <fst/connect.h>
+--- ./src/include/fst/util.h.orig	2013-01-24 11:36:24.000000000 +0900
++++ ./src/include/fst/util.h	2013-11-17 00:23:01.000000000 +0900
+@@ -21,12 +21,21 @@
+ #ifndef FST_LIB_UTIL_H__
+ #define FST_LIB_UTIL_H__
+ 
++#if __cplusplus >= 201103L || defined(_LIBCPP_VERSION)
++#include <unordered_map>
++using std::unordered_map;
++using std::unordered_multimap;
++#include <unordered_set>
++using std::unordered_set;
++using std::unordered_multiset;
++#else
+ #include <tr1/unordered_map>
+ using std::tr1::unordered_map;
+ using std::tr1::unordered_multimap;
+ #include <tr1/unordered_set>
+ using std::tr1::unordered_set;
+ using std::tr1::unordered_multiset;
++#endif
+ #include <list>
+ #include <map>
+ #include <set>

Added: trunk/dports/devel/openfst/files/patch-src-include-fst-config.h.in.diff
===================================================================
--- trunk/dports/devel/openfst/files/patch-src-include-fst-config.h.in.diff	                        (rev 0)
+++ trunk/dports/devel/openfst/files/patch-src-include-fst-config.h.in.diff	2013-11-16 15:49:40 UTC (rev 113460)
@@ -0,0 +1,12 @@
+--- src/include/fst/config.h.in.orig	2010-12-18 00:43:31.000000000 +0900
++++ src/include/fst/config.h.in	2013-11-17 00:27:51.000000000 +0900
+@@ -5,7 +5,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_
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20131116/6e6e8b76/attachment-0001.html>


More information about the macports-changes mailing list