Import of pkgsrc-2013Q2

inputmethod/canna/DESCR

@@ -0,0 +1,3 @@
+Canna is a Japanese input method server/client.  Canna supports
+Emacs/Mule (Multi-lingual extension Emacs), kinput2 X11 input methods,
+cannum front end, and some others.

inputmethod/canna/Makefile

@@ -0,0 +1,15 @@
+# $NetBSD: Makefile,v 1.11 2010/02/20 10:39:01 obache Exp $
+
+META_PACKAGE=	yes
+
+.include "Makefile.common"
+
+PKGNAME:=	Canna-${CANNA_VERSION}
+PKGREVISION=	2
+
+DEPENDS+=	Canna-server>=${CANNA_VERSION}nb2:../../inputmethod/canna-server
+DEPENDS+=	Canna-dict>=${CANNA_VERSION}nb1:../../inputmethod/canna-dict
+
+CANNA_MODULE=	meta-package
+
+.include "../../mk/bsd.pkg.mk"

inputmethod/canna/Makefile.common

@@ -0,0 +1,45 @@
+# $NetBSD: Makefile.common,v 1.21 2010/05/28 11:06:34 obache Exp $
+#
+# Canna common makefile.
+#
+# used by inputmethod/canna-canuum/Makefile
+# used by inputmethod/canna-dict/Makefile
+# used by inputmethod/canna-lib/Makefile
+# used by inputmethod/canna-server/Makefile
+
+# "Pkgsrc" version.
+CANNA_VERSION=	3.6pl4
+
+DISTNAME=	Canna${CANNA_VERSION:S|.||:S|pl|p|}
+PKGNAME=	Canna-${CANNA_MODULE}-${CANNA_VERSION}
+CATEGORIES=	japanese inputmethod
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP:=canna/6059/}
+
+MAINTAINER=	tech-pkg-ja@jp.NetBSD.org
+HOMEPAGE=	http://canna.sourceforge.jp/
+COMMENT=	Kana-Kanji conversion system (${CANNA_MODULE})
+
+FILESDIR=	${.CURDIR}/../../inputmethod/canna/files
+DISTINFO_FILE=	${.CURDIR}/../../inputmethod/canna/distinfo
+PATCHDIR=	${.CURDIR}/../../inputmethod/canna/patches
+
+USE_IMAKE=	yes
+CANNA_SPOOL=	${VARBASE}/spool/canna
+CANNA_MODE=	0755
+
+PKG_GROUPS_VARS+=	CANNA_GROUP
+PKG_USERS_VARS+=	CANNA_USER
+
+CANNA_ENV=	CANNA_USER=${CANNA_USER}				\
+		CANNA_GROUP=${CANNA_GROUP}				\
+		CANNA_SPOOL=${CANNA_SPOOL}				\
+		CANNA_MODE=${CANNA_MODE}				\
+		IMDICTDIR=${IMDICTDIR}
+MAKE_ENV+=	${CANNA_ENV}
+SCRIPTS_ENV+=	${CANNA_ENV}
+PLIST_SUBST+=	${CANNA_ENV}
+FILES_SUBST+=	${CANNA_ENV}
+
+INSTALL_MAKE_FLAGS+=	CHOWN=${TRUE}
+INSTALL_MAKE_FLAGS+=	CHGRP=${TRUE}
+INSTALL_MAKE_FLAGS+=	CHMOD=${TRUE}

inputmethod/canna/distinfo

