View | Details | Raw Unified | Return to bug 65116
Collapse All | Expand All

(-)./srilm/Makefile (-4 / +5 lines)
Lines 6-15 Link Here
6
#
6
#
7
7
8
PORTNAME=	srilm
8
PORTNAME=	srilm
9
PORTVERSION=	1.3.3
9
PORTVERSION=	1.4
10
CATEGORIES=	textproc
10
CATEGORIES=	textproc
11
DISTNAME=	srilm
11
DISTNAME=	srilm
12
EXTRACT_SUFX?=	.gz
12
EXTRACT_SUFX?=	.tgz
13
13
14
MAINTAINER=	clsung@dragon2.net
14
MAINTAINER=	clsung@dragon2.net
15
COMMENT=	Toolkit for building and applying statistical language models
15
COMMENT=	Toolkit for building and applying statistical language models
Lines 56-62 Link Here
56
		nbest-lattice.1 nbest-optimize.1 nbest-mix.1 \
56
		nbest-lattice.1 nbest-optimize.1 nbest-mix.1 \
57
		nbest-pron-score.1 segment.1 segment-nbest.1 hidden-ngram.1 \
57
		nbest-pron-score.1 segment.1 segment-nbest.1 hidden-ngram.1 \
58
		anti-ngram.1 multi-ngram.1 lattice-tool.1 training-scripts.1 \
58
		anti-ngram.1 multi-ngram.1 lattice-tool.1 training-scripts.1 \
59
		lm-scripts.1 ppl-scripts.1 pfsg-scripts.1 nbest-scripts.1
59
		lm-scripts.1 ppl-scripts.1 pfsg-scripts.1 nbest-scripts.1 \
60
		select-vocab.1
60
MAN3=		Prob.3 Vocab.3 LM.3 File.3
61
MAN3=		Prob.3 Vocab.3 LM.3 File.3
61
MAN5=		ngram-format.5 nbest-format.5 classes-format.5 \
62
MAN5=		ngram-format.5 nbest-format.5 classes-format.5 \
62
		pfsg-format.5 wlat-format.5
63
		pfsg-format.5 wlat-format.5
Lines 87-93 Link Here
87
88
88
do-install:
89
do-install:
89
	@${MKDIR} ${EXAMPLESDIR}
90
	@${MKDIR} ${EXAMPLESDIR}
90
	cd ${WRKSRC}/bin/${MACHINE_ARCH} && \
91
	cd ${WRKSRC}/bin/freebsd && \
91
		${INSTALL_PROGRAM} ${PROGRAMS} ${PREFIX}/bin && \
92
		${INSTALL_PROGRAM} ${PROGRAMS} ${PREFIX}/bin && \
92
		${INSTALL_SCRIPT} ${GAWK_SCRIPTS} ${EXAMPLESDIR} && \
93
		${INSTALL_SCRIPT} ${GAWK_SCRIPTS} ${EXAMPLESDIR} && \
93
	cd ${WRKSRC}/man/man1 && \
94
	cd ${WRKSRC}/man/man1 && \
(-)./srilm/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
MD5 (srilm.gz) = fc9ec46ba80466fcb6586899eead4f86
1
MD5 (srilm.tgz) = 5c084953c2f73ecf565f8791dfb401e0
2
SIZE (srilm.gz) = 28246362
2
SIZE (srilm.tgz) = 30125078
(-)./srilm/files/patch-Makefile.machine.freebsd (+10 lines)
Line 0 Link Here
1
--- common/Makefile.machine.freebsd.orig	Mon Oct 20 02:59:58 2003
2
+++ common/Makefile.machine.freebsd	Sat Apr  3 16:44:00 2004
3
@@ -65,6 +65,6 @@
4
    LINT_FLAGS = -DDEBUG $(CFLAGS)
5
 
6
    # Location of gawk binary
7
-   GAWK = /usr/bin/gawk
8
+   GAWK = /usr/bin/awk
9
 
10
 
