@@ -1,36 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2002/06/15 09:31:39 shell Exp $
-
---- src/Makefile.orig	Mon Jun 10 21:05:56 2002
-+++ src/Makefile
-@@ -1,20 +1,16 @@
- 
--CC = gcc
- 
- # do you have imlib?
- #No, I don't have that strange library
- #IMLIB = 
- #LIBIMLIB =
--#Yes I have
--IMLIB = -DIMLIB
--LIBIMLIB = -lImlib
- 
- #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
--CFLAGS =  -Wall -g -DFOR_PILOT_COMPAT -O2 -fno-strength-reduce
-+CFLAGS +=  -Wall -DFOR_PILOT_COMPAT -O2 -fno-strength-reduce
- 
- INC = -I./include -I./IMdkit/include -I/usr/include -I/usr/X11R6/include   
- 
--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
-+LIB = -lXext -lX11 ./IMdkit/lib/libXimd.a -limmclient -limm_server -lpth
- 
- 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 
- 
-@@ -23,7 +19,7 @@
- all: chinput
- 
- chinput: IMdkit/lib/libXimd.a $(OBJ) 
--	g++ -o chinput $(OBJ) $(LIB) $(LIBIMLIB)
-+	$(CC) -o chinput $(OBJ) $(LDFLAGS) $(LIB) $(LIBIMLIB)
- 
- .c.o:
- 	$(CC) -c $(CFLAGS) $(IMLIB) $(INC) $<

@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2002/06/15 09:31:39 shell Exp $
-
---- src/XIM.h.orig	Mon Jun 10 21:19:55 2002
-+++ src/XIM.h
-@@ -25,7 +25,7 @@
- //setenv XMODIFIERS @im=Chinput		(csh, tcsh)
- #define DEFAULT_IMNAME  "Chinput"
- 
--#define LOCALE_GB	"zh_CN.GBK"
-+#define LOCALE_GB	"zh_CN.eucCN"
- #define LOCALE_BIG5	"zh_TW.Big5"
- 
- //This input server support CJK by default

@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2002/06/15 09:31:39 shell Exp $
-
---- src/chinput.c.orig	Mon Jun 10 21:16:56 2002
-+++ src/chinput.c
-@@ -75,7 +75,7 @@
- 	HZloadRCFile();				//resource file
- 	HZloadRCIME();				//IME lists from Chinput.ad
- 	HZparseParameters(argc, argv);		//parse parameters
--	setlocale(LC_ALL, deflocale);		//locale set
-+	setlocale(LC_CTYPE, deflocale);		//locale set
- 	HZinitDisplay();			//display init
- 	HZinitServerFont();			//font init
- 	HZinitWindows();			//windows geometry init