@@ -0,0 +1,22 @@
+$NetBSD: distinfo,v 1.11 2012/07/03 17:44:39 joerg Exp $
+
+SHA1 (Canna36p4.tar.gz) = 4edc22e2e4e5c6db42daa2083fabb53aa1ae8168
+RMD160 (Canna36p4.tar.gz) = 7f8bb7f5d87e6b939ff2b84edf58072c75a5d09d
+Size (Canna36p4.tar.gz) = 1455672 bytes
+SHA1 (patch-aa) = 6bb6da1cc2a458ebbcfe09fe19a371d7e8aea7da
+SHA1 (patch-ab) = b203ad0cb1285ffed0037e0eced3ae298bec5eb9
+SHA1 (patch-ac) = a81a07db87d3b501dedd423e148a8e7e1d1804c4
+SHA1 (patch-ad) = d4b5720c206f81124e0d53e71590de86f66c524c
+SHA1 (patch-ae) = 9e8de536052d76d8aeeab2d443dc42450ae53947
+SHA1 (patch-af) = 2700fc8395895176c16562af66ea5bf0b13d4e10
+SHA1 (patch-ag) = cb435e54334ead8dba6a9ac9f14368d69d6e3a7c
+SHA1 (patch-ah) = 5d2f01fa4810dafa7a83d02edaec36fc274173fe
+SHA1 (patch-ai) = b44d683b2c1d489746f1174f8ae6d06ddca66a59
+SHA1 (patch-aj) = 30d19c8ef9c1129e5214cb9a8a1d8b2b636b0361
+SHA1 (patch-ak) = 18b408344b8b617142ced8804990e87b7ae27f56
+SHA1 (patch-al) = f6025d6fb7a3247ef44b0a50ae13b67ef3dad2d9
+SHA1 (patch-am) = 756aed6fc81a9d75a55d123c8dc00c0932b8df7f
+SHA1 (patch-an) = ef892b0837e7b3b5b569a7a9a518df2379c43f1c
+SHA1 (patch-ao) = c577319f50df6624333726cd62b48d869989d881
+SHA1 (patch-ap) = 3f514037c4d67b2e18b27285370fe2ea84d977cc
+SHA1 (patch-dic_phono_Imakefile) = 3192d7c6e38caf2e5e8378283d673df29c2dc430

inputmethod/canna/files/canna.sh

@@ -0,0 +1,42 @@
+#!@RCD_SCRIPTS_SHELL@
+#
+# $NetBSD: canna.sh,v 1.2 2006/07/05 04:48:28 jlam Exp $
+#
+# PROVIDE: canna
+# REQUIRE: DAEMON
+
+. /etc/rc.subr
+
+name="canna"
+rcvar=$name
+command="@PREFIX@/sbin/cannaserver"
+start_precmd="canna_prestart"
+stop_cmd="@PREFIX@/sbin/cannakill"
+
+mkdir_perms() {
+	dir="$1"; user="$2"; group="$3"; mode="$4"
+	@TEST@ -d $dir || @MKDIR@ $dir
+	@CHOWN@ $user $dir
+	@CHGRP@ $group $dir
+	@CHMOD@ $mode $dir
+}
+
+canna_prestart()
+{
+	mkdir_perms @CANNA_SPOOL@ @CANNA_USER@ @CANNA_GROUP@ 0755
+	mkdir_perms @IMDICTDIR@/canna @CANNA_USER@ @CANNA_GROUP@ 0775
+	mkdir_perms @IMDICTDIR@/canna/canna @CANNA_USER@ @CANNA_GROUP@ 0775
+
+	srcdictdir="@PREFIX@/libdata/canna"
+	dictdir="@IMDICTDIR@/canna/canna"
+	if @TEST@ -d $srcdictdir; then
+		( cd $srcdictdir; for f in *; do
+			@TEST@ "$f" != "*" || continue
+			@RM@ -f $dictdir/$f
+			@LN@ -fs $srcdictdir/$f $dictdir/$f
+		done )
+	fi
+}
+
+load_rc_config $name
+run_rc_command "$1"

inputmethod/canna/files/dic-phono-filter.awk

@@ -0,0 +1,13 @@
+BEGIN {
+	skip = 0
+}
+
+/^#ifdef SHIFT/ { skip = 0 }
+/^#ifdef ASCII/ { skip = 1 }
+/^#ifndef SHIFT/ { skip = 1 }
+/^#ifndef ASCII/ { skip = 0 }
+/^#else/ { skip = !skip }
+/^#endif/ { skip = 0 }
+/^#/ { next; }
+
+{ if (!skip) print }

