From clsung@dragon2.net  Mon Oct 27 06:21:35 2003
Return-Path: <clsung@dragon2.net>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 7572B16A4B3
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 27 Oct 2003 06:21:35 -0800 (PST)
Received: from mail.dragon2.net (sungsung.csie.nctu.edu.tw [140.113.215.201])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 2480F43FA3
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 27 Oct 2003 06:21:33 -0800 (PST)
	(envelope-from clsung@dragon2.net)
Received: from localhost (localhost.csie.nctu.edu.tw [127.0.0.1])
	by mail.dragon2.net (Postfix) with ESMTP
	id 2FA5F154D4; Mon, 27 Oct 2003 14:22:51 +0000 (GMT)
Received: from mail.dragon2.net ([127.0.0.1])
 by localhost (sungsung.csie.nctu.edu.tw [127.0.0.1]) (amavisd-new, port 10024)
 with ESMTP id 47160-09; Mon, 27 Oct 2003 22:22:50 +0800 (CST)
Received: by mail.dragon2.net (Postfix, from userid 1022)
	id 823D0153AE; Mon, 27 Oct 2003 22:22:50 +0800 (CST)
Message-Id: <20031027142250.823D0153AE@mail.dragon2.net>
Date: Mon, 27 Oct 2003 22:22:50 +0800 (CST)
From: Cheng-Lung Sung <clsung@dragon2.net>
Reply-To: Cheng-Lung Sung <clsung@dragon2.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc: clsung@tiger2.net, statue@freebsd.sinica.edu.tw
Subject: Update port: chinese/dictd
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         58597
>Category:       ports
>Synopsis:       Update port: chinese/dictd
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Oct 27 06:30:13 PST 2003
>Closed-Date:    Tue Oct 28 07:24:52 PST 2003
>Last-Modified:  Tue Oct 28 07:24:52 PST 2003
>Originator:     Cheng-Lung Sung
>Release:        FreeBSD 4.8-RELEASE-p13 i386
>Organization:
FreeBSD @ Taiwan
>Environment:
System: FreeBSD sungsung.csie.nctu.edu.tw 4.8-RELEASE-p13 FreeBSD 4.8-RELEASE-p13 #3: Wed Oct 8 07:32:16 CST 2003 root@sungsung.csie.nctu.edu.tw:/usr/obj/usr/src/sys/SUNGSUNG i386

>Description:
fix building on version 1.9.7
>How-To-Repeat:
>Fix:

diff -ruN /usr/ports/chinese/dictd/Makefile ./dictd/Makefile
--- /usr/ports/chinese/dictd/Makefile	Wed Sep 24 09:10:36 2003
+++ ./dictd/Makefile	Mon Oct 27 22:20:07 2003
@@ -12,8 +12,8 @@
 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 -ruN /usr/ports/chinese/dictd/files/patch-Makefile.in ./dictd/files/patch-Makefile.in
--- /usr/ports/chinese/dictd/files/patch-Makefile.in	Sun Nov 24 09:38:44 2002
+++ ./dictd/files/patch-Makefile.in	Thu Jan  1 08:00:00 1970
@@ -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 -ruN /usr/ports/chinese/dictd/files/patch-dictfmt.c ./dictd/files/patch-dictfmt.c
--- /usr/ports/chinese/dictd/files/patch-dictfmt.c	Sun Nov 24 09:38:44 2002
+++ ./dictd/files/patch-dictfmt.c	Mon Oct 27 22:04:02 2003
@@ -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 -ruN /usr/ports/chinese/dictd/files/patch-index.c ./dictd/files/patch-index.c
--- /usr/ports/chinese/dictd/files/patch-index.c	Sun Nov 24 09:38:44 2002
+++ ./dictd/files/patch-index.c	Mon Oct 27 22:10:36 2003
@@ -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 -ruN /usr/ports/chinese/dictd/files/patch-libmaa::arg.c ./dictd/files/patch-libmaa::arg.c
--- /usr/ports/chinese/dictd/files/patch-libmaa::arg.c	Fri Jul 19 17:12:40 2002
+++ ./dictd/files/patch-libmaa::arg.c	Mon Oct 27 22:11:33 2003
@@ -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':

>Release-Note:
>Audit-Trail:

From: statue@freebsd.sinica.edu.tw (Statue)
To: freebsd-gnats-submit@FreeBSD.org
Cc:  
Subject: Re: ports/58597: Update port: chinese/dictd
Date: Mon, 27 Oct 2003 23:13:06 +0800 (CST)

 maintainer approved.
State-Changed-From-To: open->closed 
State-Changed-By: foxfair 
State-Changed-When: Tue Oct 28 07:24:38 PST 2003 
State-Changed-Why:  
Committed, thanks! 


http://www.freebsd.org/cgi/query-pr.cgi?pr=58597 
>Unformatted:
