Hello,
I bumped inputmethod/{canna,canna-server,canna-lib,canna-dict}
from Canna 3.6 to 3.7, as attached diff or tar.gz files.
Also, I imported FreeBSD's ports/japanese/cannadic which is a GPL
licensed extra dictionary for canna, to improve kana-kanji
conversion, as canna-gplextradic.
Tested on:
canna-server:
* canna-server runs on NetBSD 7.99.4 amd64
+ client connection and kanji conversion from FreeBSD/amd64 9.3,
canna 3.7 ==> OK
+ client connection from NetBSD/amd64 7.99.4
canna-lib:
+ connection to cannaserver runs on NetBSD/amd64 7.99.4
==> OK
+ connection to cannaserver runs on FreeBSDBSD/amd64 9.3, canna 3.7
==> OK
+ connection from NetBSD/sparc to cannaserver on any architecture
==> FAIL
canna-gplextradic:
* canna-server runs on NetBSD 7.99.4 amd64
==> OK
Not tested yet:
+ inputmethod/canna-uum
+ client connection from pkgsrc/editors/mule from NetBSD/amd64 and
NetBSD/spparc.
Note:
canna-lib seem to be broken in NetBSD/sparc, in both of Canna 3.6
in pkgsrc-2014Q4 and Canna 3.7 in this new pkgsrc version.
All client programs cause bus error as following, detail is now
under investigation. It will take long... (Now I'm recompiling
canna-lib and canna-server with -g option in SPARCstation 20)
Anyway, it seem to be caused by original Canna itself, not pkgsrc
problem.
Bus error seem to cause in initialization process, since only
kinput2 which is all resources are loaded by 'xrdb -merge
/usr/pkg/lib/X11/app-defaults/Kinput2' doesn't cause buss error,
but others.
Note that in case of is is not done even kinput2 causes bus error.
In this case resources '*Canna.Cannahost:' and '*Canna.Cannafile:'
must be filled correct setting.
----8<--------8<--------8<--------8<----
<balalaika>nobu-s% unsetenv CANNAHOST
<balalaika>nobu-s% cannacheck -v
カスタマイズファイルとして "/home/nobu-s/.canna" を用います。
Bus error
<balalaika>nobu-s% setenv CANNAHOST boris # <= NetBSD/amd64 canna server
<balalaika>nobu-s% cannacheck -v
カスタマイズファイルとして "/home/nobu-s/.canna" を用います。
Bus error
<balalaika>nobu-s% setenv CANNAHOST leech # <= FreeBSD/amd64 canna server
<balalaika>nobu-s% cannacheck -v
カスタマイズファイルとして "/home/nobu-s/.canna" を用います。
Bus error
<balalaika>nobu-s% setenv CANNAHOST localhost # <= NetBSD/sparc canna server
<balalaika>nobu-s% cannacheck -v
カスタマイズファイルとして "/home/nobu-s/.canna" を用います。
Bus error
<balalaika>nobu-s%
----8<--------8<--------8<--------8<----
Lecturer / Faculty of Software & Info. Sci., Iwate Prefectural Univ., Japan
Nobuyoshi Sato, Ph.D / nobu-s@iwate-pu.ac.jp / +81-19-694-2612
diff -urN ../canna36/canna/Makefile ./canna/Makefile
--- ../canna36/canna/Makefile 2010-02-20 19:39:01.000000000 +0900
+++ ./canna/Makefile 2015-02-24 16:34:22.000000000 +0900
@@ -5,9 +5,9 @@
.include "Makefile.common"
PKGNAME:= Canna-${CANNA_VERSION}
-PKGREVISION= 2
+PKGREVISION= 1
-DEPENDS+= Canna-server>=${CANNA_VERSION}nb2:../../inputmethod/canna-server
+DEPENDS+= Canna-server>=${CANNA_VERSION}nb1:../../inputmethod/canna-server
DEPENDS+= Canna-dict>=${CANNA_VERSION}nb1:../../inputmethod/canna-dict
CANNA_MODULE= meta-package
diff -urN ../canna36/canna/Makefile.common ./canna/Makefile.common
--- ../canna36/canna/Makefile.common 2010-05-28 20:06:34.000000000 +0900
+++ ./canna/Makefile.common 2015-02-25 20:34:30.000000000 +0900
@@ -8,12 +8,13 @@
# 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_SOURCEFORGE_JP:=canna/6059/}
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP:=canna/9565/}
+EXTRACT_SUFX= .tar.bz2
MAINTAINER= tech-pkg-ja@jp.NetBSD.org
HOMEPAGE= http://canna.sourceforge.jp/
diff -urN ../canna36/canna/distinfo ./canna/distinfo
--- ../canna36/canna/distinfo 2012-07-04 02:44:39.000000000 +0900
+++ ./canna/distinfo 2015-02-25 15:12:41.000000000 +0900
@@ -1,22 +1,15 @@
$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 (Canna37p3.tar.bz2) = e39eece7c70c669dd46dd74b26121a60a2496fde
+RMD160 (Canna37p3.tar.bz2) = 33e5eb9e2dc144835db838612897e652acbc60ed
+Size (Canna37p3.tar.bz2) = 1263065 bytes
+SHA1 (patch-aa) = d956212678d08055fe018f2550fb56a5aaeeb615
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-af) = 694b468ab8678aa0be682242d633dfa60c4d7725
SHA1 (patch-an) = ef892b0837e7b3b5b569a7a9a518df2379c43f1c
SHA1 (patch-ao) = c577319f50df6624333726cd62b48d869989d881
-SHA1 (patch-ap) = 3f514037c4d67b2e18b27285370fe2ea84d977cc
+SHA1 (patch-ap) = 2c0a2ecd44aa08a70238c2f5fb31478f0052de0f
+SHA1 (patch-aq) = 37938c5aa4cc9f7cc0459bfffeea1823785e8449
+SHA1 (patch-ar) = f0ed59765d3b29b2df4daf7c617725747ee5f9f8
SHA1 (patch-dic_phono_Imakefile) = 3192d7c6e38caf2e5e8378283d673df29c2dc430
diff -urN ../canna36/canna/patches/patch-aa ./canna/patches/patch-aa
--- ../canna36/canna/patches/patch-aa 2008-05-21 03:53:17.000000000 +0900
+++ ./canna/patches/patch-aa 2015-02-24 17:05:00.000000000 +0900
@@ -1,15 +1,6 @@
-$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
+--- Canna.conf.orig 2015-02-24 16:52:28.000000000 +0900
++++ Canna.conf 2015-02-24 17:04:18.000000000 +0900
+@@ -109,12 +109,12 @@
# define DefErrDir $(cannaPrefix)/log
# define DefLibCannaDir $(cannaExecPrefix)/lib
#else
@@ -24,7 +15,7 @@
# define DefLibCannaDir $(cannaExecPrefix)/lib
# endif
#endif
-@@ -164,7 +164,7 @@ XCOMM cannaLibDir = /var/lib/canna
+@@ -148,7 +148,7 @@
XCOMM cannaLibDir = /var/db/canna
cannaLibDir = DefCannaLibDir
XCOMM cannaManDir = $(cannaPrefix)/share/man
@@ -33,12 +24,22 @@
cannaIncDir = $(cannaPrefix)/include/canna
libCannaDir = DefLibCannaDir
-@@ -173,10 +173,10 @@ ErrDir = DefErrDir
- /* 次の3行は変更しないでください */
- wcharDefinition = -DCANNA_WCHAR
- Wlib =
--JapaneseLocale = japanese
-+JapaneseLocale = ja_JP.eucJP
+@@ -158,7 +158,7 @@
+ #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 */
+@@ -166,11 +166,11 @@
+ /* ELFを使うプラットフォームで、共有ライブラリの扱いを、LinuxやNetBSD、
+ * OpenBSDのような現代的な扱いにしたい場合、YESにしてください。
+ */
+-#define ModernElfLink NO /* experimental */
++#define ModernElfLink YES /* experimental */
+
-cannaOwner = bin
-cannaGroup = bin
@@ -47,64 +48,33 @@
#ifdef InstallAsUser
cannaOwnerGroup =
-@@ -249,7 +249,7 @@ dontHaveRename = 0
+@@ -234,8 +234,8 @@
+ * インストール済みの共有ライブラリを用いて Canna の
* コマンド類をリンクする時は、次を YES にしてくだい。
*/
- /* #define UseInstalledLibCanna YES */
+-/* #define UseInstalledLibCanna YES */
-#define UseInstalledLibCanna NO
+#define UseInstalledLibCanna YES
++/* #define UseInstalledLibCanna NO */
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 */
+@@ -279,14 +279,14 @@
#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
+ 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)
++CANNALIB = -Wl,-rpath,$(libCannaDir) -L$(CANNASRC) -lcanna $(DLLIB)
+ DEPCANNALIB16 = $(CANNASRC)/CannaDepLibraryName(canna16)
+-CANNALIB16 = -L$(CANNASRC) -lcanna16 $(DLLIB)
++CANNALIB16 = -Wl,-rpath,$(libCannaDir) -L$(CANNASRC) -lcanna16 $(DLLIB)
#endif
- /* USE_OBSOLETE_STYLE_FILENAME を定義するための定義 */
+ #if DoSharedLib
diff -urN ../canna36/canna/patches/patch-ad ./canna/patches/patch-ad
--- ../canna36/canna/patches/patch-ad 2003-05-31 16:24:42.000000000 +0900
+++ ./canna/patches/patch-ad 1970-01-01 09:00:00.000000000 +0900
@@ -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
diff -urN ../canna36/canna/patches/patch-ae ./canna/patches/patch-ae
--- ../canna36/canna/patches/patch-ae 2005-12-30 00:29:12.000000000 +0900
+++ ./canna/patches/patch-ae 1970-01-01 09:00:00.000000000 +0900
@@ -1,16 +0,0 @@
-$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_
diff -urN ../canna36/canna/patches/patch-af ./canna/patches/patch-af
--- ../canna36/canna/patches/patch-af 2003-05-31 16:24:42.000000000 +0900
+++ ./canna/patches/patch-af 2015-02-24 17:31:12.000000000 +0900
@@ -1,13 +1,11 @@
-$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
+--- lib/RKC/convert.c.orig 2004-04-27 06:48:37.000000000 +0900
++++ lib/RKC/convert.c 2015-02-24 17:16:57.000000000 +0900
+@@ -30,7 +30,7 @@
+ #include "rkcw.h"
+ #include "canna/RK.h"
+ #include "rkc.h"
-#include "IRproto.h"
+#include "../server/IRproto.h"
+ #include "RKindep/file.h"
- #include <errno.h>
#include <sys/types.h>
diff -urN ../canna36/canna/patches/patch-ag ./canna/patches/patch-ag
--- ../canna36/canna/patches/patch-ag 2005-12-31 00:16:21.000000000 +0900
+++ ./canna/patches/patch-ag 1970-01-01 09:00:00.000000000 +0900
@@ -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,
diff -urN ../canna36/canna/patches/patch-ah ./canna/patches/patch-ah
--- ../canna36/canna/patches/patch-ah 2005-12-31 00:16:21.000000000 +0900
+++ ./canna/patches/patch-ah 1970-01-01 09:00:00.000000000 +0900
@@ -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 ;
diff -urN ../canna36/canna/patches/patch-ai ./canna/patches/patch-ai
--- ../canna36/canna/patches/patch-ai 2005-12-31 00:16:21.000000000 +0900
+++ ./canna/patches/patch-ai 1970-01-01 09:00:00.000000000 +0900
@@ -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;
diff -urN ../canna36/canna/patches/patch-aj ./canna/patches/patch-aj
--- ../canna36/canna/patches/patch-aj 2005-12-31 00:16:21.000000000 +0900
+++ ./canna/patches/patch-aj 1970-01-01 09:00:00.000000000 +0900
@@ -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 */
diff -urN ../canna36/canna/patches/patch-ak ./canna/patches/patch-ak
--- ../canna36/canna/patches/patch-ak 2005-12-31 00:16:21.000000000 +0900
+++ ./canna/patches/patch-ak 1970-01-01 09:00:00.000000000 +0900
@@ -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
diff -urN ../canna36/canna/patches/patch-al ./canna/patches/patch-al
--- ../canna36/canna/patches/patch-al 2005-12-31 00:16:21.000000000 +0900
+++ ./canna/patches/patch-al 1970-01-01 09:00:00.000000000 +0900
@@ -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__
diff -urN ../canna36/canna/patches/patch-am ./canna/patches/patch-am
--- ../canna36/canna/patches/patch-am 2005-12-31 00:16:21.000000000 +0900
+++ ./canna/patches/patch-am 1970-01-01 09:00:00.000000000 +0900
@@ -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;
diff -urN ../canna36/canna/patches/patch-ap ./canna/patches/patch-ap
--- ../canna36/canna/patches/patch-ap 2011-12-08 01:05:59.000000000 +0900
+++ ./canna/patches/patch-ap 2015-02-24 17:28:56.000000000 +0900
@@ -1,7 +1,5 @@
-$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
+--- canuum/termio.c.orig 2003-12-28 02:15:21.000000000 +0900
++++ canuum/termio.c 2015-02-24 17:25:08.000000000 +0900
@@ -175,7 +175,6 @@
void
closeTermData ()
@@ -10,21 +8,3 @@
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
diff -urN ../canna36/canna/patches/patch-aq ./canna/patches/patch-aq
--- ../canna36/canna/patches/patch-aq 1970-01-01 09:00:00.000000000 +0900
+++ ./canna/patches/patch-aq 2015-02-25 13:56:02.000000000 +0900
@@ -0,0 +1,13 @@
+--- cmd/forcpp/Imakefile.orig 2003-01-26 13:36:33.000000000 +0900
++++ cmd/forcpp/Imakefile 2015-02-25 13:54:59.000000000 +0900
+@@ -1,5 +1,8 @@
+ /* $Id: Imakefile,v 1.3 2003/01/26 04:36:33 aida_s Exp $ */
+ #include "../../Canna.conf"
+-#define SimpleCommand
+-#define TargetName forcpp
++/* #define SimpleCommand */
++/* #define TargetName forcpp */
++AllTarget(forcpp)
++SingleProgramTarget(forcpp,forcpp.o,,)
++InstallProgram(forcpp,$(cannaBinDir))
+ #include "../cmd.tmpl"
diff -urN ../canna36/canna/patches/patch-ar ./canna/patches/patch-ar
--- ../canna36/canna/patches/patch-ar 1970-01-01 09:00:00.000000000 +0900
+++ ./canna/patches/patch-ar 2015-02-25 13:56:38.000000000 +0900
@@ -0,0 +1,13 @@
+--- cmd/kpdic/Imakefile.orig 2003-01-26 13:36:33.000000000 +0900
++++ cmd/kpdic/Imakefile 2015-02-25 13:54:46.000000000 +0900
+@@ -1,5 +1,8 @@
+ /* $Id: Imakefile,v 1.4 2003/01/26 04:36:33 aida_s Exp $ */
+ #include "../../Canna.conf"
+-#define SimpleCommand
+-#define TargetName kpdic
++/* #define SimpleCommand */
++/* #define TargetName kpdic */
++AllTarget(kpdic)
++SingleProgramTarget(kpdic,kpdic.o,,)
++InstallProgram(kpdic,$(cannaBinDir))
+ #include "../cmd.tmpl"
diff -urN ../canna36/canna-canuum/CVS/Entries ./canna-canuum/CVS/Entries
--- ../canna36/canna-canuum/CVS/Entries 2014-12-30 17:23:19.000000000 +0900
+++ ./canna-canuum/CVS/Entries 1970-01-01 09:00:00.000000000 +0900
@@ -1,5 +0,0 @@
-/DESCR/1.1/Tue Sep 23 15:06:58 2003//Tpkgsrc-2014Q4
-/MESSAGE/1.2/Wed Jul 5 04:48:28 2006//Tpkgsrc-2014Q4
-/Makefile/1.13/Sat Oct 6 14:25:10 2012//Tpkgsrc-2014Q4
-/PLIST/1.3/Sat Feb 20 10:34:04 2010//Tpkgsrc-2014Q4
-D
diff -urN ../canna36/canna-canuum/CVS/Repository ./canna-canuum/CVS/Repository
--- ../canna36/canna-canuum/CVS/Repository 2014-12-30 17:23:19.000000000 +0900
+++ ./canna-canuum/CVS/Repository 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-pkgsrc/inputmethod/canna-canuum
diff -urN ../canna36/canna-canuum/CVS/Root ./canna-canuum/CVS/Root
--- ../canna36/canna-canuum/CVS/Root 2014-12-30 17:23:19.000000000 +0900
+++ ./canna-canuum/CVS/Root 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-anoncvs@anoncvs.netbsd.org:/cvsroot
diff -urN ../canna36/canna-canuum/CVS/Tag ./canna-canuum/CVS/Tag
--- ../canna36/canna-canuum/CVS/Tag 2014-12-30 17:23:19.000000000 +0900
+++ ./canna-canuum/CVS/Tag 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-Tpkgsrc-2014Q4
diff -urN ../canna36/canna-canuum/DESCR ./canna-canuum/DESCR
--- ../canna36/canna-canuum/DESCR 2003-09-24 00:06:58.000000000 +0900
+++ ./canna-canuum/DESCR 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-Canuum is a Japanese input frontend program from Wnn tty frontend uum.
diff -urN ../canna36/canna-canuum/MESSAGE ./canna-canuum/MESSAGE
--- ../canna36/canna-canuum/MESSAGE 2006-07-05 13:48:28.000000000 +0900
+++ ./canna-canuum/MESSAGE 1970-01-01 09:00:00.000000000 +0900
@@ -1,9 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.2 2006/07/05 04:48:28 jlam Exp $
-
-You at least should set up key functions in ~/.canna, e.g.:
-
- (set-key 'alpha-mode "\C-i" 'japanese-mode)
- (set-key 'empty-mode "\C-i" 'alpha-mode)
-
-===========================================================================
diff -urN ../canna36/canna-canuum/Makefile ./canna-canuum/Makefile
--- ../canna36/canna-canuum/Makefile 2012-10-06 23:25:10.000000000 +0900
+++ ./canna-canuum/Makefile 1970-01-01 09:00:00.000000000 +0900
@@ -1,34 +0,0 @@
-# $NetBSD: Makefile,v 1.13 2012/10/06 14:25:10 asau Exp $
-
-PKGREVISION= 3
-CANNA_MODULE= canuum
-
-.include "../../inputmethod/canna/Makefile.common"
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-
-INSTALLATION_DIRS= ${PKGMANDIR}/ja_JP.EUC/man1
-
-CONFIGURE_DIRS= . canuum
-BUILD_DIRS= canuum
-
-INSTALL_MAKE_FLAGS+= INSTUGIDFLAGS=
-
-SPECIAL_PERMS+= bin/canuum ${SETUID_ROOT_PERMS}
-
-.include "../../mk/curses.buildlink3.mk"
-SUBST_CLASSES+= fix_curs
-SUBST_STAGE.fix_curs= post-patch
-SUBST_MESSAGE.fix_curs= Fixing curses
-SUBST_FILES.fix_curs+= canuum/Imakefile
-SUBST_SED.fix_curs+= -e 's/TERMCAP_LIB = .*/TERMCAP_LIB = -l'${BUILDLINK_LIBNAME.curses}'/g'
-
-.include "../../inputmethod/canna-lib/buildlink3.mk"
-
-pre-configure:
- ${CP} ${PKGSRCDIR}/mk/gnu-config/config.guess ${WRKSRC}/canuum
- ${CP} ${PKGSRCDIR}/mk/gnu-config/config.sub ${WRKSRC}/canuum
- ${LN} -fs ${WRKSRC}/cannaconf.h ${WRKSRC}/canuum
- ${LN} -fs ${WRKSRC}/canna/ccompat.h ${WRKSRC}/canuum
-
-.include "../../mk/bsd.pkg.mk"
diff -urN ../canna36/canna-canuum/PLIST ./canna-canuum/PLIST
--- ../canna36/canna-canuum/PLIST 2010-02-20 19:34:04.000000000 +0900
+++ ./canna-canuum/PLIST 1970-01-01 09:00:00.000000000 +0900
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2010/02/20 10:34:04 obache Exp $
-bin/canuum
-man/ja_JP.EUC/man1/canuum.1
-man/man1/canuum.1
diff -urN ../canna36/canna-dict/Makefile ./canna-dict/Makefile
--- ../canna36/canna-dict/Makefile 2013-07-12 19:44:55.000000000 +0900
+++ ./canna-dict/Makefile 2015-02-25 15:16:43.000000000 +0900
@@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.14 2013/07/12 10:44:55 jperkin Exp $
-PKGREVISION= 3
+PKGREVISION= 1
CANNA_MODULE= dict
MAKE_JOBS_SAFE= no
@@ -15,7 +15,8 @@
-e 's|\(${cmd} = \).*/\(.*\)|\1${CANNASERVERBINDIR}/bin/\2|'
.endfor
-CONFIGURE_DIRS= ${DICT_WRKSRC}
+#CONFIGURE_DIRS= ${DICT_WRKSRC}
+BUILD_DIRS= ${WRKSRC}/lib/RKindep ${WRKSRC}/dic/ideo
DICT_WRKSRC= ${WRKSRC}/dic/ideo
CANNA_DICTDIR= ${PREFIX}/libdata/canna
diff -urN ../canna36/canna-lib/Makefile ./canna-lib/Makefile
--- ../canna36/canna-lib/Makefile 2012-10-06 23:25:10.000000000 +0900
+++ ./canna-lib/Makefile 2015-02-25 13:33:54.000000000 +0900
@@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.14 2012/10/06 14:25:10 asau Exp $
-PKGREVISION= 3
+PKGREVISION= 1
CANNA_MODULE= lib
.include "../../inputmethod/canna/Makefile.common"
diff -urN ../canna36/canna-lib/PLIST ./canna-lib/PLIST
--- ../canna36/canna-lib/PLIST 2009-06-15 03:01:29.000000000 +0900
+++ ./canna-lib/PLIST 2015-02-25 14:03:05.000000000 +0900
@@ -1,66 +1,68 @@
-@comment $NetBSD: PLIST,v 1.8 2009/06/14 18:01:29 joerg Exp $
+@comment $NetBSD$
include/canna/RK.h
include/canna/jrkanji.h
include/canna/keydef.h
include/canna/mfdef.h
+include/canna/pubconf.h
+include/canna/sysdep.h
lib/libRKC.a
lib/libRKC.so
lib/libRKC.so.1
-lib/libRKC.so.1.1
+lib/libRKC.so.1.2
lib/libRKC16.a
lib/libRKC16.so
lib/libRKC16.so.1
-lib/libRKC16.so.1.1
+lib/libRKC16.so.1.2
lib/libcanna.a
lib/libcanna.so
lib/libcanna.so.1
-lib/libcanna.so.1.1
+lib/libcanna.so.1.2
lib/libcanna16.a
lib/libcanna16.so
lib/libcanna16.so.1
-lib/libcanna16.so.1.1
-man/ja_JP.EUC/man3/RkBgnBun.3
-man/ja_JP.EUC/man3/RkCloseRoma.3
-man/ja_JP.EUC/man3/RkCvtEuc.3
-man/ja_JP.EUC/man3/RkCvtHan.3
-man/ja_JP.EUC/man3/RkCvtHira.3
-man/ja_JP.EUC/man3/RkCvtKana.3
-man/ja_JP.EUC/man3/RkCvtRoma.3
-man/ja_JP.EUC/man3/RkCvtZen.3
-man/ja_JP.EUC/man3/RkDefineDic.3
-man/ja_JP.EUC/man3/RkDeleteDic.3
-man/ja_JP.EUC/man3/RkEndBun.3
-man/ja_JP.EUC/man3/RkEnlarge.3
-man/ja_JP.EUC/man3/RkFinalize.3
-man/ja_JP.EUC/man3/RkGetDicList.3
-man/ja_JP.EUC/man3/RkGetKanji.3
-man/ja_JP.EUC/man3/RkGetLex.3
-man/ja_JP.EUC/man3/RkGetStat.3
-man/ja_JP.EUC/man3/RkGetYomi.3
-man/ja_JP.EUC/man3/RkGoto.3
-man/ja_JP.EUC/man3/RkInitialize.3
-man/ja_JP.EUC/man3/RkIntro.3
-man/ja_JP.EUC/man3/RkLeft.3
-man/ja_JP.EUC/man3/RkMapPhonogram.3
-man/ja_JP.EUC/man3/RkMapRoma.3
-man/ja_JP.EUC/man3/RkMountDic.3
-man/ja_JP.EUC/man3/RkNext.3
-man/ja_JP.EUC/man3/RkNfer.3
-man/ja_JP.EUC/man3/RkOpenRoma.3
-man/ja_JP.EUC/man3/RkPrev.3
-man/ja_JP.EUC/man3/RkRemountDic.3
-man/ja_JP.EUC/man3/RkResize.3
-man/ja_JP.EUC/man3/RkRight.3
-man/ja_JP.EUC/man3/RkShorten.3
-man/ja_JP.EUC/man3/RkStoreYomi.3
-man/ja_JP.EUC/man3/RkUnmountDic.3
-man/ja_JP.EUC/man3/RkXfer.3
-man/ja_JP.EUC/man3/XKanjiControl.3
-man/ja_JP.EUC/man3/XLookupKanjiString.3
-man/ja_JP.EUC/man3/cannalib.3
-man/ja_JP.EUC/man3/jrKanjiControl.3
-man/ja_JP.EUC/man3/jrKanjiString.3
-man/ja_JP.EUC/man3/uilib.3
+lib/libcanna16.so.1.2
+man/ja/man3/RkBgnBun.3
+man/ja/man3/RkCloseRoma.3
+man/ja/man3/RkCvtEuc.3
+man/ja/man3/RkCvtHan.3
+man/ja/man3/RkCvtHira.3
+man/ja/man3/RkCvtKana.3
+man/ja/man3/RkCvtRoma.3
+man/ja/man3/RkCvtZen.3
+man/ja/man3/RkDefineDic.3
+man/ja/man3/RkDeleteDic.3
+man/ja/man3/RkEndBun.3
+man/ja/man3/RkEnlarge.3
+man/ja/man3/RkFinalize.3
+man/ja/man3/RkGetDicList.3
+man/ja/man3/RkGetKanji.3
+man/ja/man3/RkGetLex.3
+man/ja/man3/RkGetStat.3
+man/ja/man3/RkGetYomi.3
+man/ja/man3/RkGoto.3
+man/ja/man3/RkInitialize.3
+man/ja/man3/RkIntro.3
+man/ja/man3/RkLeft.3
+man/ja/man3/RkMapPhonogram.3
+man/ja/man3/RkMapRoma.3
+man/ja/man3/RkMountDic.3
+man/ja/man3/RkNext.3
+man/ja/man3/RkNfer.3
+man/ja/man3/RkOpenRoma.3
+man/ja/man3/RkPrev.3
+man/ja/man3/RkRemountDic.3
+man/ja/man3/RkResize.3
+man/ja/man3/RkRight.3
+man/ja/man3/RkShorten.3
+man/ja/man3/RkStoreYomi.3
+man/ja/man3/RkUnmountDic.3
+man/ja/man3/RkXfer.3
+man/ja/man3/XKanjiControl.3
+man/ja/man3/XLookupKanjiString.3
+man/ja/man3/cannalib.3
+man/ja/man3/jrKanjiControl.3
+man/ja/man3/jrKanjiString.3
+man/ja/man3/uilib.3
man/man3/RkBgnBun.3
man/man3/RkCloseRoma.3
man/man3/RkCvtEuc.3
diff -urN ../canna36/canna-server/Makefile ./canna-server/Makefile
--- ../canna36/canna-server/Makefile 2013-07-12 19:44:55.000000000 +0900
+++ ./canna-server/Makefile 2015-02-25 14:39:02.000000000 +0900
@@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.23 2013/07/12 10:44:55 jperkin Exp $
-PKGREVISION= 5
+PKGREVISION= 1
CANNA_MODULE= server
.include "../../inputmethod/canna/Makefile.common"
diff -urN ../canna36/canna-server/PLIST ./canna-server/PLIST
--- ../canna36/canna-server/PLIST 2014-03-11 23:05:02.000000000 +0900
+++ ./canna-server/PLIST 2015-02-25 14:11:39.000000000 +0900
@@ -1,9 +1,10 @@
-@comment $NetBSD: PLIST,v 1.8 2014/03/11 14:05:02 jperkin Exp $
+@comment $NetBSD$
bin/addwords
bin/canlisp
bin/cannacheck
bin/cannastat
bin/catdic
+bin/chkconc
bin/chmoddic
bin/cpdic
bin/crfreq
@@ -29,28 +30,28 @@
bin/splitword
bin/syncdic
bin/wtoc
-man/ja_JP.EUC/man1/addwords.1
-man/ja_JP.EUC/man1/cannacheck.1
-man/ja_JP.EUC/man1/cannakill.1
-man/ja_JP.EUC/man1/cannaserver.1
-man/ja_JP.EUC/man1/cannastat.1
-man/ja_JP.EUC/man1/catdic.1
-man/ja_JP.EUC/man1/chmoddic.1
-man/ja_JP.EUC/man1/cpdic.1
-man/ja_JP.EUC/man1/cshost.1
-man/ja_JP.EUC/man1/ctow.1
-man/ja_JP.EUC/man1/delwords.1
-man/ja_JP.EUC/man1/dicar.1
-man/ja_JP.EUC/man1/dpbindic.1
-man/ja_JP.EUC/man1/dpromdic.1
-man/ja_JP.EUC/man1/lsdic.1
-man/ja_JP.EUC/man1/mkbindic.1
-man/ja_JP.EUC/man1/mkdic.1
-man/ja_JP.EUC/man1/mkromdic.1
-man/ja_JP.EUC/man1/mvdic.1
-man/ja_JP.EUC/man1/rmdic.1
-man/ja_JP.EUC/man1/splitword.1
-man/ja_JP.EUC/man1/wtoc.1
+man/ja/man1/addwords.1
+man/ja/man1/cannacheck.1
+man/ja/man1/cannakill.1
+man/ja/man1/cannaserver.1
+man/ja/man1/cannastat.1
+man/ja/man1/catdic.1
+man/ja/man1/chmoddic.1
+man/ja/man1/cpdic.1
+man/ja/man1/cshost.1
+man/ja/man1/ctow.1
+man/ja/man1/delwords.1
+man/ja/man1/dicar.1
+man/ja/man1/dpbindic.1
+man/ja/man1/dpromdic.1
+man/ja/man1/lsdic.1
+man/ja/man1/mkbindic.1
+man/ja/man1/mkdic.1
+man/ja/man1/mkromdic.1
+man/ja/man1/mvdic.1
+man/ja/man1/rmdic.1
+man/ja/man1/splitword.1
+man/ja/man1/wtoc.1
man/man1/addwords.1
man/man1/cannacheck.1
man/man1/cannakill.1
pkgsrc-inputmethod-canna37.tar.gz
pkgsrc-inputmethod-canna-gplextradic.tar.gz