(-)./srilm/files/patch-Makefile.machine.i386 (-72 lines)
Lines 1-72 Link Here
1
--- common/Makefile.machine.i386.orig	Thu Jan  1 12:44:20 2004
2
+++ common/Makefile.machine.i386	Thu Jan  1 12:38:27 2004
3
@@ -0,0 +1,69 @@
4
+#
5
+#    File:   Makefile.i686
6
+#    Author: The SRI DECIPHER (TM) System
7
+#    Date:   Fri Feb 19 22:45:31 PST 1999
8
+#
9
+#    Description:
10
+#	Machine dependent compilation options and variable definitions
11
+#	for Linux/i686 platform
12
+#
13
+#    Copyright (c) 1999-2001 SRI International.  All Rights Reserved.
14
+#
15
+#    $Header: /home/srilm/devel/common/RCS/Makefile.machine.i686,v 1.8 2003/02/21 22:30:00 stolcke Exp $
16
+#
17
+
18
+   # Use the GNU C compiler.
19
+   GCC_FLAGS = 
20
+   CC = gcc $(GCC_FLAGS)
21
+   CXX = g++ -Wno-deprecated $(GCC_FLAGS) -DINSTANTIATE_TEMPLATES
22
+
23
+   # Optional compilation flags.
24
+   OPTIMIZE_FLAGS = -g -O2
25
+   DEBUG_FLAGS = -g -DDEBUG
26
+   PROFILE_FLAGS = -g -pg -O2
27
+
28
+   # Optional linking flags.
29
+   EXPORT_LDFLAGS = -s
30
+
31
+   # Shared compilation flags.
32
+   CFLAGS = $(ADDITIONAL_CFLAGS) $(INCLUDES)
33
+   CXXFLAGS = $(ADDITIONAL_CXXFLAGS) $(INCLUDES)
34
+
35
+   # Shared linking flags.
36
+   LDFLAGS = $(ADDITIONAL_LDFLAGS) -L$(SRILM_LIBDIR)
37
+
38
+   # Other useful compilation flags.
39
+   ADDITIONAL_CFLAGS =
40
+   ADDITIONAL_CXXFLAGS =
41
+
42
+   # Other useful include directories.
43
+   ADDITIONAL_INCLUDES = 
44
+
45
+   # Other useful linking flags.
46
+   ADDITIONAL_LDFLAGS = 
47
+
48
+   # Other useful libraries.
49
+   ADDITIONAL_LIBRARIES = -L/home/clsung/srilm/work/srilm/dstruct/obj/i686 -L/home/clsung/srilm/work/srilm/misc/obj/i686 -L/home/clsung/srilm/work/srilm/htk/obj/i686 -L/home/clsung/srilm/work/srilm/lattice/obj/i686 -L/home/clsung/srilm/work/srilm/utils/obj/i686 -L/home/clsung/srilm/work/srilm/lm/obj/i686 -lm
50
+
51
+   # run-time linker path flag
52
+   RLD_FLAG = -R
53
+
54
+   # Tcl support (standard in Linux)
55
+   TCL_INCLUDE = -I/usr/local/include/tcl8.3
56
+   TCL_LIBRARY = -L/usr/local/lib -ltcl83
57
+
58
+   # No ranlib
59
+   RANLIB = :
60
+
61
+   # Generate dependencies from source files.
62
+   GEN_DEP = $(CC) $(CFLAGS) -MM
63
+
64
+   GEN_DEP.cc = $(CXX) $(CXXFLAGS) -MM
65
+
66
+   # Run lint.
67
+   LINT = lint
68
+   LINT_FLAGS = -DDEBUG $(CFLAGS)
69
+
70
+   # Location of awk binary
71
+   GAWK = /usr/bin/awk
72
+
(-)./srilm/files/patch-bin-machine-type (-11 lines)
Lines 1-11 Link Here
1
--- bin/machine-type.orig	Sat Feb 22 06:04:46 2003
2
+++ bin/machine-type	Thu Jan  1 12:43:08 2004
3
@@ -92,6 +92,8 @@
4
 	set MACHINE_TYPE = macosx
5
     else if (`uname -m` == i686) then
6
 	set MACHINE_TYPE = i686
7
+    else if (`uname -m` == i386) then
8
+	set MACHINE_TYPE = i386
9
     else
10
 	## Generate an error by doing nothing.  (Used to be the line below:)
11
 	## echo "ERROR: Unsupported machine type: "$RESULT
(-)./srilm/files/patch-compare-outputs (+8 lines)
Line 0 Link Here
1
--- test/compare-outputs.orig	Fri Feb 28 10:04:35 2003
2
+++ test/compare-outputs	Sat Apr  3 16:45:20 2004
3
@@ -1,4 +1,4 @@
4
-#!/usr/local/bin/gawk -f 
5
+#!/usr/bin/awk -f 
6
 #
