Sun Jul 4 07:18:44 2010 UTC ()
Pullup previous changes on HEAD to pkgsrc-2010Q2 branch to fix branching
error, and to sync with reality.


(agc)
diff -r1.1 -r1.1.64.1 pkgsrc/inputmethod/Chinput/patches/patch-aa
diff -r1.1 -r1.1.64.1 pkgsrc/inputmethod/Chinput/patches/patch-ab
diff -r1.1 -r1.1.64.1 pkgsrc/inputmethod/Chinput/patches/patch-ac
diff -r1.1 -r1.1.64.1 pkgsrc/inputmethod/Chinput/patches/patch-ad
diff -r1.1 -r1.1.64.1 pkgsrc/inputmethod/Chinput/patches/patch-ae
diff -r1.1 -r1.1.64.1 pkgsrc/inputmethod/Chinput/patches/patch-af
diff -r1.3 -r1.3.2.1 pkgsrc/inputmethod/scim-tomoe/Makefile
diff -r1.2 -r1.2.2.1 pkgsrc/inputmethod/scim-tomoe/distinfo
diff -r1.1 -r1.1.2.1 pkgsrc/inputmethod/scim-tomoe/patches/patch-ab
diff -r1.1 -r1.1.64.1 pkgsrc/inputmethod/skkfep/patches/patch-ab
diff -r1.1 -r1.1.64.1 pkgsrc/inputmethod/skkfep/patches/patch-ac
diff -r1.1 -r1.1.64.1 pkgsrc/inputmethod/skkfep/patches/patch-bb
diff -r1.1 -r1.1.64.1 pkgsrc/inputmethod/skkfep/patches/patch-bd
diff -r1.1 -r1.1.64.1 pkgsrc/inputmethod/skkfep/patches/patch-be
diff -r1.1 -r1.1.64.1 pkgsrc/inputmethod/skkfep/patches/patch-bf
diff -r1.1 -r1.1.64.1 pkgsrc/inputmethod/skkfep/patches/patch-bg
diff -r1.1 -r1.1.64.1 pkgsrc/inputmethod/skkserv/patches/patch-aa
diff -r1.1 -r1.1.64.1 pkgsrc/inputmethod/skkserv/patches/patch-ab
diff -r1.1 -r1.1.64.1 pkgsrc/inputmethod/skkserv/patches/patch-ac
diff -r1.1 -r1.1.64.1 pkgsrc/inputmethod/skkserv/patches/patch-ad
diff -r1.1 -r1.1.64.1 pkgsrc/inputmethod/skkserv/patches/patch-ae
diff -r1.1 -r1.1.64.1 pkgsrc/inputmethod/skkserv/patches/patch-af
diff -r1.1 -r1.1.64.1 pkgsrc/inputmethod/skkserv/patches/patch-bsearch
diff -r1.1 -r1.1.64.1 pkgsrc/inputmethod/skkserv/patches/patch-jisyo
diff -r1.7 -r1.7.2.1 pkgsrc/inputmethod/tomoe-gtk/Makefile
diff -r1.2 -r1.2.2.1 pkgsrc/inputmethod/tomoe-gtk/distinfo
diff -r0 -r1.1.2.2 pkgsrc/inputmethod/tomoe-gtk/patches/patch-ab
diff -r1.1 -r1.1.64.1 pkgsrc/inputmethod/unicon-im/patches/patch-aa
diff -r1.1 -r1.1.64.1 pkgsrc/inputmethod/unicon-im/patches/patch-ac
diff -r1.1 -r1.1.64.1 pkgsrc/inputmethod/unicon-im/patches/patch-ag
cvs diff -r1.1 -r1.1.64.1 pkgsrc/inputmethod/Chinput/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/inputmethod/Chinput/patches/patch-aa 2002/06/15 09:31:39 1.1
+++ pkgsrc/inputmethod/Chinput/patches/patch-aa 1.1.64.1
@@ -1,36 +0,0 @@ @@ -1,36 +0,0 @@
1$NetBSD: patch-aa,v 1.1 2002/06/15 09:31:39 shell Exp $ 
2 
3--- src/Makefile.orig Mon Jun 10 21:05:56 2002 
4+++ src/Makefile 
5@@ -1,20 +1,16 @@ 
6  
7-CC = gcc 
8  
9 # do you have imlib? 
10 #No, I don't have that strange library 
11 #IMLIB =  
12 #LIBIMLIB = 
13-#Yes I have 
14-IMLIB = -DIMLIB 
15-LIBIMLIB = -lImlib 
16  
17 #CFLAGS = -Wall -g -DFOR_PILOT_COMPAT -O2 -fno-strength-reduce -Dlinux -D__i386__ -D_POSIX_C_SOURCE=199309L -D_POSIX_SOURCE -D_XOPEN_SOURCE=500L -D_BSD_SOURCE -D_SVID_SOURCE -DFUNCPROTO=15 -DNARROWPROTO 
18-CFLAGS = -Wall -g -DFOR_PILOT_COMPAT -O2 -fno-strength-reduce 
19+CFLAGS += -Wall -DFOR_PILOT_COMPAT -O2 -fno-strength-reduce 
20  
21 INC = -I./include -I./IMdkit/include -I/usr/include -I/usr/X11R6/include  
22  
23-LIB = -L/usr/X11R6/lib -lXext -lX11 ./IMdkit/lib/libXimd.a -L/usr/lib/unicon2 -limmclient -Wl,-rpath=/usr/lib/unicon2 -limm_server -lpth -ldl 
24+LIB = -lXext -lX11 ./IMdkit/lib/libXimd.a -limmclient -limm_server -lpth 
25  
26 SRC = chinput.c init.c server.c config.c color.c util.c convert.c IC.c XIM.c focus.c root.c overspot.c onspot.c offspot.c voice.c keyboard.c handw.c hwengine.c loop.c  
27  
28@@ -23,7 +19,7 @@ 
29 all: chinput 
30  
31 chinput: IMdkit/lib/libXimd.a $(OBJ)  
32- g++ -o chinput $(OBJ) $(LIB) $(LIBIMLIB) 
33+ $(CC) -o chinput $(OBJ) $(LDFLAGS) $(LIB) $(LIBIMLIB) 
34  
35 .c.o: 
36 $(CC) -c $(CFLAGS) $(IMLIB) $(INC) $< 
cvs diff -r1.1 -r1.1.64.1 pkgsrc/inputmethod/Chinput/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/inputmethod/Chinput/patches/patch-ab 2002/06/15 09:31:39 1.1
+++ pkgsrc/inputmethod/Chinput/patches/patch-ab 1.1.64.1
@@ -1,13 +0,0 @@ @@ -1,13 +0,0 @@
1$NetBSD: patch-ab,v 1.1 2002/06/15 09:31:39 shell Exp $ 
2 
3--- src/XIM.h.orig Mon Jun 10 21:19:55 2002 
4+++ src/XIM.h 
5@@ -25,7 +25,7 @@ 
6 //setenv XMODIFIERS @im=Chinput (csh, tcsh) 
7 #define DEFAULT_IMNAME "Chinput" 
8  
9-#define LOCALE_GB "zh_CN.GBK" 
10+#define LOCALE_GB "zh_CN.eucCN" 
11 #define LOCALE_BIG5 "zh_TW.Big5" 
12  
13 //This input server support CJK by default 
cvs diff -r1.1 -r1.1.64.1 pkgsrc/inputmethod/Chinput/patches/patch-ac (expand / switch to unified diff)

--- pkgsrc/inputmethod/Chinput/patches/patch-ac 2002/06/15 09:31:39 1.1
+++ pkgsrc/inputmethod/Chinput/patches/patch-ac 1.1.64.1
@@ -1,13 +0,0 @@ @@ -1,13 +0,0 @@
1$NetBSD: patch-ac,v 1.1 2002/06/15 09:31:39 shell Exp $ 
2 
3--- src/chinput.c.orig Mon Jun 10 21:16:56 2002 
4+++ src/chinput.c 
5@@ -75,7 +75,7 @@ 
6 HZloadRCFile(); //resource file 
7 HZloadRCIME(); //IME lists from Chinput.ad 
8 HZparseParameters(argc, argv); //parse parameters 
9- setlocale(LC_ALL, deflocale); //locale set 
10+ setlocale(LC_CTYPE, deflocale); //locale set 
11 HZinitDisplay(); //display init 
12 HZinitServerFont(); //font init 
13 HZinitWindows(); //windows geometry init 
cvs diff -r1.1 -r1.1.64.1 pkgsrc/inputmethod/Chinput/patches/patch-ad (expand / switch to unified diff)

