1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
|
diff -Naur ispell-3.2.06-old/Makefile ispell-3.2.06/Makefile
--- ispell-3.2.06-old/Makefile 2003-12-13 23:59:07.000000000 +0000
+++ ispell-3.2.06/Makefile 2003-12-13 23:59:23.000000000 +0000
@@ -415,7 +415,7 @@
cat config.X local.h \
| sed -n -e "s/^#define[ ]*$$var[ ]*"'"'"/$$var=/p" \
| sed -e 's/".*$$/'"'/" -e "s/=/='/" \
- | tail -1; \
+ | tail -n 1; \
done > config.sh; \
echo 'case "$$MAKE_SORTTMP" in "") \
SORTTMP="-e /!!SORTTMP!!/s/=.*$$/=/";; *) SORTTMP=;; esac' \
diff -Naur ispell-3.2.06-old/Makepatch ispell-3.2.06/Makepatch
--- ispell-3.2.06-old/Makepatch 2003-12-13 23:59:07.000000000 +0000
+++ ispell-3.2.06/Makepatch 2003-12-13 23:59:23.000000000 +0000
@@ -141,7 +141,7 @@
if [ -r "$destdir/Patch${baserelease}.01" ]
then
- lastpatch=`ls $destdir/Patch${baserelease}.?? | tail -1 \
+ lastpatch=`ls $destdir/Patch${baserelease}.?? | tail -n 1 \
| sed "s;$destdir/Patch${baserelease}.;;"`
else
lastpatch=00
diff -Naur ispell-3.2.06-old/findaffix.X ispell-3.2.06/findaffix.X
--- ispell-3.2.06-old/findaffix.X 2003-12-13 23:59:07.000000000 +0000
+++ ispell-3.2.06/findaffix.X 2003-12-13 23:59:23.000000000 +0000
@@ -152,7 +152,7 @@
elimlen=1
lowcount=10
cleanout=no
-finalsortopts='+3rn -4 +2rn -3 +1 -2 +0 -1'
+finalsortopts='-k 4rn,5 -k 3rn,4 -k 2,3 -k 1,2'
tabch=/
while :
do
@@ -177,7 +177,7 @@
shift
;;
-f)
- finalsortopts='+2rn -3 +3rn -4 +1 -2 +0 -1'
+ finalsortopts='-k 3rn,4 -k 4rn,5 -k 2,3 -k 1,2'
shift
;;
-c)
@@ -256,10 +256,10 @@
next
'"$LOOP"'
}' < ${TMP}a \
- | sort "-t$tabch" +0 -1 +1 $SORTTMP -o ${TMP}a
+ | sort "-t$tabch" -k 1,2 -k 2 $SORTTMP -o ${TMP}a
join "-t$tabch" -o 1.2 2.2 2.3 ${TMP}a ${TMP}a \
| awk "-F$tabch" "BEGIN{elimlen=$elimlen}$ELIM" \
- | sort "-t$tabch" +1 -2 +0 -1 $SORTTMP \
+ | sort "-t$tabch" -k 2,3 -k 1,2 $SORTTMP \
| awk "-F$tabch" 'BEGIN{tabch="'"$tabch"'"; lowcount='"$lowcount"'}
{
if ($1 == last1 && $2 == last2)
diff -Naur ispell-3.2.06-old/languages/english/Makefile ispell-3.2.06/languages/english/Makefile
--- ispell-3.2.06-old/languages/english/Makefile 2003-12-13 23:59:07.000000000 +0000
+++ ispell-3.2.06/languages/english/Makefile 2003-12-14 00:01:15.000000000 +0000
@@ -336,7 +336,7 @@
done; \
trap "rm -f english.sml" 1 2 15; \
set -x; \
- eval sort -u -t/ +0f -1 +0 $$MAKE_SORTTMP -o english.sml $$dicts
+ eval sort -u -t/ -k 1f,2 -k 1 $$MAKE_SORTTMP -o english.sml $$dicts
$(DBUILD)english.sml+: $(CONFIG) $(EXTRADICT)
$(DBUILD)english.sml+: english.0
@@ -376,7 +376,7 @@
done; \
trap "rm -f english.med" 1 2 15; \
set -x; \
- eval sort -u -t/ +0f -1 +0 $$MAKE_SORTTMP -o english.med $$dicts
+ eval sort -u -t/ -k 1f,2 -k 1 $$MAKE_SORTTMP -o english.med $$dicts
$(DBUILD)english.med+: $(CONFIG) $(EXTRADICT)
$(DBUILD)english.med+: english.0
@@ -424,7 +424,7 @@
done; \
trap "rm -f english.lrg" 1 2 15; \
set -x; \
- eval sort -u -t/ +0f -1 +0 $$MAKE_SORTTMP -o english.lrg $$dicts
+ eval sort -u -t/ -k 1f,2 -k 1 $$MAKE_SORTTMP -o english.lrg $$dicts
$(DBUILD)english.lrg+: $(CONFIG) $(EXTRADICT)
$(DBUILD)english.lrg+: english.0
@@ -477,7 +477,7 @@
done; \
trap "rm -f english.xlg" 1 2 15; \
set -x; \
- eval sort -u -t/ +0f -1 +0 $$MAKE_SORTTMP -o english.xlg $$dicts
+ eval sort -u -t/ -k 1f,2 -k 1 $$MAKE_SORTTMP -o english.xlg $$dicts
$(DBUILD)english.xlg+: $(CONFIG) $(EXTRADICT)
$(DBUILD)english.xlg+: english.0
diff -Naur ispell-3.2.06-old/munchlist.X ispell-3.2.06/munchlist.X
--- ispell-3.2.06-old/munchlist.X 2003-12-13 23:59:07.000000000 +0000
+++ ispell-3.2.06/munchlist.X 2003-12-13 23:59:23.000000000 +0000
@@ -422,7 +422,7 @@
cat "$@" | $ISPELL "$wchars" -e1 -d $FAKEHASH -p /dev/null | tr " " '
'
fi \
- | sort $SORTTMP -u +0f -1 +0 \
+ | sort $SORTTMP -u -k 1f,2 -k 1 \
| $COMBINE $icflags $langtabs \
| sort $SORTTMP -u > $EXPANDEDINPUT
#
@@ -482,7 +482,7 @@
$ISPELL "$wchars" -c -W0 -d $FAKEHASH -p /dev/null < $STRIPPEDINPUT \
| tr " " '
' \
- | egrep "$flagmarker" | sort $SORTTMP -u "-t$flagmarker" +0 -1 +1 \
+ | egrep "$flagmarker" | sort $SORTTMP -u "-t$flagmarker" -k 1,2 -k 2 \
| $JOIN $SIGNED "-t$flagmarker" - $EXPANDEDINPUT > $CRUNCHEDINPUT
#
# We now have a list of legal roots, and of affixes that apply to the
@@ -508,7 +508,7 @@
#
$verbose && echo 'Expanding dictionary into EXPANDEDPAIRS.' 1>&2
$ISPELL "$wchars" -e3 -d $FAKEHASH -p /dev/null < $CRUNCHEDINPUT \
- | sort $SORTTMP +1 > $EXPANDEDPAIRS
+ | sort $SORTTMP -k 2 > $EXPANDEDPAIRS
#
# Now we want to extract the lines in EXPANDEDPAIRS in which the second field
# is *not* listed in the original dictionary EXPANDEDINPUT; these illegal
@@ -536,7 +536,7 @@
| (sed -e 's; .*$;;' ; /bin/rm -f $JOINEDPAIRS $EXPANDEDPAIRS) \
| uniq \
| (comm -13 - $CRUNCHEDINPUT ; /bin/rm -f $CRUNCHEDINPUT) \
- | sort $SORTTMP -u "-t$flagmarker" +0f -1 +0 \
+ | sort $SORTTMP -u "-t$flagmarker" -k 1f,2 -k 1 \
| $COMBINE $langtabs > $LEGALFLAGLIST
#
@@ -566,7 +566,7 @@
| sort $SORTTMP \
| uniq -c \
| tr ' ' ' ' \
- | sort $SORTTMP +0rn -1 +2 > $PRODUCTLIST
+ | sort $SORTTMP -k 1rn,2 -k 3 > $PRODUCTLIST
if [ `egrep ' p ' $PRODUCTLIST | wc -l` -gt 0 \
-a `egrep ' s ' $PRODUCTLIST | wc -l` -gt 0 ]
@@ -681,7 +681,7 @@
#
$verbose && echo "Creating cross expansions (pass $dbnum)." 1>&2
$ISPELL "$wchars" -e3 -d $FAKEHASH -p /dev/null < $CROSSROOTS \
- | sort $SORTTMP +1 > $CROSSEXPANDED
+ | sort $SORTTMP -k 2 > $CROSSEXPANDED
#
# Now we join CROSSEXPANDED against EXPANDEDINPUT to produce
# CROSSPAIRS, and then comm that against CROSSEXPANDED to
@@ -765,7 +765,7 @@
D
}' \
| comm -23 - $ILLEGALCOMBOS \
- | sort $SORTTMP -u "-t$flagmarker" +0f -1 +0 \
+ | sort $SORTTMP -u "-t$flagmarker" -k 1f,2 -k 1 \
| $COMBINE $langtabs > $CROSSROOTS
mv $CROSSROOTS $LEGALFLAGLIST
if [ "$debug" = yes ]
@@ -801,10 +801,10 @@
#
$verbose && echo 'Eliminating non-optimal affixes.' 1>&2
$ISPELL "$wchars" -e4 -d $FAKEHASH -p /dev/null < $LEGALFLAGLIST \
- | sort $SORTTMP +1 -2 +2rn -3 +0 -1 \
- | sort $SORTTMP -um +1 -2 \
+ | sort $SORTTMP -k 2,3 -k 3rn,4 -k 1,2 \
+ | sort $SORTTMP -um -k 2,3 \
| sed -e 's; .*$;;' \
- | sort $SORTTMP -u "-t$flagmarker" +0f -1 +0 > $MINIMALAFFIXES
+ | sort $SORTTMP -u "-t$flagmarker" -k 1f,2 -k 1 > $MINIMALAFFIXES
/bin/rm -f $LEGALFLAGLIST
#
# Now we're almost done. MINIMALAFFIXES covers some (with luck, most)
@@ -832,10 +832,10 @@
fi
($ISPELL "$wchars" -l -d $FAKEHASH -p /dev/null < $STRIPPEDINPUT; \
$COMBINE $langtabs < $MINIMALAFFIXES) \
- | sort $SORTTMP "-t$flagmarker" -u +0f -1 +0
+ | sort $SORTTMP "-t$flagmarker" -u -k 1f,2 -k 1
else
# MINIMALAFFIXES is empty; just produce a sorted version of STRIPPEDINPUT
- sort $SORTTMP "-t$flagmarker" -u +0f -1 +0 $STRIPPEDINPUT
+ sort $SORTTMP "-t$flagmarker" -u -k 1f,2 -k 1 $STRIPPEDINPUT
fi
/bin/rm -f ${TMP}*
if [ "X$MUNCHMAIL" != X ]
|
GitWeb