@@ -1,31 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2002/06/15 09:31:39 shell Exp $
-
---- src/config.c.orig	Mon Jun 10 22:53:45 2002
-+++ src/config.c
-@@ -388,7 +388,7 @@
- 	if(method == cur_inputmethod) return;
- 
- 	//change the encoding for later use
--	if(!strcmp(chinputime[method].encoding, "GB"))
-+	if(!strcmp(chinputime[method].encoding, "eucCN"))
- 		HZServer.encoding = HZSERVER_ENCODING_GB;
- 	else
- 		HZServer.encoding = HZSERVER_ENCODING_BIG5;
-@@ -681,7 +681,7 @@
- 	if(HZServer.encoding == HZSERVER_ENCODING_GB){
- 		for(i=0; i<index_ime; i++){
- 			if(!strcmp(chinputime[i].name, imd) && 
--			   !strcmp(chinputime[i].encoding, "GB")){
-+			   !strcmp(chinputime[i].encoding, "eucCN")){
- 				return i;
- 			}
- 		}
-@@ -738,7 +738,7 @@
- 	//chinput_imserver = IMM_OpenClient("127.0.0.1", 9010);
- 
- 	cur_inputmethod = id;
--	if(!strcmp(chinputime[cur_inputmethod].encoding, "GB"))
-+	if(!strcmp(chinputime[cur_inputmethod].encoding, "eucCN"))
- 		HZServer.encoding = HZSERVER_ENCODING_GB;
- 	else
- 		HZServer.encoding = HZSERVER_ENCODING_BIG5;

@@ -1,22 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2002/06/15 09:31:39 shell Exp $
-
---- src/init.c.orig	Mon Jun 10 21:23:44 2002
-+++ src/init.c
-@@ -342,7 +342,7 @@
- 	//enable two locales at the same time
- 	strcpy(imlocale, IMLOCALE);
- 
--	if(getenv("LC_ALL") && strstr(getenv("LC_ALL"), "zh_TW")){
-+	if(getenv("LC_CTYPE") && strstr(getenv("LC_CTYPE"), "zh_TW.Big5")){
- 		strcpy(deflocale, LOCALE_BIG5);
- 		//strcpy(imlocale,  "zh_TW");
- 		flag_encoding = HZSERVER_ENCODING_BIG5;
-@@ -567,7 +567,7 @@
- 	}
- 	fclose(fp);
- 
--	if(strstr(getenv("LC_ALL"), "zh_TW"))
-+	if(strstr(getenv("LC_CTYPE"), "zh_TW.Big5"))
- 		cur_inputmethod = HZgetInputMethod(input_method_big5);
- 	else
- 		cur_inputmethod = HZgetInputMethod(input_method_gb);

@@ -1,15 +0,0 @@
-$NetBSD: patch-af,v 1.1 2002/06/15 09:31:39 shell Exp $
-
---- resource/Chinput.ad.orig	Mon Jun 10 21:55:02 2002
-+++ resource/Chinput.ad
-@@ -55,8 +55,8 @@
- ! 16 point font set
- !
- chinput.font			=	8x16
--chinput.gbfont			=	-*-song-medium-r-normal--16-*-*-*-*-*-gbk-0
--chinput.big5font		=	-*-song-medium-r-normal--16-*-*-*-*-*-big5-0
-+chinput.gbfont			=	-*-medium-r-normal--16-*-*-*-*-*-gb2312.1980-0
-+chinput.big5font		=	-*-medium-r-normal--16-*-*-*-*-*-big5-0
- !
- !
- ! inputbar width in chars

@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2010/06/13 22:44:50 wiz Exp $
+# $NetBSD: Makefile,v 1.3.2.1 2010/07/04 07:18:43 agc Exp $
 #
 
 DISTNAME=		scim-tomoe-0.6.0
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		inputmethod
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=tomoe/}
 

@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2010/05/28 09:31:35 obache Exp $
+$NetBSD: distinfo,v 1.2.2.1 2010/07/04 07:18:43 agc Exp $
 
 SHA1 (scim-tomoe-0.6.0.tar.gz) = 481ee2f8f9baa6105a349da36360aed06e432291
 RMD160 (scim-tomoe-0.6.0.tar.gz) = c95059e7f594192c97b082aa61818060391a8591
 Size (scim-tomoe-0.6.0.tar.gz) = 385126 bytes
 SHA1 (patch-aa) = 0554574908f37adae9d8771dcadce2e038c5857a
-SHA1 (patch-ab) = 1c598b251d218a9f1da7c089dd51780e97108d40
+SHA1 (patch-ab) = b27e4074c5f3b18eb8969c66929c78f9f6ff8fe0

@@ -1,18 +1,32 @@
-$NetBSD: patch-ab,v 1.1 2010/05/28 09:31:35 obache Exp $
+$NetBSD: patch-ab,v 1.1.2.1 2010/07/04 07:18:43 agc Exp $
 
-support gucharmap-2
+* GtkSpinButton: setting an adjustment with non-zero page size is deprecated
+* support gucharmap-2
 
 --- src/scim_tomoe_prefs_widget.cpp.orig	2007-05-07 07:49:15.000000000 +0000
 +++ src/scim_tomoe_prefs_widget.cpp
-@@ -472,9 +472,9 @@ apply_config (ScimTomoePrefsWidget *pref
+@@ -170,7 +170,7 @@ create_spin_button (ScimTomoePrefsWidget
+     gtk_widget_show (label);
+ 
+     GtkObject *adj = gtk_adjustment_new (value, min, max, step,
+-                                         page_size, page_size);
++                                         page_size, 0.0);
+     GtkWidget *spin = gtk_spin_button_new (GTK_ADJUSTMENT (adj), 0.0, 0);
+     g_object_set_data (G_OBJECT (spin),
+                        OBJECT_DATA_CONFIG_KEY, (gpointer) key);
+@@ -472,9 +472,13 @@ apply_config (ScimTomoePrefsWidget *pref
          String (SCIM_TOMOE_CONFIG_UNICODE_TABLE_FONT_DEFAULT));
  
      if (font.length() > 0) {
 -        gucharmap_charmap_set_font (charmap, font.c_str ());
-+        gucharmap_charmap_set_font_desc (charmap, pango_font_description_from_string(font.c_str ()));
++        PangoFontDescription *desc = pango_font_description_from_string(font.c_str ());
++        gucharmap_charmap_set_font_desc (charmap, desc);
++        pango_font_description_free (desc);
      } else {
 -        gucharmap_charmap_set_font (charmap, NULL);
-+        gucharmap_charmap_set_font_desc (charmap, pango_font_description_from_string(NULL));
++        PangoFontDescription *desc = pango_font_description_new ();
++        gucharmap_charmap_set_font_desc (charmap, desc);
++        pango_font_description_free (desc);
          set_default_font (prefs, SCIM_TOMOE_CONFIG_CAND_FONT,
                            GTK_WIDGET (charmap));
      }

@@ -1,22 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2002/05/31 13:00:04 seb Exp $
-
---- configs/netbsd.h.orig	Tue Jul  7 00:31:13 1998
-+++ configs/netbsd.h	Mon Dec 20 23:53:25 1999
-@@ -1,5 +1,5 @@
- /*
-- * Configuration for NetBSD-1.2 (x68k)
-+ * Configuration for NetBSD
-  */
- 
- #define BSD		/* My machine is BSD system */
-@@ -8,7 +8,9 @@
- #define HAVE_SETENV	/* My machine has setenv() */
- #define HAVE_BSD_OPENPTY /* BSD type openpty() */
- 
--#include <stdlib.h>	/* just in case of NetBSD/Alpha */
-+#include <stdlib.h>
-+#include <string.h>
-+#include <unistd.h>
- #include <util.h>	/* for openpty() */
- 
- #if makefile_parameter

@@ -1,14 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2002/05/31 13:00:04 seb Exp $
-
---- Makefile.orig	Tue Jul  7 00:31:14 1998
-+++ Makefile	Mon Dec 20 23:45:52 1999
-@@ -15,5 +15,8 @@
- 	rm -f genMakefile
- 
- genMakefile: protoMakefile config.h
--	awk -f extrpar `grep 'configs/.*\.h' config.h | sed 's/.*\(configs\/.*\.h\).*/\1/'` > genMakefile
-+	rm -f genMakefile
-+	cp config.h junk.c
-+	awk -f extrpar `cc -E junk.c | sed -n 's/^#[^"]*"\([^/][^"]*onfigs[^"]*\)".*/\1/p' | sort | uniq` > genMakefile
-+	rm -f junk.c
- 	awk -f extrpar config.h | cat - protoMakefile >> genMakefile

@@ -1,146 +0,0 @@
-$NetBSD: patch-bb,v 1.1 2002/05/31 13:00:04 seb Exp $
-
---- connserv.c.orig	Tue Jul  7 00:31:16 1998
-+++ connserv.c	Tue Nov  7 20:58:57 2000
-@@ -14,6 +14,10 @@
- #include <netinet/in.h>
- #include <netdb.h>
- 
-+#ifdef PF_INET6
-+# define HAVE_GETADDRINFO
-+#endif
-+
- #define SKK_PORT_NUMBER	1178
- #define SKK_SERVICENAME	"skkserv"
- 
-@@ -36,50 +40,112 @@
- 	int sock;
- 	int i;
- 	unsigned short port;
-+#ifdef HAVE_GETADDRINFO
-+	struct addrinfo aihint, *ai0, *ai;
-+	int error;
-+#else
- 	struct sockaddr_in hostaddr;
- 	struct hostent *entry;
- 	struct servent *serv;
- 	struct protoent *proto;
--	int a1,a2,a3,a4;
-+#endif
- 	char *hostname;
--
--	serv = getservbyname(SKK_SERVICENAME,"tcp");
--	fillzero((char*)&hostaddr,sizeof(struct sockaddr_in));
--	if ((proto = getprotobyname("tcp")) == NULL) {
--		return -1;
--	}
--
--	if ((sock = socket(AF_INET,SOCK_STREAM,proto->p_proto)) < 0) {
--		return -1;
-+#ifdef SKK_CONF		/* use skk.conf */
-+	FILE *conffp;
-+	char line[128];
-+	char hostbuf[128];
-+	char servbuf[128];
-+	char *confhost = NULL;
-+	char *confport = SKK_SERVICENAME;
-+
-+	if ((conffp = fopen(SKK_CONF, "r")) != NULL) {
-+		char *p, *data;
-+
-+		while (fgets(line, sizeof line, conffp) != NULL) {
-+			if ((p = strchr(line, '#')) != NULL)
-+				*p = '\0';
-+			if ((p = strtok(line, ": \t\n")) == NULL)
-+				continue;
-+			if ((data = strtok((char *) NULL, " \t\n")) == NULL)
-+				continue;
-+			if (!strcmp(p, "skkserv_host")) {
-+				strcpy(hostbuf, data);
-+				confhost = hostbuf;
-+			} else if (!strcmp(p, "skkserv_port")) {
-+				strcpy(servbuf, data);
-+				confport = servbuf;
-+			}
-+		}
- 	}
-+# undef SKK_SERVICENAME
-+# define SKK_SERVICENAME confport
-+#endif
- 
- 	if (SKKServerHost)
- 		hostname = SKKServerHost;
- 	else if ((hostname = getenv("SKKSERVER")) == NULL) {
-+#ifdef SKK_CONF
-+		if ((hostname = confhost) == NULL)
-+#endif
- #ifdef SKK_SERVER_HOST
- 		hostname = SKK_SERVER_HOST;
- #else
- 		return -1;
- #endif
- 	}
--	if ('0' <= *hostname && *hostname <= '9') {
--		if (sscanf(hostname,"%d.%d.%d.%d",&a1,&a2,&a3,&a4) != 4) {
--			return -1;
--		}
--		a1 = (a1<<24)|(a2<<16)|(a3<<8)|a4;
--		hostaddr.sin_addr.s_addr = htonl(a1);
-+
-+#ifdef HAVE_GETADDRINFO
-+	fillzero((char*)&aihint, sizeof aihint);
-+	aihint.ai_family = PF_UNSPEC;
-+	aihint.ai_socktype = SOCK_STREAM;
-+	aihint.ai_flags = AI_CANONNAME;
-+	error = getaddrinfo(hostname, SKK_SERVICENAME, &aihint, &ai0);
-+	if (error) {
-+		printf("%s: %s\r\n", gai_strerror(error), hostname);
-+		return -1;
-+	}
-+
-+	sock = -1;
-+	for (ai = ai0; ai; ai = ai->ai_next) {
-+		sock = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);
-+		if (sock >= 0 &&
-+		    connect(sock, ai->ai_addr, ai->ai_addrlen) == 0)
-+			break;
-+		close(sock);
-+		sock = -1;
-+	}
-+	if (sock < 0) {
-+		perror(hostname);
-+		return -1;
-+	}
-+#else
-+	serv = getservbyname(SKK_SERVICENAME,"tcp");
-+	fillzero((char*)&hostaddr,sizeof(struct sockaddr_in));
-+	if ((proto = getprotobyname("tcp")) == NULL) {
-+		return -1;
- 	}
--	else {
-+
-+	if ((sock = socket(AF_INET,SOCK_STREAM,proto->p_proto)) < 0) {
-+		return -1;
-+	}
-+
-+	if ((hostaddr.sin_addr.s_addr = inet_addr(hostname)) == INADDR_NONE) {
- 		if ((entry = gethostbyname(hostname)) == NULL) {
- 			return -1;
- 		}
- 		bincopy(entry->h_addr, &hostaddr.sin_addr, entry->h_length);
- 	}
-         hostaddr.sin_family = AF_INET;
--	hostaddr.sin_port = serv ? serv->s_port : htons(SKK_PORT_NUMBER);
-+	hostaddr.sin_port =
-+		serv ? serv->s_port :
-+#ifdef SKK_CONF
-+		(i = atoi(confport)) > 0 ? htons(i) :
-+#endif
-+		htons(SKK_PORT_NUMBER);
- 	if (connect(sock,(struct sockaddr *)&hostaddr,sizeof(struct sockaddr_in)) < 0) {
- 		return -1;
- 	}
-+#endif
- 	printf("SKKSERVER=%s\r\n",hostname);
- 	skkservsock = sock;
- 	rserv = fdopen(sock,"r");

@@ -1,21 +0,0 @@
-$NetBSD: patch-bd,v 1.1 2002/05/31 13:00:04 seb Exp $
-
---- fep.c.orig	Tue Jul  7 00:31:16 1998
-+++ fep.c	Tue Dec 21 00:42:53 1999
-@@ -219,7 +219,6 @@
- 	/* Initialize */
- 	setKanaKey();
- 	getTCstr();
--	tty_ready();
- 	get_winsize();
- 	set_tty();
- 	set_int();
-@@ -308,7 +307,7 @@
- 			break;
- 		}
- 	}
--	return jisAJ;	/* default */
-+	return jisBB;	/* default */
- }
- 
- flushOut(minchar)

@@ -1,66 +0,0 @@
-$NetBSD: patch-be,v 1.1 2002/05/31 13:00:04 seb Exp $
-
---- readwrite.c.orig	Tue Jul  7 00:31:15 1998
-+++ readwrite.c	Sun Sep 27 10:24:06 1998
-@@ -4,6 +4,14 @@
- #include "kanjicode.h"
- #include "ctrlcode.h"
- 
-+#ifndef STDIN_FILENO
-+#define STDIN_FILENO	0
-+#endif
-+
-+#ifndef STDOUT_FILENO
-+#define STDOUT_FILENO	1
-+#endif
-+
- #ifdef DEBUG
- extern FILE *wrlog;
- #endif
-@@ -29,12 +37,10 @@
- 	SIC_B,SOC_B,"JIS",3,3,
- };
- 
--extern int	tty;
--
- char read1()
- {	char	c;
- 
--	if (read(tty,&c,1) != 0)
-+	if (read(STDIN_FILENO,&c,1) != 0)
- 		return c;
- 	return EOF;
- }
-@@ -320,13 +326,13 @@
- char    *s;
- {       int    l = strlen(s);
- 	
--	writeTTYorg(tty,s,l,INTERNALCODE,OutCode,&TInter_Stat,&To_TTY_Stat);
-+	writeTTYorg(STDOUT_FILENO,s,l,INTERNALCODE,OutCode,&TInter_Stat,&To_TTY_Stat);
- }
- 
- write1(c)
- char c;
- {
--	writeTTYorg(tty,&c,1,INTERNALCODE,OutCode,&TInter_Stat,&To_TTY_Stat);
-+	writeTTYorg(STDOUT_FILENO,&c,1,INTERNALCODE,OutCode,&TInter_Stat,&To_TTY_Stat);
- }
- 
- writeShTty(s,l)
-@@ -334,14 +340,14 @@
- int	l;
- {
- 
--	writeTTYorg(tty,s,l,WriteCode,OutCode,&From_SH_Stat,&To_TTY_Stat);
-+	writeTTYorg(STDOUT_FILENO,s,l,WriteCode,OutCode,&From_SH_Stat,&To_TTY_Stat);
- }
- 
- writeTty(s,l)
- char	*s;
- int	l;
- {
--	writeTTYorg(tty,s,l,INTERNALCODE,OutCode,&TInter_Stat,&To_TTY_Stat);
-+	writeTTYorg(STDOUT_FILENO,s,l,INTERNALCODE,OutCode,&TInter_Stat,&To_TTY_Stat);
- }
- 
- 