--- pkgsrc/inputmethod/Chinput/patches/patch-ad 2002/06/15 09:31:39 1.1
+++ pkgsrc/inputmethod/Chinput/patches/patch-ad 1.1.64.1
@@ -1,31 +0,0 @@ @@ -1,31 +0,0 @@
1$NetBSD: patch-ad,v 1.1 2002/06/15 09:31:39 shell Exp $ 
2 
3--- src/config.c.orig Mon Jun 10 22:53:45 2002 
4+++ src/config.c 
5@@ -388,7 +388,7 @@ 
6 if(method == cur_inputmethod) return; 
7  
8 //change the encoding for later use 
9- if(!strcmp(chinputime[method].encoding, "GB")) 
10+ if(!strcmp(chinputime[method].encoding, "eucCN")) 
11 HZServer.encoding = HZSERVER_ENCODING_GB; 
12 else 
13 HZServer.encoding = HZSERVER_ENCODING_BIG5; 
14@@ -681,7 +681,7 @@ 
15 if(HZServer.encoding == HZSERVER_ENCODING_GB){ 
16 for(i=0; i<index_ime; i++){ 
17 if(!strcmp(chinputime[i].name, imd) &&  
18- !strcmp(chinputime[i].encoding, "GB")){ 
19+ !strcmp(chinputime[i].encoding, "eucCN")){ 
20 return i; 
21 } 
22 } 
23@@ -738,7 +738,7 @@ 
24 //chinput_imserver = IMM_OpenClient("127.0.0.1", 9010); 
25  
26 cur_inputmethod = id; 
27- if(!strcmp(chinputime[cur_inputmethod].encoding, "GB")) 
28+ if(!strcmp(chinputime[cur_inputmethod].encoding, "eucCN")) 
29 HZServer.encoding = HZSERVER_ENCODING_GB; 
30 else 
31 HZServer.encoding = HZSERVER_ENCODING_BIG5; 
cvs diff -r1.1 -r1.1.64.1 pkgsrc/inputmethod/Chinput/patches/patch-ae (expand / switch to unified diff)

--- pkgsrc/inputmethod/Chinput/patches/patch-ae 2002/06/15 09:31:39 1.1
+++ pkgsrc/inputmethod/Chinput/patches/patch-ae 1.1.64.1
@@ -1,22 +0,0 @@ @@ -1,22 +0,0 @@
1$NetBSD: patch-ae,v 1.1 2002/06/15 09:31:39 shell Exp $ 
2 
3--- src/init.c.orig Mon Jun 10 21:23:44 2002 
4+++ src/init.c 
5@@ -342,7 +342,7 @@ 
6 //enable two locales at the same time 
7 strcpy(imlocale, IMLOCALE); 
8  
9- if(getenv("LC_ALL") && strstr(getenv("LC_ALL"), "zh_TW")){ 
10+ if(getenv("LC_CTYPE") && strstr(getenv("LC_CTYPE"), "zh_TW.Big5")){ 
11 strcpy(deflocale, LOCALE_BIG5); 
12 //strcpy(imlocale, "zh_TW"); 
13 flag_encoding = HZSERVER_ENCODING_BIG5; 
14@@ -567,7 +567,7 @@ 
15 } 
16 fclose(fp); 
17  
18- if(strstr(getenv("LC_ALL"), "zh_TW")) 
19+ if(strstr(getenv("LC_CTYPE"), "zh_TW.Big5")) 
20 cur_inputmethod = HZgetInputMethod(input_method_big5); 
21 else 
22 cur_inputmethod = HZgetInputMethod(input_method_gb); 
cvs diff -r1.1 -r1.1.64.1 pkgsrc/inputmethod/Chinput/patches/patch-af (expand / switch to unified diff)

--- pkgsrc/inputmethod/Chinput/patches/patch-af 2002/06/15 09:31:39 1.1
+++ pkgsrc/inputmethod/Chinput/patches/patch-af 1.1.64.1
@@ -1,15 +0,0 @@ @@ -1,15 +0,0 @@
1$NetBSD: patch-af,v 1.1 2002/06/15 09:31:39 shell Exp $ 
2 
3--- resource/Chinput.ad.orig Mon Jun 10 21:55:02 2002 
4+++ resource/Chinput.ad 
5@@ -55,8 +55,8 @@ 
6 ! 16 point font set 
7 ! 
8 chinput.font = 8x16 
9-chinput.gbfont = -*-song-medium-r-normal--16-*-*-*-*-*-gbk-0 
10-chinput.big5font = -*-song-medium-r-normal--16-*-*-*-*-*-big5-0 
11+chinput.gbfont = -*-medium-r-normal--16-*-*-*-*-*-gb2312.1980-0 
12+chinput.big5font = -*-medium-r-normal--16-*-*-*-*-*-big5-0 
13 ! 
14 ! 
15 ! inputbar width in chars 
cvs diff -r1.3 -r1.3.2.1 pkgsrc/inputmethod/scim-tomoe/Makefile (expand / switch to unified diff)

--- pkgsrc/inputmethod/scim-tomoe/Makefile 2010/06/13 22:44:50 1.3
+++ pkgsrc/inputmethod/scim-tomoe/Makefile 2010/07/04 07:18:43 1.3.2.1
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.3 2010/06/13 22:44:50 wiz Exp $ 1# $NetBSD: Makefile,v 1.3.2.1 2010/07/04 07:18:43 agc Exp $
2# 2#
3 3
4DISTNAME= scim-tomoe-0.6.0 4DISTNAME= scim-tomoe-0.6.0
5PKGREVISION= 2 5PKGREVISION= 3
6CATEGORIES= inputmethod 6CATEGORIES= inputmethod
7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tomoe/} 7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tomoe/}
8 8
9MAINTAINER= obache@NetBSD.org 9MAINTAINER= obache@NetBSD.org
10HOMEPAGE= http://tomoe.sourceforge.jp/ 10HOMEPAGE= http://tomoe.sourceforge.jp/
11COMMENT= SCIM IMEngine module for Tomoe 11COMMENT= SCIM IMEngine module for Tomoe
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
15 15
16USE_LANGUAGES= c c++ 16USE_LANGUAGES= c c++
17USE_PKGLOCALEDIR= yes 17USE_PKGLOCALEDIR= yes
18USE_LIBTOOL= yes 18USE_LIBTOOL= yes
cvs diff -r1.2 -r1.2.2.1 pkgsrc/inputmethod/scim-tomoe/distinfo (expand / switch to unified diff)

--- pkgsrc/inputmethod/scim-tomoe/distinfo 2010/05/28 09:31:35 1.2
+++ pkgsrc/inputmethod/scim-tomoe/distinfo 2010/07/04 07:18:43 1.2.2.1
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.2 2010/05/28 09:31:35 obache Exp $ 1$NetBSD: distinfo,v 1.2.2.1 2010/07/04 07:18:43 agc Exp $
2 2
3SHA1 (scim-tomoe-0.6.0.tar.gz) = 481ee2f8f9baa6105a349da36360aed06e432291 3SHA1 (scim-tomoe-0.6.0.tar.gz) = 481ee2f8f9baa6105a349da36360aed06e432291
4RMD160 (scim-tomoe-0.6.0.tar.gz) = c95059e7f594192c97b082aa61818060391a8591 4RMD160 (scim-tomoe-0.6.0.tar.gz) = c95059e7f594192c97b082aa61818060391a8591
5Size (scim-tomoe-0.6.0.tar.gz) = 385126 bytes 5Size (scim-tomoe-0.6.0.tar.gz) = 385126 bytes
6SHA1 (patch-aa) = 0554574908f37adae9d8771dcadce2e038c5857a 6SHA1 (patch-aa) = 0554574908f37adae9d8771dcadce2e038c5857a
7SHA1 (patch-ab) = 1c598b251d218a9f1da7c089dd51780e97108d40 7SHA1 (patch-ab) = b27e4074c5f3b18eb8969c66929c78f9f6ff8fe0
cvs diff -r1.1 -r1.1.2.1 pkgsrc/inputmethod/scim-tomoe/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/inputmethod/scim-tomoe/patches/patch-ab 2010/05/28 09:31:35 1.1
+++ pkgsrc/inputmethod/scim-tomoe/patches/patch-ab 2010/07/04 07:18:43 1.1.2.1
@@ -1,18 +1,32 @@ @@ -1,18 +1,32 @@
1$NetBSD: patch-ab,v 1.1 2010/05/28 09:31:35 obache Exp $ 1$NetBSD: patch-ab,v 1.1.2.1 2010/07/04 07:18:43 agc Exp $
2 2
3support gucharmap-2 3* GtkSpinButton: setting an adjustment with non-zero page size is deprecated
 4* support gucharmap-2
4 5
5--- src/scim_tomoe_prefs_widget.cpp.orig 2007-05-07 07:49:15.000000000 +0000 6--- src/scim_tomoe_prefs_widget.cpp.orig 2007-05-07 07:49:15.000000000 +0000
6+++ src/scim_tomoe_prefs_widget.cpp 7+++ src/scim_tomoe_prefs_widget.cpp
7@@ -472,9 +472,9 @@ apply_config (ScimTomoePrefsWidget *pref 8@@ -170,7 +170,7 @@ create_spin_button (ScimTomoePrefsWidget
 9 gtk_widget_show (label);
 10
 11 GtkObject *adj = gtk_adjustment_new (value, min, max, step,
 12- page_size, page_size);
 13+ page_size, 0.0);
 14 GtkWidget *spin = gtk_spin_button_new (GTK_ADJUSTMENT (adj), 0.0, 0);
 15 g_object_set_data (G_OBJECT (spin),
 16 OBJECT_DATA_CONFIG_KEY, (gpointer) key);
 17@@ -472,9 +472,13 @@ apply_config (ScimTomoePrefsWidget *pref
8 String (SCIM_TOMOE_CONFIG_UNICODE_TABLE_FONT_DEFAULT)); 18 String (SCIM_TOMOE_CONFIG_UNICODE_TABLE_FONT_DEFAULT));
9  19
10 if (font.length() > 0) { 20 if (font.length() > 0) {
11- gucharmap_charmap_set_font (charmap, font.c_str ()); 21- gucharmap_charmap_set_font (charmap, font.c_str ());
12+ gucharmap_charmap_set_font_desc (charmap, pango_font_description_from_string(font.c_str ())); 22+ PangoFontDescription *desc = pango_font_description_from_string(font.c_str ());
 23+ gucharmap_charmap_set_font_desc (charmap, desc);
 24+ pango_font_description_free (desc);
13 } else { 25 } else {
14- gucharmap_charmap_set_font (charmap, NULL); 26- gucharmap_charmap_set_font (charmap, NULL);
15+ gucharmap_charmap_set_font_desc (charmap, pango_font_description_from_string(NULL)); 27+ PangoFontDescription *desc = pango_font_description_new ();
 28+ gucharmap_charmap_set_font_desc (charmap, desc);
 29+ pango_font_description_free (desc);
16 set_default_font (prefs, SCIM_TOMOE_CONFIG_CAND_FONT, 30 set_default_font (prefs, SCIM_TOMOE_CONFIG_CAND_FONT,
17 GTK_WIDGET (charmap)); 31 GTK_WIDGET (charmap));
18 } 32 }
cvs diff -r1.1 -r1.1.64.1 pkgsrc/inputmethod/skkfep/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/inputmethod/skkfep/patches/patch-ab 2002/05/31 13:00:04 1.1
+++ pkgsrc/inputmethod/skkfep/patches/patch-ab 1.1.64.1
@@ -1,22 +0,0 @@ @@ -1,22 +0,0 @@
1$NetBSD: patch-ab,v 1.1 2002/05/31 13:00:04 seb Exp $ 
2 
3--- configs/netbsd.h.orig Tue Jul 7 00:31:13 1998 
4+++ configs/netbsd.h Mon Dec 20 23:53:25 1999 
5@@ -1,5 +1,5 @@ 
6 /* 
7- * Configuration for NetBSD-1.2 (x68k) 
8+ * Configuration for NetBSD 
9 */ 
10  
11 #define BSD /* My machine is BSD system */ 
12@@ -8,7 +8,9 @@ 
13 #define HAVE_SETENV /* My machine has setenv() */ 
14 #define HAVE_BSD_OPENPTY /* BSD type openpty() */ 
15  
16-#include <stdlib.h> /* just in case of NetBSD/Alpha */ 
17+#include <stdlib.h> 
18+#include <string.h> 
19+#include <unistd.h> 
20 #include <util.h> /* for openpty() */ 
21  
22 #if makefile_parameter 
cvs diff -r1.1 -r1.1.64.1 pkgsrc/inputmethod/skkfep/patches/patch-ac (expand / switch to unified diff)

