Minix/pkgsrc-ng
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Import of pkgsrc-2016Q3

Browse Source
This commit is contained in:
Lionel Sambuc
2016-10-14 07:49:11 +02:00
committed by Lionel Sambuc
parent 9d819b6d54
commit 1242aa1e36
35952 changed files with 949749 additions and 377083 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
inputmethod/canna/Makefile
View File

@@ -1,14 +1,13 @@
# $NetBSD: Makefile,v 1.11 2010/02/20 10:39:01 obache Exp $
# $NetBSD: Makefile,v 1.12 2015/10/18 03:58:31 tsutsui 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
DEPENDS+= Canna-server>=${CANNA_VERSION}:../../inputmethod/canna-server
DEPENDS+= Canna-dict>=${CANNA_VERSION}:../../inputmethod/canna-dict
CANNA_MODULE= meta-package

9
inputmethod/canna/Makefile.common
View File

@@ -1,4 +1,4 @@
# $NetBSD: Makefile.common,v 1.22 2015/06/29 11:06:47 ryoon Exp $
# $NetBSD: Makefile.common,v 1.23 2015/10/18 03:58:31 tsutsui Exp $
#
# Canna common makefile.
#
@@ -8,14 +8,15 @@
# used by inputmethod/canna-server/Makefile
# "Pkgsrc" version.
CANNA_VERSION= 3.6pl4
CANNA_VERSION= 3.7pl3
DISTNAME= Canna${CANNA_VERSION:S|.||:S|pl|p|}
PKGNAME= Canna-${CANNA_MODULE}-${CANNA_VERSION}
CATEGORIES= japanese inputmethod
MASTER_SITES= ${MASTER_SITE_OSDN:=canna/6059/}
MASTER_SITES= ${MASTER_SITE_OSDN:=canna/9565/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= tech-pkg-ja@jp.NetBSD.org
MAINTAINER= tsutsui@NetBSD.org
HOMEPAGE= http://canna.osdn.jp/
COMMENT= Kana-Kanji conversion system (${CANNA_MODULE})

44
inputmethod/canna/distinfo
View File

@@ -1,22 +1,24 @@
$NetBSD: distinfo,v 1.11 2012/07/03 17:44:39 joerg Exp $
$NetBSD: distinfo,v 1.15 2015/11/04 17:41:19 agc 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
SHA1 (Canna37p3.tar.bz2) = e39eece7c70c669dd46dd74b26121a60a2496fde
RMD160 (Canna37p3.tar.bz2) = 33e5eb9e2dc144835db838612897e652acbc60ed
SHA512 (Canna37p3.tar.bz2) = 82846f2393aa2654dd2c97a93178098b8bd11e5409b584447f1b6fdf303adacc9802e2293cafd98b68af8b69622625ed00aa9712bf270feaa119adfdf4211158
Size (Canna37p3.tar.bz2) = 1263065 bytes
SHA1 (patch-Canna.conf) = 81b46285a2b91c07b8497dc6669eb26552391a6c
SHA1 (patch-Imakefile) = a70dee63ce9ce392b29b76df70479fee45e1a2b9
SHA1 (patch-canna_widedef.h) = c52cbbe5b55fc4fca6a501eef50fbf5bb878e514
SHA1 (patch-canuum_Imakefile) = 5f4e7970a92d514ec538e4591eaa4f46843654a3
SHA1 (patch-canuum_canna.c) = a543a720fba9e2f770d6397d6b05352cfa58f300
SHA1 (patch-canuum_config.h.in) = 98547954e459bd85e5b03fc86f34fb5d1e3eed4b
SHA1 (patch-canuum_configure) = c08efb73bb7d93d8c539873c1337be54ed864902
SHA1 (patch-canuum_configure.in) = a1a6a821b9e9f9baef450ad340cb57a6f20a6989
SHA1 (patch-canuum_jhlp.c) = 1d15186608f116cc4fb3e6a9691bb1b701d8b0ec
SHA1 (patch-canuum_printf.c) = c05ef114fae689855989d5d5eded2f734c62e12e
SHA1 (patch-canuum_termcap.c) = 958015b3bf4e9f89703e198c1ed28d51ae3f8c4e
SHA1 (patch-canuum_termio.c) = df9e68c8fb564ee4c4367acf6b042c253d17e525
SHA1 (patch-cmd_cmd.tmpl) = f6ec97c273aa84eb84bdd24cbe16aaf7e696e041
SHA1 (patch-dic_phono_Imakefile) = 4e1210517317b57796cad5b350de41e1f0d8157d
SHA1 (patch-lib_RKC_convert.c) = f196cfa3db3ef163c1869ca6bfd3f22170997aef
SHA1 (patch-lib_RK_dd.c) = 8055a2a3902e7d4d0cc1d782295c2879311750ec
SHA1 (patch-lib_RK_ncache.c) = e792592500e7db85a6b2370c4ea9eb533d97bda0
SHA1 (patch-lib_canna_keydef.c) = af14140f58bf8a6214a7fb9d5d73347c1b3cdd85

82
inputmethod/canna/patches/patch-Canna.conf Normal file
View File

@@ -0,0 +1,82 @@
$NetBSD: patch-Canna.conf,v 1.1 2015/10/18 03:58:31 tsutsui Exp $
- Handle pkgsrc environments
- Enable IPv6 support
- Fix shlib options
--- Canna.conf.orig 2004-05-19 15:48:47.000000000 +0000
+++ Canna.conf
@@ -109,12 +109,12 @@
# 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
@@ -148,7 +148,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
@@ -158,7 +158,7 @@ ErrDir = DefErrDir
#define SupportOldWchar 1
/* IPv6を用いる場合は1と定義してください */
-#define UseInet6 0 /* requires newer IPv6 implementation */
+#define UseInet6 1 /* requires newer IPv6 implementation */
/* 3.2系から3.6系までの形式の辞書を作る場合はこれを定義してください */
/* #define DIC_3_6_COMPAT */
@@ -169,8 +169,8 @@ ErrDir = DefErrDir
#define ModernElfLink NO /* experimental */
-cannaOwner = bin
-cannaGroup = bin
+cannaOwner = ${CANNA_USER}
+cannaGroup = ${CANNA_GROUP}
#ifdef InstallAsUser
cannaOwnerGroup =
@@ -235,7 +235,7 @@ cannaLight = 1
* コマンド類をリンクする時は、次を YES にしてくだい。
*/
/* #define UseInstalledLibCanna YES */
-#define UseInstalledLibCanna NO
+#define UseInstalledLibCanna YES
DicDir = $(cannaLibDir)/dic
@@ -279,9 +279,9 @@ DicDir = $(cannaLibDir)/dic
#if UseInstalledLibCanna
DEPCANNALIB = $(libCannaDir)/CannaDepLibraryName(canna)
-CANNALIB = -L$(libCannaDir) -lcanna $(DLLIB)
+CANNALIB = -Wl,-rpath,$(libCannaDir) -L$(libCannaDir) -lcanna $(DLLIB)
DEPCANNALIB16 = $(libCannaDir)/CannaDepLibraryName(canna16)
-CANNALIB16 = -L$(libCannaDir) -lcanna16 $(DLLIB)
+CANNALIB16 = -Wl,-rpath,$(libCannaDir) -L$(libCannaDir) -lcanna16 $(DLLIB)
#else
DEPCANNALIB = $(CANNASRC)/CannaDepLibraryName(canna)
CANNALIB = -L$(CANNASRC) -lcanna $(DLLIB)
@@ -330,7 +330,7 @@ UILIB_DEFINES = $(cannaDsoRevDef) $(CANN
SCRIPTS_DEFINES = $(CANNA_DEFINES)
#ifdef JAPANESEMAN
-JMNLOCALE = ja
+JMNLOCALE = ja_JP.EUC
#endif
/* USE_OBSOLETE_STYLE_FILENAME を定義するための定義 */

13
inputmethod/canna/patches/patch-ab → inputmethod/canna/patches/patch-Imakefile
View File

@@ -1,7 +1,10 @@
$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 @@
$NetBSD: patch-Imakefile,v 1.1 2015/10/18 03:58:31 tsutsui Exp $
Explicitly install man pages.
--- Imakefile.orig 2004-05-19 15:39:22.000000000 +0000
+++ Imakefile
@@ -166,7 +166,7 @@ instserver::
for i in $(SERVERDIR) ;\
do \
(cd $$i ; echo "installing" "in $(CURRENT_DIR)/$$i..."; \
@@ -10,7 +13,7 @@ $NetBSD: patch-ab,v 1.1 2003/05/31 07:24:41 uebayasi Exp $
done
instclient::
@@ -68,7 +68,7 @@
@@ -174,7 +174,7 @@ instclient::
for i in $(CLIENTDIR) ;\
do \
(cd $$i ; echo "installing" "in $(CURRENT_DIR)/$$i..."; \

110
inputmethod/canna/patches/patch-aa
View File

@@ -1,110 +0,0 @@
$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 を定義するための定義 */

17
inputmethod/canna/patches/patch-ac
View File

@@ -1,17 +0,0 @@
$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 \

12
inputmethod/canna/patches/patch-ad
View File

@@ -1,12 +0,0 @@
$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

13
inputmethod/canna/patches/patch-af
View File

@@ -1,13 +0,0 @@
$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>

13
inputmethod/canna/patches/patch-ag
View File

@@ -1,13 +0,0 @@
$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,

13
inputmethod/canna/patches/patch-ah
View File

@@ -1,13 +0,0 @@
$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 ;

13
inputmethod/canna/patches/patch-ai
View File

@@ -1,13 +0,0 @@
$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;

13
inputmethod/canna/patches/patch-aj
View File

@@ -1,13 +0,0 @@
$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 */

12
inputmethod/canna/patches/patch-ak
View File

@@ -1,12 +0,0 @@
$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

12
inputmethod/canna/patches/patch-al
View File

@@ -1,12 +0,0 @@
$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__

13
inputmethod/canna/patches/patch-am
View File

@@ -1,13 +0,0 @@
$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;

22
inputmethod/canna/patches/patch-an
View File

@@ -1,22 +0,0 @@
$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)) {

13
inputmethod/canna/patches/patch-ao
View File

@@ -1,13 +0,0 @@
$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;

30
inputmethod/canna/patches/patch-ap
View File

@@ -1,30 +0,0 @@
$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

12
inputmethod/canna/patches/patch-ae → inputmethod/canna/patches/patch-canna_widedef.h
View File

@@ -1,10 +1,12 @@
$NetBSD: patch-ae,v 1.1 2005/12/29 15:29:12 joerg Exp $
$NetBSD: patch-canna_widedef.h,v 1.1 2015/10/18 03:58:31 tsutsui Exp $
--- canna/widedef.h.orig 2003-09-12 14:32:52.000000000 +0000
DragonFly wchar_t support.
--- canna/widedef.h.orig 2003-12-27 17:15:20.000000000 +0000
+++ canna/widedef.h
@@ -66,7 +66,10 @@
#endif /* !nec_ews_svr2 */
#endif /* HAVE_WCHAR_OPERATION */
@@ -36,7 +36,10 @@
# include <machine/ansi.h>
#endif
-#if (defined(__FreeBSD__) && __FreeBSD_version < 500000) \
+#if defined(__DragonFly__)

25
inputmethod/canna/patches/patch-canuum_Imakefile Normal file
View File

@@ -0,0 +1,25 @@
$NetBSD: patch-canuum_Imakefile,v 1.1 2015/10/18 03:58:31 tsutsui Exp $
Disable obsolete libspt because posix_openpt(3) or openpty(3) is enough for us.
--- canuum/Imakefile.orig 2004-05-19 15:39:22.000000000 +0000
+++ canuum/Imakefile
@@ -17,9 +17,15 @@ TERMCAP_LIB = -ltermcap
INSTUGIDFLAGS =
CANNASRC = $(CANNAROOT)/lib/canna16
DEFINES = -DCANNA -DJAPANESE $(SIGNAL_DEFINES) -DHAVE_CONFIG_H \
- -DCONFIG_TERMINFO -DUSE_LIBSPT
- INCLUDES = -I$(CANNAROOT)/include -I. `libspt-config --cflags`
-SYS_LIBRARIES = $(TERMCAP_LIB) `libspt-config --libs`
+ -DCONFIG_TERMINFO
+ INCLUDES = -I$(CANNAROOT)/include -I.
+SYS_LIBRARIES = $(TERMCAP_LIB)
+
+XCOMM XXX required only for openpty(3)
+#if (defined(LinuxArchitecture) && \
+ (LinuxCLibMajorVersion == 6) && (LinuxCLibMinorVersion < 1))
+SYS_LIBRARIES += -lutil
+#endif
SRCS = header.c printf.c termio.c termcap.c \
screen.c cursor.c jhlp.c xutoj.c canna.c

47
inputmethod/canna/patches/patch-canuum_canna.c Normal file
View File

@@ -0,0 +1,47 @@
$NetBSD: patch-canuum_canna.c,v 1.1 2015/10/18 03:58:31 tsutsui Exp $
- Appease prototype warnings.
- Remove unnecessary ops.
--- canuum/canna.c.orig 2003-09-17 08:50:52.000000000 +0000
+++ canuum/canna.c
@@ -52,4 +52,16 @@ static char rcsid[] = "$Id: canna.c,v 1.
#endif
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#if STDC_HEADERS
+# include <string.h>
+#else
+# if HAVE_STRINGS_H
+# include <strings.h>
+# endif
+#endif /* STDC_HEADERS */
+
#include "commonhd.h"
#include "sdefine.h"
@@ -95,6 +107,4 @@ static char rcsid[] = "$Id: canna.c,v 1.
#define NOREDRAW 0
-extern int errno;
-
static int maxmodelen;
static int maxwidth = 0;
@@ -1239,8 +1249,6 @@ int flag;
#ifdef TERMINFO
- int fd, res;
- fd = open("/dev/null", O_WRONLY, &res);
- setupterm(term, fd, (int *)0);
+ setupterm(term, 0, NULL);
cannakeyentry(key_f1, CANNA_KEY_F1);
@@ -1271,5 +1279,4 @@ int flag;
#endif
- resetterm();
#endif

51
inputmethod/canna/patches/patch-canuum_config.h.in Normal file
View File

@@ -0,0 +1,51 @@
$NetBSD: patch-canuum_config.h.in,v 1.1 2015/10/18 03:58:31 tsutsui Exp $
Check openpty(3), posix_openpt(3), and ptsname(3).
--- canuum/config.h.in.orig 2004-05-19 15:48:58.000000000 +0000
+++ canuum/config.h.in
@@ -83,6 +83,9 @@
/* Define to 1 if you have the `killpg' function. */
#undef HAVE_KILLPG
+/* Define to 1 if you have the <libutil.h> header file. */
+#undef HAVE_LIBUTIL_H
+
/* Define to 1 if you have the <malloc.h> header file. */
#undef HAVE_MALLOC_H
@@ -98,6 +101,15 @@
/* Define to 1 if you have the `memset' function. */
#undef HAVE_MEMSET
+/* Define to 1 if you have the openpty function. */
+#undef HAVE_OPENPTY
+
+/* Define to 1 if you have the posix_openpt function. */
+#undef HAVE_POSIX_OPENPT
+
+/* Define to 1 if you have the ptsname function. */
+#undef HAVE_PTSNAME
+
/* Define to 1 if you have the <ncurses.h> header file. */
#undef HAVE_NCURSES_H
@@ -200,12 +212,18 @@
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
+/* Define to 1 if you have the <util.h> header file. */
+#undef HAVE_UTIL_H
+
/* Define to 1 if you have the `vsyslog' function. */
#undef HAVE_VSYSLOG
/* Define to 1 if you have the `wait3' function. */
#undef HAVE_WAIT3
+/* Define to 1 if you have the util library (-lutil). */
+#undef HAVE_LIBUTIL
+
/* Define to the address where bug reports for this package should be sent. */
#undef PACKAGE_BUGREPORT

76
inputmethod/canna/patches/patch-canuum_configure Normal file
View File

@@ -0,0 +1,76 @@
$NetBSD: patch-canuum_configure,v 1.1 2015/10/18 03:58:31 tsutsui Exp $
Check openpty(3), posix_openpt(3), and ptsname(3).
--- canuum/configure.orig 2004-05-19 15:48:55.000000000 +0000
+++ canuum/configure
@@ -1001,6 +1001,46 @@ fi
+echo $ac_n "checking for openpty in -lutil""... $ac_c" 1>&6
+echo "configure:1006: checking for openpty in -lutil" >&5
+ac_lib_var=`echo util'_'openpty | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ ac_save_LIBS="$LIBS"
+LIBS="-lutil $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 1014 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char openpty();
+
+int main() {
+openpty()
+; return 0; }
+EOF
+if { (eval echo configure:1025: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ HAVE_LIBUTIL='have_libutil'
+else
+ echo "$ac_t""no" 1>&6
+fi
+
# If we find X, set shell vars x_includes and x_libraries to the
# paths, otherwise set no_x=yes.
@@ -1421,7 +1461,7 @@ for ac_hdr in fcntl.h sgtty.h syslog.h u
sys/file.h sys/ioctl.h sys/time.h sys/types.h sys/param.h \
malloc.h strings.h memory.h \
curses.h ncurses.h term.h termio.h \
- termcap.h sgtty.h sys/termio.h termios.h
+ termcap.h sgtty.h sys/termio.h termios.h libutil.h util.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
@@ -2079,10 +2119,11 @@ fi
for ac_func in random drand48 fchmod getopt \
gethostname select socket closesocket setsockopt send recv \
FD_SET \
- getdtablesize getrlimit syslog vsyslog setenv snprintf
+ getdtablesize getrlimit syslog vsyslog setenv snprintf \
+ ptsname posix_openpt openpty
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2086: checking for $ac_func" >&5
+echo "configure:2127: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else

49
inputmethod/canna/patches/patch-canuum_configure.in Normal file
View File

@@ -0,0 +1,49 @@
$NetBSD: patch-canuum_configure.in,v 1.1 2015/10/18 03:58:31 tsutsui Exp $
Check openpty(3), posix_openpt(3), and ptsname(3).
--- canuum/configure.in.orig 2003-03-24 04:15:22.000000000 +0000
+++ canuum/configure.in
@@ -378,6 +378,8 @@ AC_CHECK_LIB(socket, connect)
AC_CHECK_LIB(bind, getservbyname)
AC_CHECK_LIB(nsl, gethostbyname)
])dnl not CANNA
+dnl libutil only needed by uum with openpty... (determine later)
+AC_CHECK_LIB(util, openpty, [HAVE_LIBUTIL='have_libutil'])
dnl
dnl Checks for header files.
@@ -390,7 +392,7 @@ AC_CHECK_HEADERS(fcntl.h sgtty.h syslog.
sys/file.h sys/ioctl.h sys/time.h sys/types.h sys/param.h \
malloc.h strings.h memory.h \
curses.h ncurses.h term.h termio.h \
- termcap.h sgtty.h sys/termio.h termios.h
+ termcap.h sgtty.h sys/termio.h termios.h libutil.h util.h
)
dnl If you don't use ansidecl.h, use this (and modify Wnn/jserver/error.c)
dnl AC_CHECK_HEADERS(stdarg.h varargs.h, break)
@@ -508,7 +510,8 @@ dnl AC_FUNC_WAIT3
AC_CHECK_FUNCS(random drand48 fchmod getopt \
gethostname select socket closesocket setsockopt send recv \
FD_SET \
- getdtablesize getrlimit syslog vsyslog setenv snprintf)
+ getdtablesize getrlimit syslog vsyslog setenv snprintf \
+ ptsname posix_openpt openpty)
dnl for bcopy/index -> memcpy/strchr conversion (preparation):
AC_CHECK_FUNCS(bcopy bzero bcmp index rindex \
memcpy memmove memset strchr strrchr)
@@ -520,6 +523,14 @@ AC_CHECK_FUNCS(mkdir vasprintf, ,
[JS_SUPPORTOBJS="${JS_SUPPORTOBJS} ${ac_func}.o"])
AC_SUBST(JS_SUPPORTOBJS)
+dnl
+dnl File Existence
+dnl Checking file at compile time may bring false result when cross-
+dnl compiling. So, one have to check generated config.h and edit it
+dnl if necessary after running configure.
+dnl
+dnl AC_CHECK_FILE(/dev/ptmx, AC_DEFINE(HAVE_DEV_PTMX, 1, [/dev/ptmx found]),)
+AC_CHECK_FILES(/dev/ptmx,,)
dnl
dnl Creating Makefiles.

1743
inputmethod/canna/patches/patch-canuum_jhlp.c Normal file
View File

File diff suppressed because it is too large Load Diff

25
inputmethod/canna/patches/patch-canuum_printf.c Normal file
View File

@@ -0,0 +1,25 @@
$NetBSD: patch-canuum_printf.c,v 1.1 2015/10/18 03:58:31 tsutsui Exp $
Appease prototype warnings.
--- canuum/printf.c.orig 2003-01-04 07:31:02.000000000 +0000
+++ canuum/printf.c
@@ -29,8 +29,18 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
#include <stdio.h>
+#if STDC_HEADERS
+# include <string.h>
+#else
+# if HAVE_STRINGS_H
+# include <strings.h>
+# endif
+#endif /* STDC_HEADERS */
#include "commonhd.h"
#include "sdefine.h"
#include "sheader.h"

37
inputmethod/canna/patches/patch-canuum_termcap.c Normal file
View File

@@ -0,0 +1,37 @@
$NetBSD: patch-canuum_termcap.c,v 1.1 2015/10/18 03:58:31 tsutsui Exp $
Appease warnings.
--- canuum/termcap.c.orig 2004-04-26 21:48:37.000000000 +0000
+++ canuum/termcap.c
@@ -64,21 +64,21 @@ int Term_RowWidth;
/*
char *Term_Bell;
*/
-char *Term_ClrScreen;
-char *Term_ClrEofLine;
+const char *Term_ClrScreen;
+const char *Term_ClrEofLine;
char *Term_CleEndScreen;
-char *Term_ThrowCursor;
-char *Term_StandOutStart; /* These variables has value even if terminfo is used. see termio.c. */
-char *Term_StandOutEnd;
+const char *Term_ThrowCursor;
+const char *Term_StandOutStart; /* These variables has value even if terminfo is used. see termio.c. */
+const char *Term_StandOutEnd;
static int bold_mode_fun;
-char *Term_BoldOutStart;
-char *Term_BoldOutEnd;
+const char *Term_BoldOutStart;
+const char *Term_BoldOutEnd;
/*
int Term_StandOutBlankNum;
char *Term_DelChar;
*/
-char *Term_UnderScoreStart;
-char *Term_UnderScoreEnd;
+const char *Term_UnderScoreStart;
+const char *Term_UnderScoreEnd;
char *Term_KeyPadOn;
char *Term_KeyPadOff;

86
inputmethod/canna/patches/patch-canuum_termio.c Normal file
View File

@@ -0,0 +1,86 @@
$NetBSD: patch-canuum_termio.c,v 1.1 2015/10/18 03:58:31 tsutsui Exp $
- Appease prototype warnings.
- Reorganize curses ops.
--- canuum/termio.c.orig 2003-12-27 17:15:21.000000000 +0000
+++ canuum/termio.c
@@ -36,6 +36,11 @@
#include <stdio.h>
#if STDC_HEADERS
# include <stdlib.h>
+# include <string.h>
+#else
+# if HAVE_STRINGS_H
+# include <strings.h>
+# endif
#endif /* STDC_HEADERS */
#include "commonhd.h"
@@ -51,15 +56,15 @@
extern int putchar ();
extern char Term_Name[];
-extern char *Term_UnderScoreStart;
-extern char *Term_UnderScoreEnd;
-extern char *Term_ClrScreen;
-extern char *Term_ClrEofLine;
-extern char *Term_ThrowCursor;
-extern char *Term_StandOutStart;
-extern char *Term_StandOutEnd;
-extern char *Term_BoldOutStart;
-extern char *Term_BoldOutEnd;
+extern const char *Term_UnderScoreStart;
+extern const char *Term_UnderScoreEnd;
+extern const char *Term_ClrScreen;
+extern const char *Term_ClrEofLine;
+extern const char *Term_ThrowCursor;
+extern const char *Term_StandOutStart;
+extern const char *Term_StandOutEnd;
+extern const char *Term_BoldOutStart;
+extern const char *Term_BoldOutEnd;
static int bold_mode_fun = 0;
int
@@ -73,7 +78,7 @@ openTermData ()
char errprefix[1024] = "error";
/* for convert_key --- added by Nide 10/3 */
- if (NULL == (cp = get_kbd_env ()) || 0 != convert_getterm (cp, (0 != verbose_option)))
+ if (NULL == initscr() || NULL == (cp = get_kbd_env ()) || 0 != convert_getterm (cp, (0 != verbose_option)))
{
fprintf (stderr, "Cannot get keyboard information.\n");
return (-1);
@@ -96,13 +101,8 @@ openTermData ()
return (-1);
}
#endif /* CANNA */
- setupterm (0, 1, &status);
- /* This seems needless and causes hangs on Solaris8 + ncurses */
- /* reset_shell_mode (); */
- if (status != 1)
- {
- return (-1);
- }
+ reset_shell_mode();
+
#if defined(uniosu)
if (jterm < 2)
{ /* kanji terminal */
@@ -110,7 +110,7 @@ openTermData ()
return (-1);
}
#endif /* defined(uniosu) */
- if (save_cursor == (char *) NULL || *save_cursor == NULL || restore_cursor == (char *) NULL || *restore_cursor == NULL || change_scroll_region == (char *) NULL || *change_scroll_region == NULL)
+ if (save_cursor == (char *) NULL || *save_cursor == 0 || restore_cursor == (char *) NULL || *restore_cursor == 0 || change_scroll_region == (char *) NULL || *change_scroll_region == 0)
{
fprintf (stderr, "Your terminal is not strong enough. Goodbye !\n");
return (-1);
@@ -175,7 +175,6 @@ openTermData ()
void
closeTermData ()
{
- resetterm ();
reset_shell_mode ();
}

16
inputmethod/canna/patches/patch-cmd_cmd.tmpl Normal file
View File

@@ -0,0 +1,16 @@
$NetBSD: patch-cmd_cmd.tmpl,v 1.1 2015/10/18 03:58:31 tsutsui Exp $
Add a hook to disable installation of unnecessary commands in canna-lib
--- cmd/cmd.tmpl.orig 2003-09-25 06:30:21.000000000 +0000
+++ cmd/cmd.tmpl
@@ -33,7 +33,9 @@ NormalProgramTarget($(TARGET),$(OBJS),$(
# else
NormalProgramTarget($(TARGET),$(OBJS),$(DEPRKINDEPLIB),$(RKINDEPLIB),)
# endif
+# ifndef DontInstallProgram
InstallProgram($(TARGET),$(cannaBinDir))
+# endif
# ifdef ManSrcName
InstallManPageLong(ManSrcName,$(cannaManDir),$(TARGET))
# endif

20
inputmethod/canna/patches/patch-dic_phono_Imakefile
View File

@@ -1,7 +1,23 @@
$NetBSD: patch-dic_phono_Imakefile,v 1.1 2012/07/03 17:44:39 joerg Exp $
$NetBSD: patch-dic_phono_Imakefile,v 1.2 2015/10/18 03:58:31 tsutsui Exp $
--- dic/phono/Imakefile.orig 2012-06-17 06:10:27.000000000 +0000
- Tweak canna-dict dirs
- avoid use of ${CPP} as generic preprocessor
--- dic/phono/Imakefile.orig 2015-10-03 19:39:32.000000000 +0000
+++ 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 \
@@ -54,16 +54,16 @@ AllTarget($(ROMKANA_TABLES))
#ifdef __EMX__

15
inputmethod/canna/patches/patch-lib_RKC_convert.c Normal file
View File

@@ -0,0 +1,15 @@
$NetBSD: patch-lib_RKC_convert.c,v 1.1 2015/10/18 03:58:31 tsutsui Exp $
Tweak include path to build without configure in unnecessary dirs
--- lib/RKC/convert.c.orig 2004-04-26 21:48:37.000000000 +0000
+++ lib/RKC/convert.c
@@ -30,7 +30,7 @@ static char rcs_id[] = "$Id: convert.c,v
#include "rkcw.h"
#include "canna/RK.h"
#include "rkc.h"
-#include "IRproto.h"
+#include "../server/IRproto.h"
#include "RKindep/file.h"
#include <sys/types.h>

28
inputmethod/canna/patches/patch-lib_RK_dd.c Normal file
View File

@@ -0,0 +1,28 @@
$NetBSD: patch-lib_RK_dd.c,v 1.1 2015/10/18 03:58:31 tsutsui Exp $
Fix "64 bit time_t on 32 bit architecture" problem.
--- lib/RK/dd.c.orig 2003-09-17 08:50:52.000000000 +0000
+++ lib/RK/dd.c
@@ -42,6 +42,12 @@ static char rcsid[]="$Id: dd.c,v 1.5 200
#include <sys/types.h>
#include <sys/stat.h>
+#ifdef HAVE_TIME_T
+#define TIME_T time_t
+#else
+#define TIME_T long
+#endif
+
#define Calloc calloc
#define cx_gwt cx_extdata.ptr
#define STRCMP(d, s) strcmp((char *)(d), (char *)(s))
@@ -742,7 +748,7 @@ _RkRealizeDD(dd)
int ret = -1;
int tmpres;
int fdes;
- long tloc;
+ TIME_T tloc;
#ifdef __EMX__
struct stat statbuf;
#endif

16
inputmethod/canna/patches/patch-lib_RK_ncache.c Normal file
View File

@@ -0,0 +1,16 @@
$NetBSD: patch-lib_RK_ncache.c,v 1.2 2015/10/25 12:17:36 tsutsui Exp $
Pull upstream fix to avoid crash problem of cannaserver.
https://osdn.jp/cvs/view/canna/canna/lib/RK/ncache.c?view=log#rev1.3
--- lib/RK/ncache.c.orig 2003-09-17 08:50:52.000000000 +0000
+++ lib/RK/ncache.c
@@ -27,7 +27,7 @@ static char rcsid[]="$Id: ncache.c,v 1.2
#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;

22
inputmethod/canna/patches/patch-lib_canna_keydef.c Normal file
View File

@@ -0,0 +1,22 @@
$NetBSD: patch-lib_canna_keydef.c,v 1.1 2015/10/25 12:17:36 tsutsui Exp $
Pull upstream fix to avoid crash on set-key in ~/.canna (PR pkg/50368).
https://osdn.jp/cvs/view/canna/canna/lib/canna/keydef.c?view=log#rev1.3
--- lib/canna/keydef.c.orig 2003-09-17 08:50:53.000000000 +0000
+++ lib/canna/keydef.c
@@ -444,12 +444,9 @@ static unsigned int
createHashKey(data1, data2, which_seq)
unsigned char *data1;
unsigned char data2;
-int which_seq;
+unsigned int which_seq;
{
- unsigned int hashKey;
-
- hashKey = (int)(((POINTERINT)data1 + (POINTERINT)data2) % which_seq);
- return hashKey;
+ return (unsigned int)(((canna_uintptr_t)data1 + (canna_uintptr_t)data2) % which_seq);
}
/* 機能シーケンスを割り出す */