@@ -1,104 +0,0 @@
-$NetBSD: patch-bf,v 1.1 2002/05/31 13:00:04 seb Exp $
-
---- stty.c.orig	Wed Sep 23 01:22:53 1998
-+++ stty.c	Sun Sep 27 10:21:12 1998
-@@ -31,12 +31,15 @@
- 
- #endif
- 
-+#ifndef STDIN_FILENO
-+#define STDIN_FILENO	0
-+#endif
-+
- #ifndef NO_SUSPEND
- SignalFunc suspend();
- #endif
- 
- TERMPARAM	d_ioval;
--int		tty;
- #ifdef TIOCSWINSZ
- struct winsize  d_winsize;
- #endif /* TIOCSWINSZ */
-@@ -142,7 +145,7 @@
- #ifdef TIOCSWINSZ
- 	extern int lines, columns;
- 
--	ioctl(tty, TIOCGWINSZ, &d_winsize);
-+	ioctl(STDIN_FILENO, TIOCGWINSZ, &d_winsize);
- 	if (d_winsize.ws_col == 0) {
- 		d_winsize.ws_col = columns;
- 	} else {
-@@ -153,7 +156,7 @@
- 	} else {
- 		lines = d_winsize.ws_row;
- 	}
--	ioctl(tty, TIOCSWINSZ, &d_winsize);
-+	ioctl(STDIN_FILENO, TIOCSWINSZ, &d_winsize);
- #endif /* TIOCSWINSZ */
- }
- 
-@@ -161,7 +164,7 @@
- {	int	er;
- 	TERMPARAM ioval;
- 
--	GET_TTY(tty, &d_ioval);
-+	GET_TTY(STDIN_FILENO, &d_ioval);
- 	ioval = d_ioval;
- 
- #if defined TERMIOS || defined TERMIO
-@@ -195,7 +198,7 @@
- 	ioval.m_ttyb.sg_flags = RAW;
- #endif
- 
--	er = SET_TTY(tty, &ioval);
-+	er = SET_TTY(STDIN_FILENO, &ioval);
- 
- 	initFep();
- 
-@@ -208,14 +211,8 @@
- 
- reset_tty()
- {
--	reset_tty_without_close();
--	close(tty);
--}
--
--reset_tty_without_close()
--{
- 	termFep();
--	SET_TTY(tty, &d_ioval);
-+	SET_TTY(STDIN_FILENO, &d_ioval);
- }
- 
- set_tty_sane(tty)
-@@ -258,12 +255,6 @@
- 	}
- }
- 
--tty_ready()
--{	char	*ttyname();
--
--	tty = open(ttyname(0),O_RDWR);
--}
--
- SignalFunc
- reset_exit()
- {
-@@ -315,7 +306,7 @@
- 	union wait statusp;
- #endif
- 
--#ifndef NO_SUSPEND
-+#ifdef NO_SUSPEND
- 	while ((cpid = wait((int *)&statusp)) != -1 && cpid != ShellPID)
- 		;
- #else
-@@ -385,7 +376,7 @@
- SignalFunc
- suspend()
- {
--	reset_tty_without_close();
-+	reset_tty();
- 	signal(SIGTSTP,SIG_DFL);
- 	kill(0,SIGTSTP);
- 

@@ -1,70 +0,0 @@
-$NetBSD: patch-bg,v 1.1 2002/05/31 13:00:04 seb Exp $
-
---- skkfep.1.orig	Tue Jul  7 00:31:16 1998
-+++ skkfep.1	Sat Dec 25 17:28:26 1999
-@@ -21,12 +21,13 @@
- EUC (or DEC code).  
- .IP \fBsj\fR 
- MS-Kanji (Shift-JIS) code.  
--.IP \fBjis\fIIO\fR 
-+.IP \fBjis\fIIO\fR
- JIS code. \fII\fR and \fIO\fR are characters which
--represent shift-in/out escape sequence respectively.  For shift-in,
--\fBA,@\fR(ESC $ @) or \fBB\fR(ESC $ B) can be specified; for
--shift-out, \fBH\fR(ESC ( H), \fBJ\fR(ESC ( J) or \fBB\fR(ESC ( B) can
-+represent kanji/ASCII escape sequences respectively.  For kanji sequence,
-+\fBA\fR, \fB@\fR (ESC $ @) or \fBB\fR (ESC $ B) can be specified; for
-+ASCII sequence, \fBH\fR (ESC ( H), \fBJ\fR (ESC ( J) or \fBB\fR (ESC ( B) can
- be specified.  
-+If the \fIIO\fR characters are omitted, the characters default to \fBBB\fR.
- .RE
- .TP 
- .BI -f kanjicode 
-@@ -34,7 +35,7 @@
- .TP 
- .BI -udic \0dictionary 
- Specifies the user dictionary file.
--Default is $(HOME)/.skk-jisyo.  
-+Default is $HOME/.skk-jisyo.  
- .TP 
- .B -bs 
- Toggle BS behavior when the
-@@ -46,12 +47,12 @@
- Choose the mode of learning words got from skk server. 
- \fImode\fR is one of following:
- .RS
--.IP \fBnone\fR or \fBoff\fR or \fB0\fR
-+.IP "\fBnone\fR or \fBoff\fR or \fB0\fR"
- Do not learn the words at all.
--.IP \fBtemporal\fR or \fB1\fR
-+.IP "\fBtemporal\fR or \fB1\fR"
- Learn the words while the skkfep process is alive, but do not record
- the learned information.
--.IP \fBpermanent\fR or \fB2\fR
-+.IP "\fBpermanent\fR or \fB2\fR"
- Learn the words and record them on the user dictionary.
- .RE
- .TP
-@@ -61,12 +62,20 @@
- .TP
- .BI -k char 
- Specify the kanji toggle key. A control character is
--expressed as ^ followed by an alphabet (for example, ^t).  Default is
--^T.  
-+expressed as ^ followed by an alphabet (for example, ^j).  Default is
-+^J.  
- .TP
- .B -esc
- With this option, ESC key becomes `RETUEN-TO-SKK-MODE' key.
- This option is useful for vi-users.
-+.TP
-+.B -viesc
-+With this option, ESC key becomes `RETUEN-TO-SKK-MODE' key and
-+one of i, a, o, I, A, S, and R key restores the last mode.
-+.TP
-+.B -emacsesc
-+With this option, control characters go though to the shell and disable
-+conversion temporarily.
- .TP
- .B -rs
- Reverse status line.

@@ -1,21 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2002/05/31 12:59:58 seb Exp $
-
---- Makefile.in.orig	Mon Feb  3 18:21:39 1997
-+++ Makefile.in	Tue Dec 21 20:03:09 1999
-@@ -33,7 +33,7 @@
- JISYO = @JISYO@
- JISYODIR = $(datadir)/skk
- 
--SUBDIRS = lisp skkserv jisyo-tools doc etc
-+SUBDIRS = skkserv jisyo-tools
- 
- MDEFINES = CC='$(CC)' CFLAGS='$(CFLAGS)' LDFLAGS='$(LDFLAGS)' \
- 	EMACS='$(EMACS)' JISYO='$(JISYO)' JISYODIR='$(JISYODIR)' \
-@@ -50,7 +50,6 @@
- 	  echo making $@ in $$subdir; \
- 	  (cd $$subdir && $(MAKE) $(MDEFINES) $@) || exit 1; \
- 	done
--	$(INSTALL_DATA) jisyo/$(JISYO) $(JISYODIR)/$(JISYO)
- 
- clean:
- 	cd lisp; $(MAKE) clean

@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2002/05/31 12:59:58 seb Exp $
-
---- configure.in.orig	Mon Feb  3 17:02:01 1997
-+++ configure.in	Tue Dec 21 15:46:54 1999
-@@ -18,7 +18,7 @@
- AC_PROG_GCC_TRADITIONAL
- AC_FUNC_SETPGRP
- AC_TYPE_SIGNAL
--AC_CHECK_FUNCS(bzero tiocnotty getdtablesize)
-+AC_CHECK_FUNCS(bzero setsid getdtablesize)
- 
- AC_CHECK_FUNC(dbm_open, , [DBMLIB="-ldbm"])
- 

@@ -1,15 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2002/05/31 12:59:58 seb Exp $
-
---- config.h.in.orig	Fri Jan 17 20:27:10 1997
-+++ config.h.in	Tue Dec 21 15:52:49 1999
-@@ -15,8 +15,8 @@
- /* Define if you have the getdtablesize function.  */
- #undef HAVE_GETDTABLESIZE
- 
--/* Define if you have the tiocnotty function.  */
--#undef HAVE_TIOCNOTTY
-+/* Define if you have the setsid function.  */
-+#undef HAVE_SETSID
- 
- /* Define if you have the <fcntl.h> header file.  */
- #undef HAVE_FCNTL_H

@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2002/05/31 12:59:58 seb Exp $
-
---- configure.orig	Fri Feb  7 14:00:43 1997
-+++ configure	Tue Dec 21 15:46:55 1999
-@@ -1191,7 +1191,7 @@
- EOF
- 
- 
--for ac_func in bzero tiocnotty getdtablesize
-+for ac_func in bzero setsid getdtablesize
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
- echo "configure:1198: checking for $ac_func" >&5

@@ -1,14 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2002/05/31 12:59:58 seb Exp $
-
---- skkserv/Makefile.in.orig	Fri Feb  7 11:05:23 1997
-+++ skkserv/Makefile.in	Tue Dec 21 07:41:57 1999
-@@ -28,7 +28,8 @@
- SERVERDIR = @libexecdir@
- 
- DEFS = -I$(srcdir) -I$(top_srcdir) $(CFLAGS) @DEFS@ @PRIVATE@ \
--	-DDEFAULT_JISYO=\"$(JISYODIR)/$(JISYO)\"
-+	-DDEFAULT_JISYO=\"$(JISYODIR)/$(JISYO)\" \
-+	-DSKKSERV_UID=${SKKUID} -DSKKSERV_GID=${SKKGID}
- 
- all: skkserv
- 

@@ -1,282 +0,0 @@
-$NetBSD: patch-af,v 1.1 2002/05/31 12:59:58 seb Exp $
-
---- skkserv/skkserv.c.orig	Tue Jan 21 04:16:36 1997
-+++ skkserv/skkserv.c	Mon Nov  6 00:12:57 2000
-@@ -100,14 +100,16 @@
- #define SERVER_NOT_FOUND "4"
- #define SERVER_FULL	"9"
- 
-+#define warn(m)	\
-+	{if (debug) fprintf(errout, "%s: %s\n", pgmnm, m);}
- #define err(m)	\
--	{if (debug) fprintf(errout, "%s: %s\n", pgmnm, m); exit(1);}
-+	{warn(m); exit(1);}
- 
- /*
-  *	Global Variables
-  */
- 
--char	pgmver[] = "3.9.4 ";	/* version number */
-+char	pgmver[] = "3.9.4nb1 ";	/* version number */
- 
- char	*pgmnm;		/* program name */
- char	*jname;		/* name of shared dictionary */
-@@ -121,6 +123,9 @@
- int	jtab1[KANAMOJI]; /* index-table by 1st letter (1st part)*/
- int	jtab2[KANAMOJI]; /* index-table by 1st letter (2nd part)*/
- int	initsock;	/* socket for waiting requests */
-+#ifdef PF_INET6
-+int	initsock6;	/* IPv6 socket for waiting requests */
-+#endif
- int	clientsock[MAXCLNT];	/* socket for each client */
- int	nclients;	/* max index for active clients */
- 
-@@ -130,8 +135,18 @@
-   int	parg;
-   int	setjisho = 0;
-   int	ctlterm;	/* fildes for control terminal */
--  void	reread();
-+  RETSIGTYPE 	req_reread();
-+
-+#ifdef SKKSERV_UID
-+  gid_t	gid = SKKSERV_GID;
- 
-+  /* revoke privilege if any */
-+  if (geteuid() == 0) {
-+    setgroups(1, &gid);
-+    setgid(SKKSERV_GID);
-+    setuid(SKKSERV_UID);
-+  }
-+#endif
-   pgmnm = argv[0];
-   debug = 0;
-   errout = stderr;
-@@ -200,7 +215,10 @@
-     fclose(stderr);
- 
-     /* detach child process from control terminal */
--#ifdef HAVE_TIOCNOTTY
-+#ifdef HAVE_SETSID
-+    setsid();
-+#else
-+#ifdef TIOCNOTTY
-     if ((ctlterm = open("/dev/tty", 2)) >= 0) { 
-       ioctl(ctlterm, TIOCNOTTY, 0);
-       close(ctlterm);
-@@ -215,6 +233,7 @@
-     signal(SIGHUP, SIG_IGN);
-     if (fork() != 0) exit(0);
- #endif
-+#endif
-   } else { /* debug mode */
-     fprintf(errout, "SKK-JISYO is %s\n", jname);
-     fflush(errout);
-@@ -222,7 +241,7 @@
-     if (errout != stderr) fclose(stderr);
-   }
- 
--  signal(SIGINT, reread);
-+  signal(SIGINT, req_reread);
-   /* 1993/6/5 by kam, re-read dictionary by "INT" signal */
- 
-   nclients = 0;
-@@ -244,8 +263,11 @@
- mksock()
- {
-   struct sockaddr_in	sin;
-+#ifdef PF_INET6
-+  struct sockaddr_in6	sin6;
-+#endif
-   struct servent	*sp;
--  int	optbuf = 1; /* enable socket REUSEADDR */
-+  int	optbuf;		/* enable socket REUSEADDR */
-   
-   bzero((char*)&sin, sizeof(sin));
-   sin.sin_family = AF_INET;
-@@ -262,16 +284,54 @@
-   sin.sin_port = htons(portnum); 
- 
-   if ((initsock = socket(PF_INET, SOCK_STREAM, 0)) < 0)
--    err("socket error; socket cannot be created");
--  if (setsockopt(initsock, SOL_SOCKET, SO_REUSEADDR, 
-+    warn("socket error; socket cannot be created");
-+#ifdef PF_INET6
-+  bzero((char*)&sin6, sizeof(sin6));
-+  sin6.sin6_family = AF_INET6;
-+  /* sin6.sin6_addr.s6_addr = IN6ADDR_ANY_INIT;  ... all-zero pattern */
-+  sin6.sin6_port = htons(portnum); 
-+  if ((initsock6 = socket(PF_INET6, SOCK_STREAM, 0)) < 0)
-+    warn("socket error; IPv6 socket cannot be created");
-+#endif
-+  optbuf = 1;
-+  if (initsock >= 0 && setsockopt(initsock, SOL_SOCKET, SO_REUSEADDR, 
-+		 &optbuf, sizeof(optbuf)) < 0)
-+    warn("socket error; cannot set socket option");
-+#ifdef PF_INET6
-+  optbuf = 1;
-+  if (initsock6 >= 0 && setsockopt(initsock6, SOL_SOCKET, SO_REUSEADDR, 
- 		 &optbuf, sizeof(optbuf)) < 0)
--    err("socket error; cannot set socket option");
--  if (bind(initsock, (struct sockaddr *)&sin, sizeof(sin))< 0) 
--    err("bind error; the socket is already used");
--  if (listen(initsock, MAXQUE) < 0) 
-+    warn("socket error; cannot set socket option");
-+#endif
-+  if (initsock >= 0 && bind(initsock, (struct sockaddr *)&sin, sizeof(sin))< 0)  {
-+    warn("bind error; the socket is already used");
-+    close(initsock);
-+    initsock = -1;
-+  }
-+#ifdef PF_INET6
-+  if (initsock6 >= 0 && bind(initsock6, (struct sockaddr *)&sin6, sizeof(sin6))< 0) {
-+    warn("bind error; the socket is already used");
-+    close(initsock6);
-+    initsock6 = -1;
-+  }
-+#endif
-+  if (initsock < 0
-+#ifdef PF_INET6
-+      && initsock6 < 0
-+#endif
-+	)
-+    exit(1);
-+  if (initsock >= 0 && listen(initsock, MAXQUE) < 0) 
-     err("listen error; something wrong happened with the socket");
-+#ifdef PF_INET6
-+  if (initsock6 >= 0 && listen(initsock6, MAXQUE) < 0) 
-+    err("listen error; something wrong happened with the IPv6 socket");
-+#endif
-   if (debug) {
-     fprintf(errout, "file descriptor for initsock is %d\n", initsock);
-+#ifdef PF_INET6
-+    fprintf(errout, "file descriptor for initsock6 is %d\n", initsock6);
-+#endif
-     fflush(errout);
-   }
- }
-@@ -303,8 +363,19 @@
-     mkoldjtab(buf);
- }
- 
-+/* using stdio in signal handler is unsafe */
-+#ifdef __STDC__
-+volatile
-+#endif
-+int reread_requested;
-+
-+RETSIGTYPE req_reread()
-+{
-+  reread_requested = 1;
-+}
-+
- /* 1993/6/5 by kam, re-read dictionary by "INT" signal */
--RETSIGTYPE reread()
-+void reread()
- {
-   if (fclose(jisho) < 0) {
-     fprintf(stderr, 
-@@ -455,15 +526,22 @@
- main_loop()
- {
-   fd_set 		readfds, writefds, exceptfds;
--  fd_set 		getrfds();
-+  void	 		getrfds();
-   struct sockaddr_in	from;
-+#ifdef PF_INET6
-+  struct sockaddr_in6	from6;
-+#endif
-   int			len;
-   register int		i;
- 
-   FD_ZERO(&writefds);
-   FD_ZERO(&exceptfds);
-   for(;;) {	/* infinite loop; waiting for client's request */
--    readfds = getrfds();
-+    if (reread_requested) {
-+      reread();
-+      reread_requested = 0;
-+    }
-+    getrfds(&readfds);
-     if (select(MAXDTAB, &readfds, &writefds, &exceptfds, NULL) < 0) {
-       if (errno == EINTR) /* if signal happens */
- 	continue;
-@@ -474,16 +552,32 @@
-       fflush(errout);
-     }
- 
--    if (FD_ISSET(initsock, &readfds)) {
-+    if (initsock >= 0 && FD_ISSET(initsock, &readfds)) {
-       len = sizeof(from);
-       if ((clientsock[nclients ++] = accept(initsock, &from, &len)) < 0) {
- 	err("accept error; something wrong happened with the socket");
-       }
--      if (nclients >= MAXDTAB - 3 - debug * 2) {
-+      if (nclients >= MAXDTAB - 3
-+#ifdef PF_INET6
-+		-1
-+#endif
-+		- debug * 2) {
- 	write(clientsock[--nclients], SERVER_FULL, 1);
- 	close(clientsock[nclients]);
-       }
-     }
-+#ifdef PF_INET6
-+    if (initsock6 >= 0 && FD_ISSET(initsock6, &readfds)) {
-+      len = sizeof(from6);
-+      if ((clientsock[nclients ++] = accept(initsock6, &from6, &len)) < 0) {
-+	err("accept error; something wrong happened with the socket");
-+      }
-+      if (nclients >= MAXDTAB - 4 - debug * 2) {
-+	write(clientsock[--nclients], SERVER_FULL, 1);
-+	close(clientsock[nclients]);
-+      }
-+    }
-+#endif
- 
-     /*	naiive scheduling */
-     for (i = 0; i < nclients; i ++)
-@@ -511,16 +605,20 @@
-  *	get bit pattern of read file descriptor
-  */
- 
--fd_set getrfds()
-+void getrfds(rfds)
-+fd_set	*rfds;
- {
--  fd_set		rfds;
-   register int		i;
- 
--  FD_ZERO(&rfds);
--  FD_SET(initsock, &rfds);
-+  FD_ZERO(rfds);
-+  if (initsock >= 0)
-+    FD_SET(initsock, rfds);
-+#ifdef PF_INET6
-+  if (initsock6 >= 0)
-+    FD_SET(initsock6, rfds);
-+#endif
-   for (i = 0; i < nclients; i ++)
--    FD_SET(clientsock[i], &rfds);
--  return (rfds);
-+    FD_SET(clientsock[i], rfds);
- }
- 
- /*
-@@ -724,6 +822,9 @@
-     exit(1);
-   }
-   hentry = gethostbyname(hname);
-+  if (hentry == NULL) {
-+    fprintf(errout, "%s: WARNING: gethostbyname(%s) failed\n", pgmnm, hname);
-+  } else {
- #ifdef NO_ADDR_LIST
-   strcat(hname, ":");
-   strcat(hname, hentry->h_addr);
-@@ -736,6 +837,7 @@
-     strcat(hname, inet_ntoa(*(struct in_addr *)*p++));
-   }
- #endif
-+  }
-   strcat(hname, ": ");
- }
- 

@@ -1,123 +0,0 @@
-$NetBSD: patch-bsearch,v 1.1 2002/05/31 12:59:59 seb Exp $
-
-Binary search patch.
-Originally from skk-users mailing list
-(Masahiro Doteguchi, Mailinglist-Id: 1779).
-
---- skkserv/skkserv.c.patch1	Mon Nov  6 00:12:57 2000
-+++ skkserv/skkserv.c	Mon Nov  6 00:15:00 2000
-@@ -109,7 +109,7 @@
-  *	Global Variables
-  */
- 
--char	pgmver[] = "3.9.4nb1 ";	/* version number */
-+char	pgmver[] = "3.9.4nb1 (binary search) ";	/* version number */
- 
- char	*pgmnm;		/* program name */
- char	*jname;		/* name of shared dictionary */
-@@ -622,7 +622,7 @@
- }
- 
- /*
-- *	reply to client: linear search
-+ *	reply to client: binary search
-  */
- 
- search(commsock)
-@@ -635,6 +635,7 @@
-   int		n; 	 	 /* number of characters from client */
-   int		sttpnt; 	 /* start point of searching */
-   int		endpnt; 	 /* end point of searching */
-+  int		curpnt;		 /* current point of searching */
-   int		errcod = 0; 	 /* error flag */
-   int		sstyle;		 /* search style */
- 
-@@ -743,18 +744,36 @@
-       endpnt = jtab1[KANA_END - code + 1];
-     }
-   }
--  fseek(jisho, sttpnt, 0);
-   if (debug)
--    fprintf(stderr, "from %d to %d\n", sttpnt, endpnt);
-+    fprintf(errout, "from %d to %d\n", sttpnt, endpnt);
-   
--  while ((c = fgetc(jisho)) != EOF) {
-+  for (;;) {
-+    if ((sstyle & 0x4) == 0) {	/* binary search? */
-+      curpnt = (sttpnt + endpnt) / 2;
-+      fseek(jisho, curpnt, 0);
-+      while ((c = fgetc(jisho)) != EOF) {
-+	curpnt++;
-+	if (c == EOL) break;
-+      }
-+      if (c == EOF) break;
-+      if (curpnt >= endpnt) {
-+	fseek(jisho, sttpnt, 0);
-+	sstyle |= 0x4;	/* linear search */
-+      }
-+    }
-+
-+    if (debug) {fprintf(errout, "%d:%d\t%d\t%d\t", sstyle, sttpnt, curpnt, endpnt);}
-+    c = fgetc(jisho);
-     pbuf = &combuf[1]; /* ' ' is end-symbol */
-     while (c == *pbuf && c != ' ' && c != EOL) {
--      if (debug) {fprintf(errout, "1:%d:%d:%d:%d:\n", c, *pbuf, ' ', EOL);}
-+/*    if (debug) {fprintf(errout, "1:%d:%d:%d:%d:", c, *pbuf, ' ', EOL);}*/
-+      if (debug) {fprintf(errout, "%c", c);}
-       c = fgetc(jisho); pbuf++;
--    } 
--    if (debug) {fprintf(errout, "1:%d:%d:%d:%d:\n", c, *pbuf, ' ', EOL);}
-+    }
-+/*    if (debug) {fprintf(errout, "1:%d:%d:%d:%d:", c, *pbuf, ' ', EOL);}*/
-+    if (debug) {fprintf(errout, "%c", c);}
-     if (c == ' ' && (*pbuf == ' ' || *pbuf == '\n')) { /* found */
-+      if (debug) {fprintf(errout, "found\n");}
-       if ((errcod = write(commsock, SERVER_FOUND, 1)) >= 0)
- 	while ((c = fgetc(jisho)) != EOF) {
- 	  *pbuf = c;
-@@ -770,18 +789,35 @@
-       }
-       return(0);
-     }
--    if (comp(*pbuf, c, sstyle)) {
--      if (debug) {
--	fprintf(stderr, "comp break %d \n", ftell(jisho));
--      }
--      break; 
-+    if (debug) {
-+      int ch;
-+
-+      if (c != ' ')
-+	do {
-+	  ch = fgetc(jisho);
-+	  fprintf(errout, "%c", ch);
-+	} while (ch != ' ' && ch != EOL);
-+      fprintf(errout, "unmatched\n");
-     }
--                       /* fix 1992/3/6 under suggestion  */
--		       /* of guchi@pfu.fujitsu.co.jp     */
--    while ((c = fgetc(jisho)) != EOF) {
--      if (c == EOL) break;
-+    if (sstyle & 0x4) {
-+      if (comp(*pbuf, c, sstyle&~0x4)) {
-+	if (debug) {
-+	  fprintf(stderr, "comp break %d \n", ftell(jisho));
-+        }
-+	break;
-+      }
-+                        /* fix 1992/3/6 under suggestion  */
-+ 		       /* of guchi@pfu.fujitsu.co.jp     */
-+      while ((c = fgetc(jisho)) != EOF) {
-+        if (c == EOL) break;
-+      }
-+      if (ftell(jisho) >= endpnt) break;
-+    } else {
-+      if (comp(*pbuf, c, sstyle&~0x4))
-+	endpnt = curpnt;
-+      else
-+	sttpnt = curpnt;
-     }
--    if (ftell(jisho) >= endpnt) break;
-   }
- 
-   if ((errcod = write(commsock, SERVER_NOT_FOUND, 1)) >= 0) {

@@ -1,112 +0,0 @@
-$NetBSD: patch-jisyo,v 1.1 2002/05/31 12:59:59 seb Exp $
-
-Dictionary (SKK-JISYO.L) corrigenda.
-Partially from skk-dic mailing list.
-
---- jisyo/SKK-JISYO.L.fix1	Mon Dec 20 16:28:52 1999
-+++ jisyo/SKK-JISYO.L	Mon Dec 27 23:53:47 1999
-@@ -3530,7 +3530,7 @@
- しりあe /知り合/
- しらべr /調べ/
- しらじらs /白々/
--しらs /報/知ら/知らせ/
-+しらs /報/知ら/
- しらm /白/
- しらk /白/
- しらb /調/
-@@ -4216,9 +4216,9 @@
- ぐi /食/
- くんよm /訓読/
- くんづk /君付/
--くわわt /加/
-+くわわt /加わ/
- くわだt /企/
--くわw /加わ/
-+くわw /加/
- くわs /詳/加/
- くわk /区分/
- くわe /加/咥/銜/加え/
-@@ -30746,7 +30746,7 @@
- がいかんび /外観美/
- がいき /外気/
- がいきおん /外気温/
--がいきょう /概況/外匡/
-+がいきょう /概況/外筐/
- がいきょく /外局/
- がいきれいぼう /外気冷房/
- がいきん /外勤/
-@@ -34044,7 +34044,7 @@
- きゅうきゅうたい /救急隊/
- きゅうきゅうばこ /救急箱/
- きゅうきゅうばんそうこう /救急絆創膏/
--きゅうきょ /急拠/急遽/急きょ/
-+きゅうきょ /急遽/急きょ/
- きゅうきょう /窮境/
- きゅうきょうさんけんしょこく /旧共産圏諸国/
- きゅうきょうしょくいん /旧教職員/
-@@ -35040,9 +35040,9 @@
- きょうぞんきょうえい /共存共栄/
- きょうぞんほう /共存法/
- きょうぞんほうほう /共存方法/
--きょうたい /匡体/筐体/狂態/矯態/嬌態/筺体/
-+きょうたい /筐体/狂態/嬌態/
- きょうたいいき /狭帯域/
--きょうたいじっそうぎじゅつ /匡体実装技術/
-+きょうたいじっそうぎじゅつ /筐体実装技術/
- きょうたく /供託/教卓/
- きょうたくきん /供託金/
- きょうたくしょ /供託所/
-@@ -36904,7 +36904,7 @@
- ぎじんほう /擬人法/
- ぎせい /犠牲/擬声/擬制/
- ぎせいご /擬声語/
--ぎせいしゃ /儀牲者/犠牲者/
-+ぎせいしゃ /犠牲者/
- ぎせき /議席/
- ぎせきすう /議席数/
- ぎせきはいぶん /議席配分/
-@@ -42867,7 +42867,7 @@
- こうぎせきぶん /広義積分/
- こうぎたいしょう /抗議対象/
- こうぎちゅう /講義中/
--こうぎとう /講義搭/講義棟/
-+こうぎとう /講義棟/
- こうぎないよう /講義内容/
- こうぎぶん /抗議文/
- こうぎめい /講義名/
-@@ -84011,7 +84011,7 @@
- とうじゅうろう /藤十郎/
- とうじゆうめい /当時有名/
- とうじょ /唐書/
--とうじょう /登場/搭乗/東條/東条/棟上/東上/塔乗/頭状/東城/筒状/
-+とうじょう /登場/搭乗/東條/東条/棟上/東上/頭状/東城/筒状/
- とうじょういぜん /登場以前/
- とうじょういらい /登場以来/
- とうじょういん /搭乗員/
-@@ -84025,7 +84025,7 @@
- とうじょうご /登場後/
- とうじょうしゃ /搭乗者/
- とうじょうしゃほけん /搭乗者保険/
--とうじょうじ /塔乗時/登場時/
-+とうじょうじ /搭乗時/登場時/
- とうじょうじっせき /搭乗実績/
- とうじょうじんぶつ /登場人物/
- とうじょうじんぶつたち /登場人物達/
-@@ -84038,7 +84038,7 @@
- とうじょうとうじ /登場当時/
- とうじょうばめん /登場場面/
- とうじょうばんぐみ /登場番組/
--とうじょうび /塔乗日/搭乗日/
-+とうじょうび /搭乗日/
- とうじょうびん /搭乗便/
- とうじょうまえ /登場前/搭乗前/
- とうじょうよてい /登場予定/搭乗予定/
-@@ -93140,7 +93140,7 @@
- はげたか /禿鷹/
- はげやま /禿山/
- はげん /波源/
--はこ /箱/函/運/葉子/□/匡/凾/筥/箪/匣/
-+はこ /箱/函/運/葉子/□/筐/凾/筥/箪/匣/
- はこいり /箱入り/箱入/
- はこう /破口/跛行/波高/
- はこうぶんぷ /波高分布/

@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2010/06/13 22:44:50 wiz Exp $
+# $NetBSD: Makefile,v 1.7.2.1 2010/07/04 07:18:44 agc Exp $
 #
 
 DISTNAME=	tomoe-gtk-0.6.0
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	inputmethod
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=tomoe/}
 

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

@@ -1,35 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2002/06/15 09:29:15 shell Exp $
-
---- Makefile.in.orig	Mon May 22 17:21:20 2000
-+++ Makefile.in
-@@ -2,7 +2,6 @@
- all:
- 	cd server; make
- 	cd client; make
--	cd unicon; make
- 	cd ImmModules/CCE; make
- 	cd ImmModules/TL-1; make
- 
-@@ -15,19 +14,14 @@
- data: gbdata big5data
- 
- install: 
--	if [ ! -d $(prefix) ] ; then mkdir -p $(prefix); fi
--	if [ ! -d $(prefix)/lib/unicon2 ] ; then mkdir -p $(prefix)/lib/unicon2; fi
--	if [ ! -d $(prefix)/bin ] ; then mkdir -p $(prefix)/bin; fi
--	if [ ! -d $(prefix)/lib/unicon2/gbk ] ; then mkdir -p $(prefix)/lib/unicon2/gbk; fi
--	if [ ! -d $(prefix)/lib/unicon2/gb ] ; then mkdir -p $(prefix)/lib/unicon2/gb; fi
--	if [ ! -d $(prefix)/lib/unicon2/big5 ] ; then mkdir -p $(prefix)/lib/unicon2/big5; fi
--	if [ ! -d $(prefix)/lib/unicon2/freepy ] ; then mkdir -p $(prefix)/lib/unicon2/freepy; fi
-+	$(BSD_INSTALL_DATA_DIR) $(prefix)/lib/unicon
- 	cd data; make install
- 	cd server; make install
- 	cd client; make install
--	cd unicon; make install
- 	cd ImmModules/CCE; make install
- 	cd ImmModules/TL-1; make install
-+	$(BSD_INSTALL_DATA) unicon/sys-big5.tab $(prefix)/lib/unicon
-+	$(BSD_INSTALL_DATA) unicon/sys-gb.tab $(prefix)/lib/unicon
- 
- clean:
- 	cd server; make clean

@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2002/06/15 09:29:15 shell Exp $
-
---- server/TLS_Debug.hpp.orig	Sat Jun  8 14:12:06 2002
-+++ server/TLS_Debug.hpp
-@@ -3,6 +3,8 @@
- 
- #include <stdio.h>
- #include <stdlib.h>
-+#include <stdarg.h>
-+#include <sys/types.h>
- 
- typedef char * PSTR;
- class TLS_CDebug

@@ -1,14 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2002/06/15 09:29:16 shell Exp $
-
---- data/Makefile.in.orig	Sat Jun  8 20:34:49 2002
-+++ data/Makefile.in
-@@ -1,7 +1,7 @@
- prefix=@prefix@
- CFLAGS = @CFLAGS@
- install: 
--	mkdir -p $(prefix)/lib/unicon2/freepy
--	cp pinyin* sysphrase* usrphrase* $(prefix)/lib/unicon2/freepy
-+	$(BSD_INSTALL_DATA_DIR) $(prefix)/lib/unicon/freepy
-+	$(BSD_INSTALL_DATA) pinyin* sysphrase* usrphrase* $(prefix)/lib/unicon/freepy
- distclean:
- 	rm -f Makefile *.bak