--- pkgsrc/inputmethod/skkfep/patches/patch-ac 2002/05/31 13:00:04 1.1
+++ pkgsrc/inputmethod/skkfep/patches/patch-ac 1.1.64.1
@@ -1,14 +0,0 @@ @@ -1,14 +0,0 @@
1$NetBSD: patch-ac,v 1.1 2002/05/31 13:00:04 seb Exp $ 
2 
3--- Makefile.orig Tue Jul 7 00:31:14 1998 
4+++ Makefile Mon Dec 20 23:45:52 1999 
5@@ -15,5 +15,8 @@ 
6 rm -f genMakefile 
7  
8 genMakefile: protoMakefile config.h 
9- awk -f extrpar `grep 'configs/.*\.h' config.h | sed 's/.*\(configs\/.*\.h\).*/\1/'` > genMakefile 
10+ rm -f genMakefile 
11+ cp config.h junk.c 
12+ awk -f extrpar `cc -E junk.c | sed -n 's/^#[^"]*"\([^/][^"]*onfigs[^"]*\)".*/\1/p' | sort | uniq` > genMakefile 
13+ rm -f junk.c 
14 awk -f extrpar config.h | cat - protoMakefile >> genMakefile 
cvs diff -r1.1 -r1.1.64.1 pkgsrc/inputmethod/skkfep/patches/patch-bb (expand / switch to unified diff)

--- pkgsrc/inputmethod/skkfep/patches/patch-bb 2002/05/31 13:00:04 1.1
+++ pkgsrc/inputmethod/skkfep/patches/patch-bb 1.1.64.1
@@ -1,146 +0,0 @@ @@ -1,146 +0,0 @@
1$NetBSD: patch-bb,v 1.1 2002/05/31 13:00:04 seb Exp $ 
2 
3--- connserv.c.orig Tue Jul 7 00:31:16 1998 
4+++ connserv.c Tue Nov 7 20:58:57 2000 
5@@ -14,6 +14,10 @@ 
6 #include <netinet/in.h> 
7 #include <netdb.h> 
8  
9+#ifdef PF_INET6 
10+# define HAVE_GETADDRINFO 
11+#endif 
12+ 
13 #define SKK_PORT_NUMBER 1178 
14 #define SKK_SERVICENAME "skkserv" 
15  
16@@ -36,50 +40,112 @@ 
17 int sock; 
18 int i; 
19 unsigned short port; 
20+#ifdef HAVE_GETADDRINFO 
21+ struct addrinfo aihint, *ai0, *ai; 
22+ int error; 
23+#else 
24 struct sockaddr_in hostaddr; 
25 struct hostent *entry; 
26 struct servent *serv; 
27 struct protoent *proto; 
28- int a1,a2,a3,a4; 
29+#endif 
30 char *hostname; 
31- 
32- serv = getservbyname(SKK_SERVICENAME,"tcp"); 
33- fillzero((char*)&hostaddr,sizeof(struct sockaddr_in)); 
34- if ((proto = getprotobyname("tcp")) == NULL) { 
35- return -1; 
36- } 
37- 
38- if ((sock = socket(AF_INET,SOCK_STREAM,proto->p_proto)) < 0) { 
39- return -1; 
40+#ifdef SKK_CONF /* use skk.conf */ 
41+ FILE *conffp; 
42+ char line[128]; 
43+ char hostbuf[128]; 
44+ char servbuf[128]; 
45+ char *confhost = NULL; 
46+ char *confport = SKK_SERVICENAME; 
47+ 
48+ if ((conffp = fopen(SKK_CONF, "r")) != NULL) { 
49+ char *p, *data; 
50+ 
51+ while (fgets(line, sizeof line, conffp) != NULL) { 
52+ if ((p = strchr(line, '#')) != NULL) 
53+ *p = '\0'; 
54+ if ((p = strtok(line, ": \t\n")) == NULL) 
55+ continue; 
56+ if ((data = strtok((char *) NULL, " \t\n")) == NULL) 
57+ continue; 
58+ if (!strcmp(p, "skkserv_host")) { 
59+ strcpy(hostbuf, data); 
60+ confhost = hostbuf; 
61+ } else if (!strcmp(p, "skkserv_port")) { 
62+ strcpy(servbuf, data); 
63+ confport = servbuf; 
64+ } 
65+ } 
66 } 
67+# undef SKK_SERVICENAME 
68+# define SKK_SERVICENAME confport 
69+#endif 
70  
71 if (SKKServerHost) 
72 hostname = SKKServerHost; 
73 else if ((hostname = getenv("SKKSERVER")) == NULL) { 
74+#ifdef SKK_CONF 
75+ if ((hostname = confhost) == NULL) 
76+#endif 
77 #ifdef SKK_SERVER_HOST 
78 hostname = SKK_SERVER_HOST; 
79 #else 
80 return -1; 
81 #endif 
82 } 
83- if ('0' <= *hostname && *hostname <= '9') { 
84- if (sscanf(hostname,"%d.%d.%d.%d",&a1,&a2,&a3,&a4) != 4) { 
85- return -1; 
86- } 
87- a1 = (a1<<24)|(a2<<16)|(a3<<8)|a4; 
88- hostaddr.sin_addr.s_addr = htonl(a1); 
89+ 
90+#ifdef HAVE_GETADDRINFO 
91+ fillzero((char*)&aihint, sizeof aihint); 
92+ aihint.ai_family = PF_UNSPEC; 
93+ aihint.ai_socktype = SOCK_STREAM; 
94+ aihint.ai_flags = AI_CANONNAME; 
95+ error = getaddrinfo(hostname, SKK_SERVICENAME, &aihint, &ai0); 
96+ if (error) { 
97+ printf("%s: %s\r\n", gai_strerror(error), hostname); 
98+ return -1; 
99+ } 
100+ 
101+ sock = -1; 
102+ for (ai = ai0; ai; ai = ai->ai_next) { 
103+ sock = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol); 
104+ if (sock >= 0 && 
105+ connect(sock, ai->ai_addr, ai->ai_addrlen) == 0) 
106+ break; 
107+ close(sock); 
108+ sock = -1; 
109+ } 
110+ if (sock < 0) { 
111+ perror(hostname); 
112+ return -1; 
113+ } 
114+#else 
115+ serv = getservbyname(SKK_SERVICENAME,"tcp"); 
116+ fillzero((char*)&hostaddr,sizeof(struct sockaddr_in)); 
117+ if ((proto = getprotobyname("tcp")) == NULL) { 
118+ return -1; 
119 } 
120- else { 
121+ 
122+ if ((sock = socket(AF_INET,SOCK_STREAM,proto->p_proto)) < 0) { 
123+ return -1; 
124+ } 
125+ 
126+ if ((hostaddr.sin_addr.s_addr = inet_addr(hostname)) == INADDR_NONE) { 
127 if ((entry = gethostbyname(hostname)) == NULL) { 
128 return -1; 
129 } 
130 bincopy(entry->h_addr, &hostaddr.sin_addr, entry->h_length); 
131 } 
132 hostaddr.sin_family = AF_INET; 
133- hostaddr.sin_port = serv ? serv->s_port : htons(SKK_PORT_NUMBER); 
134+ hostaddr.sin_port = 
135+ serv ? serv->s_port : 
136+#ifdef SKK_CONF 
137+ (i = atoi(confport)) > 0 ? htons(i) : 
138+#endif 
139+ htons(SKK_PORT_NUMBER); 
140 if (connect(sock,(struct sockaddr *)&hostaddr,sizeof(struct sockaddr_in)) < 0) { 
141 return -1; 
142 } 
143+#endif 
144 printf("SKKSERVER=%s\r\n",hostname); 
145 skkservsock = sock; 
146 rserv = fdopen(sock,"r"); 
cvs diff -r1.1 -r1.1.64.1 pkgsrc/inputmethod/skkfep/patches/patch-bd (expand / switch to unified diff)

--- pkgsrc/inputmethod/skkfep/patches/patch-bd 2002/05/31 13:00:04 1.1
+++ pkgsrc/inputmethod/skkfep/patches/patch-bd 1.1.64.1
@@ -1,21 +0,0 @@ @@ -1,21 +0,0 @@
1$NetBSD: patch-bd,v 1.1 2002/05/31 13:00:04 seb Exp $ 
2 
3--- fep.c.orig Tue Jul 7 00:31:16 1998 
4+++ fep.c Tue Dec 21 00:42:53 1999 
5@@ -219,7 +219,6 @@ 
6 /* Initialize */ 
7 setKanaKey(); 
8 getTCstr(); 
9- tty_ready(); 
10 get_winsize(); 
11 set_tty(); 
12 set_int(); 
13@@ -308,7 +307,7 @@ 
14 break; 
15 } 
16 } 
17- return jisAJ; /* default */ 
18+ return jisBB; /* default */ 
19 } 
20  
21 flushOut(minchar) 
cvs diff -r1.1 -r1.1.64.1 pkgsrc/inputmethod/skkfep/patches/patch-be (expand / switch to unified diff)