inputmethod/canna/patches/patch-aa

@@ -0,0 +1,110 @@
+$NetBSD: patch-aa,v 1.3 2008/05/20 18:53:17 tnn Exp $
+
+--- Canna.conf.orig	2003-09-22 12:27:12.000000000 +0200
++++ Canna.conf
+@@ -133,18 +133,18 @@
+ /* rootにならずにインストールする時はこれを定義して下さい */
+ /* #define InstallAsUser */
+ /* 従来と互換のディレクトリ構造にする場合はこれを定義してください */
+-#define ObsoleteInstallDir
++/* #define ObsoleteInstallDir */
+ #ifdef InstallAsUser
+ # define DefCannaPrefix $(HOME)/canna
+ # define DefErrDir $(cannaPrefix)/log
+ # define DefLibCannaDir $(cannaExecPrefix)/lib
+ #else 
+-# define DefCannaPrefix /usr/local/canna
++# define DefCannaPrefix ${PREFIX}
+ # ifdef ObsoleteInstallDir
+ #  define DefErrDir /usr/spool/canna
+ #  define DefLibCannaDir /usr/lib
+ # else
+-#  define DefErrDir /var/log
++#  define DefErrDir ${CANNA_SPOOL}
+ #  define DefLibCannaDir $(cannaExecPrefix)/lib
+ # endif
+ #endif
+@@ -164,7 +164,7 @@ XCOMM cannaLibDir = /var/lib/canna
+ XCOMM cannaLibDir = /var/db/canna
+ cannaLibDir = DefCannaLibDir
+ XCOMM cannaManDir = $(cannaPrefix)/share/man
+-cannaManDir = $(cannaPrefix)/man
++cannaManDir = $(cannaPrefix)/$(PKGMANDIR)
+ cannaIncDir = $(cannaPrefix)/include/canna
+ 
+ libCannaDir = DefLibCannaDir
+@@ -173,10 +173,10 @@ ErrDir  = DefErrDir
+ /* 次の3行は変更しないでください */
+ wcharDefinition = -DCANNA_WCHAR
+ Wlib =
+-JapaneseLocale = japanese
++JapaneseLocale = ja_JP.eucJP
+ 
+-cannaOwner = bin
+-cannaGroup = bin
++cannaOwner = ${CANNA_USER}
++cannaGroup = ${CANNA_GROUP}
+ 
+ #ifdef InstallAsUser
+ cannaOwnerGroup =
+@@ -249,7 +249,7 @@ dontHaveRename = 0
+  * コマンド類をリンクする時は、次を YES にしてくだい。
+  */
+ /* #define UseInstalledLibCanna YES */
+-#define UseInstalledLibCanna NO
++#define UseInstalledLibCanna YES
+ 
+ DicDir   = $(cannaLibDir)/dic
+ 
+@@ -294,18 +294,18 @@ DicDir   = $(cannaLibDir)/dic
+     DEPCANNALIB = $(libCannaDir)/libcanna.a
+ #endif
+ # endif
+-       CANNALIB = -L$(libCannaDir) -lcanna $(DLLIB)
++       CANNALIB = -Wl,-rpath,$(libCannaDir) -L$(libCannaDir) -lcanna $(DLLIB)
+ #else /* ! UseInstalledLibCanna */
+ # if DoSharedLib
+-    DEPCANNALIB = $(CANNASRC)/libcanna.$(sharedLibExtension)
++    DEPCANNALIB = $(libCannaDir)/libcanna.$(sharedLibExtension)
+ # else
+ #ifdef __EMX__
+-    DEPCANNALIB = $(CANNASRC)/canna.a
++    DEPCANNALIB = $(libCannaDir)/canna.a
+ #else
+-    DEPCANNALIB = $(CANNASRC)/libcanna.a
++    DEPCANNALIB = $(libCannaDir)/libcanna.a
+ #endif
+ # endif
+-       CANNALIB = -L$(CANNASRC) -lcanna $(DLLIB)
++       CANNALIB = -Wl,-rpath,$(libCannaDir) -L$(CANNASRC) -lcanna $(DLLIB)
+ #endif /* UseInstalledLibCanna */
+ 
+ #if UseInstalledLibCanna
+@@ -314,14 +314,14 @@ DicDir   = $(cannaLibDir)/dic
+ # else
+     DEPCANNALIB16 = $(libCannaDir)/libcanna16.a
+ # endif
+-       CANNALIB16 = -L$(libCannaDir) -lcanna16 $(DLLIB)
++       CANNALIB16 = -Wl,-rpath,$(libCannaDir) -L$(libCannaDir) -lcanna16 $(DLLIB)
+ #else /* ! UseInstalledLibCanna */
+ # if DoSharedLib
+-    DEPCANNALIB16 = $(CANNASRC)/libcanna16.$(sharedLibExtension)
++    DEPCANNALIB16 = $(libCannaDir)/libcanna16.$(sharedLibExtension)
+ # else
+-    DEPCANNALIB16 = $(CANNASRC)/libcanna16.a
++    DEPCANNALIB16 = $(libCannaDir)/libcanna16.a
+ # endif
+-       CANNALIB16 = -L$(CANNASRC) -lcanna16 $(DLLIB)
++       CANNALIB16 = -Wl,-rpath,$(libCannaDir) -L$(CANNASRC) -lcanna16 $(DLLIB)
+ #endif /* UseInstalledLibCanna */
+ 
+ /*
+@@ -338,7 +338,7 @@ DicDir   = $(cannaLibDir)/dic
+      SCRIPTS_DEFINES = 
+ 
+ #ifdef JAPANESEMAN
+-JMNLOCALE = ja
++JMNLOCALE = ja_JP.EUC
+ #endif
+ 
+ /* USE_OBSOLETE_STYLE_FILENAME を定義するための定義 */

