? canna/work
? canna-dict/work
? canna-lib/work
? canna-server/work
Index: canna/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/inputmethod/canna/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- canna/Makefile	20 Feb 2010 10:39:01 -0000	1.11
+++ canna/Makefile	1 Jan 2011 13:37:56 -0000
@@ -5,10 +5,9 @@
 .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
 
Index: canna/Makefile.common
===================================================================
RCS file: /cvsroot/pkgsrc/inputmethod/canna/Makefile.common,v
retrieving revision 1.21
diff -u -r1.21 Makefile.common
--- canna/Makefile.common	28 May 2010 11:06:34 -0000	1.21
+++ canna/Makefile.common	1 Jan 2011 13:37:56 -0000
@@ -8,12 +8,13 @@
 # used by inputmethod/canna-server/Makefile
 
 # "Pkgsrc" version.
-CANNA_VERSION=	3.6pl4
+CANNA_VERSION=	3.7p3
 
 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/
Index: canna/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/inputmethod/canna/distinfo,v
retrieving revision 1.9
diff -u -r1.9 distinfo
--- canna/distinfo	18 Sep 2008 12:33:44 -0000	1.9
+++ canna/distinfo	1 Jan 2011 13:37:56 -0000
@@ -1,20 +1,12 @@
 $NetBSD: distinfo,v 1.9 2008/09/18 12:33:44 taca 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) = bfcbc667b1b93da39cebe31ebba86d45739c4aad
 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-ae) = 0bb5c06e6523952e6cec2188787707d69223fb16
+SHA1 (patch-af) = a3ea53da7ce38c71708031dd9c66aafad3d1bf65
 SHA1 (patch-an) = d639f774bf9ef440458bfc716b211a1dcc95a823
 SHA1 (patch-ao) = c577319f50df6624333726cd62b48d869989d881
Index: canna/patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/inputmethod/canna/patches/patch-aa,v
retrieving revision 1.3
diff -u -r1.3 patch-aa
--- canna/patches/patch-aa	20 May 2008 18:53:17 -0000	1.3
+++ canna/patches/patch-aa	1 Jan 2011 13:37:56 -0000
@@ -1,15 +1,8 @@
-$NetBSD: patch-aa,v 1.3 2008/05/20 18:53:17 tnn Exp $
+$NetBSD$
 
---- 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	2004-05-20 00:48:47.000000000 +0900
++++ Canna.conf	2010-12-31 20:55:30.000000000 +0900
+@@ -109,12 +109,12 @@
  # define DefErrDir $(cannaPrefix)/log
  # define DefLibCannaDir $(cannaExecPrefix)/lib
  #else 
@@ -24,21 +17,9 @@
  #  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
+@@ -169,8 +169,8 @@
+ #define ModernElfLink NO /* experimental */
+ 
  
 -cannaOwner = bin
 -cannaGroup = bin
@@ -47,60 +28,25 @@
  
  #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
+@@ -281,12 +281,12 @@
+ DEPCANNALIB = $(libCannaDir)/CannaDepLibraryName(canna)
+ CANNALIB = -L$(libCannaDir) -lcanna $(DLLIB)
+ DEPCANNALIB16 = $(libCannaDir)/CannaDepLibraryName(canna16)
+-CANNALIB16 = -L$(libCannaDir) -lcanna16 $(DLLIB)
++CANNALIB16 = -Wl,-rpath,$(libCannaDir) -L$(libCannaDir) -lcanna16 $(DLLIB)
  #else
--    DEPCANNALIB = $(CANNASRC)/libcanna.a
-+    DEPCANNALIB = $(libCannaDir)/libcanna.a
+ DEPCANNALIB = $(CANNASRC)/CannaDepLibraryName(canna)
+-CANNALIB = -L$(CANNASRC) -lcanna $(DLLIB)
+-DEPCANNALIB16 = $(CANNASRC)/CannaDepLibraryName(canna16)
+-CANNALIB16 = -L$(CANNASRC) -lcanna16 $(DLLIB)
++CANNALIB = -Wl,-rpath,$(libCannaDir) -L$(CANNASRC) -lcanna $(DLLIB)
++DEPCANNALIB16 = $(libCannaDir)/libcanna16.a
++CANNALIB16 =  -Wl,-rpath,$(libCannaDir) -L$(CANNASRC) -lcanna16 $(DLLIB)
  #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 = 
+ #if DoSharedLib
+@@ -330,7 +330,7 @@
+ SCRIPTS_DEFINES = $(CANNA_DEFINES)
  
  #ifdef JAPANESEMAN
 -JMNLOCALE = ja
Index: canna/patches/patch-ae
===================================================================
RCS file: /cvsroot/pkgsrc/inputmethod/canna/patches/patch-ae,v
retrieving revision 1.1
diff -u -r1.1 patch-ae
--- canna/patches/patch-ae	29 Dec 2005 15:29:12 -0000	1.1
+++ canna/patches/patch-ae	1 Jan 2011 13:37:56 -0000
@@ -1,14 +1,13 @@
-$NetBSD: patch-ae,v 1.1 2005/12/29 15:29:12 joerg Exp $
+$NetBSD$
 
---- 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 */
+--- canna/widedef.h.orig	2003-12-28 02:15:20.000000000 +0900
++++ canna/widedef.h	2010-12-31 19:01:34.000000000 +0900
+@@ -36,7 +36,9 @@
+ # include <machine/ansi.h>
+ #endif
  
 -#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__)
