diff options
Diffstat (limited to 'textproc/srilm/files')
| -rw-r--r-- | textproc/srilm/files/patch-Makefile.common.variables | 11 | ||||
| -rw-r--r-- | textproc/srilm/files/patch-Makefile.machine.freebsd | 36 | ||||
| -rw-r--r-- | textproc/srilm/files/patch-compare-outputs | 8 | ||||
| -rw-r--r-- | textproc/srilm/files/patch-dstruct-src-Array.h | 11 | ||||
| -rw-r--r-- | textproc/srilm/files/patch-go.run-test | 21 | ||||
| -rw-r--r-- | textproc/srilm/files/patch-lm-src-matherr.c | 16 |
6 files changed, 0 insertions, 103 deletions
diff --git a/textproc/srilm/files/patch-Makefile.common.variables b/textproc/srilm/files/patch-Makefile.common.variables deleted file mode 100644 index 4c90146bc4a5..000000000000 --- a/textproc/srilm/files/patch-Makefile.common.variables +++ /dev/null @@ -1,11 +0,0 @@ ---- common/Makefile.common.variables.orig Sat Feb 22 06:43:31 2003 -+++ common/Makefile.common.variables Thu Jan 1 02:57:25 2004 -@@ -52,7 +52,7 @@ - DEMANGLE_FILTER = 2>&1 | c++filt - - # Path to GNU awk; used in editing scripts --GAWK = /usr/local/bin/gawk -+GAWK = /usr/bin/awk - - # Include machine-type dependent variables - include $(SRILM)/common/Makefile.machine.$(MACHINE_TYPE) diff --git a/textproc/srilm/files/patch-Makefile.machine.freebsd b/textproc/srilm/files/patch-Makefile.machine.freebsd deleted file mode 100644 index 8000f1df35b0..000000000000 --- a/textproc/srilm/files/patch-Makefile.machine.freebsd +++ /dev/null @@ -1,36 +0,0 @@ ---- common/Makefile.machine.freebsd.orig 2006-01-05 23:25:59.000000000 +0300 -+++ common/Makefile.machine.freebsd 2014-07-24 15:58:41.000000000 +0400 -@@ -26,11 +26,11 @@ - EXPORT_LDFLAGS = -s - - # Shared compilation flags. -- CFLAGS = $(ADDITIONAL_CFLAGS) $(INCLUDES) -- CXXFLAGS = $(ADDITIONAL_CXXFLAGS) $(INCLUDES) -+ CFLAGS += $(ADDITIONAL_CFLAGS) $(INCLUDES) -+ CXXFLAGS += $(ADDITIONAL_CXXFLAGS) $(INCLUDES) - - # Shared linking flags. -- LDFLAGS = $(ADDITIONAL_LDFLAGS) -L$(SRILM_LIBDIR) -+ LDFLAGS += $(ADDITIONAL_LDFLAGS) -L$(SRILM_LIBDIR) - - # Other useful compilation flags. - ADDITIONAL_CFLAGS = -@@ -49,8 +49,8 @@ - RLD_FLAG = -R - - # Tcl support (part of cygwin) -- TCL_INCLUDE = -I/usr/local/include/tcl8.3 -- TCL_LIBRARY = -L/usr/local/lib -ltcl83 -+ TCL_INCLUDE = -I/usr/local/include/tcl8.4 -+ TCL_LIBRARY = -L/usr/local/lib -ltcl84 - - # No ranlib - RANLIB = : -@@ -65,6 +65,6 @@ - LINT_FLAGS = -DDEBUG $(CFLAGS) - - # Location of gawk binary -- GAWK = /usr/bin/gawk -+ GAWK = /usr/bin/awk - - diff --git a/textproc/srilm/files/patch-compare-outputs b/textproc/srilm/files/patch-compare-outputs deleted file mode 100644 index 0c2e2f774e92..000000000000 --- a/textproc/srilm/files/patch-compare-outputs +++ /dev/null @@ -1,8 +0,0 @@ ---- sbin/compare-outputs.orig Fri Feb 28 10:04:35 2003 -+++ sbin/compare-outputs Sat Apr 3 16:45:20 2004 -@@ -1,4 +1,4 @@ --#!/usr/local/bin/gawk -f -+#!/usr/bin/awk -f - # - # compare test outputs allowing for small numerical differences - # diff --git a/textproc/srilm/files/patch-dstruct-src-Array.h b/textproc/srilm/files/patch-dstruct-src-Array.h deleted file mode 100644 index 08d10253f443..000000000000 --- a/textproc/srilm/files/patch-dstruct-src-Array.h +++ /dev/null @@ -1,11 +0,0 @@ ---- dstruct/src/Array.h.orig 2014-09-02 15:48:38.000000000 +0400 -+++ dstruct/src/Array.h 2014-09-02 15:48:57.000000000 +0400 -@@ -89,7 +89,7 @@ public: - * gcc and icc allow this as part of the language, but many other C++ compilers - * don't (Sun Studio, MS Visual C). - */ --#if !defined(DEBUG) && defined(__GNUC__) && (!defined(__INTEL_COMPILER) || __INTEL_COMPILER >=900) -+#if !defined(DEBUG) && !defined(__clang__) && defined(__GNUC__) && (!defined(__INTEL_COMPILER) || __INTEL_COMPILER >=900) - # define makeArray(T, A, n) T A[n] - #else - # define makeArray(T, A, n) StaticArray<T> A(n) diff --git a/textproc/srilm/files/patch-go.run-test b/textproc/srilm/files/patch-go.run-test deleted file mode 100644 index accd14867823..000000000000 --- a/textproc/srilm/files/patch-go.run-test +++ /dev/null @@ -1,21 +0,0 @@ ---- sbin/go.run-test.orig 2009-12-02 23:15:49.000000000 +0300 -+++ sbin/go.run-test 2014-03-28 11:45:04.000000000 +0400 -@@ -6,6 +6,9 @@ - # $Header: /home/srilm/devel/lattice/test/../../sbin/RCS/go.run-test,v 1.13 2009/12/02 20:15:39 stolcke Exp $ - # - -+PATH=$PATH:$WRKSRC/bin:$WRKSRC/bin/freebsd -+export PATH -+ - dir=$1 - - if [ -z "$MACHINE_TYPE" ]; then -@@ -16,7 +19,7 @@ - - #diff=cmp - # ignore different whitespace and EOL conventions --diff="gawk -f $SRILM/sbin/compare-outputs 2>/dev/null" -+diff="awk -f $SRILM/sbin/compare-outputs 2>/dev/null" - - test -d output || mkdir output - diff --git a/textproc/srilm/files/patch-lm-src-matherr.c b/textproc/srilm/files/patch-lm-src-matherr.c deleted file mode 100644 index d4174d7c68b2..000000000000 --- a/textproc/srilm/files/patch-lm-src-matherr.c +++ /dev/null @@ -1,16 +0,0 @@ ---- lm/src/matherr.c.orig Fri Jul 29 11:29:51 2005 -+++ lm/src/matherr.c Mon Jul 3 15:16:58 2006 -@@ -18,13 +18,6 @@ - matherr(struct exception *x) - #endif - { -- if (x->type == SING && strcmp(x->name, "log10") == 0) { -- /* -- * suppress warnings about log10(0.0) -- */ -- return 1; -- } else { - return 0; -- } - } - |
