From c100c44f2d28a145bd413ee36a1064b1db8992a8 Mon Sep 17 00:00:00 2001 From: Dmitry Marakasov Date: Fri, 4 Jul 2014 08:02:23 +0000 Subject: [PATCH] - Switch to USES=libtool, drop .la files - Fix build on 9.x: requires unordered_map, thus c++11-lib Approved by: portmgr blanket --- math/openfst/Makefile | 3 +- math/openfst/pkg-plist | 68 +++++++++++++++++++++--------------------- 2 files changed, 36 insertions(+), 35 deletions(-) diff --git a/math/openfst/Makefile b/math/openfst/Makefile index 2e1d8c4a9389..bdc458b2a8d7 100644 --- a/math/openfst/Makefile +++ b/math/openfst/Makefile @@ -3,6 +3,7 @@ PORTNAME= openfst PORTVERSION= 1.4.1 +PORTREVISION= 1 CATEGORIES= math MASTER_SITES= http://www.openfst.org/twiki/pub/FST/FstDownload/ @@ -11,7 +12,7 @@ COMMENT= Library for working with weighted finite-state transducers (FSTs) LICENSE= APACHE20 -USES= compiler:c++11-lang +USES= compiler:c++11-lib libtool USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+=--enable-compact-fsts --enable-const-fsts --enable-far --enable-linear-fsts --enable-ngram-fsts --enable-lookahead-fsts --enable-pdt diff --git a/math/openfst/pkg-plist b/math/openfst/pkg-plist index dbeecb1c92a9..6a7a497a2956 100644 --- a/math/openfst/pkg-plist +++ b/math/openfst/pkg-plist @@ -232,108 +232,108 @@ include/fst/vector-fst.h include/fst/verify.h include/fst/visit.h include/fst/weight.h -lib/fst/arc_lookahead-fst.la lib/fst/arc_lookahead-fst.so lib/fst/arc_lookahead-fst.so.0 -lib/fst/compact16_acceptor-fst.la +lib/fst/arc_lookahead-fst.so.0.0.0 lib/fst/compact16_acceptor-fst.so lib/fst/compact16_acceptor-fst.so.0 -lib/fst/compact16_string-fst.la +lib/fst/compact16_acceptor-fst.so.0.0.0 lib/fst/compact16_string-fst.so lib/fst/compact16_string-fst.so.0 -lib/fst/compact16_unweighted-fst.la +lib/fst/compact16_string-fst.so.0.0.0 lib/fst/compact16_unweighted-fst.so lib/fst/compact16_unweighted-fst.so.0 -lib/fst/compact16_unweighted_acceptor-fst.la +lib/fst/compact16_unweighted-fst.so.0.0.0 lib/fst/compact16_unweighted_acceptor-fst.so lib/fst/compact16_unweighted_acceptor-fst.so.0 -lib/fst/compact16_weighted_string-fst.la +lib/fst/compact16_unweighted_acceptor-fst.so.0.0.0 lib/fst/compact16_weighted_string-fst.so lib/fst/compact16_weighted_string-fst.so.0 -lib/fst/compact64_acceptor-fst.la +lib/fst/compact16_weighted_string-fst.so.0.0.0 lib/fst/compact64_acceptor-fst.so lib/fst/compact64_acceptor-fst.so.0 -lib/fst/compact64_string-fst.la +lib/fst/compact64_acceptor-fst.so.0.0.0 lib/fst/compact64_string-fst.so lib/fst/compact64_string-fst.so.0 -lib/fst/compact64_unweighted-fst.la +lib/fst/compact64_string-fst.so.0.0.0 lib/fst/compact64_unweighted-fst.so lib/fst/compact64_unweighted-fst.so.0 -lib/fst/compact64_unweighted_acceptor-fst.la +lib/fst/compact64_unweighted-fst.so.0.0.0 lib/fst/compact64_unweighted_acceptor-fst.so lib/fst/compact64_unweighted_acceptor-fst.so.0 -lib/fst/compact64_weighted_string-fst.la +lib/fst/compact64_unweighted_acceptor-fst.so.0.0.0 lib/fst/compact64_weighted_string-fst.so lib/fst/compact64_weighted_string-fst.so.0 -lib/fst/compact8_acceptor-fst.la +lib/fst/compact64_weighted_string-fst.so.0.0.0 lib/fst/compact8_acceptor-fst.so lib/fst/compact8_acceptor-fst.so.0 -lib/fst/compact8_string-fst.la +lib/fst/compact8_acceptor-fst.so.0.0.0 lib/fst/compact8_string-fst.so lib/fst/compact8_string-fst.so.0 -lib/fst/compact8_unweighted-fst.la +lib/fst/compact8_string-fst.so.0.0.0 lib/fst/compact8_unweighted-fst.so lib/fst/compact8_unweighted-fst.so.0 -lib/fst/compact8_unweighted_acceptor-fst.la +lib/fst/compact8_unweighted-fst.so.0.0.0 lib/fst/compact8_unweighted_acceptor-fst.so lib/fst/compact8_unweighted_acceptor-fst.so.0 -lib/fst/compact8_weighted_string-fst.la +lib/fst/compact8_unweighted_acceptor-fst.so.0.0.0 lib/fst/compact8_weighted_string-fst.so lib/fst/compact8_weighted_string-fst.so.0 -lib/fst/const16-fst.la +lib/fst/compact8_weighted_string-fst.so.0.0.0 lib/fst/const16-fst.so lib/fst/const16-fst.so.0 -lib/fst/const64-fst.la +lib/fst/const16-fst.so.0.0.0 lib/fst/const64-fst.so lib/fst/const64-fst.so.0 -lib/fst/const8-fst.la +lib/fst/const64-fst.so.0.0.0 lib/fst/const8-fst.so lib/fst/const8-fst.so.0 -lib/fst/ilabel_lookahead-fst.la +lib/fst/const8-fst.so.0.0.0 lib/fst/ilabel_lookahead-fst.so lib/fst/ilabel_lookahead-fst.so.0 -lib/fst/libfstcompact.la +lib/fst/ilabel_lookahead-fst.so.0.0.0 lib/fst/libfstcompact.so lib/fst/libfstcompact.so.1 -lib/fst/libfstconst.la +lib/fst/libfstcompact.so.1.0.0 lib/fst/libfstconst.so lib/fst/libfstconst.so.1 -lib/fst/libfstfar.la +lib/fst/libfstconst.so.1.0.0 lib/fst/libfstfar.so lib/fst/libfstfar.so.1 -lib/fst/libfstfarscript.la +lib/fst/libfstfar.so.1.0.0 lib/fst/libfstfarscript.so lib/fst/libfstfarscript.so.1 -lib/fst/libfstlinearscript.la +lib/fst/libfstfarscript.so.1.0.0 lib/fst/libfstlinearscript.so lib/fst/libfstlinearscript.so.1 -lib/fst/libfstlookahead.la +lib/fst/libfstlinearscript.so.1.0.0 lib/fst/libfstlookahead.so lib/fst/libfstlookahead.so.0 -lib/fst/libfstngram.la +lib/fst/libfstlookahead.so.0.0.0 lib/fst/libfstngram.so lib/fst/libfstngram.so.1 -lib/fst/libfstpdtscript.la +lib/fst/libfstngram.so.1.0.0 lib/fst/libfstpdtscript.so lib/fst/libfstpdtscript.so.1 -lib/fst/linear_classifier-fst.la +lib/fst/libfstpdtscript.so.1.0.0 lib/fst/linear_classifier-fst.so lib/fst/linear_classifier-fst.so.0 -lib/fst/linear_tagger-fst.la +lib/fst/linear_classifier-fst.so.0.0.0 lib/fst/linear_tagger-fst.so lib/fst/linear_tagger-fst.so.0 -lib/fst/ngram-fst.la +lib/fst/linear_tagger-fst.so.0.0.0 lib/fst/ngram-fst.so lib/fst/ngram-fst.so.0 -lib/fst/olabel_lookahead-fst.la +lib/fst/ngram-fst.so.0.0.0 lib/fst/olabel_lookahead-fst.so lib/fst/olabel_lookahead-fst.so.0 -lib/libfst.la +lib/fst/olabel_lookahead-fst.so.0.0.0 lib/libfst.so lib/libfst.so.3 -lib/libfstscript.la +lib/libfst.so.3.0.0 lib/libfstscript.so lib/libfstscript.so.1 +lib/libfstscript.so.1.0.0 @dirrm lib/fst @dirrm include/fst/extensions/far @dirrm include/fst/extensions/linear