7 files changed, 95 insertions, 181 deletions

diff --git a/japanese/Canna/Makefile b/japanese/Canna/Makefile
index 9546e023836a..457f44ee41e4 100644
--- a/japanese/Canna/Makefile
+++ b/japanese/Canna/Makefile
@@ -7,9 +7,9 @@
 #
 
 PORTNAME=	Canna
-PORTVERSION=	3.6p1
+PORTVERSION=	3.6p3
 CATEGORIES=	japanese
-MASTER_SITES=	http://downloads.sourceforge.jp/canna/1722/
+MASTER_SITES=	http://downloads.sourceforge.jp/canna/2181/
 DISTNAME=	${PORTNAME}${PORTVERSION:S/.//g}
 
 MAINTAINER=	max@FreeBSD.org
@@ -28,14 +28,13 @@ MAN3=	RkCloseRoma.3 RkCvtEuc.3 RkCvtHan.3 RkCvtHira.3 RkCvtKana.3 \
 	RkCvtRoma.3 RkCvtZen.3 RkDefineDic.3 RkDeleteDic.3 RkEndBun.3 \
 	RkEnlarge.3 RkFinalize.3 RkGetDicList.3 RkGetKanji.3 RkGetLex.3 \
 	RkGetStat.3 RkGetYomi.3 RkGoto.3 RkInitialize.3 RkIntro.3 RkLeft.3 \
-	RkMapPhonogram.3 RkMapRoma.3 RkMountD.3 RkNext.3 RkNfer.3 \
+	RkMapPhonogram.3 RkMapRoma.3 RkMountDic.3 RkNext.3 RkNfer.3 \
 	RkOpenRoma.3 RkPrev.3 RkRemountDic.3 RkResize.3 RkBgnBun.3 RkRight.3 \
 	RkShorten.3 RkStoreYomi.3 RkUnmountDic.3 RkXfer.3 cannalib.3 uilib.3
-MANCOMPRESSED=	no
-XFREE86_HTML_MAN=	no
-
 MLINKS=		uilib.3 XKanjiControl.3  uilib.3 XLookupKanjiString.3 \
 		uilib.3 jrKanjiControl.3  uilib.3 jrKanjiString.3
+MANCOMPRESSED=	no
+XFREE86_HTML_MAN=	no
 
 post-build:
 	@${SED} -e "s,@RM@,${RM},g; s,@TOUCH@,${TOUCH},g; \
diff --git a/japanese/Canna/distinfo b/japanese/Canna/distinfo
index 869d8c26eaeb..2db5958943e1 100644
--- a/japanese/Canna/distinfo
+++ b/japanese/Canna/distinfo
@@ -1 +1 @@
-MD5 (Canna36p1.tar.gz) = 303f236f40f923c9c3f3cdde90561ddc
+MD5 (Canna36p3.tar.gz) = fc48790adccd026aa2b1ddba80fe5850
diff --git a/japanese/Canna/files/patch-ac b/japanese/Canna/files/patch-ac
index 42a70332d271..676f2d290887 100644
--- a/japanese/Canna/files/patch-ac
+++ b/japanese/Canna/files/patch-ac
@@ -1,47 +1,19 @@
---- Canna.conf.orig	Thu Oct 24 23:37:25 2002
-+++ Canna.conf	Thu Nov 14 09:28:18 2002
-@@ -132,11 +132,12 @@
- 
+--- Canna.conf.orig	Sat Jan 25 17:47:47 2003
++++ Canna.conf	Tue Feb  4 16:20:34 2003
+@@ -133,13 +133,14 @@
  /* rootにならずにインストールする時はこれを定義して下さい */
  /* #define InstallAsUser */
--cannaPrefix = /usr/local/canna
+ /* 従来と互換のディレクトリ構造にする場合はこれを定義してください */
+-#define ObsoleteInstallDir
++/* #define ObsoleteInstallDir  */
+ #ifdef InstallAsUser
+ # define DefCannaPrefix $(HOME)/canna
+ # define DefErrDir $(cannaPrefix)/log
+ # define DefLibCannaDir $(cannaExecPrefix)/lib
+ #else 
+-# define DefCannaPrefix /usr/local/canna
 +PREFIX?= /usr/local
-+cannaPrefix = $(PREFIX)
- cannaExecPrefix = $(cannaPrefix)
- cannaBinDir = $(cannaExecPrefix)/bin
--cannaSrvDir = $(cannaExecPrefix)/bin
--cannaLibDir = $(cannaPrefix)/lib
-+cannaSrvDir = $(cannaExecPrefix)/sbin
-+cannaLibDir = $(cannaPrefix)/lib/canna
- cannaManDir = $(cannaPrefix)/man
- cannaIncDir = $(cannaPrefix)/include/canna
- 
-@@ -144,8 +145,8 @@
- libCannaDir = $(cannaExecPrefix)/lib
- ErrDir  = $(cannaExecPrefix)/log
- #else
--libCannaDir = /usr/lib
--ErrDir  = /usr/spool/canna
-+libCannaDir = $(cannaPrefix)/lib
-+ErrDir  = /var/log
- #endif
- 
- /* 次の3行は変更しないでください */
-@@ -164,7 +165,7 @@
- 
- pointerIntegerDef =
- 
--cannaDsoRev = 1
-+cannaDsoRev = 1.0
-     /* SunOS 4.x をお使いの方で shared object を利用する場合には
-             cannaDsoRev = 1.1
-     と指定してください。また、FreeBSD を利用する場合は、
-@@ -308,7 +309,7 @@
-  * ここから下は変更しないようにしてください。
-  */
- 
-- CANNASERVER_DEFINES = $(wcharDefinition)
-+ CANNASERVER_DEFINES = $(wcharDefinition) $(cannaOwnerDefinition)
-           RK_DEFINES = $(pointerIntegerDef)
-          RKC_DEFINES = $(wcharDefinition)
-        UILIB_DEFINES = $(wcharDefinition) $(pointerIntegerDef) \
++# define DefCannaPrefix $(PREFIX)
+ # ifdef ObsoleteInstallDir
+ #  define DefErrDir /usr/spool/canna
+ #  define DefLibCannaDir /usr/lib
diff --git a/japanese/Canna/files/patch-ag b/japanese/Canna/files/patch-ag
deleted file mode 100644
index 98f85358433f..000000000000
--- a/japanese/Canna/files/patch-ag
+++ /dev/null
@@ -1,18 +0,0 @@
---- cmd/catdic/Imakefile.orig	Thu Nov  7 23:46:02 2002
-+++ cmd/catdic/Imakefile	Mon Dec  2 12:09:42 2002
-@@ -84,7 +84,7 @@
- 	$(RM) $(DESTDIR)$(cannaBinDir)/chmoddic
- 	$(RM) $(DESTDIR)$(cannaBinDir)/addwords
- 	$(RM) $(DESTDIR)$(cannaBinDir)/delwords
--	$(RM) $(DESTDIR)$(cannaBinDir)/cannakill
-+	$(RM) $(DESTDIR)$(cannaSrvDir)/cannakill
- 	$(LN) $(DESTDIR)$(cannaBinDir)/catdic $(DESTDIR)$(cannaBinDir)/cpdic
- 	$(LN) $(DESTDIR)$(cannaBinDir)/catdic $(DESTDIR)$(cannaBinDir)/lsdic
- 	$(LN) $(DESTDIR)$(cannaBinDir)/catdic $(DESTDIR)$(cannaBinDir)/mkdic
-@@ -94,5 +94,5 @@
- 	$(LN) $(DESTDIR)$(cannaBinDir)/catdic $(DESTDIR)$(cannaBinDir)/chmoddic
- 	$(LN) $(DESTDIR)$(cannaBinDir)/catdic $(DESTDIR)$(cannaBinDir)/addwords
- 	$(LN) $(DESTDIR)$(cannaBinDir)/catdic $(DESTDIR)$(cannaBinDir)/delwords
--	$(LN) $(DESTDIR)$(cannaBinDir)/catdic $(DESTDIR)$(cannaBinDir)/cannakill
-+	$(LN) $(DESTDIR)$(cannaBinDir)/catdic $(DESTDIR)$(cannaSrvDir)/cannakill
- #endif
diff --git a/japanese/Canna/files/patch-al b/japanese/Canna/files/patch-al
deleted file mode 100644
index 27876dd02ac4..000000000000
--- a/japanese/Canna/files/patch-al
+++ /dev/null
@@ -1,38 +0,0 @@
---- canna/widedef.h.orig	Sat Oct 19 17:27:28 2002
-+++ canna/widedef.h	Tue Nov 19 08:20:30 2002
-@@ -35,7 +35,11 @@
- #define WCHAR16
- #endif
-      
--#if defined(__FreeBSD__) || defined(__NetBSD__)
-+#ifdef __FreeBSD__
-+# include <osreldate.h>
-+#endif
-+
-+#if (defined(__FreeBSD__) && __FreeBSD_version < 500000) || defined(__NetBSD__)
- # include <machine/ansi.h>
- #endif
- 
-@@ -61,7 +65,7 @@
- #endif /* !nec_ews_svr2 */
- #endif /* HAVE_WCHAR_OPERATION */
- 
--#if defined(__FreeBSD__) || defined(__NetBSD__)
-+#if (defined(__FreeBSD__) && __FreeBSD_version < 500000) || defined(__NetBSD__)
- # ifdef _BSD_WCHAR_T_
- #  undef _BSD_WCHAR_T_
- #  ifdef WCHAR16
-@@ -72,6 +76,13 @@
- # include <stddef.h>
- # define _WCHAR_T
- # endif
-+#elif defined(__FreeBSD__) && __FreeBSD_version >= 500000
-+# ifdef WCHAR16
-+typedef unsigned short wchar_t;
-+#  define _WCHAR_T_DECLARED
-+# endif
-+# include <stddef.h>
-+# define _WCHAR_T
- #else
- #if !defined(WCHAR_T) && !defined(_WCHAR_T) && !defined(_WCHAR_T_) \
-  && !defined(__WCHAR_T) && !defined(_GCC_WCHAR_T) && !defined(_WCHAR_T_DEFINED)
diff --git a/japanese/Canna/pkg-descr b/japanese/Canna/pkg-descr
index 21bb848df32a..d825639763b8 100644
--- a/japanese/Canna/pkg-descr
+++ b/japanese/Canna/pkg-descr
@@ -1,5 +1,5 @@
 Canna is a Kana-Kanji conversion server.
-Supports Mule(Multi-lingual extention Emacs), kinput2 X11 input
+It supports Mule(Multi-lingual extention Emacs), kinput2 X11 input
 method, etc.
 
 
diff --git a/japanese/Canna/pkg-plist b/japanese/Canna/pkg-plist
index f13d9712f589..6fda02821dde 100644
--- a/japanese/Canna/pkg-plist
+++ b/japanese/Canna/pkg-plist
@@ -32,68 +32,67 @@ include/canna/RK.h
 include/canna/jrkanji.h
 include/canna/keydef.h
 include/canna/mfdef.h
-lib/canna/default.canna
-lib/canna/dic/canna/bushu.cld
-lib/canna/dic/canna/chimei.ctd
-lib/canna/dic/canna/dics.dir
-lib/canna/dic/canna/fuzokugo.cbd
-lib/canna/dic/canna/fuzokugo.cld
-lib/canna/dic/canna/hojomwd.ctd
-lib/canna/dic/canna/hojoswd.ctd
-lib/canna/dic/canna/iroha.cbd
-lib/canna/dic/canna/iroha.cld
-lib/canna/dic/canna/kanasmpl.ctd
-lib/canna/dic/canna/katakana.ctd
-lib/canna/dic/canna/keishiki.ctd
-lib/canna/dic/canna/necgaiji.ctd
-lib/canna/dic/canna/number.ctd
-lib/canna/dic/canna/software.ctd
-lib/canna/dic/canna/suffix.ctd
-lib/canna/dic/default.cbp
-lib/canna/dic/english.cbp
-lib/canna/dic/jdaemon.cbp
-lib/canna/dic/just.cbp
-lib/canna/dic/kaisoku.cbp
-lib/canna/dic/kana.cbp
-lib/canna/dic/lan5.cbp
-lib/canna/dic/matsu.cbp
-lib/canna/dic/newjis.cbp
-lib/canna/dic/romaji.cbp
-lib/canna/dic/sokuon.cbp
-lib/canna/dic/tut.cbp
-lib/canna/dic/vje.cbp
-lib/canna/dic/wx2+.cbp
-lib/canna/sample/1.1.canna
-lib/canna/sample/1.2.canna
-lib/canna/sample/default.canna
-lib/canna/sample/fixer.canna
-lib/canna/sample/jdemon.canna
-lib/canna/sample/just.canna
-lib/canna/sample/lan5.canna
-lib/canna/sample/matsu.canna
-lib/canna/sample/modes.canna
-lib/canna/sample/sample.canna
-lib/canna/sample/skk.canna
-lib/canna/sample/src/Makefile
-lib/canna/sample/src/default.ctd
-lib/canna/sample/src/english.ctd
-lib/canna/sample/src/is.c
-lib/canna/sample/src/jdaemon.ctd
-lib/canna/sample/src/just.ctd
-lib/canna/sample/src/kaisoku.ctd
-lib/canna/sample/src/kana.ctd
-lib/canna/sample/src/lan5.ctd
-lib/canna/sample/src/matsu.ctd
-lib/canna/sample/src/newjis.ctd
-lib/canna/sample/src/romaji.ctd
-lib/canna/sample/src/sokuon.ctd
-lib/canna/sample/src/tut.ctd
-lib/canna/sample/src/vje.ctd
-lib/canna/sample/src/wx2+.ctd
-lib/canna/sample/tut.canna
-lib/canna/sample/unix.canna
-lib/canna/sample/vje.canna
-lib/canna/sample/wx2+.canna
+share/canna/default.canna
+share/canna/dic/canna/bushu.cld
+share/canna/dic/canna/chimei.ctd
+share/canna/dic/canna/dics.dir
+share/canna/dic/canna/fuzokugo.cbd
+share/canna/dic/canna/fuzokugo.cld
+share/canna/dic/canna/hojomwd.ctd
+share/canna/dic/canna/hojoswd.ctd
+share/canna/dic/canna/iroha.cbd
+share/canna/dic/canna/iroha.cld
+share/canna/dic/canna/kanasmpl.ctd
+share/canna/dic/canna/katakana.ctd
+share/canna/dic/canna/keishiki.ctd
+share/canna/dic/canna/necgaiji.ctd
+share/canna/dic/canna/number.ctd
+share/canna/dic/canna/software.ctd
+share/canna/dic/canna/suffix.ctd
+share/canna/dic/default.cbp
+share/canna/dic/english.cbp
+share/canna/dic/jdaemon.cbp
+share/canna/dic/just.cbp
+share/canna/dic/kaisoku.cbp
+share/canna/dic/kana.cbp
+share/canna/dic/lan5.cbp
+share/canna/dic/matsu.cbp
+share/canna/dic/newjis.cbp
+share/canna/dic/romaji.cbp
+share/canna/dic/sokuon.cbp
+share/canna/dic/tut.cbp
+share/canna/dic/vje.cbp
+share/canna/dic/wx2+.cbp
+share/canna/sample/1.1.canna
+share/canna/sample/1.2.canna
+share/canna/sample/fixer.canna
+share/canna/sample/jdemon.canna
+share/canna/sample/just.canna
+share/canna/sample/lan5.canna
+share/canna/sample/matsu.canna
+share/canna/sample/modes.canna
+share/canna/sample/sample.canna
+share/canna/sample/skk.canna
+share/canna/sample/src/Makefile
+share/canna/sample/src/default.ctd
+share/canna/sample/src/english.ctd
+share/canna/sample/src/is.c
+share/canna/sample/src/jdaemon.ctd
+share/canna/sample/src/just.ctd
+share/canna/sample/src/kaisoku.ctd
+share/canna/sample/src/kana.ctd
+share/canna/sample/src/lan5.ctd
+share/canna/sample/src/matsu.ctd
+share/canna/sample/src/newjis.ctd
+share/canna/sample/src/romaji.ctd
+share/canna/sample/src/sokuon.ctd
+share/canna/sample/src/tut.ctd
+share/canna/sample/src/vje.ctd
+share/canna/sample/src/wx2+.ctd
+share/canna/sample/tut.canna
+share/canna/sample/unix.canna
+share/canna/sample/vje.canna
+share/canna/sample/wx2+.canna
 lib/libRKC.a
 lib/libRKC.so
 lib/libRKC.so.1
@@ -108,15 +107,15 @@ lib/libcanna16.so
 lib/libcanna16.so.1
 sbin/cannaserver
 sbin/cannakill
-@exec mkdir -p %D/lib/canna/dic/user/user %D/lib/canna/dic/group
-@exec chown bin:bin %D/lib/canna/dic/user/user %D/lib/canna/dic/user %D/lib/canna/dic/group
-@exec chmod 775 %D/lib/canna/dic/user/user %D/lib/canna/dic/user %D/lib/canna/dic/group
-@dirrm lib/canna/sample/src
-@dirrm lib/canna/sample
-@dirrm lib/canna/dic/canna
+@exec mkdir -p %D/share/canna/dic/user/user %D/share/canna/dic/group
+@exec chown bin:bin %D/share/canna/dic/user/user %D/share/canna/dic/user %D/share/canna/dic/group
+@exec chmod 775 %D/share/canna/dic/user/user %D/share/canna/dic/user %D/share/canna/dic/group
+@dirrm share/canna/sample/src
+@dirrm share/canna/sample
+@dirrm share/canna/dic/canna
 @dirrm include/canna
-@unexec rmdir %D/lib/canna/dic/user/user 2>/dev/null || true
-@unexec rmdir %D/lib/canna/dic/user      2>/dev/null || true
-@unexec rmdir %D/lib/canna/dic/group     2>/dev/null || true
-@unexec rmdir %D/lib/canna/dic           2>/dev/null || true
-@unexec rmdir %D/lib/canna               2>/dev/null || true
+@unexec rmdir %D/share/canna/dic/user/user 2>/dev/null || true
+@unexec rmdir %D/share/canna/dic/user      2>/dev/null || true
+@unexec rmdir %D/share/canna/dic/group     2>/dev/null || true
+@unexec rmdir %D/share/canna/dic           2>/dev/null || true
+@unexec rmdir %D/share/canna               2>/dev/null || true