Index: head/textproc/randlm/Makefile =================================================================== --- head/textproc/randlm/Makefile (revision 366895) +++ head/textproc/randlm/Makefile (revision 366896) @@ -1,31 +1,31 @@ # Created by: Dmitry Sivachenko # $FreeBSD$ PORTNAME= randlm PORTVERSION= 0.2.5 CATEGORIES= textproc MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR=${PORTNAME} MAINTAINER= demon@FreeBSD.org COMMENT= A toolkit for building randomized language models BUILD_DEPENDS= ${LOCALBASE}/include/google/sparse_hash_map:${PORTSDIR}/devel/google-sparsehash LIB_DEPENDS= libboost_thread.so:${PORTSDIR}/devel/boost-libs RUN_DEPENDS= ${LOCALBASE}/include/google/sparse_hash_map:${PORTSDIR}/devel/google-sparsehash GNU_CONFIGURE= yes USE_PERL5= run USE_AUTOTOOLS= libtoolize aclocal autoconf automake AUTOMAKE_ARGS= --add-missing USE_LDCONFIG= yes USES= libtool compiler:c++11-lang MAKE_JOBS_UNSAFE=yes -CXXFLAGS+= -std=c++11 -I${LOCALBASE}/include +CXXFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib post-patch: cd ${WRKSRC}/hadoop && ${MV} strings.cpp strings.cc && ${MV} strings.h s.h ${REINPLACE_CMD} -e s#strings.h#s.h# ${WRKSRC}/hadoop/r_compute_ngram_counts.cpp ${WRKSRC}/hadoop/m_compute_ngram_counts_batch.cpp .include Index: head/textproc/randlm/files/patch-src-RandLM-RandLMPreproc.h =================================================================== --- head/textproc/randlm/files/patch-src-RandLM-RandLMPreproc.h (revision 366895) +++ head/textproc/randlm/files/patch-src-RandLM-RandLMPreproc.h (nonexistent) @@ -1,11 +0,0 @@ ---- src/RandLM/RandLMPreproc.h.orig 2014-09-01 18:11:27.000000000 +0400 -+++ src/RandLM/RandLMPreproc.h 2014-09-01 18:11:43.000000000 +0400 -@@ -407,7 +407,7 @@ namespace randlm { - // Concrete subclass of NormalisedNgramFile for backoff model data - class BackoffModelFile : public NormalisedNgramFile { - public: -- static const float kNullBackoffWeight = 0; // indicates lack of backoff weight -+ static constexpr float kNullBackoffWeight = 0; // indicates lack of backoff weight - static bool ValidWeight(float boweight); - // creation at start of pipeline (i.e. load a preprocess backoff model) - BackoffModelFile(const std::string & input_path, const std::string & input_type, Property changes on: head/textproc/randlm/files/patch-src-RandLM-RandLMPreproc.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/textproc/randlm/files/patch-src-RandLM-RandLM.h =================================================================== --- head/textproc/randlm/files/patch-src-RandLM-RandLM.h (revision 366895) +++ head/textproc/randlm/files/patch-src-RandLM-RandLM.h (nonexistent) @@ -1,13 +0,0 @@ ---- src/RandLM/RandLM.h.orig 2012-03-30 13:53:30.000000000 +0400 -+++ src/RandLM/RandLM.h 2014-09-01 18:11:00.000000000 +0400 -@@ -86,8 +86,8 @@ namespace randlm { - - static const std::string kRandLMFileType; - -- static const float kNullLogProb = -1000000; -- static const float kUnknownLogProb = 1000000; -+ static constexpr float kNullLogProb = -1000000; -+ static constexpr float kUnknownLogProb = 1000000; - - static const int kMainEventIdx = 0; - static const int kAuxEventIdx = 1; Property changes on: head/textproc/randlm/files/patch-src-RandLM-RandLM.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/textproc/randlm/files/patch-src-RandLM-RandLMQuantiser.h =================================================================== --- head/textproc/randlm/files/patch-src-RandLM-RandLMQuantiser.h (revision 366895) +++ head/textproc/randlm/files/patch-src-RandLM-RandLMQuantiser.h (nonexistent) @@ -1,11 +0,0 @@ ---- src/RandLM/RandLMQuantiser.h.orig 2014-09-01 18:09:32.000000000 +0400 -+++ src/RandLM/RandLMQuantiser.h 2014-09-01 18:09:51.000000000 +0400 -@@ -38,7 +38,7 @@ namespace randlm { - - class Quantiser { - public: -- static const float kFloatErr = 0.00001f; -+ static constexpr float kFloatErr = 0.00001f; - - Quantiser(RandLMInfo* info, Stats* stats, EventType event) - : info_(info), event_type_(event), code_to_value_(NULL), Property changes on: head/textproc/randlm/files/patch-src-RandLM-RandLMQuantiser.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property