Date: Tue, 16 Oct 2012 02:56:11 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/172725: japanese/skk-tools: Fix build with clang Message-ID: <20121016025611.6b27e7e1c77f2676a59774da@yahoo.com> Resent-Message-ID: <201210151810.q9FIA3TS043633@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 172725 >Category: ports >Synopsis: japanese/skk-tools: Fix build with clang >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Oct 15 18:10:03 UTC 2012 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 7.4-RELEASE-p10 i386 >Organization: >Environment: >Description: - Fix build with clang New file: files/patch-skkdic-expr.c >How-To-Repeat: >Fix: diff -urN /usr/ports/japanese/skk-tools/Makefile japanese/skk-tools/Makefile --- /usr/ports/japanese/skk-tools/Makefile 2012-10-10 07:12:13.000000000 +0900 +++ japanese/skk-tools/Makefile 2012-10-16 02:10:26.000000000 +0900 @@ -1,9 +1,5 @@ -# New ports collection makefile for: skk-tools -# Date created: 31 Oct 1998 -# Whom: Shigeyuki FUKUSHIMA <shige@kuis.kyoto-u.ac.jp> -# +# Created by: Shigeyuki FUKUSHIMA <shige@kuis.kyoto-u.ac.jp> # $FreeBSD: ports/japanese/skk-tools/Makefile,v 1.23 2012/10/09 22:12:13 linimon Exp $ -# PORTNAME= skk-tools PORTVERSION= 1.3.2 @@ -22,7 +18,6 @@ OPTIONS_DEFAULT= EXPR2 EXPR2_DESC= Build skkdic-expr2 (needs glib-2.x) -USE_GCC= any GNU_CONFIGURE= yes MAKE_JOBS_SAFE= yes diff -urN /usr/ports/japanese/skk-tools/files/patch-skkdic-expr.c japanese/skk-tools/files/patch-skkdic-expr.c --- /usr/ports/japanese/skk-tools/files/patch-skkdic-expr.c 1970-01-01 09:00:00.000000000 +0900 +++ japanese/skk-tools/files/patch-skkdic-expr.c 2012-10-13 06:48:34.000000000 +0900 @@ -0,0 +1,83 @@ +--- skkdic-expr.c.orig 2011-04-11 04:42:08.000000000 +0900 ++++ skkdic-expr.c 2012-10-13 05:40:10.000000000 +0900 +@@ -336,7 +336,7 @@ + + /* ______tkey________ */ + for (p = headtop; *s != '/'; s++, p++) { +- if (*s < 0x20) return; ++ if (*s < 0x20) return 0; + *p = *s; + } + tkey.dsize = p - keybuf; +@@ -344,12 +344,12 @@ + /* __________content____________ */ + p = content; + for( ; *s != ']'; s++, p++) { +- if (*s < 0x20) return; ++ if (*s < 0x20) return 0; + *p = *s; + } + *p = '\0'; + if (*++s != '/') +- return ; /* __________________ */ ++ return 0; /* __________________ */ + + /* ________________________append */ + otails = dbm_fetch(okuriheaddb, tkey); +@@ -555,7 +555,7 @@ + + /* ______tkey________ */ + for (p = headtop; *s != '/'; s++, p++) { +- if (*s < 0x20) return; ++ if (*s < 0x20) return 0; + *p = *s; + } + tkey.dsize = p - keybuf; +@@ -563,12 +563,12 @@ + /* __________content____________ */ + p = content; + for( ; *s != ']'; s++, p++) { +- if (*s < 0x20) return; ++ if (*s < 0x20) return 0; + *p = *s; + } + *p = '\0'; + if (*++s != '/') +- return ; /* __________________ */ ++ return 0; /* __________________ */ + + /* ________________________replace/delete */ + otails = dbm_fetch(okuriheaddb, tkey); +@@ -600,12 +600,12 @@ + goto next; + } + } +- return; ++ return 0; + } + } + next:; + } +- return; ++ return 0; + } + + static void +@@ -708,7 +708,7 @@ + + tails = dbm_fetch(okuritaildb, tkey); + if (tails.dptr == NULL) { +- return; ++ return 0; + } else { + fseek(dbcontent, getpos(tails.dptr), 0); + db_gets(tail_content, BLEN, dbcontent); +@@ -717,7 +717,7 @@ + for(e = s; e[1] != '\0'; s = e + 2) { + for (e = s; *e != '/'; e++) + if (*e < 0x20) +- return; ++ return 0; + + strncpy(headtop, s, e - s); + tkey.dsize = (headtop - keybuf) + (e - s); >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20121016025611.6b27e7e1c77f2676a59774da>