Index: canna/patches/patch-af
===================================================================
RCS file: /cvsroot/pkgsrc/inputmethod/canna/patches/patch-af,v
retrieving revision 1.1
diff -u -r1.1 patch-af
--- canna/patches/patch-af	31 May 2003 07:24:42 -0000	1.1
+++ canna/patches/patch-af	1 Jan 2011 13:37:56 -0000
@@ -1,13 +1,13 @@
-$NetBSD: patch-af,v 1.1 2003/05/31 07:24:42 uebayasi Exp $
+$NetBSD$
 
---- 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	2010-12-31 18:49:15.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>
Index: canna-canuum/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/inputmethod/canna-canuum/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- canna-canuum/Makefile	28 May 2010 11:06:34 -0000	1.11
+++ canna-canuum/Makefile	1 Jan 2011 13:37:56 -0000
@@ -1,6 +1,5 @@
 # $NetBSD: Makefile,v 1.11 2010/05/28 11:06:34 obache Exp $
 
-PKGREVISION=	3
 CANNA_MODULE=	canuum
 
 .include "../../inputmethod/canna/Makefile.common"
@@ -26,5 +25,6 @@
 	${LN} -fs ${WRKSRC}/cannaconf.h ${WRKSRC}/canuum
 	${LN} -fs ${WRKSRC}/canna/ccompat.h ${WRKSRC}/canuum
 
+.include "../../wip/libspt/buildlink3.mk"
 .include "../../mk/termcap.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
Index: canna-dict/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/inputmethod/canna-dict/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- canna-dict/Makefile	20 Feb 2010 11:44:53 -0000	1.12
+++ canna-dict/Makefile	1 Jan 2011 13:37:56 -0000
@@ -1,6 +1,5 @@
 # $NetBSD: Makefile,v 1.12 2010/02/20 11:44:53 obache Exp $
 
-PKGREVISION=	2
 CANNA_MODULE=	dict
 
 MAKE_JOBS_SAFE=	no
@@ -33,6 +32,14 @@
 		${SED} ${CANNA_CMD_SED_SCRIPT} $$file.orig > $$file;	\
 	done
 
+# cannaconf.h is not automatically generated so specify explicitly.
+do-build:
+	(cd ${WRKSRC};\
+	xmkmf;\
+	make Makefile; \
+	make cannaconf.h; \
+	make canna )
+
 INSTALLATION_DIRS+=	${CANNA_DICTDIR}
 
 do-install:
Index: canna-dict/PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/inputmethod/canna-dict/PLIST,v
retrieving revision 1.4
diff -u -r1.4 PLIST
--- canna-dict/PLIST	14 Jun 2009 18:01:29 -0000	1.4
+++ canna-dict/PLIST	1 Jan 2011 13:37:56 -0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 18:01:29 joerg Exp $
+@comment $NetBSD$
 libdata/canna/bushu.cld
 libdata/canna/chimei.ctd
 libdata/canna/dics.dir
Index: canna-lib/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/inputmethod/canna-lib/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- canna-lib/Makefile	28 May 2010 11:06:34 -0000	1.12
+++ canna-lib/Makefile	1 Jan 2011 13:37:56 -0000
@@ -1,6 +1,5 @@
 # $NetBSD: Makefile,v 1.12 2010/05/28 11:06:34 obache Exp $
 
-PKGREVISION=	2
 CANNA_MODULE=	lib
 
 PKG_DESTDIR_SUPPORT= user-destdir
Index: canna-lib/PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/inputmethod/canna-lib/PLIST,v
retrieving revision 1.8
diff -u -r1.8 PLIST
--- canna-lib/PLIST	14 Jun 2009 18:01:29 -0000	1.8
+++ canna-lib/PLIST	1 Jan 2011 13:37:56 -0000
@@ -1,24 +1,28 @@
-@comment $NetBSD: PLIST,v 1.8 2009/06/14 18:01:29 joerg Exp $
+@comment $NetBSD$
+bin/forcpp
+bin/kpdic
 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
+lib/libcanna16.so.1.2
 man/ja_JP.EUC/man3/RkBgnBun.3
 man/ja_JP.EUC/man3/RkCloseRoma.3
 man/ja_JP.EUC/man3/RkCvtEuc.3
Index: canna-server/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/inputmethod/canna-server/Makefile,v
retrieving revision 1.22
diff -u -r1.22 Makefile
--- canna-server/Makefile	20 Feb 2010 10:48:00 -0000	1.22
+++ canna-server/Makefile	1 Jan 2011 13:37:56 -0000
@@ -1,6 +1,5 @@
 # $NetBSD: Makefile,v 1.22 2010/02/20 10:48:00 obache Exp $
 
-PKGREVISION=	4
 CANNA_MODULE=	server
 
 .include "../../inputmethod/canna/Makefile.common"
Index: canna-server/PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/inputmethod/canna-server/PLIST,v
retrieving revision 1.7
diff -u -r1.7 PLIST
--- canna-server/PLIST	2 May 2005 20:33:59 -0000	1.7
+++ canna-server/PLIST	1 Jan 2011 13:37:56 -0000
@@ -4,6 +4,7 @@
 bin/cannacheck
 bin/cannastat
 bin/catdic
+bin/chkconc
 bin/chmoddic
 bin/cpdic
 bin/crfreq