From fef9554d1c44463cdff8b35048faa77be0a89aa5 Mon Sep 17 00:00:00 2001
From: Dmitry Sivachenko <demon@FreeBSD.org>
Date: Mon, 1 Sep 2014 12:09:12 +0000
Subject: [PATCH] Remove gcc-isms.

---
 textproc/irstlm/Makefile                      |  1 -
 .../irstlm/files/patch-src-interpolate-lm.cpp | 27 ++++++++++
 textproc/irstlm/files/patch-src-mdiadapt.cpp  | 54 +++++++++++++++++++
 3 files changed, 81 insertions(+), 1 deletion(-)
 create mode 100644 textproc/irstlm/files/patch-src-interpolate-lm.cpp
 create mode 100644 textproc/irstlm/files/patch-src-mdiadapt.cpp

diff --git a/textproc/irstlm/Makefile b/textproc/irstlm/Makefile
index 360a9aed3771..5f889b5475f6 100644
--- a/textproc/irstlm/Makefile
+++ b/textproc/irstlm/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS=	${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared
 USE_PERL5=	run
-USE_GCC=	yes
 USE_AUTOTOOLS=	libtoolize aclocal autoconf automake
 AUTOMAKE_ARGS=	--add-missing
 USES=		shebangfix libtool tar:tgz
diff --git a/textproc/irstlm/files/patch-src-interpolate-lm.cpp b/textproc/irstlm/files/patch-src-interpolate-lm.cpp
new file mode 100644
index 000000000000..bfa9b5f47a08
--- /dev/null
+++ b/textproc/irstlm/files/patch-src-interpolate-lm.cpp
@@ -0,0 +1,27 @@
+--- src/interpolate-lm.cpp.orig	2014-09-01 15:59:41.000000000 +0400
++++ src/interpolate-lm.cpp	2014-09-01 16:00:21.000000000 +0400
+@@ -230,7 +230,7 @@ int main(int argc, char **argv)
+   //Learning mixture weights
+   if (learn) {
+ 
+-    std::vector<float> p[N]; //LM probabilities
++    std::vector<float> *p = new std::vector<float>[N]; //LM probabilities
+     float c[N]; //expected counts
+     float den,norm; //inner denominator, normalization term
+     float variation=1.0; // global variation between new old params
+@@ -256,6 +256,7 @@ int main(int argc, char **argv)
+         lstream >> token >> id >> newlm;
+         if(id <= 0 || id > N) {
+           std::cerr << "LM id out of range." << std::endl;
++          delete[] p;
+           return 1;
+         }
+         id--; // count from 0 now
+@@ -318,6 +319,7 @@ int main(int argc, char **argv)
+     outtxt << "LMINTERPOLATION " << N << "\n";
+     for (int i=0; i<N; i++) outtxt << w[i] << " " << lmf[i] << "\n";
+     outtxt.close();
++    delete[] p;
+   }
+ 
+   for(int i = 0; i < N; i++)
diff --git a/textproc/irstlm/files/patch-src-mdiadapt.cpp b/textproc/irstlm/files/patch-src-mdiadapt.cpp
new file mode 100644
index 000000000000..73fa1d1c5106
--- /dev/null
+++ b/textproc/irstlm/files/patch-src-mdiadapt.cpp
@@ -0,0 +1,54 @@
+--- src/mdiadapt.cpp.orig	2014-09-01 15:41:52.000000000 +0400
++++ src/mdiadapt.cpp	2014-09-01 15:46:52.000000000 +0400
+@@ -1170,7 +1170,7 @@ int mdiadaptlm::saveBIN_per_word(char *f
+   }
+ 	
+ 	
+-  streampos pos[lmsize()+1];
++  streampos *pos = new streampos[lmsize()+1];
+   int maxlev=lmsize();
+   char buff[100];
+   int isQuant=0; //savebin for quantized LM is not yet implemented
+@@ -1385,7 +1385,7 @@ int mdiadaptlm::saveBIN_per_word(char *f
+     out.seekp(pos[i]);
+     out << buff;
+   }
+-	
++	delete[] pos;
+ 	out.close();
+ 	
+   //concatenate files for each single level into one file
+@@ -1420,7 +1420,7 @@ int mdiadaptlm::saveBIN_per_level(char *
+     VERBOSE(2,"savebin: " << filename << "\n");
+   }
+ 
+-  streampos pos[lmsize()+1];
++  streampos *pos = new streampos[lmsize()+1];
+   int maxlev=lmsize();
+   char buff[100];
+   int isQuant=0; //savebin for quantized LM is not yet implemented
+@@ -1583,6 +1583,7 @@ int mdiadaptlm::saveBIN_per_level(char *
+     out << buff;
+   }
+   out.close();
++  delete[] pos;
+ 
+   //concatenate files for each single level into one file
+ 	//single level files should have a name derived from "filename"
+@@ -1803,7 +1804,7 @@ int mdiadaptlm::saveARPA_per_level(char 
+   fstream out(filename,ios::out);
+   //  out.precision(15);
+ 
+-  streampos pos[lmsize()+1];
++  streampos *pos = new streampos[lmsize()+1]; 
+   table_entry_pos_t num[lmsize()+1];
+   char buff[100];
+ 
+@@ -1955,6 +1956,7 @@ int mdiadaptlm::saveARPA_per_level(char 
+     out << buff;
+   }
+ 
++  delete[] pos;
+   out.seekp(last);
+   out << "\\end\\" << "\n";
+   system("date");