--- pkgsrc/inputmethod/skkfep/patches/patch-be 2002/05/31 13:00:04 1.1
+++ pkgsrc/inputmethod/skkfep/patches/patch-be 1.1.64.1
@@ -1,66 +0,0 @@ @@ -1,66 +0,0 @@
1$NetBSD: patch-be,v 1.1 2002/05/31 13:00:04 seb Exp $ 
2 
3--- readwrite.c.orig Tue Jul 7 00:31:15 1998 
4+++ readwrite.c Sun Sep 27 10:24:06 1998 
5@@ -4,6 +4,14 @@ 
6 #include "kanjicode.h" 
7 #include "ctrlcode.h" 
8  
9+#ifndef STDIN_FILENO 
10+#define STDIN_FILENO 0 
11+#endif 
12+ 
13+#ifndef STDOUT_FILENO 
14+#define STDOUT_FILENO 1 
15+#endif 
16+ 
17 #ifdef DEBUG 
18 extern FILE *wrlog; 
19 #endif 
20@@ -29,12 +37,10 @@ 
21 SIC_B,SOC_B,"JIS",3,3, 
22 }; 
23  
24-extern int tty; 
25- 
26 char read1() 
27 { char c; 
28  
29- if (read(tty,&c,1) != 0) 
30+ if (read(STDIN_FILENO,&c,1) != 0) 
31 return c; 
32 return EOF; 
33 } 
34@@ -320,13 +326,13 @@ 
35 char *s; 
36 { int l = strlen(s); 
37  
38- writeTTYorg(tty,s,l,INTERNALCODE,OutCode,&TInter_Stat,&To_TTY_Stat); 
39+ writeTTYorg(STDOUT_FILENO,s,l,INTERNALCODE,OutCode,&TInter_Stat,&To_TTY_Stat); 
40 } 
41  
42 write1(c) 
43 char c; 
44 { 
45- writeTTYorg(tty,&c,1,INTERNALCODE,OutCode,&TInter_Stat,&To_TTY_Stat); 
46+ writeTTYorg(STDOUT_FILENO,&c,1,INTERNALCODE,OutCode,&TInter_Stat,&To_TTY_Stat); 
47 } 
48  
49 writeShTty(s,l) 
50@@ -334,14 +340,14 @@ 
51 int l; 
52 { 
53  
54- writeTTYorg(tty,s,l,WriteCode,OutCode,&From_SH_Stat,&To_TTY_Stat); 
55+ writeTTYorg(STDOUT_FILENO,s,l,WriteCode,OutCode,&From_SH_Stat,&To_TTY_Stat); 
56 } 
57  
58 writeTty(s,l) 
59 char *s; 
60 int l; 
61 { 
62- writeTTYorg(tty,s,l,INTERNALCODE,OutCode,&TInter_Stat,&To_TTY_Stat); 
63+ writeTTYorg(STDOUT_FILENO,s,l,INTERNALCODE,OutCode,&TInter_Stat,&To_TTY_Stat); 
64 } 
65  
66  
cvs diff -r1.1 -r1.1.64.1 pkgsrc/inputmethod/skkfep/patches/patch-bf (expand / switch to unified diff)

