| 1 |
commit: e9bf929c7254140da82714c052130348180a9464 |
| 2 |
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jul 8 07:21:03 2017 +0000 |
| 4 |
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jul 8 07:21:03 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9bf929c |
| 7 |
|
| 8 |
app-i18n/canna: update patches |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.1 |
| 11 |
|
| 12 |
app-i18n/canna/canna-3.7_p3-r1.ebuild | 17 +-- |
| 13 |
app-i18n/canna/canna-3.7_p3-r2.ebuild | 17 +-- |
| 14 |
app-i18n/canna/files/canna-3.7-gentoo.diff.in | 144 -------------------- |
| 15 |
app-i18n/canna/files/canna-3.7_p3-strip.patch | 142 -------------------- |
| 16 |
app-i18n/canna/files/canna-gentoo.patch | 146 +++++++++++++++++++++ |
| 17 |
.../{canna-kpdef-gentoo.diff => canna-kpdef.patch} | 4 +- |
| 18 |
app-i18n/canna/files/canna-posix-sort.patch | 11 ++ |
| 19 |
7 files changed, 167 insertions(+), 314 deletions(-) |
| 20 |
|
| 21 |
diff --git a/app-i18n/canna/canna-3.7_p3-r1.ebuild b/app-i18n/canna/canna-3.7_p3-r1.ebuild |
| 22 |
index d9b11fd2453..2ee6f1090d1 100644 |
| 23 |
--- a/app-i18n/canna/canna-3.7_p3-r1.ebuild |
| 24 |
+++ b/app-i18n/canna/canna-3.7_p3-r1.ebuild |
| 25 |
@@ -25,23 +25,14 @@ src_unpack() { |
| 26 |
unpack ${A} |
| 27 |
cd "${S}" |
| 28 |
|
| 29 |
- find . -name '*.man' -o -name '*.jmn' | xargs sed -i.bak -e 's/1M/8/g' || die |
| 30 |
- sed -e "s%@cannapkgver@%${PF}%" \ |
| 31 |
- "${FILESDIR}"/${PN}-3.7-gentoo.diff.in > "${T}"/${PF}-gentoo.diff || die |
| 32 |
- epatch "${T}"/${PF}-gentoo.diff |
| 33 |
+ epatch "${FILESDIR}"/${PN}-gentoo.patch \ |
| 34 |
+ "${FILESDIR}"/${PN}-kpdef.patch \ |
| 35 |
+ "${FILESDIR}"/${PN}-posix-sort.patch |
| 36 |
|
| 37 |
- # bug #248723 |
| 38 |
- epatch "${FILESDIR}"/${P}-strip.patch |
| 39 |
+ find . -name '*.man' -o -name '*.jmn' | xargs sed -i.bak -e 's/1M/8/g' || die |
| 40 |
|
| 41 |
# Multilib-strict fix for amd64 |
| 42 |
sed -i -e "s:\(DefLibCannaDir.*\)/lib:\1/$(get_libdir):g" Canna.conf* || die |
| 43 |
- # fix deprecated sort syntax |
| 44 |
- sed -e 's:^\(sortcmd=\".* -s\).*$:\1 -k 1,1\":' \ |
| 45 |
- -i cmd/mkbindic/mkbindic.cpp || die |
| 46 |
- |
| 47 |
- cd "${S}"/dic/phono |
| 48 |
- epatch "${FILESDIR}"/${PN}-kpdef-gentoo.diff |
| 49 |
- |
| 50 |
} |
| 51 |
|
| 52 |
src_compile() { |
| 53 |
|
| 54 |
diff --git a/app-i18n/canna/canna-3.7_p3-r2.ebuild b/app-i18n/canna/canna-3.7_p3-r2.ebuild |
| 55 |
index a8c2701d3d5..fb7bc151458 100644 |
| 56 |
--- a/app-i18n/canna/canna-3.7_p3-r2.ebuild |
| 57 |
+++ b/app-i18n/canna/canna-3.7_p3-r2.ebuild |
| 58 |
@@ -32,23 +32,14 @@ src_unpack() { |
| 59 |
unpack ${A} |
| 60 |
cd "${S}" |
| 61 |
|
| 62 |
- find . -name '*.man' -o -name '*.jmn' | xargs sed -i.bak -e 's/1M/8/g' || die |
| 63 |
- sed -e "s%@cannapkgver@%${PF}%" \ |
| 64 |
- "${FILESDIR}"/${PN}-3.7-gentoo.diff.in > "${T}"/${PF}-gentoo.diff || die |
| 65 |
- epatch "${T}"/${PF}-gentoo.diff |
| 66 |
+ epatch "${FILESDIR}"/${PN}-gentoo.patch \ |
| 67 |
+ "${FILESDIR}"/${PN}-kpdef.patch \ |
| 68 |
+ "${FILESDIR}"/${PN}-posix-sort.patch |
| 69 |
|
| 70 |
- # bug #248723 |
| 71 |
- epatch "${FILESDIR}"/${P}-strip.patch |
| 72 |
+ find . -name '*.man' -o -name '*.jmn' | xargs sed -i.bak -e 's/1M/8/g' || die |
| 73 |
|
| 74 |
# Multilib-strict fix for amd64 |
| 75 |
sed -i -e "s:\(DefLibCannaDir.*\)/lib:\1/$(get_libdir):g" Canna.conf* || die |
| 76 |
- # fix deprecated sort syntax |
| 77 |
- sed -e 's:^\(sortcmd=\".* -s\).*$:\1 -k 1,1\":' \ |
| 78 |
- -i cmd/mkbindic/mkbindic.cpp || die |
| 79 |
- |
| 80 |
- cd "${S}"/dic/phono |
| 81 |
- epatch "${FILESDIR}"/${PN}-kpdef-gentoo.diff |
| 82 |
- |
| 83 |
} |
| 84 |
|
| 85 |
src_compile() { |
| 86 |
|
| 87 |
diff --git a/app-i18n/canna/files/canna-3.7-gentoo.diff.in b/app-i18n/canna/files/canna-3.7-gentoo.diff.in |
| 88 |
deleted file mode 100644 |
| 89 |
index 940c97f6dca..00000000000 |
| 90 |
--- a/app-i18n/canna/files/canna-3.7-gentoo.diff.in |
| 91 |
+++ /dev/null |
| 92 |
@@ -1,144 +0,0 @@ |
| 93 |
-diff -urN Canna37b1.ORIG/Canna.conf Canna37b1/Canna.conf |
| 94 |
---- Canna37b1.ORIG/Canna.conf 2003-09-27 15:23:08.000000000 +0900 |
| 95 |
-+++ Canna37b1/Canna.conf 2003-09-27 19:09:13.000000000 +0900 |
| 96 |
-@@ -114,7 +114,7 @@ |
| 97 |
- # define DefErrDir /usr/spool/canna |
| 98 |
- # define DefLibCannaDir /usr/lib |
| 99 |
- # else |
| 100 |
--# define DefErrDir /var/log |
| 101 |
-+# define DefErrDir /var/log/canna |
| 102 |
- # define DefLibCannaDir $(cannaExecPrefix)/lib |
| 103 |
- # endif |
| 104 |
- #endif |
| 105 |
-@@ -140,16 +140,18 @@ |
| 106 |
- # define ModernElfLinkAvailable NO |
| 107 |
- #endif |
| 108 |
- |
| 109 |
--cannaPrefix = DefCannaPrefix |
| 110 |
-+cannaPrefix = /usr |
| 111 |
- cannaExecPrefix = $(cannaPrefix) |
| 112 |
- cannaBinDir = $(cannaExecPrefix)/bin |
| 113 |
- cannaSrvDir = DefCannaSrvDir |
| 114 |
- XCOMM cannaLibDir = /var/lib/canna |
| 115 |
- XCOMM cannaLibDir = /var/db/canna |
| 116 |
- cannaLibDir = DefCannaLibDir |
| 117 |
--XCOMM cannaManDir = $(cannaPrefix)/share/man |
| 118 |
--cannaManDir = $(cannaPrefix)/man |
| 119 |
-+cannaManDir = $(cannaPrefix)/share/man |
| 120 |
-+XCOMM cannaManDir = $(cannaPrefix)/man |
| 121 |
- cannaIncDir = $(cannaPrefix)/include/canna |
| 122 |
-+cannaDocDir = $(cannaPrefix)/share/doc/@cannapkgver@ |
| 123 |
-+cannaShareDir = $(cannaPrefix)/share/canna |
| 124 |
- |
| 125 |
- libCannaDir = DefLibCannaDir |
| 126 |
- ErrDir = DefErrDir |
| 127 |
-@@ -158,7 +160,7 @@ |
| 128 |
- #define SupportOldWchar 1 |
| 129 |
- |
| 130 |
- /* IPv6を用いる場合は1と定義してください */ |
| 131 |
--#define UseInet6 0 /* requires newer IPv6 implementation */ |
| 132 |
-+/* #define UseInet6 0 /* requires newer IPv6 implementation */ |
| 133 |
- |
| 134 |
- /* 3.2系から3.6系までの形式の辞書を作る場合はこれを定義してください */ |
| 135 |
- /* #define DIC_3_6_COMPAT */ |
| 136 |
-@@ -237,7 +239,7 @@ |
| 137 |
- /* #define UseInstalledLibCanna YES */ |
| 138 |
- #define UseInstalledLibCanna NO |
| 139 |
- |
| 140 |
--DicDir = $(cannaLibDir)/dic |
| 141 |
-+DicDir = /var/lib/canna/dic |
| 142 |
- |
| 143 |
- /* ここから下は変更不要です */ |
| 144 |
- |
| 145 |
-diff -urN Canna37b1.ORIG/Imakefile Canna37b1/Imakefile |
| 146 |
---- Canna37b1.ORIG/Imakefile 2003-09-25 15:30:20.000000000 +0900 |
| 147 |
-+++ Canna37b1/Imakefile 2003-09-27 19:09:00.000000000 +0900 |
| 148 |
-@@ -55,6 +55,7 @@ |
| 149 |
- @echo "#define CANNAHOSTFILE '$(cannaLibDir)/cannahost'" >> junkjunk |
| 150 |
- @echo "/* for lib/canna */" >> junkjunk |
| 151 |
- @echo "#define CANNALIBDIR '$(cannaLibDir)'" >> junkjunk |
| 152 |
-+ @echo "#define CANNASHAREDIR '$(cannaShareDir)'" >> junkjunk |
| 153 |
- @echo "#define SUPPORT_OLD_WCHAR '$(supportOldWchar)'" >> junkjunk |
| 154 |
- @echo "/* for scripts */" >> junkjunk |
| 155 |
- @echo "#define CANNABINDIR $(cannaBinDir)" >> junkjunk |
| 156 |
-@@ -83,6 +84,7 @@ |
| 157 |
- echo "#define CANNAHOSTFILE \"$(cannaLibDir)/cannahost\"";\ |
| 158 |
- echo "/* for lib/canna */";\ |
| 159 |
- echo "#define CANNALIBDIR \"$(cannaLibDir)\""; \ |
| 160 |
-+ echo "#define CANNASHAREDIR \"$(cannaShareDir)\""; \ |
| 161 |
- echo "#define SUPPORT_OLD_WCHAR $(supportOldWchar)"; \ |
| 162 |
- echo "/* for scripts */";\ |
| 163 |
- echo "#define CANNABINDIR $(cannaBinDir)"; \ |
| 164 |
-diff -urN Canna37b1.ORIG/dic/phono/Imakefile Canna37b1/dic/phono/Imakefile |
| 165 |
---- Canna37b1.ORIG/dic/phono/Imakefile 2002-10-19 17:27:40.000000000 +0900 |
| 166 |
-+++ Canna37b1/dic/phono/Imakefile 2003-09-27 19:09:00.000000000 +0900 |
| 167 |
-@@ -27,9 +27,10 @@ |
| 168 |
- |
| 169 |
- ROMAJI_DIC_DEF = -DSHIFT |
| 170 |
- |
| 171 |
-- DICDIR = $(cannaLibDir)/dic |
| 172 |
-- SAMPLEDIR = $(cannaLibDir)/sample |
| 173 |
-- SAMPLESRCDIR = $(cannaLibDir)/sample/src |
| 174 |
-+ DICDIR = $(DicDir) |
| 175 |
-+ CANNASHAREDIR = $(cannaShareDir) |
| 176 |
-+ SAMPLEDIR = $(cannaDocDir)/sample |
| 177 |
-+ SAMPLESRCDIR = $(cannaDocDir)/sample/src |
| 178 |
- |
| 179 |
- KPDEF = default.kpdef jdaemon.kpdef just.kpdef kaisoku.kpdef kana.kpdef \ |
| 180 |
- lan5.kpdef matsu.kpdef newjis.kpdef romaji.kpdef sokuon.kpdef \ |
| 181 |
-@@ -69,7 +70,7 @@ |
| 182 |
- MakeDirectories(install,$(DICDIR)) |
| 183 |
- MakeDirectories(install,$(SAMPLESRCDIR)) |
| 184 |
- |
| 185 |
--InstallMultiple($(ROMKANA_TABLES),$(DICDIR)) |
| 186 |
-+InstallMultiple($(ROMKANA_TABLES),$(CANNASHAREDIR)) |
| 187 |
- |
| 188 |
- #ifdef USE_OBSOLETE_STYLE_FILENAME |
| 189 |
- InstallNonExec(default.kpdef,$(SAMPLESRCDIR)) |
| 190 |
-diff -urN Canna37b1.ORIG/lib/canna/romaji.c Canna37b1/lib/canna/romaji.c |
| 191 |
---- Canna37b1.ORIG/lib/canna/romaji.c 2003-09-17 17:50:53.000000000 +0900 |
| 192 |
-+++ Canna37b1/lib/canna/romaji.c 2003-09-27 19:09:00.000000000 +0900 |
| 193 |
-@@ -427,7 +427,7 @@ |
| 194 |
- } |
| 195 |
- } |
| 196 |
- |
| 197 |
--#if 0 /* currently CANNASHAREDDIR is not defined */ |
| 198 |
-+#if 1 /* currently CANNASHAREDDIR is defined */ |
| 199 |
- if (retval == (struct RkRxDic *)NULL) { /* added for Debian by ISHIKAWA Mutsumi <ishikawa@××××××××.jp> */ |
| 200 |
- extern jrUserInfoStruct *uinfo; |
| 201 |
- |
| 202 |
-diff -urN Canna37b1.ORIG/misc/Imakefile Canna37b1/misc/Imakefile |
| 203 |
---- Canna37b1.ORIG/misc/Imakefile 2003-03-05 04:23:53.000000000 +0900 |
| 204 |
-+++ Canna37b1/misc/Imakefile 2003-09-27 19:09:00.000000000 +0900 |
| 205 |
-@@ -48,7 +48,7 @@ |
| 206 |
- MakeLintLibSubdirs($(SUBDIRS)) |
| 207 |
- MakeLintSubdirs($(SUBDIRS),install.ln,install.ln) |
| 208 |
- |
| 209 |
--MakeDirectories(install,$(cannaLibDir)/sample/src) |
| 210 |
-+MakeDirectories(install,$(cannaDocDir)/sample/src) |
| 211 |
- |
| 212 |
- #ifdef USE_OBSOLETE_STYLE_FILENAME |
| 213 |
- default.canna: default.ca |
| 214 |
-@@ -58,8 +58,8 @@ |
| 215 |
- $(CP) default.ca default.canna |
| 216 |
- #endif |
| 217 |
- |
| 218 |
--InstallNonExec(default.canna,$(cannaLibDir)) |
| 219 |
--InstallNonExec(is.c,$(cannaLibDir)/sample/src) |
| 220 |
-+InstallNonExec(default.canna,$(cannaDocDir)) |
| 221 |
-+InstallNonExec(is.c,$(cannaDocDir)/sample/src) |
| 222 |
- |
| 223 |
- clean:: |
| 224 |
- $(RM) $(PROGRAMS) |
| 225 |
-diff -urN Canna37b1.ORIG/misc/initfiles/Imakefile Canna37b1/misc/initfiles/Imakefile |
| 226 |
---- Canna37b1.ORIG/misc/initfiles/Imakefile 2003-02-04 05:13:01.000000000 +0900 |
| 227 |
-+++ Canna37b1/misc/initfiles/Imakefile 2003-09-27 19:09:00.000000000 +0900 |
| 228 |
-@@ -6,7 +6,7 @@ |
| 229 |
- #endif |
| 230 |
- |
| 231 |
- CANNAROOT = ../.. |
| 232 |
-- SAMPLEDIR = $(cannaLibDir)/sample |
| 233 |
-+ SAMPLEDIR = $(cannaShareDir) |
| 234 |
- |
| 235 |
- all:: |
| 236 |
- |
| 237 |
|
| 238 |
diff --git a/app-i18n/canna/files/canna-3.7_p3-strip.patch b/app-i18n/canna/files/canna-3.7_p3-strip.patch |
| 239 |
deleted file mode 100644 |
| 240 |
index ebcde1ef733..00000000000 |
| 241 |
--- a/app-i18n/canna/files/canna-3.7_p3-strip.patch |
| 242 |
+++ /dev/null |
| 243 |
@@ -1,142 +0,0 @@ |
| 244 |
-diff -Naur Canna37p3.orig/config.log Canna37p3/config.log |
| 245 |
---- Canna37p3.orig/config.log 1970-01-01 09:00:00.000000000 +0900 |
| 246 |
-+++ Canna37p3/config.log 2009-09-21 10:25:33.000000000 +0900 |
| 247 |
-@@ -0,0 +1,126 @@ |
| 248 |
-+This file contains any messages produced by compilers while |
| 249 |
-+running configure, to aid debugging if configure makes a mistake. |
| 250 |
-+ |
| 251 |
-+It was created by canna configure 3.7p3, which was |
| 252 |
-+generated by GNU Autoconf 2.59. Invocation command line was |
| 253 |
-+ |
| 254 |
-+ $ ./configure |
| 255 |
-+ |
| 256 |
-+## --------- ## |
| 257 |
-+## Platform. ## |
| 258 |
-+## --------- ## |
| 259 |
-+ |
| 260 |
-+hostname = lets |
| 261 |
-+uname -m = x86_64 |
| 262 |
-+uname -r = 2.6.31-gentoo |
| 263 |
-+uname -s = Linux |
| 264 |
-+uname -v = #1 SMP PREEMPT Fri Sep 11 17:39:06 JST 2009 |
| 265 |
-+ |
| 266 |
-+/usr/bin/uname -p = Intel(R) Core(TM)2 Duo CPU L7300 @ 1.40GHz |
| 267 |
-+/bin/uname -X = unknown |
| 268 |
-+ |
| 269 |
-+/bin/arch = unknown |
| 270 |
-+/usr/bin/arch -k = unknown |
| 271 |
-+/usr/convex/getsysinfo = unknown |
| 272 |
-+hostinfo = unknown |
| 273 |
-+/bin/machine = unknown |
| 274 |
-+/usr/bin/oslevel = unknown |
| 275 |
-+/bin/universe = unknown |
| 276 |
-+ |
| 277 |
-+PATH: /usr/local/bin |
| 278 |
-+PATH: /usr/bin |
| 279 |
-+PATH: /bin |
| 280 |
-+PATH: /opt/bin |
| 281 |
-+PATH: /usr/x86_64-pc-linux-gnu/i686-pc-linux-gnu/gcc-bin/4.3.3 |
| 282 |
-+PATH: /usr/x86_64-pc-linux-gnu/gcc-bin/4.4.1 |
| 283 |
-+PATH: /usr/kde/3.5/bin |
| 284 |
-+PATH: /usr/qt/3/bin |
| 285 |
-+PATH: /opt/android-sdk-1.5/tools |
| 286 |
-+PATH: /opt/android-sdk-1.5/platforms/android-1.5/tools |
| 287 |
-+PATH: /usr/games/bin |
| 288 |
-+ |
| 289 |
-+ |
| 290 |
-+## ----------- ## |
| 291 |
-+## Core tests. ## |
| 292 |
-+## ----------- ## |
| 293 |
-+ |
| 294 |
-+configure:1307: error: You cannot invloke configure directly. |
| 295 |
-+ |
| 296 |
-+## ---------------- ## |
| 297 |
-+## Cache variables. ## |
| 298 |
-+## ---------------- ## |
| 299 |
-+ |
| 300 |
-+ac_cv_env_CC_set= |
| 301 |
-+ac_cv_env_CC_value= |
| 302 |
-+ac_cv_env_CFLAGS_set= |
| 303 |
-+ac_cv_env_CFLAGS_value= |
| 304 |
-+ac_cv_env_CPPFLAGS_set= |
| 305 |
-+ac_cv_env_CPPFLAGS_value= |
| 306 |
-+ac_cv_env_CPP_set= |
| 307 |
-+ac_cv_env_CPP_value= |
| 308 |
-+ac_cv_env_LDFLAGS_set= |
| 309 |
-+ac_cv_env_LDFLAGS_value= |
| 310 |
-+ac_cv_env_build_alias_set= |
| 311 |
-+ac_cv_env_build_alias_value= |
| 312 |
-+ac_cv_env_host_alias_set= |
| 313 |
-+ac_cv_env_host_alias_value= |
| 314 |
-+ac_cv_env_target_alias_set= |
| 315 |
-+ac_cv_env_target_alias_value= |
| 316 |
-+ |
| 317 |
-+## ----------------- ## |
| 318 |
-+## Output variables. ## |
| 319 |
-+## ----------------- ## |
| 320 |
-+ |
| 321 |
-+CC='' |
| 322 |
-+CFLAGS='' |
| 323 |
-+CPP='' |
| 324 |
-+CPPFLAGS='' |
| 325 |
-+DEFS='' |
| 326 |
-+ECHO_C='' |
| 327 |
-+ECHO_N='-n' |
| 328 |
-+ECHO_T='' |
| 329 |
-+EGREP='' |
| 330 |
-+EXEEXT='' |
| 331 |
-+LDFLAGS='' |
| 332 |
-+LIBOBJS='' |
| 333 |
-+LIBS='' |
| 334 |
-+LTLIBOBJS='' |
| 335 |
-+OBJEXT='' |
| 336 |
-+PACKAGE_BUGREPORT='canna-dev@×××××××××××××××××.jp' |
| 337 |
-+PACKAGE_NAME='canna' |
| 338 |
-+PACKAGE_STRING='canna 3.7p3' |
| 339 |
-+PACKAGE_TARNAME='canna' |
| 340 |
-+PACKAGE_VERSION='3.7p3' |
| 341 |
-+PATH_SEPARATOR=':' |
| 342 |
-+SHELL='/bin/sh' |
| 343 |
-+ac_ct_CC='' |
| 344 |
-+bindir='${exec_prefix}/bin' |
| 345 |
-+build_alias='' |
| 346 |
-+datadir='${prefix}/share' |
| 347 |
-+exec_prefix='NONE' |
| 348 |
-+host_alias='' |
| 349 |
-+includedir='${prefix}/include' |
| 350 |
-+infodir='${prefix}/info' |
| 351 |
-+libdir='${exec_prefix}/lib' |
| 352 |
-+libexecdir='${exec_prefix}/libexec' |
| 353 |
-+localstatedir='${prefix}/var' |
| 354 |
-+mandir='${prefix}/man' |
| 355 |
-+oldincludedir='/usr/include' |
| 356 |
-+prefix='NONE' |
| 357 |
-+program_transform_name='s,x,x,' |
| 358 |
-+sbindir='${exec_prefix}/sbin' |
| 359 |
-+sharedstatedir='${prefix}/com' |
| 360 |
-+sysconfdir='${prefix}/etc' |
| 361 |
-+target_alias='' |
| 362 |
-+ |
| 363 |
-+## ----------- ## |
| 364 |
-+## confdefs.h. ## |
| 365 |
-+## ----------- ## |
| 366 |
-+ |
| 367 |
-+#define PACKAGE_BUGREPORT "canna-dev@×××××××××××××××××.jp" |
| 368 |
-+#define PACKAGE_NAME "canna" |
| 369 |
-+#define PACKAGE_STRING "canna 3.7p3" |
| 370 |
-+#define PACKAGE_TARNAME "canna" |
| 371 |
-+#define PACKAGE_VERSION "3.7p3" |
| 372 |
-+ |
| 373 |
-+configure: exit 1 |
| 374 |
-diff -Naur Canna37p3.orig/server/Imakefile Canna37p3/server/Imakefile |
| 375 |
---- Canna37p3.orig/server/Imakefile 2004-04-27 06:48:37.000000000 +0900 |
| 376 |
-+++ Canna37p3/server/Imakefile 2009-09-21 10:28:48.000000000 +0900 |
| 377 |
-@@ -6,7 +6,7 @@ |
| 378 |
- #ifdef __EMX__ |
| 379 |
- INSTFLAGS = $(INSTUGIDFLAGS) |
| 380 |
- #else |
| 381 |
-- INSTFLAGS = -s $(INSTUGIDFLAGS) |
| 382 |
-+ INSTFLAGS = $(INSTUGIDFLAGS) |
| 383 |
- #endif |
| 384 |
- DEFINES = $(CANNASERVER_DEFINES) $(SIGNAL_DEFINES) ConnectionFlags |
| 385 |
- INCLUDES = -I$(CANNAROOT)/include |
| 386 |
|
| 387 |
diff --git a/app-i18n/canna/files/canna-gentoo.patch b/app-i18n/canna/files/canna-gentoo.patch |
| 388 |
new file mode 100644 |
| 389 |
index 00000000000..7ecfb4b9cd8 |
| 390 |
--- /dev/null |
| 391 |
+++ b/app-i18n/canna/files/canna-gentoo.patch |
| 392 |
@@ -0,0 +1,146 @@ |
| 393 |
+--- a/Canna.conf |
| 394 |
++++ b/Canna.conf |
| 395 |
+@@ -109,12 +109,12 @@ |
| 396 |
+ # define DefErrDir $(cannaPrefix)/log |
| 397 |
+ # define DefLibCannaDir $(cannaExecPrefix)/lib |
| 398 |
+ #else |
| 399 |
+-# define DefCannaPrefix /usr/local/canna |
| 400 |
++# define DefCannaPrefix $(EPREFIX)/usr |
| 401 |
+ # ifdef ObsoleteInstallDir |
| 402 |
+ # define DefErrDir /usr/spool/canna |
| 403 |
+ # define DefLibCannaDir /usr/lib |
| 404 |
+ # else |
| 405 |
+-# define DefErrDir /var/log |
| 406 |
++# define DefErrDir $(EPREFIX)/var/log/$(PN) |
| 407 |
+ # define DefLibCannaDir $(cannaExecPrefix)/lib |
| 408 |
+ # endif |
| 409 |
+ #endif |
| 410 |
+@@ -123,7 +123,7 @@ |
| 411 |
+ # define DefCannaLibDir $(cannaPrefix)/lib |
| 412 |
+ #else |
| 413 |
+ # define DefCannaSrvDir $(cannaExecPrefix)/sbin |
| 414 |
+-# define DefCannaLibDir $(cannaPrefix)/share/canna |
| 415 |
++# define DefCannaLibDir $(cannaPrefix)/share/$(PN) |
| 416 |
+ #endif |
| 417 |
+ |
| 418 |
+ #if defined(LinuxArchitecture) || defined(FreeBSDArchitecture) \ |
| 419 |
+@@ -147,9 +147,11 @@ |
| 420 |
+ XCOMM cannaLibDir = /var/lib/canna |
| 421 |
+ XCOMM cannaLibDir = /var/db/canna |
| 422 |
+ cannaLibDir = DefCannaLibDir |
| 423 |
+-XCOMM cannaManDir = $(cannaPrefix)/share/man |
| 424 |
+-cannaManDir = $(cannaPrefix)/man |
| 425 |
+-cannaIncDir = $(cannaPrefix)/include/canna |
| 426 |
++cannaManDir = $(cannaPrefix)/share/man |
| 427 |
++XCOMM cannaManDir = $(cannaPrefix)/man |
| 428 |
++cannaIncDir = $(cannaPrefix)/include/$(PN) |
| 429 |
++cannaShareDir = $(cannaPrefix)/share/$(PN) |
| 430 |
++cannaDocDir = $(cannaPrefix)/share/doc/$(PF) |
| 431 |
+ |
| 432 |
+ libCannaDir = DefLibCannaDir |
| 433 |
+ ErrDir = DefErrDir |
| 434 |
+@@ -237,7 +239,7 @@ |
| 435 |
+ /* #define UseInstalledLibCanna YES */ |
| 436 |
+ #define UseInstalledLibCanna NO |
| 437 |
+ |
| 438 |
+-DicDir = $(cannaLibDir)/dic |
| 439 |
++DicDir = $(EPREFIX)/var/lib/$(PN)/dic |
| 440 |
+ |
| 441 |
+ /* ここから下は変更不要です */ |
| 442 |
+ |
| 443 |
+--- a/Imakefile |
| 444 |
++++ b/Imakefile |
| 445 |
+@@ -87,6 +87,7 @@ |
| 446 |
+ echo "#define CANNAHOSTFILE \"$(cannaLibDir)/cannahost\"";\ |
| 447 |
+ echo "/* for lib/canna */";\ |
| 448 |
+ echo "#define CANNALIBDIR \"$(cannaLibDir)\""; \ |
| 449 |
++ echo "#define CANNASHAREDIR \"$(cannaShareDir)\""; \ |
| 450 |
+ echo "#define SUPPORT_OLD_WCHAR $(supportOldWchar)"; \ |
| 451 |
+ echo "/* for scripts */";\ |
| 452 |
+ echo "#define CANNABINDIR $(cannaBinDir)"; \ |
| 453 |
+--- a/dic/phono/Imakefile |
| 454 |
++++ b/dic/phono/Imakefile |
| 455 |
+@@ -27,9 +27,10 @@ |
| 456 |
+ |
| 457 |
+ ROMAJI_DIC_DEF = -DSHIFT |
| 458 |
+ |
| 459 |
+- DICDIR = $(cannaLibDir)/dic |
| 460 |
+- SAMPLEDIR = $(cannaLibDir)/sample |
| 461 |
+- SAMPLESRCDIR = $(cannaLibDir)/sample/src |
| 462 |
++ DICDIR = $(DicDir) |
| 463 |
++ CANNASHAREDIR = $(cannaShareDir) |
| 464 |
++ SAMPLEDIR = $(cannaDocDir)/sample |
| 465 |
++ SAMPLESRCDIR = $(cannaDocDir)/sample/src |
| 466 |
+ |
| 467 |
+ KPDEF = default.kpdef jdaemon.kpdef just.kpdef kaisoku.kpdef kana.kpdef \ |
| 468 |
+ lan5.kpdef matsu.kpdef newjis.kpdef romaji.kpdef sokuon.kpdef \ |
| 469 |
+@@ -69,7 +70,7 @@ |
| 470 |
+ MakeDirectories(install,$(DICDIR)) |
| 471 |
+ MakeDirectories(install,$(SAMPLESRCDIR)) |
| 472 |
+ |
| 473 |
+-InstallMultiple($(ROMKANA_TABLES),$(DICDIR)) |
| 474 |
++InstallMultiple($(ROMKANA_TABLES),$(CANNASHAREDIR)) |
| 475 |
+ |
| 476 |
+ #ifdef USE_OBSOLETE_STYLE_FILENAME |
| 477 |
+ InstallNonExec(default.kpdef,$(SAMPLESRCDIR)) |
| 478 |
+--- a/lib/canna/romaji.c |
| 479 |
++++ b/lib/canna/romaji.c |
| 480 |
+@@ -427,7 +427,6 @@ |
| 481 |
+ } |
| 482 |
+ } |
| 483 |
+ |
| 484 |
+-#if 0 /* currently CANNASHAREDDIR is not defined */ |
| 485 |
+ if (retval == (struct RkRxDic *)NULL) { /* added for Debian by ISHIKAWA Mutsumi <ishikawa@××××××××.jp> */ |
| 486 |
+ extern jrUserInfoStruct *uinfo; |
| 487 |
+ |
| 488 |
+@@ -450,7 +449,6 @@ |
| 489 |
+ } |
| 490 |
+ } |
| 491 |
+ } |
| 492 |
+-#endif |
| 493 |
+ |
| 494 |
+ if (retval == (struct RkRxDic *)NULL) { /* 全部オープンできない */ |
| 495 |
+ sprintf(rdic, |
| 496 |
+--- a/misc/Imakefile |
| 497 |
++++ b/misc/Imakefile |
| 498 |
+@@ -48,7 +48,7 @@ |
| 499 |
+ MakeLintLibSubdirs($(SUBDIRS)) |
| 500 |
+ MakeLintSubdirs($(SUBDIRS),install.ln,install.ln) |
| 501 |
+ |
| 502 |
+-MakeDirectories(install,$(cannaLibDir)/sample/src) |
| 503 |
++MakeDirectories(install,$(cannaDocDir)/sample/src) |
| 504 |
+ |
| 505 |
+ #ifdef USE_OBSOLETE_STYLE_FILENAME |
| 506 |
+ default.canna: default.ca |
| 507 |
+@@ -58,8 +58,8 @@ |
| 508 |
+ $(CP) default.ca default.canna |
| 509 |
+ #endif |
| 510 |
+ |
| 511 |
+ InstallNonExec(default.canna,$(cannaLibDir)) |
| 512 |
+-InstallNonExec(is.c,$(cannaLibDir)/sample/src) |
| 513 |
++InstallNonExec(is.c,$(cannaDocDir)/sample/src) |
| 514 |
+ |
| 515 |
+ clean:: |
| 516 |
+ $(RM) $(PROGRAMS) |
| 517 |
+--- a/misc/initfiles/Imakefile |
| 518 |
++++ b/misc/initfiles/Imakefile |
| 519 |
+@@ -6,7 +6,7 @@ |
| 520 |
+ #endif |
| 521 |
+ |
| 522 |
+ CANNAROOT = ../.. |
| 523 |
+- SAMPLEDIR = $(cannaLibDir)/sample |
| 524 |
++ SAMPLEDIR = $(cannaDocDir)/sample |
| 525 |
+ |
| 526 |
+ all:: |
| 527 |
+ |
| 528 |
+--- a/server/Imakefile |
| 529 |
++++ b/server/Imakefile |
| 530 |
+@@ -6,7 +6,7 @@ |
| 531 |
+ #ifdef __EMX__ |
| 532 |
+ INSTFLAGS = $(INSTUGIDFLAGS) |
| 533 |
+ #else |
| 534 |
+- INSTFLAGS = -s $(INSTUGIDFLAGS) |
| 535 |
++ INSTFLAGS = $(INSTUGIDFLAGS) |
| 536 |
+ #endif |
| 537 |
+ DEFINES = $(CANNASERVER_DEFINES) $(SIGNAL_DEFINES) ConnectionFlags |
| 538 |
+ INCLUDES = -I$(CANNAROOT)/include |
| 539 |
|
| 540 |
diff --git a/app-i18n/canna/files/canna-kpdef-gentoo.diff b/app-i18n/canna/files/canna-kpdef.patch |
| 541 |
similarity index 55% |
| 542 |
rename from app-i18n/canna/files/canna-kpdef-gentoo.diff |
| 543 |
rename to app-i18n/canna/files/canna-kpdef.patch |
| 544 |
index f458c53efdd..b0b71b4442c 100644 |
| 545 |
--- a/app-i18n/canna/files/canna-kpdef-gentoo.diff |
| 546 |
+++ b/app-i18n/canna/files/canna-kpdef.patch |
| 547 |
@@ -1,5 +1,5 @@ |
| 548 |
---- default.kpdef.orig 2002-10-19 17:27:40.000000000 +0900 |
| 549 |
-+++ default.kpdef 2003-12-13 00:54:51.000000000 +0900 |
| 550 |
+--- a/dic/phono/default.kpdef |
| 551 |
++++ b/dic/phono/default.kpdef |
| 552 |
@@ -350,3 +350,15 @@ |
| 553 |
_ ＿ |
| 554 |
/ ／ |
| 555 |
|
| 556 |
diff --git a/app-i18n/canna/files/canna-posix-sort.patch b/app-i18n/canna/files/canna-posix-sort.patch |
| 557 |
new file mode 100644 |
| 558 |
index 00000000000..1f98aaf5efd |
| 559 |
--- /dev/null |
| 560 |
+++ b/app-i18n/canna/files/canna-posix-sort.patch |
| 561 |
@@ -0,0 +1,11 @@ |
| 562 |
+--- a/cmd/mkbindic/mkbindic.cpp |
| 563 |
++++ b/cmd/mkbindic/mkbindic.cpp |
| 564 |
+@@ -40,7 +40,7 @@ |
| 565 |
+ bck_text=; |
| 566 |
+ flag=; |
| 567 |
+ compat_flag=; |
| 568 |
+-sortcmd="sort -d -s +0 -1" |
| 569 |
++sortcmd="sort -d -s -k 1,1" |
| 570 |
+ usage="usage: mkbindic [-m|-s] [-name dicname] [-c version] textfile [cpp-args ...]"; |
| 571 |
+ : ${TMPDIR:=/tmp} |
| 572 |
+ |
Archives