7
 # compare test outputs allowing for small numerical differences
8
 #
(-)./srilm/files/patch-go.run-test (-4 / +13 lines)
Lines 1-12 Link Here
1
--- test/go.run-test.orig	Thu Jan  1 12:15:21 2004
1
--- test/go.run-test.orig	Tue Mar  4 12:51:40 2003
2
+++ test/go.run-test	Thu Jan  1 12:16:10 2004
2
+++ test/go.run-test	Sat Apr  3 16:46:12 2004
3
@@ -6,6 +6,9 @@
3
@@ -6,6 +6,9 @@
4
 # $Header: /home/srilm/devel/test/RCS/go.run-test,v 1.10 2003/02/27 23:42:35 stolcke Exp $
4
 # $Header: /home/srilm/devel/test/RCS/go.run-test,v 1.11 2003/03/04 04:51:27 stolcke Exp $
5
 #
5
 #
6
 
6
 
7
+PATH=$PATH:$WRKSRC/bin:$WRKSRC/bin/i386
7
+PATH=$PATH:$WRKSRC/bin:$WRKSRC/bin/freebsd
8
+export PATH
8
+export PATH
9
+
9
+
10
 dir=$1
10
 dir=$1
11
 
11
 
12
 if [ -z "$MACHINE_TYPE" ]; then
12
 if [ -z "$MACHINE_TYPE" ]; then
13
@@ -16,7 +19,7 @@
14
 
15
 #diff=cmp
16
 # ignore different whitespace and EOL conventions
17
-diff="gawk -f compare-outputs 2>/dev/null"
18
+diff="awk -f compare-outputs 2>/dev/null"
19
 
20
 test -d output || mkdir output
21
 
(-)./srilm/files/patch-lattice-src-Makefile (-11 lines)
Lines 1-11 Link Here
1
--- lattice/src/Makefile.orig	Sun Aug 25 05:29:45 2002
2
+++ lattice/src/Makefile	Thu Jan  1 11:12:00 2004
3
@@ -131,7 +131,7 @@
4
 	$(ARCHIVE) $@ $^ $(DEMANGLE_FILTER)
5
 	$(RANLIB) $@ $(DEMANGLE_FILTER)
6
 
7
-$(PROGRAMS): $(LIBRARY) $(OTHER_LIBRARIES)
8
+$(PROGRAMS): $(LIBRARY)
9
 
10
 # Variables and Targets for released system
11
 
(-)./srilm/files/patch-lm-src-Makefile (-11 lines)
Lines 1-11 Link Here
1
--- lm/src/Makefile.orig	Sat Feb 22 04:20:46 2003
2
+++ lm/src/Makefile	Thu Jan  1 11:11:40 2004
3
@@ -234,7 +234,7 @@
4
 	$(ARCHIVE) $@ $^ $(DEMANGLE_FILTER)
5
 	$(RANLIB) $@ $(DEMANGLE_FILTER)
6
 
7
-$(PROGRAMS): $(LIBRARY) $(OTHER_LIBRARIES)
8
+$(PROGRAMS): $(LIBRARY)
9
 
10
 # Variables and Targets for released system
11
 