inputmethod/canna/patches/patch-ab

@@ -0,0 +1,21 @@
+$NetBSD: patch-ab,v 1.1 2003/05/31 07:24:41 uebayasi Exp $
+--- Imakefile.orig	Thu Dec  5 22:39:41 2002
++++ Imakefile	Thu Dec  5 22:40:03 2002
+@@ -60,7 +60,7 @@
+ 	for i in $(SERVERDIR) ;\
+ 	do \
+ 		(cd $$i ; echo "installing" "in $(CURRENT_DIR)/$$i..."; \
+-		$(MAKE) $(MFLAGS) DESTDIR='$(DESTDIR)' install); \
++		$(MAKE) $(MFLAGS) DESTDIR='$(DESTDIR)' install install.man); \
+ 	done
+ 
+ instclient::
+@@ -68,7 +68,7 @@
+ 	for i in $(CLIENTDIR) ;\
+ 	do \
+ 		(cd $$i ; echo "installing" "in $(CURRENT_DIR)/$$i..."; \
+-		$(MAKE) $(MFLAGS) DESTDIR='$(DESTDIR)' install); \
++		$(MAKE) $(MFLAGS) DESTDIR='$(DESTDIR)' install install.man); \
+ 	done
+ 
+ instsgs::

inputmethod/canna/patches/patch-ac

@@ -0,0 +1,17 @@
+$NetBSD: patch-ac,v 1.2 2005/01/13 12:18:42 minskim Exp $
+
+--- dic/phono/Imakefile.orig	2002-10-19 03:27:40.000000000 -0500
++++ dic/phono/Imakefile
+@@ -27,9 +27,9 @@
+ 
+        ROMAJI_DIC_DEF = -DSHIFT
+ 
+-               DICDIR = $(cannaLibDir)/dic
+-            SAMPLEDIR = $(cannaLibDir)/sample
+-         SAMPLESRCDIR = $(cannaLibDir)/sample/src
++               DICDIR = $(DicDir)
++            SAMPLEDIR = $(DicDir)/sample
++         SAMPLESRCDIR = $(DicDir)/sample/src
+ 
+     KPDEF = default.kpdef jdaemon.kpdef just.kpdef kaisoku.kpdef kana.kpdef \
+             lan5.kpdef matsu.kpdef newjis.kpdef romaji.kpdef sokuon.kpdef \

