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

(-)japanese/skk-tools/Makefile (-6 / +1 lines)
Lines 1-9 Link Here
1
# New ports collection makefile for:	skk-tools
1
# Created by: Shigeyuki FUKUSHIMA <shige@kuis.kyoto-u.ac.jp>
2
# Date created:		31 Oct 1998
3
# Whom:			Shigeyuki FUKUSHIMA <shige@kuis.kyoto-u.ac.jp>
4
#
5
# $FreeBSD: ports/japanese/skk-tools/Makefile,v 1.23 2012/10/09 22:12:13 linimon Exp $
2
# $FreeBSD: ports/japanese/skk-tools/Makefile,v 1.23 2012/10/09 22:12:13 linimon Exp $
6
#
7
3
8
PORTNAME=	skk-tools
4
PORTNAME=	skk-tools
9
PORTVERSION=	1.3.2
5
PORTVERSION=	1.3.2
Lines 22-28 Link Here
22
OPTIONS_DEFAULT=	EXPR2
18
OPTIONS_DEFAULT=	EXPR2
23
EXPR2_DESC=	Build skkdic-expr2 (needs glib-2.x)
19
EXPR2_DESC=	Build skkdic-expr2 (needs glib-2.x)
24
20
25
USE_GCC=	any
26
GNU_CONFIGURE=	yes
21
GNU_CONFIGURE=	yes
27
MAKE_JOBS_SAFE=	yes
22
MAKE_JOBS_SAFE=	yes
28
23
(-)japanese/skk-tools/files/patch-skkdic-expr.c (+83 lines)
Line 0 Link Here
1
--- skkdic-expr.c.orig	2011-04-11 04:42:08.000000000 +0900
2
+++ skkdic-expr.c	2012-10-13 05:40:10.000000000 +0900
3
@@ -336,7 +336,7 @@
4
 
5
     /* ______tkey________ */
6
     for (p = headtop; *s != '/'; s++, p++) {
7
-	if (*s < 0x20) return;
8
+	if (*s < 0x20) return 0;
9
 	*p = *s;
10
     }
11
     tkey.dsize = p - keybuf;
12
@@ -344,12 +344,12 @@
13
     /* __________content____________ */
14
     p = content; 
15
     for( ; *s != ']'; s++, p++) {
16
-	if (*s < 0x20) return;
17
+	if (*s < 0x20) return 0;
18
 	*p = *s;
19
     }
20
     *p = '\0';
21
     if (*++s != '/') 
22
-	return ;		/* __________________ */
23
+	return 0;		/* __________________ */
24
     
25
     /* ________________________append */
26
     otails = dbm_fetch(okuriheaddb, tkey);
27
@@ -555,7 +555,7 @@
28
 
29
     /* ______tkey________ */ 
30
     for (p = headtop; *s != '/'; s++, p++) {
31
-	if (*s < 0x20) return;
32
+	if (*s < 0x20) return 0;
33
 	*p = *s;
34
     }
35
     tkey.dsize = p - keybuf;
36
@@ -563,12 +563,12 @@
37
     /* __________content____________ */
38
     p = content; 
39
     for( ; *s != ']'; s++, p++) {
40
-	if (*s < 0x20) return;
41
+	if (*s < 0x20) return 0;
42
 	*p = *s;
43
     }
44
     *p = '\0';
45
     if (*++s != '/') 
46
-	return ;		/* __________________ */
47
+	return 0;		/* __________________ */
48
     
49
     /* ________________________replace/delete */
50
     otails = dbm_fetch(okuriheaddb, tkey);
51
@@ -600,12 +600,12 @@
52
 			goto next;
53
 		    }
54
 		}
55
-		return;
56
+		return 0;
57
 	    }
58
 	}
59
       next:;
60
     }
61
-    return;
62
+    return 0;
63
 }
64
 
65
 static void
66
@@ -708,7 +708,7 @@
67
 
68
     tails = dbm_fetch(okuritaildb, tkey);
69
     if (tails.dptr == NULL)  {
70
-	return;
71
+	return 0;
72
     } else {
73
 	fseek(dbcontent, getpos(tails.dptr), 0);
74
 	db_gets(tail_content, BLEN, dbcontent);
75
@@ -717,7 +717,7 @@
76
 	for(e = s; e[1] != '\0'; s = e + 2) {
77
 	    for (e = s; *e != '/'; e++)
78
 		if (*e < 0x20) 
79
-		    return;
80
+		    return 0;
81
 
82
 	    strncpy(headtop, s, e - s);
83
 	    tkey.dsize = (headtop - keybuf) + (e - s);

Return to bug 172725