(-)./srilm/pkg-plist (-32 / +34 lines)
Lines 1-45 Link Here
1
bin/ngram
2
bin/ngram-count
3
bin/ngram-merge
4
bin/ngram-class
5
bin/disambig
6
bin/anti-ngram
1
bin/anti-ngram
2
bin/disambig
3
bin/fax2tiff
4
bin/hidden-ngram
5
bin/lattice-tool
6
bin/multi-ngram
7
bin/nbest-lattice
7
bin/nbest-lattice
8
bin/nbest-mix
8
bin/nbest-mix
9
bin/nbest-optimize
9
bin/nbest-optimize
10
bin/nbest-pron-score
10
bin/nbest-pron-score
11
bin/ncftpget
12
bin/ngram
13
bin/ngram-class
14
bin/ngram-count
15
bin/ngram-merge
11
bin/segment
16
bin/segment
12
bin/segment-nbest
17
bin/segment-nbest
13
bin/hidden-ngram
14
bin/multi-ngram
15
bin/lattice-tool
16
%%EXAMPLESDIR%%/change-lm-vocab
17
%%EXAMPLESDIR%%/rescore-decipher
18
%%EXAMPLESDIR%%/rescore-acoustic
19
%%EXAMPLESDIR%%/rescore-reweight
20
%%EXAMPLESDIR%%/rescore-minimize-wer
21
%%EXAMPLESDIR%%/make-batch-counts
22
%%EXAMPLESDIR%%/merge-batch-counts
23
%%EXAMPLESDIR%%/make-big-lm
24
%%EXAMPLESDIR%%/make-multiword-pfsg
25
%%EXAMPLESDIR%%/pfsg-from-ngram
26
%%EXAMPLESDIR%%/nbest-error
27
%%EXAMPLESDIR%%/nbest-rover
28
%%EXAMPLESDIR%%/align-with-tags
29
%%EXAMPLESDIR%%/compute-sclite
30
%%EXAMPLESDIR%%/compare-sclite
31
%%EXAMPLESDIR%%/add-classes-to-pfsg
18
%%EXAMPLESDIR%%/add-classes-to-pfsg
32
%%EXAMPLESDIR%%/add-dummy-bows
19
%%EXAMPLESDIR%%/add-dummy-bows
33
%%EXAMPLESDIR%%/add-pauses-to-pfsg
20
%%EXAMPLESDIR%%/add-pauses-to-pfsg
34
%%EXAMPLESDIR%%/add-ppls
21
%%EXAMPLESDIR%%/add-ppls
22
%%EXAMPLESDIR%%/align-with-tags
35
%%EXAMPLESDIR%%/bytelog-to-log10
23
%%EXAMPLESDIR%%/bytelog-to-log10
24
%%EXAMPLESDIR%%/change-lm-vocab
36
%%EXAMPLESDIR%%/classes-to-fsm
25
%%EXAMPLESDIR%%/classes-to-fsm
37
%%EXAMPLESDIR%%/combine-acoustic-scores
26
%%EXAMPLESDIR%%/combine-acoustic-scores
38
%%EXAMPLESDIR%%/compare-ppls
27
%%EXAMPLESDIR%%/compare-ppls
28
%%EXAMPLESDIR%%/compare-sclite
39
%%EXAMPLESDIR%%/compute-best-mix
29
%%EXAMPLESDIR%%/compute-best-mix
40
%%EXAMPLESDIR%%/compute-best-rover-mix
30
%%EXAMPLESDIR%%/compute-best-rover-mix
41
%%EXAMPLESDIR%%/compute-best-sentence-mix
31
%%EXAMPLESDIR%%/compute-best-sentence-mix
42
%%EXAMPLESDIR%%/compute-oov-rate
32
%%EXAMPLESDIR%%/compute-oov-rate
33
%%EXAMPLESDIR%%/compute-sclite
43
%%EXAMPLESDIR%%/continuous-ngram-count
34
%%EXAMPLESDIR%%/continuous-ngram-count
44
%%EXAMPLESDIR%%/extract-skip-probs
35
%%EXAMPLESDIR%%/extract-skip-probs
45
%%EXAMPLESDIR%%/find-reference-posteriors
36
%%EXAMPLESDIR%%/find-reference-posteriors
Lines 48-84 Link Here
48
%%EXAMPLESDIR%%/hits-from-log
39
%%EXAMPLESDIR%%/hits-from-log
49
%%EXAMPLESDIR%%/log10-to-bytelog
40
%%EXAMPLESDIR%%/log10-to-bytelog
50
%%EXAMPLESDIR%%/make-abs-discount
41
%%EXAMPLESDIR%%/make-abs-discount
42
%%EXAMPLESDIR%%/make-batch-counts
43
%%EXAMPLESDIR%%/make-big-lm
51
%%EXAMPLESDIR%%/make-diacritic-map
44
%%EXAMPLESDIR%%/make-diacritic-map
52
%%EXAMPLESDIR%%/make-gt-discounts
45
%%EXAMPLESDIR%%/make-gt-discounts
53
%%EXAMPLESDIR%%/make-kn-discounts
54
%%EXAMPLESDIR%%/make-kn-counts
55
%%EXAMPLESDIR%%/make-hiddens-lm
46
%%EXAMPLESDIR%%/make-hiddens-lm
47
%%EXAMPLESDIR%%/make-kn-counts
48
%%EXAMPLESDIR%%/make-kn-discounts
56
%%EXAMPLESDIR%%/make-lm-subset
49
%%EXAMPLESDIR%%/make-lm-subset
50
%%EXAMPLESDIR%%/make-multiword-pfsg
57
%%EXAMPLESDIR%%/make-nbest-pfsg
51
%%EXAMPLESDIR%%/make-nbest-pfsg
58
%%EXAMPLESDIR%%/make-ngram-pfsg
52
%%EXAMPLESDIR%%/make-ngram-pfsg
59
%%EXAMPLESDIR%%/make-sub-lm
53
%%EXAMPLESDIR%%/make-sub-lm
60
%%EXAMPLESDIR%%/sort-lm
54
%%EXAMPLESDIR%%/merge-batch-counts
61
%%EXAMPLESDIR%%/reverse-lm
62
%%EXAMPLESDIR%%/merge-nbest
55
%%EXAMPLESDIR%%/merge-nbest
56
%%EXAMPLESDIR%%/nbest-error
63
%%EXAMPLESDIR%%/nbest-posteriors
57
%%EXAMPLESDIR%%/nbest-posteriors
64
%%EXAMPLESDIR%%/nbest2-to-nbest1
58
%%EXAMPLESDIR%%/nbest-rover
65
%%EXAMPLESDIR%%/nbest-vocab
59
%%EXAMPLESDIR%%/nbest-vocab
60
%%EXAMPLESDIR%%/nbest2-to-nbest1
61
%%EXAMPLESDIR%%/pfsg-from-ngram
66
%%EXAMPLESDIR%%/pfsg-to-dot
62
%%EXAMPLESDIR%%/pfsg-to-dot
67
%%EXAMPLESDIR%%/pfsg-to-fsm
63
%%EXAMPLESDIR%%/pfsg-to-fsm
68
%%EXAMPLESDIR%%/pfsg-vocab
64
%%EXAMPLESDIR%%/pfsg-vocab
69
%%EXAMPLESDIR%%/ppl-from-log
65
%%EXAMPLESDIR%%/ppl-from-log
66
%%EXAMPLESDIR%%/prettify
70
%%EXAMPLESDIR%%/remove-lowprob-ngrams
67
%%EXAMPLESDIR%%/remove-lowprob-ngrams
71
%%EXAMPLESDIR%%/replace-words-with-classes
68
%%EXAMPLESDIR%%/replace-words-with-classes
72
%%EXAMPLESDIR%%/reverse-text
69
%%EXAMPLESDIR%%/rescore-acoustic
70
%%EXAMPLESDIR%%/rescore-decipher
71
%%EXAMPLESDIR%%/rescore-minimize-wer
72
%%EXAMPLESDIR%%/rescore-reweight
73
%%EXAMPLESDIR%%/reverse-lm
73
%%EXAMPLESDIR%%/reverse-ngram-counts
74
%%EXAMPLESDIR%%/reverse-ngram-counts
74
%%EXAMPLESDIR%%/sentid-to-sclite
75
%%EXAMPLESDIR%%/reverse-text
75
%%EXAMPLESDIR%%/sentid-to-ctm
76
%%EXAMPLESDIR%%/sentid-to-ctm
77
%%EXAMPLESDIR%%/sentid-to-sclite
78
%%EXAMPLESDIR%%/sort-lm
76
%%EXAMPLESDIR%%/subtract-ppls
79
%%EXAMPLESDIR%%/subtract-ppls
77
%%EXAMPLESDIR%%/uniform-classes
80
%%EXAMPLESDIR%%/uniform-classes
78
%%EXAMPLESDIR%%/vp2text
81
%%EXAMPLESDIR%%/vp2text
82
%%EXAMPLESDIR%%/wlat-stats
79
%%EXAMPLESDIR%%/wlat-to-dot
83
%%EXAMPLESDIR%%/wlat-to-dot
80
%%EXAMPLESDIR%%/wlat-to-pfsg
84
%%EXAMPLESDIR%%/wlat-to-pfsg
81
%%EXAMPLESDIR%%/wlat-stats
82
%%EXAMPLESDIR%%/wordlat-to-lisp
85
%%EXAMPLESDIR%%/wordlat-to-lisp
83
%%EXAMPLESDIR%%/prettify
84
@dirrm %%EXAMPLESDIR%%
86
@dirrm %%EXAMPLESDIR%%

Return to bug 65116