inputmethod/canna/patches/patch-ad

@@ -0,0 +1,12 @@
+$NetBSD: patch-ad,v 1.1 2003/05/31 07:24:42 uebayasi Exp $
+--- dic/ideo/pubdic/Imakefile.orig	Thu Dec  5 23:43:40 2002
++++ dic/ideo/pubdic/Imakefile	Thu Dec  5 23:43:52 2002
+@@ -9,7 +9,7 @@
+       CANNAROOT = ../../..
+     CANNACMDDIR = $(CANNAROOT)/cmd
+           MERGE = $(CANNACMDDIR)/mergewd/mergeword
+-       INCLUDES = -I$(CANNAROOT)/include
++       INCLUDES = -I$(CANNAROOT)/canna
+ #endif
+         TARGETS = iroha.t
+         PUBDICS = a.p k.p s.p t.p n.p h.p m.p y.p r.p w.p x.p

inputmethod/canna/patches/patch-ae

@@ -0,0 +1,16 @@
+$NetBSD: patch-ae,v 1.1 2005/12/29 15:29:12 joerg Exp $
+
+--- canna/widedef.h.orig	2003-09-12 14:32:52.000000000 +0000
++++ canna/widedef.h
+@@ -66,7 +66,10 @@
+ #endif /* !nec_ews_svr2 */
+ #endif /* HAVE_WCHAR_OPERATION */
+ 
+-#if (defined(__FreeBSD__) && __FreeBSD_version < 500000) \
++#if defined(__DragonFly__)
++# include <wchar.h>
++# define _WCHAR_T
++#elif (defined(__FreeBSD__) && __FreeBSD_version < 500000) \
+     || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__)
+ # ifdef _BSD_WCHAR_T_
+ #  undef _BSD_WCHAR_T_

inputmethod/canna/patches/patch-af

@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1 2003/05/31 07:24:42 uebayasi Exp $
+
+--- lib/RKC/convert.c.orig	Wed May 22 22:02:57 1996
++++ lib/RKC/convert.c
+@@ -32,7 +32,7 @@
+ #ifndef WIN
+ #include "sglobal.h"
+ #endif
+-#include "IRproto.h"
++#include "../server/IRproto.h"
+ 
+ #include <errno.h>
+ #include <sys/types.h>

inputmethod/canna/patches/patch-ag

@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.1 2005/12/30 15:16:21 joerg Exp $
+
+--- cmd/cannastat/cannastat.c.orig	2005-12-30 14:28:41.000000000 +0000
++++ cmd/cannastat/cannastat.c
+@@ -95,8 +95,6 @@ static IRwReq cRreq ;
+ static IRReq iRreq ;
+ static long cur_time ;	
+ 
+-extern int errno;
+-
+ static int
+ *TotalReqCount, OldTotalReqCount[ OLD_MAXREQUESTNO ],
+ ProtoCount,

inputmethod/canna/patches/patch-ah

@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.1 2005/12/30 15:16:21 joerg Exp $
+
+--- cmd/cshost/cshost.c.orig	2005-12-30 14:37:58.000000000 +0000
++++ cmd/cshost/cshost.c
+@@ -70,8 +70,6 @@ static IRReq iRreq ;
+ static int ServerFD ;
+ static int ProtocolVersion ;
+ 
+-extern int errno;
+-
+ main(argc, argv)
+ int argc ;
+ char **argv ;

inputmethod/canna/patches/patch-ai

@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.1 2005/12/30 15:16:21 joerg Exp $
+
+--- server/WaitFor.c.orig	2005-12-30 14:38:44.000000000 +0000
++++ server/WaitFor.c
+@@ -78,8 +78,6 @@ extern void CheckConnections();
+ extern void EstablishNewConnections();
+ extern void CheckSignal pro((void));
+ 
+-extern int errno;
+-
+ static int
+ _anyset(src)
+ long *src;

