[gentoo-commits] repo/gentoo:master commit in: app-i18n/canna/, app-i18n/canna/files/

["Akinori Hattori" <hattya@gentoo.org>]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=UTF-8, Size: 18622 bytes --]

commit:     e9bf929c7254140da82714c052130348180a9464
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  8 07:21:03 2017 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sat Jul  8 07:21:03 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9bf929c

app-i18n/canna: update patches

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 app-i18n/canna/canna-3.7_p3-r1.ebuild              |  17 +--
 app-i18n/canna/canna-3.7_p3-r2.ebuild              |  17 +--
 app-i18n/canna/files/canna-3.7-gentoo.diff.in      | 144 --------------------
 app-i18n/canna/files/canna-3.7_p3-strip.patch      | 142 --------------------
 app-i18n/canna/files/canna-gentoo.patch            | 146 +++++++++++++++++++++
 .../{canna-kpdef-gentoo.diff => canna-kpdef.patch} |   4 +-
 app-i18n/canna/files/canna-posix-sort.patch        |  11 ++
 7 files changed, 167 insertions(+), 314 deletions(-)

diff --git a/app-i18n/canna/canna-3.7_p3-r1.ebuild b/app-i18n/canna/canna-3.7_p3-r1.ebuild
index d9b11fd2453..2ee6f1090d1 100644
--- a/app-i18n/canna/canna-3.7_p3-r1.ebuild
+++ b/app-i18n/canna/canna-3.7_p3-r1.ebuild
@@ -25,23 +25,14 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	find . -name '*.man' -o -name '*.jmn' | xargs sed -i.bak -e 's/1M/8/g' || die
-	sed -e "s%@cannapkgver@%${PF}%" \
-		"${FILESDIR}"/${PN}-3.7-gentoo.diff.in > "${T}"/${PF}-gentoo.diff || die
-	epatch "${T}"/${PF}-gentoo.diff
+	epatch "${FILESDIR}"/${PN}-gentoo.patch \
+		"${FILESDIR}"/${PN}-kpdef.patch \
+		"${FILESDIR}"/${PN}-posix-sort.patch
 
-	# bug #248723
-	epatch "${FILESDIR}"/${P}-strip.patch
+	find . -name '*.man' -o -name '*.jmn' | xargs sed -i.bak -e 's/1M/8/g' || die
 
 	# Multilib-strict fix for amd64
 	sed -i -e "s:\(DefLibCannaDir.*\)/lib:\1/$(get_libdir):g" Canna.conf* || die