--- pkgsrc/inputmethod/skkfep/patches/patch-bf 2002/05/31 13:00:04 1.1
+++ pkgsrc/inputmethod/skkfep/patches/patch-bf 1.1.64.1
@@ -1,104 +0,0 @@ @@ -1,104 +0,0 @@
1$NetBSD: patch-bf,v 1.1 2002/05/31 13:00:04 seb Exp $ 
2 
3--- stty.c.orig Wed Sep 23 01:22:53 1998 
4+++ stty.c Sun Sep 27 10:21:12 1998 
5@@ -31,12 +31,15 @@ 
6  
7 #endif 
8  
9+#ifndef STDIN_FILENO 
10+#define STDIN_FILENO 0 
11+#endif 
12+ 
13 #ifndef NO_SUSPEND 
14 SignalFunc suspend(); 
15 #endif 
16  
17 TERMPARAM d_ioval; 
18-int tty; 
19 #ifdef TIOCSWINSZ 
20 struct winsize d_winsize; 
21 #endif /* TIOCSWINSZ */ 
22@@ -142,7 +145,7 @@ 
23 #ifdef TIOCSWINSZ 
24 extern int lines, columns; 
25  
26- ioctl(tty, TIOCGWINSZ, &d_winsize); 
27+ ioctl(STDIN_FILENO, TIOCGWINSZ, &d_winsize); 
28 if (d_winsize.ws_col == 0) { 
29 d_winsize.ws_col = columns; 
30 } else { 
31@@ -153,7 +156,7 @@ 
32 } else { 
33 lines = d_winsize.ws_row; 
34 } 
35- ioctl(tty, TIOCSWINSZ, &d_winsize); 
36+ ioctl(STDIN_FILENO, TIOCSWINSZ, &d_winsize); 
37 #endif /* TIOCSWINSZ */ 
38 } 
39  
40@@ -161,7 +164,7 @@ 
41 { int er; 
42 TERMPARAM ioval; 
43  
44- GET_TTY(tty, &d_ioval); 
45+ GET_TTY(STDIN_FILENO, &d_ioval); 
46 ioval = d_ioval; 
47  
48 #if defined TERMIOS || defined TERMIO 
49@@ -195,7 +198,7 @@ 
50 ioval.m_ttyb.sg_flags = RAW; 
51 #endif 
52  
53- er = SET_TTY(tty, &ioval); 
54+ er = SET_TTY(STDIN_FILENO, &ioval); 
55  
56 initFep(); 
57  
58@@ -208,14 +211,8 @@ 
59  
60 reset_tty() 
61 { 
62- reset_tty_without_close(); 
63- close(tty); 
64-} 
65- 
66-reset_tty_without_close() 
67-{ 
68 termFep(); 
69- SET_TTY(tty, &d_ioval); 
70+ SET_TTY(STDIN_FILENO, &d_ioval); 
71 } 
72  
73 set_tty_sane(tty) 
74@@ -258,12 +255,6 @@ 
75 } 
76 } 
77  
78-tty_ready() 
79-{ char *ttyname(); 
80- 
81- tty = open(ttyname(0),O_RDWR); 
82-} 
83- 
84 SignalFunc 
85 reset_exit() 
86 { 
87@@ -315,7 +306,7 @@ 
88 union wait statusp; 
89 #endif 
90  
91-#ifndef NO_SUSPEND 
92+#ifdef NO_SUSPEND 
93 while ((cpid = wait((int *)&statusp)) != -1 && cpid != ShellPID) 
94 ; 
95 #else 
96@@ -385,7 +376,7 @@ 
97 SignalFunc 
98 suspend() 
99 { 
100- reset_tty_without_close(); 
101+ reset_tty(); 
102 signal(SIGTSTP,SIG_DFL); 
103 kill(0,SIGTSTP); 
104  
cvs diff -r1.1 -r1.1.64.1 pkgsrc/inputmethod/skkfep/patches/patch-bg (expand / switch to unified diff)

--- pkgsrc/inputmethod/skkfep/patches/patch-bg 2002/05/31 13:00:04 1.1
+++ pkgsrc/inputmethod/skkfep/patches/patch-bg 1.1.64.1
@@ -1,70 +0,0 @@ @@ -1,70 +0,0 @@
1$NetBSD: patch-bg,v 1.1 2002/05/31 13:00:04 seb Exp $ 
2 
3--- skkfep.1.orig Tue Jul 7 00:31:16 1998 
4+++ skkfep.1 Sat Dec 25 17:28:26 1999 
5@@ -21,12 +21,13 @@ 
6 EUC (or DEC code).  
7 .IP \fBsj\fR  
8 MS-Kanji (Shift-JIS) code.  
9-.IP \fBjis\fIIO\fR  
10+.IP \fBjis\fIIO\fR 
11 JIS code. \fII\fR and \fIO\fR are characters which 
12-represent shift-in/out escape sequence respectively. For shift-in, 
13-\fBA,@\fR(ESC $ @) or \fBB\fR(ESC $ B) can be specified; for 
14-shift-out, \fBH\fR(ESC ( H), \fBJ\fR(ESC ( J) or \fBB\fR(ESC ( B) can 
15+represent kanji/ASCII escape sequences respectively. For kanji sequence, 
16+\fBA\fR, \fB@\fR (ESC $ @) or \fBB\fR (ESC $ B) can be specified; for 
17+ASCII sequence, \fBH\fR (ESC ( H), \fBJ\fR (ESC ( J) or \fBB\fR (ESC ( B) can 
18 be specified.  
19+If the \fIIO\fR characters are omitted, the characters default to \fBBB\fR. 
20 .RE 
21 .TP  
22 .BI -f kanjicode  
23@@ -34,7 +35,7 @@ 
24 .TP  
25 .BI -udic \0dictionary  
26 Specifies the user dictionary file. 
27-Default is $(HOME)/.skk-jisyo.  
28+Default is $HOME/.skk-jisyo.  
29 .TP  
30 .B -bs  
31 Toggle BS behavior when the 
32@@ -46,12 +47,12 @@ 
33 Choose the mode of learning words got from skk server.  
34 \fImode\fR is one of following: 
35 .RS 
36-.IP \fBnone\fR or \fBoff\fR or \fB0\fR 
37+.IP "\fBnone\fR or \fBoff\fR or \fB0\fR" 
38 Do not learn the words at all. 
39-.IP \fBtemporal\fR or \fB1\fR 
40+.IP "\fBtemporal\fR or \fB1\fR" 
41 Learn the words while the skkfep process is alive, but do not record 
42 the learned information. 
43-.IP \fBpermanent\fR or \fB2\fR 
44+.IP "\fBpermanent\fR or \fB2\fR" 
45 Learn the words and record them on the user dictionary. 
46 .RE 
47 .TP 
48@@ -61,12 +62,20 @@ 
49 .TP 
50 .BI -k char  
51 Specify the kanji toggle key. A control character is 
52-expressed as ^ followed by an alphabet (for example, ^t). Default is 
53-^T.  
54+expressed as ^ followed by an alphabet (for example, ^j). Default is 
55+^J.  
56 .TP 
57 .B -esc 
58 With this option, ESC key becomes `RETUEN-TO-SKK-MODE' key. 
59 This option is useful for vi-users. 
60+.TP 
61+.B -viesc 
62+With this option, ESC key becomes `RETUEN-TO-SKK-MODE' key and 
63+one of i, a, o, I, A, S, and R key restores the last mode. 
64+.TP 
65+.B -emacsesc 
66+With this option, control characters go though to the shell and disable 
67+conversion temporarily. 
68 .TP 
69 .B -rs 
70 Reverse status line. 
cvs diff -r1.1 -r1.1.64.1 pkgsrc/inputmethod/skkserv/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/inputmethod/skkserv/patches/Attic/patch-aa 2002/05/31 12:59:58 1.1
+++ pkgsrc/inputmethod/skkserv/patches/Attic/patch-aa 1.1.64.1
@@ -1,21 +0,0 @@ @@ -1,21 +0,0 @@
1$NetBSD: patch-aa,v 1.1 2002/05/31 12:59:58 seb Exp $ 
2 
3--- Makefile.in.orig Mon Feb 3 18:21:39 1997 
4+++ Makefile.in Tue Dec 21 20:03:09 1999 
5@@ -33,7 +33,7 @@ 
6 JISYO = @JISYO@ 
7 JISYODIR = $(datadir)/skk 
8  
9-SUBDIRS = lisp skkserv jisyo-tools doc etc 
10+SUBDIRS = skkserv jisyo-tools 
11  
12 MDEFINES = CC='$(CC)' CFLAGS='$(CFLAGS)' LDFLAGS='$(LDFLAGS)' \ 
13 EMACS='$(EMACS)' JISYO='$(JISYO)' JISYODIR='$(JISYODIR)' \ 
14@@ -50,7 +50,6 @@ 
15 echo making $@ in $$subdir; \ 
16 (cd $$subdir && $(MAKE) $(MDEFINES) $@) || exit 1; \ 
17 done 
18- $(INSTALL_DATA) jisyo/$(JISYO) $(JISYODIR)/$(JISYO) 
19  
20 clean: 
21 cd lisp; $(MAKE) clean 
cvs diff -r1.1 -r1.1.64.1 pkgsrc/inputmethod/skkserv/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/inputmethod/skkserv/patches/patch-ab 2002/05/31 12:59:58 1.1
+++ pkgsrc/inputmethod/skkserv/patches/patch-ab 1.1.64.1
@@ -1,13 +0,0 @@ @@ -1,13 +0,0 @@
1$NetBSD: patch-ab,v 1.1 2002/05/31 12:59:58 seb Exp $ 
2 
3--- configure.in.orig Mon Feb 3 17:02:01 1997 
4+++ configure.in Tue Dec 21 15:46:54 1999 
5@@ -18,7 +18,7 @@ 
6 AC_PROG_GCC_TRADITIONAL 
7 AC_FUNC_SETPGRP 
8 AC_TYPE_SIGNAL 
9-AC_CHECK_FUNCS(bzero tiocnotty getdtablesize) 
10+AC_CHECK_FUNCS(bzero setsid getdtablesize) 
11  
12 AC_CHECK_FUNC(dbm_open, , [DBMLIB="-ldbm"]) 
13  
cvs diff -r1.1 -r1.1.64.1 pkgsrc/inputmethod/skkserv/patches/patch-ac (expand / switch to unified diff)

--- pkgsrc/inputmethod/skkserv/patches/patch-ac 2002/05/31 12:59:58 1.1
+++ pkgsrc/inputmethod/skkserv/patches/patch-ac 1.1.64.1
@@ -1,15 +0,0 @@ @@ -1,15 +0,0 @@
1$NetBSD: patch-ac,v 1.1 2002/05/31 12:59:58 seb Exp $ 
2 
3--- config.h.in.orig Fri Jan 17 20:27:10 1997 
4+++ config.h.in Tue Dec 21 15:52:49 1999 
5@@ -15,8 +15,8 @@ 
6 /* Define if you have the getdtablesize function. */ 
7 #undef HAVE_GETDTABLESIZE 
8  
9-/* Define if you have the tiocnotty function. */ 
10-#undef HAVE_TIOCNOTTY 
11+/* Define if you have the setsid function. */ 
12+#undef HAVE_SETSID 
13  
14 /* Define if you have the <fcntl.h> header file. */ 
15 #undef HAVE_FCNTL_H 
cvs diff -r1.1 -r1.1.64.1 pkgsrc/inputmethod/skkserv/patches/patch-ad (expand / switch to unified diff)

--- pkgsrc/inputmethod/skkserv/patches/patch-ad 2002/05/31 12:59:58 1.1
+++ pkgsrc/inputmethod/skkserv/patches/patch-ad 1.1.64.1
@@ -1,13 +0,0 @@ @@ -1,13 +0,0 @@
1$NetBSD: patch-ad,v 1.1 2002/05/31 12:59:58 seb Exp $ 
2 
3--- configure.orig Fri Feb 7 14:00:43 1997 
4+++ configure Tue Dec 21 15:46:55 1999 
5@@ -1191,7 +1191,7 @@ 
6 EOF 
7  
8  
9-for ac_func in bzero tiocnotty getdtablesize 
10+for ac_func in bzero setsid getdtablesize 
11 do 
12 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 
13 echo "configure:1198: checking for $ac_func" >&5 
cvs diff -r1.1 -r1.1.64.1 pkgsrc/inputmethod/skkserv/patches/patch-ae (expand / switch to unified diff)

--- pkgsrc/inputmethod/skkserv/patches/patch-ae 2002/05/31 12:59:58 1.1
+++ pkgsrc/inputmethod/skkserv/patches/patch-ae 1.1.64.1
@@ -1,14 +0,0 @@ @@ -1,14 +0,0 @@
1$NetBSD: patch-ae,v 1.1 2002/05/31 12:59:58 seb Exp $ 
2 
3--- skkserv/Makefile.in.orig Fri Feb 7 11:05:23 1997 
4+++ skkserv/Makefile.in Tue Dec 21 07:41:57 1999 
5@@ -28,7 +28,8 @@ 
6 SERVERDIR = @libexecdir@ 
7  
8 DEFS = -I$(srcdir) -I$(top_srcdir) $(CFLAGS) @DEFS@ @PRIVATE@ \ 
9- -DDEFAULT_JISYO=\"$(JISYODIR)/$(JISYO)\" 
10+ -DDEFAULT_JISYO=\"$(JISYODIR)/$(JISYO)\" \ 
11+ -DSKKSERV_UID=${SKKUID} -DSKKSERV_GID=${SKKGID} 
12  
13 all: skkserv 
14  
cvs diff -r1.1 -r1.1.64.1 pkgsrc/inputmethod/skkserv/patches/Attic/patch-af (expand / switch to unified diff)

--- pkgsrc/inputmethod/skkserv/patches/Attic/patch-af 2002/05/31 12:59:58 1.1
+++ pkgsrc/inputmethod/skkserv/patches/Attic/patch-af 1.1.64.1
@@ -1,282 +0,0 @@ @@ -1,282 +0,0 @@
1$NetBSD: patch-af,v 1.1 2002/05/31 12:59:58 seb Exp $ 
2 
3--- skkserv/skkserv.c.orig Tue Jan 21 04:16:36 1997 
4+++ skkserv/skkserv.c Mon Nov 6 00:12:57 2000 
5@@ -100,14 +100,16 @@ 
6 #define SERVER_NOT_FOUND "4" 
7 #define SERVER_FULL "9" 
8  
9+#define warn(m) \ 
10+ {if (debug) fprintf(errout, "%s: %s\n", pgmnm, m);} 
11 #define err(m) \ 
12- {if (debug) fprintf(errout, "%s: %s\n", pgmnm, m); exit(1);} 
13+ {warn(m); exit(1);} 
14  
15 /* 
16 * Global Variables 
17 */ 
18  
19-char pgmver[] = "3.9.4 "; /* version number */ 
20+char pgmver[] = "3.9.4nb1 "; /* version number */ 
21  
22 char *pgmnm; /* program name */ 
23 char *jname; /* name of shared dictionary */ 
24@@ -121,6 +123,9 @@ 
25 int jtab1[KANAMOJI]; /* index-table by 1st letter (1st part)*/ 
26 int jtab2[KANAMOJI]; /* index-table by 1st letter (2nd part)*/ 
27 int initsock; /* socket for waiting requests */ 
28+#ifdef PF_INET6 
29+int initsock6; /* IPv6 socket for waiting requests */ 
30+#endif 
31 int clientsock[MAXCLNT]; /* socket for each client */ 
32 int nclients; /* max index for active clients */ 
33  
34@@ -130,8 +135,18 @@ 
35 int parg; 
36 int setjisho = 0; 
37 int ctlterm; /* fildes for control terminal */ 
38- void reread(); 
39+ RETSIGTYPE req_reread(); 
40+ 
41+#ifdef SKKSERV_UID 
42+ gid_t gid = SKKSERV_GID; 
43  
44+ /* revoke privilege if any */ 
45+ if (geteuid() == 0) { 
46+ setgroups(1, &gid); 
47+ setgid(SKKSERV_GID); 
48+ setuid(SKKSERV_UID); 
49+ } 
50+#endif 
51 pgmnm = argv[0]; 
52 debug = 0; 
53 errout = stderr; 
54@@ -200,7 +215,10 @@ 
55 fclose(stderr); 
56  
57 /* detach child process from control terminal */ 
58-#ifdef HAVE_TIOCNOTTY 
59+#ifdef HAVE_SETSID 
60+ setsid(); 
61+#else 
62+#ifdef TIOCNOTTY 
63 if ((ctlterm = open("/dev/tty", 2)) >= 0) {  
64 ioctl(ctlterm, TIOCNOTTY, 0); 
65 close(ctlterm); 
66@@ -215,6 +233,7 @@ 
67 signal(SIGHUP, SIG_IGN); 
68 if (fork() != 0) exit(0); 
69 #endif 
70+#endif 
71 } else { /* debug mode */ 
72 fprintf(errout, "SKK-JISYO is %s\n", jname); 
73 fflush(errout); 
74@@ -222,7 +241,7 @@ 
75 if (errout != stderr) fclose(stderr); 
76 } 
77  
78- signal(SIGINT, reread); 
79+ signal(SIGINT, req_reread); 
80 /* 1993/6/5 by kam, re-read dictionary by "INT" signal */ 
81  
82 nclients = 0; 
83@@ -244,8 +263,11 @@ 
84 mksock() 
85 { 
86 struct sockaddr_in sin; 
87+#ifdef PF_INET6 
88+ struct sockaddr_in6 sin6; 
89+#endif 
90 struct servent *sp; 
91- int optbuf = 1; /* enable socket REUSEADDR */ 
92+ int optbuf; /* enable socket REUSEADDR */ 
93  
94 bzero((char*)&sin, sizeof(sin)); 
95 sin.sin_family = AF_INET; 
96@@ -262,16 +284,54 @@ 
97 sin.sin_port = htons(portnum);  
98  
99 if ((initsock = socket(PF_INET, SOCK_STREAM, 0)) < 0) 
100- err("socket error; socket cannot be created"); 
101- if (setsockopt(initsock, SOL_SOCKET, SO_REUSEADDR,  
102+ warn("socket error; socket cannot be created"); 
103+#ifdef PF_INET6 
104+ bzero((char*)&sin6, sizeof(sin6)); 
105+ sin6.sin6_family = AF_INET6; 
106+ /* sin6.sin6_addr.s6_addr = IN6ADDR_ANY_INIT; ... all-zero pattern */ 
107+ sin6.sin6_port = htons(portnum);  
108+ if ((initsock6 = socket(PF_INET6, SOCK_STREAM, 0)) < 0) 
109+ warn("socket error; IPv6 socket cannot be created"); 
110+#endif 
111+ optbuf = 1; 
112+ if (initsock >= 0 && setsockopt(initsock, SOL_SOCKET, SO_REUSEADDR,  
113+ &optbuf, sizeof(optbuf)) < 0) 
114+ warn("socket error; cannot set socket option"); 
115+#ifdef PF_INET6 
116+ optbuf = 1; 
117+ if (initsock6 >= 0 && setsockopt(initsock6, SOL_SOCKET, SO_REUSEADDR,  
118 &optbuf, sizeof(optbuf)) < 0) 
119- err("socket error; cannot set socket option"); 
120- if (bind(initsock, (struct sockaddr *)&sin, sizeof(sin))< 0)  
121- err("bind error; the socket is already used"); 
122- if (listen(initsock, MAXQUE) < 0)  
123+ warn("socket error; cannot set socket option"); 
124+#endif 
125+ if (initsock >= 0 && bind(initsock, (struct sockaddr *)&sin, sizeof(sin))< 0) { 
126+ warn("bind error; the socket is already used"); 
127+ close(initsock); 
128+ initsock = -1; 
129+ } 
130+#ifdef PF_INET6 
131+ if (initsock6 >= 0 && bind(initsock6, (struct sockaddr *)&sin6, sizeof(sin6))< 0) { 
132+ warn("bind error; the socket is already used"); 
133+ close(initsock6); 
134+ initsock6 = -1; 
135+ } 
136+#endif 
137+ if (initsock < 0 
138+#ifdef PF_INET6 
139+ && initsock6 < 0 
140+#endif 
141+ ) 
142+ exit(1); 
143+ if (initsock >= 0 && listen(initsock, MAXQUE) < 0)  
144 err("listen error; something wrong happened with the socket"); 
145+#ifdef PF_INET6 
146+ if (initsock6 >= 0 && listen(initsock6, MAXQUE) < 0)  
147+ err("listen error; something wrong happened with the IPv6 socket"); 
148+#endif 
149 if (debug) { 
150 fprintf(errout, "file descriptor for initsock is %d\n", initsock); 
151+#ifdef PF_INET6 
152+ fprintf(errout, "file descriptor for initsock6 is %d\n", initsock6); 
153+#endif 
154 fflush(errout); 
155 } 
156 } 
157@@ -303,8 +363,19 @@ 
158 mkoldjtab(buf); 
159 } 
160  
161+/* using stdio in signal handler is unsafe */ 
162+#ifdef __STDC__ 
163+volatile 
164+#endif 
165+int reread_requested; 
166+ 
167+RETSIGTYPE req_reread() 
168+{ 
169+ reread_requested = 1; 
170+} 
171+ 
172 /* 1993/6/5 by kam, re-read dictionary by "INT" signal */ 
173-RETSIGTYPE reread() 
174+void reread() 
175 { 
176 if (fclose(jisho) < 0) { 
177 fprintf(stderr,  
178@@ -455,15 +526,22 @@ 
179 main_loop() 
180 { 
181 fd_set readfds, writefds, exceptfds; 
182- fd_set getrfds(); 
183+ void getrfds(); 
184 struct sockaddr_in from; 
185+#ifdef PF_INET6 
186+ struct sockaddr_in6 from6; 
187+#endif 
188 int len; 
189 register int i; 
190  
191 FD_ZERO(&writefds); 
192 FD_ZERO(&exceptfds); 
193 for(;;) { /* infinite loop; waiting for client's request */ 
194- readfds = getrfds(); 
195+ if (reread_requested) { 
196+ reread(); 
197+ reread_requested = 0; 
198+ } 
199+ getrfds(&readfds); 
200 if (select(MAXDTAB, &readfds, &writefds, &exceptfds, NULL) < 0) { 
201 if (errno == EINTR) /* if signal happens */ 
202 continue; 
203@@ -474,16 +552,32 @@ 
204 fflush(errout); 
205 } 
206  
207- if (FD_ISSET(initsock, &readfds)) { 
208+ if (initsock >= 0 && FD_ISSET(initsock, &readfds)) { 
209 len = sizeof(from); 
210 if ((clientsock[nclients ++] = accept(initsock, &from, &len)) < 0) { 
211 err("accept error; something wrong happened with the socket"); 
212 } 
213- if (nclients >= MAXDTAB - 3 - debug * 2) { 
214+ if (nclients >= MAXDTAB - 3 
215+#ifdef PF_INET6 
216+ -1 
217+#endif 
218+ - debug * 2) { 
219 write(clientsock[--nclients], SERVER_FULL, 1); 
220 close(clientsock[nclients]); 
221 } 
222 } 
223+#ifdef PF_INET6 
224+ if (initsock6 >= 0 && FD_ISSET(initsock6, &readfds)) { 
225+ len = sizeof(from6); 
226+ if ((clientsock[nclients ++] = accept(initsock6, &from6, &len)) < 0) { 
227+ err("accept error; something wrong happened with the socket"); 
228+ } 
229+ if (nclients >= MAXDTAB - 4 - debug * 2) { 
230+ write(clientsock[--nclients], SERVER_FULL, 1); 
231+ close(clientsock[nclients]); 
232+ } 
233+ } 
234+#endif 
235  
236 /* naiive scheduling */ 
237 for (i = 0; i < nclients; i ++) 
238@@ -511,16 +605,20 @@ 
239 * get bit pattern of read file descriptor 
240 */ 
241  
242-fd_set getrfds() 
243+void getrfds(rfds) 
244+fd_set *rfds; 
245 { 
246- fd_set rfds; 
247 register int i; 
248  
249- FD_ZERO(&rfds); 
250- FD_SET(initsock, &rfds); 
251+ FD_ZERO(rfds); 
252+ if (initsock >= 0) 
253+ FD_SET(initsock, rfds); 
254+#ifdef PF_INET6 
255+ if (initsock6 >= 0) 
256+ FD_SET(initsock6, rfds); 
257+#endif 
258 for (i = 0; i < nclients; i ++) 
259- FD_SET(clientsock[i], &rfds); 
260- return (rfds); 
261+ FD_SET(clientsock[i], rfds); 
262 } 
263  
264 /* 
265@@ -724,6 +822,9 @@ 
266 exit(1); 
267 } 
268 hentry = gethostbyname(hname); 
269+ if (hentry == NULL) { 
270+ fprintf(errout, "%s: WARNING: gethostbyname(%s) failed\n", pgmnm, hname); 
271+ } else { 
272 #ifdef NO_ADDR_LIST 
273 strcat(hname, ":"); 
274 strcat(hname, hentry->h_addr); 
275@@ -736,6 +837,7 @@ 
276 strcat(hname, inet_ntoa(*(struct in_addr *)*p++)); 
277 } 
278 #endif 
279+ } 
280 strcat(hname, ": "); 
281 } 
282  
cvs diff -r1.1 -r1.1.64.1 pkgsrc/inputmethod/skkserv/patches/Attic/patch-bsearch (expand / switch to unified diff)

--- pkgsrc/inputmethod/skkserv/patches/Attic/patch-bsearch 2002/05/31 12:59:59 1.1
+++ pkgsrc/inputmethod/skkserv/patches/Attic/patch-bsearch 1.1.64.1
@@ -1,123 +0,0 @@ @@ -1,123 +0,0 @@
1$NetBSD: patch-bsearch,v 1.1 2002/05/31 12:59:59 seb Exp $ 
2 
3Binary search patch. 
4Originally from skk-users mailing list 
5(Masahiro Doteguchi, Mailinglist-Id: 1779). 
6 
7--- skkserv/skkserv.c.patch1 Mon Nov 6 00:12:57 2000 
8+++ skkserv/skkserv.c Mon Nov 6 00:15:00 2000 
9@@ -109,7 +109,7 @@ 
10 * Global Variables 
11 */ 
12  
13-char pgmver[] = "3.9.4nb1 "; /* version number */ 
14+char pgmver[] = "3.9.4nb1 (binary search) "; /* version number */ 
15  
16 char *pgmnm; /* program name */ 
17 char *jname; /* name of shared dictionary */ 
18@@ -622,7 +622,7 @@ 
19 } 
20  
21 /* 
22- * reply to client: linear search 
23+ * reply to client: binary search 
24 */ 
25  
26 search(commsock) 
27@@ -635,6 +635,7 @@ 
28 int n; /* number of characters from client */ 
29 int sttpnt; /* start point of searching */ 
30 int endpnt; /* end point of searching */ 
31+ int curpnt; /* current point of searching */ 
32 int errcod = 0; /* error flag */ 
33 int sstyle; /* search style */ 
34  
35@@ -743,18 +744,36 @@ 
36 endpnt = jtab1[KANA_END - code + 1]; 
37 } 
38 } 
39- fseek(jisho, sttpnt, 0); 
40 if (debug) 
41- fprintf(stderr, "from %d to %d\n", sttpnt, endpnt); 
42+ fprintf(errout, "from %d to %d\n", sttpnt, endpnt); 
43  
44- while ((c = fgetc(jisho)) != EOF) { 
45+ for (;;) { 
46+ if ((sstyle & 0x4) == 0) { /* binary search? */ 
47+ curpnt = (sttpnt + endpnt) / 2; 
48+ fseek(jisho, curpnt, 0); 
49+ while ((c = fgetc(jisho)) != EOF) { 
50+ curpnt++; 
51+ if (c == EOL) break; 
52+ } 
53+ if (c == EOF) break; 
54+ if (curpnt >= endpnt) { 
55+ fseek(jisho, sttpnt, 0); 
56+ sstyle |= 0x4; /* linear search */ 
57+ } 
58+ } 
59+ 
60+ if (debug) {fprintf(errout, "%d:%d\t%d\t%d\t", sstyle, sttpnt, curpnt, endpnt);} 
61+ c = fgetc(jisho); 
62 pbuf = &combuf[1]; /* ' ' is end-symbol */ 
63 while (c == *pbuf && c != ' ' && c != EOL) { 
64- if (debug) {fprintf(errout, "1:%d:%d:%d:%d:\n", c, *pbuf, ' ', EOL);} 
65+/* if (debug) {fprintf(errout, "1:%d:%d:%d:%d:", c, *pbuf, ' ', EOL);}*/ 
66+ if (debug) {fprintf(errout, "%c", c);} 
67 c = fgetc(jisho); pbuf++; 
68- }  
69- if (debug) {fprintf(errout, "1:%d:%d:%d:%d:\n", c, *pbuf, ' ', EOL);} 
70+ } 
71+/* if (debug) {fprintf(errout, "1:%d:%d:%d:%d:", c, *pbuf, ' ', EOL);}*/ 
72+ if (debug) {fprintf(errout, "%c", c);} 
73 if (c == ' ' && (*pbuf == ' ' || *pbuf == '\n')) { /* found */ 
74+ if (debug) {fprintf(errout, "found\n");} 
75 if ((errcod = write(commsock, SERVER_FOUND, 1)) >= 0) 
76 while ((c = fgetc(jisho)) != EOF) { 
77 *pbuf = c; 
78@@ -770,18 +789,35 @@ 
79 } 
80 return(0); 
81 } 
82- if (comp(*pbuf, c, sstyle)) { 
83- if (debug) { 
84- fprintf(stderr, "comp break %d \n", ftell(jisho)); 
85- } 
86- break;  
87+ if (debug) { 
88+ int ch; 
89+ 
90+ if (c != ' ') 
91+ do { 
92+ ch = fgetc(jisho); 
93+ fprintf(errout, "%c", ch); 
94+ } while (ch != ' ' && ch != EOL); 
95+ fprintf(errout, "unmatched\n"); 
96 } 
97- /* fix 1992/3/6 under suggestion */ 
98- /* of guchi@pfu.fujitsu.co.jp */ 
99- while ((c = fgetc(jisho)) != EOF) { 
100- if (c == EOL) break; 
101+ if (sstyle & 0x4) { 
102+ if (comp(*pbuf, c, sstyle&~0x4)) { 
103+ if (debug) { 
104+ fprintf(stderr, "comp break %d \n", ftell(jisho)); 
105+ } 
106+ break; 
107+ } 
108+ /* fix 1992/3/6 under suggestion */ 
109+ /* of guchi@pfu.fujitsu.co.jp */ 
110+ while ((c = fgetc(jisho)) != EOF) { 
111+ if (c == EOL) break; 
112+ } 
113+ if (ftell(jisho) >= endpnt) break; 
114+ } else { 
115+ if (comp(*pbuf, c, sstyle&~0x4)) 
116+ endpnt = curpnt; 
117+ else 
118+ sttpnt = curpnt; 
119 } 
120- if (ftell(jisho) >= endpnt) break; 
121 } 
122  
123 if ((errcod = write(commsock, SERVER_NOT_FOUND, 1)) >= 0) { 
cvs diff -r1.1 -r1.1.64.1 pkgsrc/inputmethod/skkserv/patches/Attic/patch-jisyo (expand / switch to unified diff)

--- pkgsrc/inputmethod/skkserv/patches/Attic/patch-jisyo 2002/05/31 12:59:59 1.1
+++ pkgsrc/inputmethod/skkserv/patches/Attic/patch-jisyo 1.1.64.1
@@ -1,112 +0,0 @@ @@ -1,112 +0,0 @@
1$NetBSD: patch-jisyo,v 1.1 2002/05/31 12:59:59 seb Exp $ 
2 
3Dictionary (SKK-JISYO.L) corrigenda. 
4Partially from skk-dic mailing list. 
5 
6--- jisyo/SKK-JISYO.L.fix1 Mon Dec 20 16:28:52 1999 
7+++ jisyo/SKK-JISYO.L Mon Dec 27 23:53:47 1999 
8@@ -3530,7 +3530,7 @@ 
9 しりあe /知り合/ 
10 しらべr /調べ/ 
11 しらじらs /白々/ 
12-しらs /報/知ら/知らせ/ 
13+しらs /報/知ら/ 
14 しらm /白/ 
15 しらk /白/ 
16 しらb /調/ 
17@@ -4216,9 +4216,9 @@ 
18 ぐi /食/ 
19 くんよm /訓読/ 
20 くんづk /君付/ 
21-くわわt /加/ 
22+くわわt /加わ/ 
23 くわだt /企/ 
24-くわw /加わ/ 
25+くわw /加/ 
26 くわs /詳/加/ 
27 くわk /区分/ 
28 くわe /加/咥/銜/加え/ 
29@@ -30746,7 +30746,7 @@ 
30 がいかんび /外観美/ 
31 がいき /外気/ 
32 がいきおん /外気温/ 
33-がいきょう /概況/外匡/ 
34+がいきょう /概況/外筐/ 
35 がいきょく /外局/ 
36 がいきれいぼう /外気冷房/ 
37 がいきん /外勤/ 
38@@ -34044,7 +34044,7 @@ 
39 きゅうきゅうたい /救急隊/ 
40 きゅうきゅうばこ /救急箱/ 
41 きゅうきゅうばんそうこう /救急絆創膏/ 
42-きゅうきょ /急拠/急遽/急きょ/ 
43+きゅうきょ /急遽/急きょ/ 
44 きゅうきょう /窮境/ 
45 きゅうきょうさんけんしょこく /旧共産圏諸国/ 
46 きゅうきょうしょくいん /旧教職員/ 
47@@ -35040,9 +35040,9 @@ 
48 きょうぞんきょうえい /共存共栄/ 
49 きょうぞんほう /共存法/ 
50 きょうぞんほうほう /共存方法/ 
51-きょうたい /匡体/筐体/狂態/矯態/嬌態/筺体/ 
52+きょうたい /筐体/狂態/嬌態/ 
53 きょうたいいき /狭帯域/ 
54-きょうたいじっそうぎじゅつ /匡体実装技術/ 
55+きょうたいじっそうぎじゅつ /筐体実装技術/ 
56 きょうたく /供託/教卓/ 
57 きょうたくきん /供託金/ 
58 きょうたくしょ /供託所/ 
59@@ -36904,7 +36904,7 @@ 
60 ぎじんほう /擬人法/ 
61 ぎせい /犠牲/擬声/擬制/ 
62 ぎせいご /擬声語/ 
63-ぎせいしゃ /儀牲者/犠牲者/ 
64+ぎせいしゃ /犠牲者/ 
65 ぎせき /議席/ 
66 ぎせきすう /議席数/ 
67 ぎせきはいぶん /議席配分/ 
68@@ -42867,7 +42867,7 @@ 
69 こうぎせきぶん /広義積分/ 
70 こうぎたいしょう /抗議対象/ 
71 こうぎちゅう /講義中/ 
72-こうぎとう /講義搭/講義棟/ 
73+こうぎとう /講義棟/ 
74 こうぎないよう /講義内容/ 
75 こうぎぶん /抗議文/ 
76 こうぎめい /講義名/ 
77@@ -84011,7 +84011,7 @@ 
78 とうじゅうろう /藤十郎/ 
79 とうじゆうめい /当時有名/ 
80 とうじょ /唐書/ 
81-とうじょう /登場/搭乗/東條/東条/棟上/東上/塔乗/頭状/東城/筒状/ 
82+とうじょう /登場/搭乗/東條/東条/棟上/東上/頭状/東城/筒状/ 
83 とうじょういぜん /登場以前/ 
84 とうじょういらい /登場以来/ 
85 とうじょういん /搭乗員/ 
86@@ -84025,7 +84025,7 @@ 
87 とうじょうご /登場後/ 
88 とうじょうしゃ /搭乗者/ 
89 とうじょうしゃほけん /搭乗者保険/ 
90-とうじょうじ /塔乗時/登場時/ 
91+とうじょうじ /搭乗時/登場時/ 
92 とうじょうじっせき /搭乗実績/ 
93 とうじょうじんぶつ /登場人物/ 
94 とうじょうじんぶつたち /登場人物達/ 
95@@ -84038,7 +84038,7 @@ 
96 とうじょうとうじ /登場当時/ 
97 とうじょうばめん /登場場面/ 
98 とうじょうばんぐみ /登場番組/ 
99-とうじょうび /塔乗日/搭乗日/ 
100+とうじょうび /搭乗日/ 
101 とうじょうびん /搭乗便/ 
102 とうじょうまえ /登場前/搭乗前/ 
103 とうじょうよてい /登場予定/搭乗予定/ 
104@@ -93140,7 +93140,7 @@ 
105 はげたか /禿鷹/ 
106 はげやま /禿山/ 
107 はげん /波源/ 
108-はこ /箱/函/運/葉子/□/匡/凾/筥/箪/匣/ 
109+はこ /箱/函/運/葉子/□/筐/凾/筥/箪/匣/ 
110 はこいり /箱入り/箱入/ 
111 はこう /破口/跛行/波高/ 
112 はこうぶんぷ /波高分布/ 
cvs diff -r1.7 -r1.7.2.1 pkgsrc/inputmethod/tomoe-gtk/Makefile (expand / switch to unified diff)

--- pkgsrc/inputmethod/tomoe-gtk/Makefile 2010/06/13 22:44:50 1.7
+++ pkgsrc/inputmethod/tomoe-gtk/Makefile 2010/07/04 07:18:44 1.7.2.1
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.7 2010/06/13 22:44:50 wiz Exp $ 1# $NetBSD: Makefile,v 1.7.2.1 2010/07/04 07:18:44 agc Exp $
2# 2#
3 3
4DISTNAME= tomoe-gtk-0.6.0 4DISTNAME= tomoe-gtk-0.6.0
5PKGREVISION= 4 5PKGREVISION= 5
6CATEGORIES= inputmethod 6CATEGORIES= inputmethod
7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tomoe/} 7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tomoe/}
8 8
9MAINTAINER= obache@NetBSD.org 9MAINTAINER= obache@NetBSD.org
10HOMEPAGE= http://tomoe.sourceforge.jp/ 10HOMEPAGE= http://tomoe.sourceforge.jp/
11COMMENT= GUI library for tomoe's GTK+ GUI parts 11COMMENT= GUI library for tomoe's GTK+ GUI parts
12LICENSE= gnu-lgpl-v2.1 12LICENSE= gnu-lgpl-v2.1
13 13
14PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
15 15
16GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
17USE_LIBTOOL= yes 17USE_LIBTOOL= yes
18USE_TOOLS+= gmake pkg-config msgfmt 18USE_TOOLS+= gmake pkg-config msgfmt
cvs diff -r1.2 -r1.2.2.1 pkgsrc/inputmethod/tomoe-gtk/distinfo (expand / switch to unified diff)

--- pkgsrc/inputmethod/tomoe-gtk/distinfo 2010/05/14 11:02:20 1.2
+++ pkgsrc/inputmethod/tomoe-gtk/distinfo 2010/07/04 07:18:44 1.2.2.1
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
1$NetBSD: distinfo,v 1.2 2010/05/14 11:02:20 obache Exp $ 1$NetBSD: distinfo,v 1.2.2.1 2010/07/04 07:18:44 agc Exp $
2 2
3SHA1 (tomoe-gtk-0.6.0.tar.gz) = dddb1178c437380a92b59dbc273dafdd2045e1d1 3SHA1 (tomoe-gtk-0.6.0.tar.gz) = dddb1178c437380a92b59dbc273dafdd2045e1d1
4RMD160 (tomoe-gtk-0.6.0.tar.gz) = 72e0954b8994d1e62acb7d4cb0c478dadb54b8f0 4RMD160 (tomoe-gtk-0.6.0.tar.gz) = 72e0954b8994d1e62acb7d4cb0c478dadb54b8f0
5Size (tomoe-gtk-0.6.0.tar.gz) = 448058 bytes 5Size (tomoe-gtk-0.6.0.tar.gz) = 448058 bytes
6SHA1 (patch-aa) = 7b185b3ec670661c5bcd85f3e1ef91729348b19c 6SHA1 (patch-aa) = 7b185b3ec670661c5bcd85f3e1ef91729348b19c
 7SHA1 (patch-ab) = 3a06e51f7ca8ab0930a2482d6f006d883b88840d
File Added: pkgsrc/inputmethod/tomoe-gtk/patches/patch-ab
$NetBSD: patch-ab,v 1.1.2.2 2010/07/04 07:18:44 agc Exp $

Gtk-WARNING **: GtkSpinButton: setting an adjustment with non-zero page size is deprecated

--- src/tomoe-reading-search.c.orig	2007-04-25 07:49:31.000000000 +0000
+++ src/tomoe-reading-search.c
@@ -203,7 +203,7 @@ tomoe_reading_search_init (TomoeReadingS
     gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 4);
     /*gtk_widget_show (label);*/
 
-    adj = gtk_adjustment_new (1.0, 1.0, 200.0, 1.0, 5.0, 5.0);
+    adj = gtk_adjustment_new (1.0, 1.0, 200.0, 1.0, 5.0, 0.0);
     spin = gtk_spin_button_new (GTK_ADJUSTMENT (adj), 0.0, 0);
     priv->min_strokes_spin = spin;
     g_signal_connect (G_OBJECT (spin), "value-changed",
@@ -217,7 +217,7 @@ tomoe_reading_search_init (TomoeReadingS
     gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 4);
     /*gtk_widget_show (label);*/
 
-    adj = gtk_adjustment_new (20.0, 1.0, 200.0, 1.0, 5.0, 5.0);
+    adj = gtk_adjustment_new (20.0, 1.0, 200.0, 1.0, 5.0, 0.0);
     spin = gtk_spin_button_new (GTK_ADJUSTMENT (adj), 0.0, 0);
     priv->max_strokes_spin = spin;
     g_signal_connect (G_OBJECT (spin), "value-changed",
cvs diff -r1.1 -r1.1.64.1 pkgsrc/inputmethod/unicon-im/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/inputmethod/unicon-im/patches/patch-aa 2002/06/15 09:29:15 1.1
+++ pkgsrc/inputmethod/unicon-im/patches/patch-aa 1.1.64.1
@@ -1,35 +0,0 @@ @@ -1,35 +0,0 @@
1$NetBSD: patch-aa,v 1.1 2002/06/15 09:29:15 shell Exp $ 
2 
3--- Makefile.in.orig Mon May 22 17:21:20 2000 
4+++ Makefile.in 
5@@ -2,7 +2,6 @@ 
6 all: 
7 cd server; make 
8 cd client; make 
9- cd unicon; make 
10 cd ImmModules/CCE; make 
11 cd ImmModules/TL-1; make 
12  
13@@ -15,19 +14,14 @@ 
14 data: gbdata big5data 
15  
16 install:  
17- if [ ! -d $(prefix) ] ; then mkdir -p $(prefix); fi 
18- if [ ! -d $(prefix)/lib/unicon2 ] ; then mkdir -p $(prefix)/lib/unicon2; fi 
19- if [ ! -d $(prefix)/bin ] ; then mkdir -p $(prefix)/bin; fi 
20- if [ ! -d $(prefix)/lib/unicon2/gbk ] ; then mkdir -p $(prefix)/lib/unicon2/gbk; fi 
21- if [ ! -d $(prefix)/lib/unicon2/gb ] ; then mkdir -p $(prefix)/lib/unicon2/gb; fi 
22- if [ ! -d $(prefix)/lib/unicon2/big5 ] ; then mkdir -p $(prefix)/lib/unicon2/big5; fi 
23- if [ ! -d $(prefix)/lib/unicon2/freepy ] ; then mkdir -p $(prefix)/lib/unicon2/freepy; fi 
24+ $(BSD_INSTALL_DATA_DIR) $(prefix)/lib/unicon 
25 cd data; make install 
26 cd server; make install 
27 cd client; make install 
28- cd unicon; make install 
29 cd ImmModules/CCE; make install 
30 cd ImmModules/TL-1; make install 
31+ $(BSD_INSTALL_DATA) unicon/sys-big5.tab $(prefix)/lib/unicon 
32+ $(BSD_INSTALL_DATA) unicon/sys-gb.tab $(prefix)/lib/unicon 
33  
34 clean: 
35 cd server; make clean 
cvs diff -r1.1 -r1.1.64.1 pkgsrc/inputmethod/unicon-im/patches/patch-ac (expand / switch to unified diff)

--- pkgsrc/inputmethod/unicon-im/patches/patch-ac 2002/06/15 09:29:15 1.1
+++ pkgsrc/inputmethod/unicon-im/patches/patch-ac 1.1.64.1
@@ -1,13 +0,0 @@ @@ -1,13 +0,0 @@
1$NetBSD: patch-ac,v 1.1 2002/06/15 09:29:15 shell Exp $ 
2 
3--- server/TLS_Debug.hpp.orig Sat Jun 8 14:12:06 2002 
4+++ server/TLS_Debug.hpp 
5@@ -3,6 +3,8 @@ 
6  
7 #include <stdio.h> 
8 #include <stdlib.h> 
9+#include <stdarg.h> 
10+#include <sys/types.h> 
11  
12 typedef char * PSTR; 
13 class TLS_CDebug 
cvs diff -r1.1 -r1.1.64.1 pkgsrc/inputmethod/unicon-im/patches/patch-ag (expand / switch to unified diff)

--- pkgsrc/inputmethod/unicon-im/patches/patch-ag 2002/06/15 09:29:16 1.1
+++ pkgsrc/inputmethod/unicon-im/patches/patch-ag 1.1.64.1
@@ -1,14 +0,0 @@ @@ -1,14 +0,0 @@
1$NetBSD: patch-ag,v 1.1 2002/06/15 09:29:16 shell Exp $ 
2 
3--- data/Makefile.in.orig Sat Jun 8 20:34:49 2002 
4+++ data/Makefile.in 
5@@ -1,7 +1,7 @@ 
6 prefix=@prefix@ 
7 CFLAGS = @CFLAGS@ 
8 install:  
9- mkdir -p $(prefix)/lib/unicon2/freepy 
10- cp pinyin* sysphrase* usrphrase* $(prefix)/lib/unicon2/freepy 
11+ $(BSD_INSTALL_DATA_DIR) $(prefix)/lib/unicon/freepy 
12+ $(BSD_INSTALL_DATA) pinyin* sysphrase* usrphrase* $(prefix)/lib/unicon/freepy 
13 distclean: 
14 rm -f Makefile *.bak