inputmethod/canna/patches/patch-aj

@@ -0,0 +1,13 @@
+$NetBSD: patch-aj,v 1.1 2005/12/30 15:16:21 joerg Exp $
+
+--- server/connection.c.orig	2005-12-30 14:39:13.000000000 +0000
++++ server/connection.c
+@@ -69,8 +69,6 @@ static char rcs_id[] = "$Id: connection.
+ #include "net.h"
+ #include "IR.h"
+ 
+-extern int errno;
+-
+ long *AllSockets;	   /* select on this */
+ long *AllClients;	   /* available clients */
+ long *LastSelectMask  ;    /* mask returned from last select call */

inputmethod/canna/patches/patch-ak

@@ -0,0 +1,12 @@
+$NetBSD: patch-ak,v 1.1 2005/12/30 15:16:21 joerg Exp $
+
+--- server/convert.c.orig	2005-12-30 14:39:52.000000000 +0000
++++ server/convert.c
+@@ -57,7 +57,6 @@ static char rcs_id[] = "@(#) 102.1 $Id: 
+ #define IR_INT_INVAL(x) ((unsigned int)x > IR_INT_MAX)
+ 
+ extern void CheckSignal pro((void));
+-extern int  errno;
+ 
+ #ifdef DEBUGPROTO
+ static void

inputmethod/canna/patches/patch-al

