diff options
author | Foxfair Hu <foxfair@FreeBSD.org> | 2003-10-28 15:24:03 +0000 |
---|---|---|
committer | Foxfair Hu <foxfair@FreeBSD.org> | 2003-10-28 15:24:03 +0000 |
commit | 7f69be7b9643fb6002103a9b858e62f5ba912d17 (patch) | |
tree | 627973691cea2d3d69664747b7cd04e878838de5 /chinese/dictd | |
parent | PR: 58565 (diff) |
PR: 58597
Submitted by: Cheng-Lung Sung <clsung@dragon2.net>
Approved by: maintainer
Fix build step in version 1.9.7
Notes
Notes:
svn path=/head/; revision=92456
Diffstat (limited to '')
-rw-r--r-- | chinese/dictd/Makefile | 4 | ||||
-rw-r--r-- | chinese/dictd/files/patch-Makefile.in | 10 | ||||
-rw-r--r-- | chinese/dictd/files/patch-dictfmt.c | 14 | ||||
-rw-r--r-- | chinese/dictd/files/patch-index.c | 40 | ||||
-rw-r--r-- | chinese/dictd/files/patch-libmaa::arg.c | 10 |
5 files changed, 34 insertions, 44 deletions
diff --git a/chinese/dictd/Makefile b/chinese/dictd/Makefile index 08f4dbe3b8b5..e519edbecb1d 100644 --- a/chinese/dictd/Makefile +++ b/chinese/dictd/Makefile @@ -12,8 +12,8 @@ MAINTAINER= statue@freebsd.sinica.edu.tw MASTERDIR= ${.CURDIR}/../../net/dictd EXTRA_PATCHES= ${.CURDIR}/files/patch-index.c \ ${.CURDIR}/files/patch-libmaa::arg.c \ - ${.CURDIR}/files/patch-dictfmt.c \ - ${.CURDIR}/files/patch-Makefile.in + ${.CURDIR}/files/patch-dictfmt.c +# ${.CURDIR}/files/patch-Makefile.in #pre-install: # ${ECHO_CMD} "bin/dictfmt" > ${PLIST} diff --git a/chinese/dictd/files/patch-Makefile.in b/chinese/dictd/files/patch-Makefile.in deleted file mode 100644 index 4d4875806b50..000000000000 --- a/chinese/dictd/files/patch-Makefile.in +++ /dev/null @@ -1,10 +0,0 @@ ---- Makefile.in.orig Sun Nov 24 02:01:29 2002 -+++ Makefile.in Sun Nov 24 02:01:44 2002 -@@ -154,7 +154,6 @@ - if test ! -d $(bindir); then $(INSTALL) -d 755 $(bindir); fi - if test ! -d $(man1_prefix); then $(INSTALL) -d 755 $(man1_prefix); fi - $(INSTALL_PROGRAM) dictfmt $(bindir) -- $(INSTALL_PROGRAM) dictfmt_index2suffix $(bindir) - $(INSTALL_DATA) dictfmt.1 $(man1_prefix)/dictfmt.1 - - install.dictd: dictd diff --git a/chinese/dictd/files/patch-dictfmt.c b/chinese/dictd/files/patch-dictfmt.c index 6ed99b84a2b2..1c9b5fb675b2 100644 --- a/chinese/dictd/files/patch-dictfmt.c +++ b/chinese/dictd/files/patch-dictfmt.c @@ -1,14 +1,14 @@ ---- dictfmt.c.orig Sun Nov 24 01:25:09 2002 -+++ dictfmt.c Sun Nov 24 01:25:23 2002 -@@ -208,6 +208,12 @@ +--- dictfmt.c.orig Tue Feb 11 03:08:33 2003 ++++ dictfmt.c Mon Oct 27 22:03:33 2003 +@@ -213,6 +213,12 @@ while (src && src [0]){ ch = *(const unsigned char *)src; + if((ch & 0x80) && *(src+1)) { -+ *dest++ = ch; -+ *dest++ = *(src+1); -+ src+=2; -+ continue; ++ *dest++ = ch; ++ *dest++ = *(src+1); ++ src+=2; ++ continue; + } if (isspace (ch)){ diff --git a/chinese/dictd/files/patch-index.c b/chinese/dictd/files/patch-index.c index 23c0d93395ea..b240e2010d78 100644 --- a/chinese/dictd/files/patch-index.c +++ b/chinese/dictd/files/patch-index.c @@ -1,36 +1,36 @@ ---- index.c.orig Sun Nov 24 01:24:10 2002 -+++ index.c Sun Nov 24 01:24:21 2002 -@@ -91,6 +91,12 @@ +--- index.c.orig Mon Mar 10 01:06:16 2003 ++++ index.c Mon Oct 27 22:10:18 2003 +@@ -103,6 +103,12 @@ for (; *src; ++src) { c = * (const unsigned char *) src; + if((c & 0x80) && *(src+1)) { -+ *dest++ = c; -+ *dest++ = *(src+1); -+ src++; -+ continue; ++ *dest++ = c; ++ *dest++ = *(src+1); ++ src++; ++ continue; + } if (isspace( c )) { *dest++ = ' '; -@@ -150,7 +156,7 @@ - isspacealnumtab_allchars['\t'] = isspacealnumtab_allchars['\n'] = 0; /* special */ +@@ -184,7 +190,7 @@ - for (i = 0; i <= UCHAR_MAX; i++){ -- if (islower (i) || (utf8_mode && i >= 0xC0)) -+ if (islower (i) || (utf8_mode && i >= 0xC0) || (i>=0x80)) - chartab[charcount++] = i; - } + charcount = 0; + for (i = 0; i <= UCHAR_MAX; i++){ +- if (islower (i) || (utf8_mode && i >= 0xC0)) ++ if (islower (i) || (utf8_mode && i >= 0xC0) || (i>=0x80)) + chartab [charcount++] = i; + } -@@ -317,6 +326,15 @@ +@@ -293,6 +299,15 @@ /* FIXME. Optimize this inner loop. */ while (*word && start < end && *start != '\t') { + if ((*start & 0x80) && start+1<end && start[1]!='\t') { -+ if(start[0]!=word[0]) -+ return ((unsigned)word[0]<(unsigned)start[0])?-2:1; -+ if(start[1]!=word[1]) -+ return ((unsigned)word[1]<(unsigned)start[1])?-2:1; ++ if(start[0]!=word[0]) ++ return ((unsigned)word[0]<(unsigned)start[0])?-2:1; ++ if(start[1]!=word[1]) ++ return ((unsigned)word[1]<(unsigned)start[1])?-2:1; + word+=2; + start+=2; + continue; @@ -38,7 +38,7 @@ if (!dbindex -> isspacealnum[* (const unsigned char *) start]) { ++start; continue; -@@ -359,6 +377,8 @@ +@@ -340,6 +355,8 @@ *start != '\t' && !dbindex -> isspacealnum[* (const unsigned char *) start]) { diff --git a/chinese/dictd/files/patch-libmaa::arg.c b/chinese/dictd/files/patch-libmaa::arg.c index 14176f4ee9ff..e325cf8dafc3 100644 --- a/chinese/dictd/files/patch-libmaa::arg.c +++ b/chinese/dictd/files/patch-libmaa::arg.c @@ -1,12 +1,12 @@ ---- libmaa/arg.c.orig Wed Jul 17 05:21:04 2002 -+++ libmaa/arg.c Wed Jul 17 05:13:50 2002 +--- libmaa/arg.c.orig Sat Aug 3 03:43:15 2002 ++++ libmaa/arg.c Mon Oct 27 22:11:11 2003 @@ -216,6 +216,9 @@ ++pt; for (last = pt, len = 0; *pt; ++pt, ++len) { -+ if((*pt & 0x80) && pt[1]) { -+ ++pt, ++len; -+ } else ++ if((*pt & 0x80) && pt[1]) { ++ ++pt, ++len; ++ } else switch (*pt) { case ' ': case '\t': |