7 files changed, 104 insertions, 4 deletions

diff --git a/textproc/randlm/Makefile b/textproc/randlm/Makefile
index 57b7e22f2ca5..3e90b8046b5e 100644
--- a/textproc/randlm/Makefile
+++ b/textproc/randlm/Makefile
@@ -15,17 +15,17 @@ 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_GCC=	yes
 USE_PERL5=	run
 USE_AUTOTOOLS=	libtoolize aclocal autoconf automake
 AUTOMAKE_ARGS=	--add-missing
 USE_LDCONFIG=	yes
-USES=		libtool
+USES=		libtool compiler:c++11-lang
 MAKE_JOBS_UNSAFE=yes
-CFLAGS+=	-I${LOCALBASE}/include
+CXXFLAGS+=	-std=c++11 -I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-patch:
-	cd ${WRKSRC}/hadoop && ${MV} strings.cpp strings.cc
+	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 <bsd.port.mk>
diff --git a/textproc/randlm/files/patch-src-RandLM-LogFreqSketch.cpp b/textproc/randlm/files/patch-src-RandLM-LogFreqSketch.cpp
new file mode 100644
index 000000000000..7665b3731725
--- /dev/null
+++ b/textproc/randlm/files/patch-src-RandLM-LogFreqSketch.cpp
@@ -0,0 +1,20 @@
+--- src/RandLM/LogFreqSketch.cpp.orig	2012-03-30 13:53:30.000000000 +0400
++++ src/RandLM/LogFreqSketch.cpp	2014-09-01 18:22:05.000000000 +0400
+@@ -162,7 +162,7 @@ namespace randlm {
+ 
+   bool LogFreqSketch::load(RandLMFile* fin) {
+     // just maximum m 
+-    return fin->read((char*)&maximum_m_, sizeof(maximum_m_));;
++    return fin->read((char*)&maximum_m_, sizeof(maximum_m_)).good();
+   }
+ 
+   bool LogFreqSketch::save(RandLMFile* fout) {
+@@ -170,7 +170,7 @@ namespace randlm {
+     assert(LogFreqBloomFilter::save(fout));  // saves RandLMStruct first
+     assert(OnlineRandLMStruct::save(fout));
+     // just maximum m
+-    return fout->write((char*)&maximum_m_, sizeof(maximum_m_));;
++    return fout->write((char*)&maximum_m_, sizeof(maximum_m_)).good();
+   }
+ 
+ }
diff --git a/textproc/randlm/files/patch-src-RandLM-RandLM.h b/textproc/randlm/files/patch-src-RandLM-RandLM.h
new file mode 100644
index 000000000000..031dff1e273b
--- /dev/null
+++ b/textproc/randlm/files/patch-src-RandLM-RandLM.h
@@ -0,0 +1,13 @@
+--- 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;
diff --git a/textproc/randlm/files/patch-src-RandLM-RandLMFilter.h b/textproc/randlm/files/patch-src-RandLM-RandLMFilter.h
new file mode 100644
index 000000000000..da03cccc4618
--- /dev/null
+++ b/textproc/randlm/files/patch-src-RandLM-RandLMFilter.h
@@ -0,0 +1,34 @@
+--- src/RandLM/RandLMFilter.h.orig	2014-09-01 18:07:56.000000000 +0400
++++ src/RandLM/RandLMFilter.h	2014-09-01 18:08:39.000000000 +0400
+@@ -289,7 +289,7 @@ namespace randlm {
+       std::cerr << "Saved ResizedBitFilter. Rho = " << rho() << "." << std::endl;
+       assert(fout->write((char*)&old_addresses_, sizeof(old_addresses_)));
+       assert(fout->write((char*)&a_, sizeof(a_)));
+-      return fout->write((char*)&b_, sizeof(b_));
++      return fout->write((char*)&b_, sizeof(b_)).good();
+     }
+   protected:
+     bool load(RandLMFile* fin) {
+@@ -297,7 +297,7 @@ namespace randlm {
+       std::cerr << "Loaded ResizedBitFilter. Rho = " << rho() << "." << std::endl;
+       assert(fin->read((char*)&old_addresses_, sizeof(old_addresses_)));
+       assert(fin->read((char*)&a_, sizeof(a_)));
+-      return fin->read((char*)&b_, sizeof(b_));
++      return fin->read((char*)&b_, sizeof(b_)).good();
+     }
+     // member data
+     uint64_t old_addresses_;  // size of pre-resized filter
+@@ -342,11 +342,11 @@ namespace randlm {
+     }
+     bool save(RandLMFile* fout) {
+       assert(Filter<T>::save(fout));
+-      return fout->write((char*)&wrap_around_, sizeof(wrap_around_));
++      return fout->write((char*)&wrap_around_, sizeof(wrap_around_)).good();
+     }
+     private:
+     bool load(RandLMFile* fin) {
+-      return fin->read((char*)&wrap_around_, sizeof(wrap_around_));
++      return fin->read((char*)&wrap_around_, sizeof(wrap_around_)).good();
+     }
+     inline bool incrementSubCell(int bit, int len, T* cell) {
+       // increment counter consisting of bits [startbit, startbit + len - 1] rest stays unchanged
diff --git a/textproc/randlm/files/patch-src-RandLM-RandLMPreproc.h b/textproc/randlm/files/patch-src-RandLM-RandLMPreproc.h
new file mode 100644
index 000000000000..1208aefeea7c
--- /dev/null
+++ b/textproc/randlm/files/patch-src-RandLM-RandLMPreproc.h
@@ -0,0 +1,11 @@
+--- 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,
diff --git a/textproc/randlm/files/patch-src-RandLM-RandLMQuantiser.h b/textproc/randlm/files/patch-src-RandLM-RandLMQuantiser.h
new file mode 100644
index 000000000000..892f83c96a6d
--- /dev/null
+++ b/textproc/randlm/files/patch-src-RandLM-RandLMQuantiser.h
@@ -0,0 +1,11 @@
+--- 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),
diff --git a/textproc/randlm/files/patch-src-RandLM-RandLMTypes.h b/textproc/randlm/files/patch-src-RandLM-RandLMTypes.h
new file mode 100644
index 000000000000..8302256066c6
--- /dev/null
+++ b/textproc/randlm/files/patch-src-RandLM-RandLMTypes.h
@@ -0,0 +1,11 @@
+--- src/RandLM/RandLMTypes.h.orig	2014-09-01 18:20:25.000000000 +0400
++++ src/RandLM/RandLMTypes.h	2014-09-01 18:21:06.000000000 +0400
+@@ -21,7 +21,7 @@
+ #include <string>
+ #include <stdint.h>
+ 
+-#define iterate(c,i) for(typeof(c.begin()) i = c.begin(); i != c.end(); i++)
++#define iterate(c,i) for(auto i = c.begin(); i != c.end(); i++)
+ 
+ namespace randlm {
+