-	# fix deprecated sort syntax
-	sed -e 's:^\(sortcmd=\".* -s\).*$:\1 -k 1,1\":' \
-		-i cmd/mkbindic/mkbindic.cpp || die
-
-	cd "${S}"/dic/phono
-	epatch "${FILESDIR}"/${PN}-kpdef-gentoo.diff
-
 }
 
 src_compile() {

diff --git a/app-i18n/canna/canna-3.7_p3-r2.ebuild b/app-i18n/canna/canna-3.7_p3-r2.ebuild
index a8c2701d3d5..fb7bc151458 100644
--- a/app-i18n/canna/canna-3.7_p3-r2.ebuild
+++ b/app-i18n/canna/canna-3.7_p3-r2.ebuild
@@ -32,23 +32,14 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	find . -name '*.man' -o -name '*.jmn' | xargs sed -i.bak -e 's/1M/8/g' || die
-	sed -e "s%@cannapkgver@%${PF}%" \
-		"${FILESDIR}"/${PN}-3.7-gentoo.diff.in > "${T}"/${PF}-gentoo.diff || die
-	epatch "${T}"/${PF}-gentoo.diff
+	epatch "${FILESDIR}"/${PN}-gentoo.patch \
+		"${FILESDIR}"/${PN}-kpdef.patch \
+		"${FILESDIR}"/${PN}-posix-sort.patch
 
-	# bug #248723
-	epatch "${FILESDIR}"/${P}-strip.patch
+	find . -name '*.man' -o -name '*.jmn' | xargs sed -i.bak -e 's/1M/8/g' || die
 
 	# Multilib-strict fix for amd64
 	sed -i -e "s:\(DefLibCannaDir.*\)/lib:\1/$(get_libdir):g" Canna.conf* || die
-	# fix deprecated sort syntax
-	sed -e 's:^\(sortcmd=\".* -s\).*$:\1 -k 1,1\":' \
-		-i cmd/mkbindic/mkbindic.cpp || die
-
-	cd "${S}"/dic/phono
-	epatch "${FILESDIR}"/${PN}-kpdef-gentoo.diff
-
 }
 
 src_compile() {

diff --git a/app-i18n/canna/files/canna-3.7-gentoo.diff.in b/app-i18n/canna/files/canna-3.7-gentoo.diff.in
deleted file mode 100644
index 940c97f6dca..00000000000
--- a/app-i18n/canna/files/canna-3.7-gentoo.diff.in
+++ /dev/null
@@ -1,144 +0,0 @@
-diff -urN Canna37b1.ORIG/Canna.conf Canna37b1/Canna.conf
---- Canna37b1.ORIG/Canna.conf	2003-09-27 15:23:08.000000000 +0900
-+++ Canna37b1/Canna.conf	2003-09-27 19:09:13.000000000 +0900
-@@ -114,7 +114,7 @@
- #  define DefErrDir /usr/spool/canna
- #  define DefLibCannaDir /usr/lib
- # else
--#  define DefErrDir /var/log
-+#  define DefErrDir /var/log/canna
- #  define DefLibCannaDir $(cannaExecPrefix)/lib
- # endif
- #endif
-@@ -140,16 +140,18 @@
- # define ModernElfLinkAvailable NO
- #endif
- 
--cannaPrefix = DefCannaPrefix
-+cannaPrefix = /usr
- cannaExecPrefix = $(cannaPrefix)
- cannaBinDir = $(cannaExecPrefix)/bin
- cannaSrvDir = DefCannaSrvDir
- XCOMM cannaLibDir = /var/lib/canna
- XCOMM cannaLibDir = /var/db/canna
- cannaLibDir = DefCannaLibDir
--XCOMM cannaManDir = $(cannaPrefix)/share/man
--cannaManDir = $(cannaPrefix)/man
-+cannaManDir = $(cannaPrefix)/share/man
-+XCOMM cannaManDir = $(cannaPrefix)/man
- cannaIncDir = $(cannaPrefix)/include/canna
-+cannaDocDir = $(cannaPrefix)/share/doc/@cannapkgver@
-+cannaShareDir = $(cannaPrefix)/share/canna
- 
- libCannaDir = DefLibCannaDir
- ErrDir  = DefErrDir
-@@ -158,7 +160,7 @@
- #define SupportOldWchar 1
- 
- /* IPv6¤òÍѤ¤¤ë¾ì¹ç¤Ï1¤ÈÄêµÁ¤·¤Æ¤¯¤À¤µ¤¤ */
--#define UseInet6 0 /* requires newer IPv6 implementation */
-+/* #define UseInet6 0 /* requires newer IPv6 implementation */
- 
- /* 3.2·Ï¤«¤é3.6·Ï¤Þ¤Ç¤Î·Á¼°¤Î¼­½ñ¤òºî¤ë¾ì¹ç¤Ï¤³¤ì¤òÄêµÁ¤·¤Æ¤¯¤À¤µ¤¤ */
- /* #define DIC_3_6_COMPAT */
-@@ -237,7 +239,7 @@
- /* #define UseInstalledLibCanna YES */
- #define UseInstalledLibCanna NO
- 
--DicDir   = $(cannaLibDir)/dic
-+DicDir   = /var/lib/canna/dic
- 
- /* ¤³¤³¤«¤é²¼¤ÏÊѹ¹ÉÔÍפǤ¹ */
- 
-diff -urN Canna37b1.ORIG/Imakefile Canna37b1/Imakefile
---- Canna37b1.ORIG/Imakefile	2003-09-25 15:30:20.000000000 +0900
-+++ Canna37b1/Imakefile	2003-09-27 19:09:00.000000000 +0900
-@@ -55,6 +55,7 @@
- 	@echo "#define CANNAHOSTFILE '$(cannaLibDir)/cannahost'" >> junkjunk
- 	@echo "/* for lib/canna */" >> junkjunk
- 	@echo "#define CANNALIBDIR '$(cannaLibDir)'" >> junkjunk
-+	@echo "#define CANNASHAREDIR '$(cannaShareDir)'" >> junkjunk
- 	@echo "#define SUPPORT_OLD_WCHAR '$(supportOldWchar)'" >> junkjunk
- 	@echo "/* for scripts */" >> junkjunk
- 	@echo "#define CANNABINDIR $(cannaBinDir)" >> junkjunk
-@@ -83,6 +84,7 @@
- 	 echo "#define CANNAHOSTFILE \"$(cannaLibDir)/cannahost\"";\
- 	 echo "/* for lib/canna */";\
- 	 echo "#define CANNALIBDIR \"$(cannaLibDir)\""; \
-+	 echo "#define CANNASHAREDIR \"$(cannaShareDir)\""; \
- 	 echo "#define SUPPORT_OLD_WCHAR $(supportOldWchar)"; \
- 	 echo "/* for scripts */";\
- 	 echo "#define CANNABINDIR $(cannaBinDir)"; \
-diff -urN Canna37b1.ORIG/dic/phono/Imakefile Canna37b1/dic/phono/Imakefile
---- Canna37b1.ORIG/dic/phono/Imakefile	2002-10-19 17:27:40.000000000 +0900
-+++ Canna37b1/dic/phono/Imakefile	2003-09-27 19:09:00.000000000 +0900
-@@ -27,9 +27,10 @@
- 
-        ROMAJI_DIC_DEF = -DSHIFT
- 
--               DICDIR = $(cannaLibDir)/dic
--            SAMPLEDIR = $(cannaLibDir)/sample
--         SAMPLESRCDIR = $(cannaLibDir)/sample/src
-+               DICDIR = $(DicDir)
-+        CANNASHAREDIR = $(cannaShareDir)
-+            SAMPLEDIR = $(cannaDocDir)/sample
-+         SAMPLESRCDIR = $(cannaDocDir)/sample/src
- 
-     KPDEF = default.kpdef jdaemon.kpdef just.kpdef kaisoku.kpdef kana.kpdef \
-             lan5.kpdef matsu.kpdef newjis.kpdef romaji.kpdef sokuon.kpdef \
-@@ -69,7 +70,7 @@
- MakeDirectories(install,$(DICDIR))
- MakeDirectories(install,$(SAMPLESRCDIR))
- 
--InstallMultiple($(ROMKANA_TABLES),$(DICDIR))
-+InstallMultiple($(ROMKANA_TABLES),$(CANNASHAREDIR))
- 
- #ifdef USE_OBSOLETE_STYLE_FILENAME
- InstallNonExec(default.kpdef,$(SAMPLESRCDIR))
-diff -urN Canna37b1.ORIG/lib/canna/romaji.c Canna37b1/lib/canna/romaji.c
---- Canna37b1.ORIG/lib/canna/romaji.c	2003-09-17 17:50:53.000000000 +0900
-+++ Canna37b1/lib/canna/romaji.c	2003-09-27 19:09:00.000000000 +0900
-@@ -427,7 +427,7 @@
- 	}
-       }
-       
--#if 0 /* currently CANNASHAREDDIR is not defined */
-+#if 1 /* currently CANNASHAREDDIR is defined */
-       if (retval == (struct RkRxDic *)NULL) { /* added for Debian by ISHIKAWA Mutsumi <ishikawa@linux.or.jp> */
-         extern jrUserInfoStruct *uinfo;
- 	
-diff -urN Canna37b1.ORIG/misc/Imakefile Canna37b1/misc/Imakefile
---- Canna37b1.ORIG/misc/Imakefile	2003-03-05 04:23:53.000000000 +0900
-+++ Canna37b1/misc/Imakefile	2003-09-27 19:09:00.000000000 +0900
-@@ -48,7 +48,7 @@
- MakeLintLibSubdirs($(SUBDIRS))
- MakeLintSubdirs($(SUBDIRS),install.ln,install.ln)
- 
--MakeDirectories(install,$(cannaLibDir)/sample/src)
-+MakeDirectories(install,$(cannaDocDir)/sample/src)
- 
- #ifdef USE_OBSOLETE_STYLE_FILENAME
- default.canna: default.ca
-@@ -58,8 +58,8 @@
- 	$(CP) default.ca default.canna
- #endif
- 
--InstallNonExec(default.canna,$(cannaLibDir))
--InstallNonExec(is.c,$(cannaLibDir)/sample/src)
-+InstallNonExec(default.canna,$(cannaDocDir))
-+InstallNonExec(is.c,$(cannaDocDir)/sample/src)
- 
- clean::
- 	$(RM) $(PROGRAMS)
-diff -urN Canna37b1.ORIG/misc/initfiles/Imakefile Canna37b1/misc/initfiles/Imakefile
---- Canna37b1.ORIG/misc/initfiles/Imakefile	2003-02-04 05:13:01.000000000 +0900
-+++ Canna37b1/misc/initfiles/Imakefile	2003-09-27 19:09:00.000000000 +0900
-@@ -6,7 +6,7 @@
- #endif
- 
-             CANNAROOT = ../..
--            SAMPLEDIR = $(cannaLibDir)/sample
-+            SAMPLEDIR = $(cannaShareDir)
- 
- all::
- 

diff --git a/app-i18n/canna/files/canna-3.7_p3-strip.patch b/app-i18n/canna/files/canna-3.7_p3-strip.patch
deleted file mode 100644
index ebcde1ef733..00000000000
--- a/app-i18n/canna/files/canna-3.7_p3-strip.patch
+++ /dev/null
@@ -1,142 +0,0 @@
-diff -Naur Canna37p3.orig/config.log Canna37p3/config.log
---- Canna37p3.orig/config.log	1970-01-01 09:00:00.000000000 +0900
-+++ Canna37p3/config.log	2009-09-21 10:25:33.000000000 +0900
-@@ -0,0 +1,126 @@
-+This file contains any messages produced by compilers while
-+running configure, to aid debugging if configure makes a mistake.
-+
-+It was created by canna configure 3.7p3, which was
-+generated by GNU Autoconf 2.59.  Invocation command line was
-+
-+  $ ./configure 
-+
-+## --------- ##
-+## Platform. ##
-+## --------- ##
-+
-+hostname = lets
-+uname -m = x86_64
-+uname -r = 2.6.31-gentoo
-+uname -s = Linux
-+uname -v = #1 SMP PREEMPT Fri Sep 11 17:39:06 JST 2009
-+
-+/usr/bin/uname -p = Intel(R) Core(TM)2 Duo CPU L7300 @ 1.40GHz
-+/bin/uname -X     = unknown
-+
-+/bin/arch              = unknown
-+/usr/bin/arch -k       = unknown
-+/usr/convex/getsysinfo = unknown
-+hostinfo               = unknown
-+/bin/machine           = unknown
-+/usr/bin/oslevel       = unknown
-+/bin/universe          = unknown
-+
-+PATH: /usr/local/bin
-+PATH: /usr/bin
-+PATH: /bin
-+PATH: /opt/bin
-+PATH: /usr/x86_64-pc-linux-gnu/i686-pc-linux-gnu/gcc-bin/4.3.3
-+PATH: /usr/x86_64-pc-linux-gnu/gcc-bin/4.4.1
-+PATH: /usr/kde/3.5/bin
-+PATH: /usr/qt/3/bin
-+PATH: /opt/android-sdk-1.5/tools
-+PATH: /opt/android-sdk-1.5/platforms/android-1.5/tools
-+PATH: /usr/games/bin
-+
-+
-+## ----------- ##
-+## Core tests. ##
-+## ----------- ##
-+
-+configure:1307: error: You cannot invloke configure directly.
-+
-+## ---------------- ##
-+## Cache variables. ##
-+## ---------------- ##
-+
-+ac_cv_env_CC_set=
-+ac_cv_env_CC_value=
-+ac_cv_env_CFLAGS_set=
-+ac_cv_env_CFLAGS_value=
-+ac_cv_env_CPPFLAGS_set=
-+ac_cv_env_CPPFLAGS_value=
-+ac_cv_env_CPP_set=
-+ac_cv_env_CPP_value=
-+ac_cv_env_LDFLAGS_set=
-+ac_cv_env_LDFLAGS_value=
-+ac_cv_env_build_alias_set=
-+ac_cv_env_build_alias_value=
-+ac_cv_env_host_alias_set=
-+ac_cv_env_host_alias_value=
-+ac_cv_env_target_alias_set=
-+ac_cv_env_target_alias_value=
-+
-+## ----------------- ##
-+## Output variables. ##
-+## ----------------- ##
-+
-+CC=''
-+CFLAGS=''
-+CPP=''
-+CPPFLAGS=''
-+DEFS=''
-+ECHO_C=''
-+ECHO_N='-n'
-+ECHO_T=''
-+EGREP=''
-+EXEEXT=''
-+LDFLAGS=''
-+LIBOBJS=''
-+LIBS=''
-+LTLIBOBJS=''
-+OBJEXT=''
-+PACKAGE_BUGREPORT='canna-dev@lists.sourceforge.jp'
-+PACKAGE_NAME='canna'
-+PACKAGE_STRING='canna 3.7p3'
-+PACKAGE_TARNAME='canna'
-+PACKAGE_VERSION='3.7p3'
-+PATH_SEPARATOR=':'
-+SHELL='/bin/sh'
-+ac_ct_CC=''
-+bindir='${exec_prefix}/bin'
-+build_alias=''
-+datadir='${prefix}/share'
-+exec_prefix='NONE'
-+host_alias=''
-+includedir='${prefix}/include'
-+infodir='${prefix}/info'
-+libdir='${exec_prefix}/lib'
-+libexecdir='${exec_prefix}/libexec'
-+localstatedir='${prefix}/var'
-+mandir='${prefix}/man'
-+oldincludedir='/usr/include'
-+prefix='NONE'
-+program_transform_name='s,x,x,'
-+sbindir='${exec_prefix}/sbin'
-+sharedstatedir='${prefix}/com'
-+sysconfdir='${prefix}/etc'
-+target_alias=''
-+
-+## ----------- ##
-+## confdefs.h. ##
-+## ----------- ##
-+
-+#define PACKAGE_BUGREPORT "canna-dev@lists.sourceforge.jp"
-+#define PACKAGE_NAME "canna"
-+#define PACKAGE_STRING "canna 3.7p3"
-+#define PACKAGE_TARNAME "canna"
-+#define PACKAGE_VERSION "3.7p3"
-+
-+configure: exit 1
-diff -Naur Canna37p3.orig/server/Imakefile Canna37p3/server/Imakefile
---- Canna37p3.orig/server/Imakefile	2004-04-27 06:48:37.000000000 +0900
-+++ Canna37p3/server/Imakefile	2009-09-21 10:28:48.000000000 +0900
-@@ -6,7 +6,7 @@
- #ifdef __EMX__
-          INSTFLAGS = $(INSTUGIDFLAGS)
- #else
--         INSTFLAGS = -s $(INSTUGIDFLAGS)
-+         INSTFLAGS = $(INSTUGIDFLAGS)
- #endif
-            DEFINES = $(CANNASERVER_DEFINES) $(SIGNAL_DEFINES) ConnectionFlags
-           INCLUDES = -I$(CANNAROOT)/include

diff --git a/app-i18n/canna/files/canna-gentoo.patch b/app-i18n/canna/files/canna-gentoo.patch
new file mode 100644
index 00000000000..7ecfb4b9cd8
--- /dev/null
+++ b/app-i18n/canna/files/canna-gentoo.patch
@@ -0,0 +1,146 @@
+--- a/Canna.conf
++++ b/Canna.conf
+@@ -109,12 +109,12 @@
+ # define DefErrDir $(cannaPrefix)/log
+ # define DefLibCannaDir $(cannaExecPrefix)/lib
+ #else 
+-# define DefCannaPrefix /usr/local/canna
++# define DefCannaPrefix $(EPREFIX)/usr
+ # ifdef ObsoleteInstallDir
+ #  define DefErrDir /usr/spool/canna
+ #  define DefLibCannaDir /usr/lib
+ # else
+-#  define DefErrDir /var/log
++#  define DefErrDir $(EPREFIX)/var/log/$(PN)
+ #  define DefLibCannaDir $(cannaExecPrefix)/lib
+ # endif
+ #endif
+@@ -123,7 +123,7 @@
+ # define DefCannaLibDir $(cannaPrefix)/lib
+ #else
+ # define DefCannaSrvDir $(cannaExecPrefix)/sbin
+-# define DefCannaLibDir $(cannaPrefix)/share/canna
++# define DefCannaLibDir $(cannaPrefix)/share/$(PN)
+ #endif
+ 
+ #if defined(LinuxArchitecture) || defined(FreeBSDArchitecture) \
+@@ -147,9 +147,11 @@
+ XCOMM cannaLibDir = /var/lib/canna
+ XCOMM cannaLibDir = /var/db/canna
+ cannaLibDir = DefCannaLibDir
+-XCOMM cannaManDir = $(cannaPrefix)/share/man
+-cannaManDir = $(cannaPrefix)/man
+-cannaIncDir = $(cannaPrefix)/include/canna
++cannaManDir = $(cannaPrefix)/share/man
++XCOMM cannaManDir = $(cannaPrefix)/man
++cannaIncDir = $(cannaPrefix)/include/$(PN)
++cannaShareDir = $(cannaPrefix)/share/$(PN)
++cannaDocDir = $(cannaPrefix)/share/doc/$(PF)
+ 
+ libCannaDir = DefLibCannaDir
+ ErrDir  = DefErrDir
+@@ -237,7 +239,7 @@
+ /* #define UseInstalledLibCanna YES */
+ #define UseInstalledLibCanna NO
+ 
+-DicDir   = $(cannaLibDir)/dic
++DicDir   = $(EPREFIX)/var/lib/$(PN)/dic
+ 
+ /* ¤³¤³¤«¤é²¼¤ÏÊѹ¹ÉÔÍפǤ¹ */
+ 
+--- a/Imakefile
++++ b/Imakefile
+@@ -87,6 +87,7 @@
+ 	 echo "#define CANNAHOSTFILE \"$(cannaLibDir)/cannahost\"";\
+ 	 echo "/* for lib/canna */";\
+ 	 echo "#define CANNALIBDIR \"$(cannaLibDir)\""; \
++	 echo "#define CANNASHAREDIR \"$(cannaShareDir)\""; \
+ 	 echo "#define SUPPORT_OLD_WCHAR $(supportOldWchar)"; \
+ 	 echo "/* for scripts */";\
+ 	 echo "#define CANNABINDIR $(cannaBinDir)"; \
+--- a/dic/phono/Imakefile
++++ b/dic/phono/Imakefile
+@@ -27,9 +27,10 @@
+ 
+        ROMAJI_DIC_DEF = -DSHIFT
+ 
+-               DICDIR = $(cannaLibDir)/dic
+-            SAMPLEDIR = $(cannaLibDir)/sample
+-         SAMPLESRCDIR = $(cannaLibDir)/sample/src
++               DICDIR = $(DicDir)
++        CANNASHAREDIR = $(cannaShareDir)
++            SAMPLEDIR = $(cannaDocDir)/sample
++         SAMPLESRCDIR = $(cannaDocDir)/sample/src
+ 
+     KPDEF = default.kpdef jdaemon.kpdef just.kpdef kaisoku.kpdef kana.kpdef \
+             lan5.kpdef matsu.kpdef newjis.kpdef romaji.kpdef sokuon.kpdef \
+@@ -69,7 +70,7 @@
+ MakeDirectories(install,$(DICDIR))
+ MakeDirectories(install,$(SAMPLESRCDIR))
+ 
+-InstallMultiple($(ROMKANA_TABLES),$(DICDIR))
++InstallMultiple($(ROMKANA_TABLES),$(CANNASHAREDIR))
+ 
+ #ifdef USE_OBSOLETE_STYLE_FILENAME
+ InstallNonExec(default.kpdef,$(SAMPLESRCDIR))
+--- a/lib/canna/romaji.c
++++ b/lib/canna/romaji.c
+@@ -427,7 +427,6 @@
+ 	}
+       }
+       
+-#if 0 /* currently CANNASHAREDDIR is not defined */
+       if (retval == (struct RkRxDic *)NULL) { /* added for Debian by ISHIKAWA Mutsumi <ishikawa@linux.or.jp> */
+         extern jrUserInfoStruct *uinfo;
+ 	
+@@ -450,7 +449,6 @@
+ 	  }
+ 	}
+       }
+-#endif
+       
+       if (retval == (struct RkRxDic *)NULL) { /* Á´Éô¥ª¡¼¥×¥ó¤Ç¤­¤Ê¤¤ */
+ 	sprintf(rdic, 
+--- a/misc/Imakefile
++++ b/misc/Imakefile
+@@ -48,7 +48,7 @@
+ MakeLintLibSubdirs($(SUBDIRS))
+ MakeLintSubdirs($(SUBDIRS),install.ln,install.ln)
+ 
+-MakeDirectories(install,$(cannaLibDir)/sample/src)
++MakeDirectories(install,$(cannaDocDir)/sample/src)
+ 
+ #ifdef USE_OBSOLETE_STYLE_FILENAME
+ default.canna: default.ca
+@@ -58,8 +58,8 @@
+ 	$(CP) default.ca default.canna
+ #endif
+ 
+ InstallNonExec(default.canna,$(cannaLibDir))
+-InstallNonExec(is.c,$(cannaLibDir)/sample/src)
++InstallNonExec(is.c,$(cannaDocDir)/sample/src)
+ 
+ clean::
+ 	$(RM) $(PROGRAMS)
+--- a/misc/initfiles/Imakefile
++++ b/misc/initfiles/Imakefile
+@@ -6,7 +6,7 @@
+ #endif
+ 
+             CANNAROOT = ../..
+-            SAMPLEDIR = $(cannaLibDir)/sample
++            SAMPLEDIR = $(cannaDocDir)/sample
+ 
+ all::
+ 
+--- a/server/Imakefile
++++ b/server/Imakefile
+@@ -6,7 +6,7 @@
+ #ifdef __EMX__
+          INSTFLAGS = $(INSTUGIDFLAGS)
+ #else
+-         INSTFLAGS = -s $(INSTUGIDFLAGS)
++         INSTFLAGS = $(INSTUGIDFLAGS)
+ #endif
+            DEFINES = $(CANNASERVER_DEFINES) $(SIGNAL_DEFINES) ConnectionFlags
+           INCLUDES = -I$(CANNAROOT)/include

diff --git a/app-i18n/canna/files/canna-kpdef-gentoo.diff b/app-i18n/canna/files/canna-kpdef.patch
similarity index 55%
rename from app-i18n/canna/files/canna-kpdef-gentoo.diff
rename to app-i18n/canna/files/canna-kpdef.patch
index f458c53efdd..b0b71b4442c 100644
--- a/app-i18n/canna/files/canna-kpdef-gentoo.diff
+++ b/app-i18n/canna/files/canna-kpdef.patch
@@ -1,5 +1,5 @@
---- default.kpdef.orig	2002-10-19 17:27:40.000000000 +0900
-+++ default.kpdef	2003-12-13 00:54:51.000000000 +0900
+--- a/dic/phono/default.kpdef
++++ b/dic/phono/default.kpdef
 @@ -350,3 +350,15 @@
  _	¡²
  /	¡¿

diff --git a/app-i18n/canna/files/canna-posix-sort.patch b/app-i18n/canna/files/canna-posix-sort.patch
new file mode 100644
index 00000000000..1f98aaf5efd
--- /dev/null
+++ b/app-i18n/canna/files/canna-posix-sort.patch
@@ -0,0 +1,11 @@
+--- a/cmd/mkbindic/mkbindic.cpp
++++ b/cmd/mkbindic/mkbindic.cpp
+@@ -40,7 +40,7 @@
+ bck_text=;
+ flag=;
+ compat_flag=;
+-sortcmd="sort -d -s +0 -1"
++sortcmd="sort -d -s -k 1,1"
+ usage="usage: mkbindic [-m|-s] [-name dicname] [-c version] textfile [cpp-args ...]";
+ : ${TMPDIR:=/tmp}
+