@@ -0,0 +1,12 @@
+$NetBSD: patch-al,v 1.1 2005/12/30 15:16:21 joerg Exp $
+
+--- server/wconvert.c.orig	2005-12-30 14:40:19.000000000 +0000
++++ server/wconvert.c
+@@ -84,7 +84,6 @@ static char rcs_id[] = "@(#) 102.1 $Id: 
+ #include "IR.h"
+ 
+ extern void CheckSignal pro((void));
+-extern int  errno;
+ 
+ typedef struct {
+ #ifdef __STDC__

inputmethod/canna/patches/patch-am

@@ -0,0 +1,13 @@
+$NetBSD: patch-am,v 1.1 2005/12/30 15:16:21 joerg Exp $
+
+--- server/misc.c.orig	2005-12-30 14:40:43.000000000 +0000
++++ server/misc.c
+@@ -75,8 +75,6 @@ extern void CheckConnections();
+ void
+ FatalError();
+ 
+-extern int  errno;
+-
+ #ifdef DEBUG
+ #define LOGFILE "/tmp/canna.log"
+ static FILE *ServerLogFp = (FILE *)0;

inputmethod/canna/patches/patch-an

@@ -0,0 +1,22 @@
+$NetBSD: patch-an,v 1.2 2011/12/07 16:05:59 roy Exp $
+
+--- canuum/canna.c.orig	2005-12-30 14:56:11.000000000 +0000
++++ canuum/canna.c
+@@ -92,8 +92,6 @@ static char rcsid[] = "$Id: canna.c,v 1.
+ #define PARTIALREDRAW 1
+ #define NOREDRAW      0
+ 
+-extern	int	errno;
+-
+ static int maxmodelen;
+ static int maxwidth = 0;
+ 
+@@ -1268,7 +1266,7 @@
+   cannakeyentry(key_end,   CANNA_KEY_End);
+ #endif
+ 
+-  resetterm();
++  reset_shell_mode();
+ #endif
+ 
+   if (terminalname = malloc(strlen(term) + 1)) {

inputmethod/canna/patches/patch-ao

@@ -0,0 +1,13 @@
+$NetBSD: patch-ao,v 1.1 2008/09/18 12:33:44 taca Exp $
+
+--- lib/RK/ncache.c.orig	2002-10-19 17:27:45.000000000 +0900
++++ lib/RK/ncache.c
+@@ -27,7 +27,7 @@ static char rcsid[]="$Id: ncache.c,v 1.1
+ #include	"RKintern.h"
+ 
+ #define	NCHASH		101
+-#define	hash(x)		((int)((x)%NCHASH))
++#define	hash(x)		((int)(((unsigned long)(x))%NCHASH))
+ 
+ static struct ncache	Nchash[NCHASH];
+ static struct ncache	Ncfree;

inputmethod/canna/patches/patch-ap

@@ -0,0 +1,30 @@
+$NetBSD: patch-ap,v 1.1 2011/12/07 16:05:59 roy Exp $
+
+--- canuum/termio.c.orig	2011-12-07 13:20:41.000000000 +0000
++++ canuum/termio.c		2011-12-07 15:58:50.000000000 +0000
+@@ -175,7 +175,6 @@
+ void
+ closeTermData ()
+ {
+-  resetterm ();
+   reset_shell_mode ();
+ }
+ 
+@@ -195,7 +194,7 @@
+ set_scroll_region (start, end)
+      int start, end;
+ {
+-  tputs (tparm (change_scroll_region, start, end), 1, putchar);
++  tputs (tparm (change_scroll_region, start, end, 0, 0, 0, 0, 0, 0, 0), 1, putchar);
+ }
+ 
+ void
+@@ -223,7 +222,7 @@
+ throw_cur_raw (col, row)
+      int col, row;
+ {
+-  tputs (tparm (cursor_address, row, col), 1, putchar);
++  tputs (tparm (cursor_address, row, col, 0, 0, 0, 0, 0, 0, 0), 1, putchar);
+ }
+ 
+ void

inputmethod/canna/patches/patch-dic_phono_Imakefile

@@ -0,0 +1,25 @@
+$NetBSD: patch-dic_phono_Imakefile,v 1.1 2012/07/03 17:44:39 joerg Exp $
+
+--- dic/phono/Imakefile.orig	2012-06-17 06:10:27.000000000 +0000
++++ dic/phono/Imakefile
+@@ -54,16 +54,16 @@ AllTarget($(ROMKANA_TABLES))
+ 
+ #ifdef __EMX__
+ .kpdef.kp:
+-	$(FORCPP) -7 < $< | $(CPP) $(ROMAJI_DIC_DEF) | $(FORCPP) -8 | $(KPDIC) > $@
++	$(FORCPP) -7 < $< | tee ${.TARGET}.before | ${AWK} -f dic-phono-filter.awk | tee ${.TARGET}.after |$(FORCPP) -8 | $(KPDIC) > $@
+ 
+ .kpdef.cbp:
+-	$(FORCPP) -7 < $< | $(CPP) $(ROMAJI_DIC_DEF) | $(FORCPP) -8 | $(KPDIC) > $@
++	$(FORCPP) -7 < $< | tee ${.TARGET}.before | ${AWK} -f dic-phono-filter.awk  | tee ${.TARGET}.after | $(FORCPP) -8 | $(KPDIC) > $@
+ #else
+ .kpdef.kp:
+-	$(FORCPP) -7 < $< | $(CPP) $(ROMAJI_DIC_DEF) | $(FORCPP) -8 | $(KPDIC) > `basename $< '.kpdef'`.kp
++	$(FORCPP) -7 < $< | tee ${.TARGET}.before | ${AWK} -f dic-phono-filter.awk  | tee ${.TARGET}.after | $(FORCPP) -8 | $(KPDIC) > `basename $< '.kpdef'`.kp
+ 
+ .kpdef.cbp:
+-	$(FORCPP) -7 < $< | $(CPP) $(ROMAJI_DIC_DEF) | $(FORCPP) -8 | $(KPDIC) > `basename $< '.kpdef'`.cbp
++	$(FORCPP) -7 < $< | tee ${.TARGET}.before | ${AWK} -f dic-phono-filter.awk  | tee ${.TARGET}.after | $(FORCPP) -8 | $(KPDIC) > `basename $< '.kpdef'`.cbp
+ #endif
+ 
+ MakeDirectories(install,$(DICDIR))