remove old ebuilds and unused files wrt bug #342541

Package-Manager: portage-2.1.11.50/cvs/Linux i686
Manifest-Sign-Key: 0xEC917A6D

11 files changed, 21 insertions, 1057 deletions

diff --git a/app-i18n/freewnn/ChangeLog b/app-i18n/freewnn/ChangeLog
index 55b1cd042444..18c4aed936a5 100644
--- a/app-i18n/freewnn/ChangeLog
+++ b/app-i18n/freewnn/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-i18n/freewnn
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/freewnn/ChangeLog,v 1.45 2011/11/07 08:49:51 naota Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/freewnn/ChangeLog,v 1.46 2013/02/27 13:02:05 hattya Exp $
+
+  27 Feb 2013; Akinori Hattori <hattya@gentoo.org>
+  -files/a017/FreeWnn-1.1.1-a017.dif, -files/a017/FreeWnn-lib64.patch,
+  -files/a017/FreeWnn-s390x.patch, -files/a017/FreeWnn-sighandler.patch,
+  -files/a017/FreeWnn-uum.patch, -files/freewnn-1.1.1_alpha20-gentoo.diff,
+  -freewnn-1.1.1_alpha20-r1.ebuild, -freewnn-1.1.1_alpha20.ebuild,
+  -freewnn-1.1.1_alpha21.ebuild:
+  remove old ebuilds and unused files wrt bug #342541
 
   22 Oct 2011; Naohiro Aota <naota@gentoo.org> freewnn-1.1.1_alpha21-r1.ebuild,
   +files/freewnn-1.1.1_alpha21-ldflags.patch:
diff --git a/app-i18n/freewnn/Manifest b/app-i18n/freewnn/Manifest
index 8bae71523455..9dde7916df0e 100644
--- a/app-i18n/freewnn/Manifest
+++ b/app-i18n/freewnn/Manifest
@@ -1,18 +1,18 @@
-AUX a017/FreeWnn-1.1.1-a017.dif 19564 SHA256 a6080cfa7ac2e92be9f099e02ec371f662c5ddb553047bb6757fb93ba12c5217 SHA512 e890fce64019cbfabc2a12ad171d5c120d706fcbf674641d9ca116243cc043963becfd7c1965b8c19ad9cf2812795564e67b05736d7f4fc06d7513775491382a WHIRLPOOL ec4abf65b48d6158da9ffde6038da47b3b83ad1c25232873f3d2b2daa88702e1e08155a84c438b6e2cc647f9d433bf8f3d37c39091ad3f8a171baccbc295cffa
-AUX a017/FreeWnn-lib64.patch 479 SHA256 a05992739cc05d00af0c5001d00e72acbad8ac25eda655b7f0505c154c426035 SHA512 5a4bf5e53af2bfa983997cf0113a8aac23ed35631272255a90506b4e10ea98a2ee65fdcd877c5f60516935c2e58bcbb2939c4a367d73f0c9c4e95551a460df30 WHIRLPOOL 7f1cd2e1294aa3e370098ff56652de7e656927e00e693d404512666cf93136ae000ad51dd345ff66bfa7c4a5dd42dfdbfca90e05311f62fc2b3122f130df932f
-AUX a017/FreeWnn-s390x.patch 7099 SHA256 c6f422c81821e57f35f99960e1f2107f77674979efde6e31bf777b98dac54a74 SHA512 12c4c01cb2a3e50dbc0dd56d3f732c121dbd0cfdc3d01d99bf4f39d93046cc1ee76957d6ad32de8626f53f7b008ac3d6efdb65c03d16a1ca5b9599b69bf26050 WHIRLPOOL 916025b435bffb9b89c04e6ca67d885b7a33d77b684dc14c06344ca94384538f24a6a4ff01c98e0dce53bec927711e4f791f1ffdaac21855c0f242e8a11a56ab
-AUX a017/FreeWnn-sighandler.patch 876 SHA256 955bb0b65a6e79f4a21c24fa312402745a56eb067d9fa1cc2879d14f967e6f6c SHA512 dedf90ae393ee98f571310dd35ec02be4e395e61ba0068dde739cfe02dba773de0db586f253f8e0ff7e3292c74f39b189a03765237c70d9a58bff3f514a4495e WHIRLPOOL f1e96ab3a77218308b2f6404703129d23d17c671447ff1c36e9e609797ae64a77c67721da597ca009691b02475e3aa75145311671516bc7016d55a8c86d6e2d4
-AUX a017/FreeWnn-uum.patch 1983 SHA256 8d44ffa69f2fca2e04ecf1a8bd510a519d645be67fd9809f7e8e3b432fc613cd SHA512 78b470b6e075898c9dbbd1a790310c21e3ae7ae80d95af17b69d983c95a7be3e8ff5212846e56e9ef45aa602c48708336fc28971bd657af1a075d15e958aa8ac WHIRLPOOL 6871f4c5b8f16a6266206357766a6e66346b02ad302ea5a01fd0d2f0f25f05669df68c906976b522bc6494f3fb336d92cc824d4aea38ea0df77120ebfea821ba
-AUX freewnn-1.1.1_alpha20-gentoo.diff 1044 SHA256 0dd0b950758158c226f482ffe7fd83fc1f942f89364ccf84e9e9bb3604d68cda SHA512 b3432603f9971d86a664181e7e9da9aee4483df98ab1ea6ec6762be2af07214abdd928cd753e2bef5ce37d5b716139681d2b9b32e504403eb51814fbbd2bb3d7 WHIRLPOOL f4d3a716e1080715838cfa6565191138808d202b8139564bed6dd672f9129ddfd80e304f394a939c01248a2c231684de45125051c576c07d14dfa2ec3ad3f60a
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX freewnn-1.1.1_alpha21-as-needed.patch 487 SHA256 02d4fb7bdc4b6764b20e15711bbbf3261ed9df0212f6b97aba80b7ae895a013c SHA512 6143cbaf4455b312adb7b17f5d959f25061f7b46d71c7722c62ed8c2f2b60ea0e0b7465d10873e5fd783ef2a02cb2c8467ded7a55a2255576acce89e90d11eb4 WHIRLPOOL 015f1f1701d29cce30b6ba89a43e7a64a526e6e34f432ec884ca7a6127c517b134bad26efb3f6bc561d693da307984609d6519dc275575bf4ec616a8e2112a45
 AUX freewnn-1.1.1_alpha21-gcc45.patch 521 SHA256 96ee7df36e9824c873518ac9b5758c7b491d95322191f76013bfac3f87aab995 SHA512 e54126963077398fe897156c5474cc7f3be7f733c4f6f69b9697198f007f95a421c8509a5e7b8c476df1983a8334c03d121041795c99d239faee57a8af2e0f67 WHIRLPOOL e7b802e52065bc3ea3858b646efa3c50ad32a80c63737e637fdd457487e80f4ab74cfce44294b13bf0f88a26704f6bc3f8c9afbe87a537b4928d537d50ba07d5
 AUX freewnn-1.1.1_alpha21-ldflags.patch 1376 SHA256 3aa5f3a92ecbbd7596f74375585624439cc59b1fed847c08886f365e0d68affb SHA512 4b4995e405061a93a4b5bd1c0bd98a99fee7c44f8523a4bfc6fada59c686a82a6be8b89a30cb4805867ecaf9d56d9ac4cf657b94246aad2af11136f1a16d0721 WHIRLPOOL c58351afa981c0db29a25fb5c14bcbed487bb5a10ab7ec1c636cdff3ae7a2506133509627321207e3e785b89c70d131984988246f222bd350a2ff13dca2ff699
 AUX freewnn.initd 296 SHA256 595c0dc6c5218d0227c1696934ff38774fe294337d95da470935c411d299d350 SHA512 5aed6abe3f7a4213bf8ad7f87805300000dfcef85788813d539a9dc3366176ec972686fcee050f7de4531ee8c1f4d0daa69bd5a4a2bd60059cf047630b3d4cc9 WHIRLPOOL 90766958f865c10d37cbdfa03c5cd1c286636b71197fdf8a7723f64c302535d6e1040550f58ac438c985f33693d25c1e17808dc7cd8387895b694e0a2ef53cac
-DIST FreeWnn-1.1.1-a020.tar.bz2 3015928 SHA256 6c63933d5bc0edaf59df3ef528f03ab8f362471a60289c1955aa8078babd73bc SHA512 bd8cc241a3a482164f52cbc9820c2a9a7a8fcb26a1901e45b7e5972f0a5fac79b150c10ee533cfd8910598e0cfa770fc702eb5f05557ba5d59e458bf0f2c5bde WHIRLPOOL e912f7e9a243818241d1ed5441e630588099d77b7d1a78a27d75dc03c05d8cf4f61b57e203cf704637ff41e673dbcd30242c60d046b4bbda3aafc747c17d1779
 DIST FreeWnn-1.1.1-a021.tar.bz2 3108905 SHA256 df9523b2eea7cbc94d9d01c19a01394abe3b648c5ec3f1259adac06fc8ecbb86 SHA512 27a61949d4f9e969d09b7c698c07db0be8140e346dad4e84be72d54f9c087e317e7854ae02e2ebbd530b6b86b4a55c8d209a7dd27de1ed908731487aece5d7a8 WHIRLPOOL 3e34357a3925fdbedd1c71138053196799de9a7b0d5e3c1e23501a52cafac5eda52b6f33b5c75f7ed7e09174dfc36a63b25e3d7d620114b157e6dd82530f6013
-EBUILD freewnn-1.1.1_alpha20-r1.ebuild 1354 SHA256 84bdabb0fc9cdb2db2e4f785827f0df6a4e9273709dcf9e134be5dd77e2ef761 SHA512 0d1281499606179fa42c3665f037098e25c69115561ac6c46698f8922d68fe77ab795257c5af8f4ae396183c902363f35185a596ba56e87808be5f450bf553aa WHIRLPOOL 139e0738548bcbddb58957d7b323401d908a98ca72a350f050307f1f8a3d21d78cb4d423d803291406d818160240006ab943fd246695b8012390fb17ef6b423c
-EBUILD freewnn-1.1.1_alpha20.ebuild 1350 SHA256 5a9de9bfbf0e4abcfa1ee8c92b104f8dc6c1b84ddcd7521bce0abe6ed2f87d2a SHA512 ee8b51e3247fa4131e53ebc3430aba7e05a8db0695089d6d5bc7fbfeb88bd5bec96692976ae18ddf4afaeabc5ad3649c541cd3617d2d546f999e91ed8a8d6fdc WHIRLPOOL 49f5b7183fe79c8ecd0735f3d076db84a69f31cb6a89a6ebd7a2d9b7cd6f480af570fc40e894168564a9b0ccd487495d413ca143925d338109553ccd2839d00c
 EBUILD freewnn-1.1.1_alpha21-r1.ebuild 1502 SHA256 86ce7d4fc430a6a67fe53b1b23c745e7700490d37ce5b2c81bd4b8f6e256fc12 SHA512 3593390ec900ac46b793bd237e54de8b4bc10f671f1d7bee0d2cf5511c3c896490a9878c071d7d7bd3d1e3bd636a9701e5c24ff20b723e4ed16561260d86ae35 WHIRLPOOL 3eff6f119c8dd7090d3c1384bb51c19ca6f6beb6ea7d58c567d2c126c3f3b9116ba694d19e2db8b4210a7614877baba90ede2f940cc004feca7ecc5bff82405e
-EBUILD freewnn-1.1.1_alpha21.ebuild 1344 SHA256 5f61041092f7e0ae6fb55a8fdd9c0613309395e522723a5c4d4d7353f105c3b1 SHA512 60d225fd184d572e1f3bbc5e7f56d127231ed91a000b9419e0f5bab323a0507c93250491429dc64b3ff47436e150c623c6fe807c584698767289d3b775bba4bd WHIRLPOOL 99e48cfdb8b4ca2581d286265894c6d42924064ec4129b81c50271a2e29ea71fc2ed911007f4db0ffb24be89e6301fff91d2b14e5ee8033c707755c18624085b
-MISC ChangeLog 6451 SHA256 f699e08285d8b51f678f71d37068e84f3d56313dff515182e763803fe4e70213 SHA512 8ab50bae2dacf053032a1614e5b15801e52d2dc0f6feffcc85cd24f4134a6b1bd4934e9463bed98ef79d4c9273be34441c2336bf776209ab6d91f40bb3431cfb WHIRLPOOL a24c6bfd0390ab6b5ff7da4824241a051da0f78b22712e9cc2f185d6dde1ea94aa10e7316296ae6c794912a5679387629ba53272cf6f8f2029d9ed9227f6f6e1
+MISC ChangeLog 6877 SHA256 2b528c1025b05633a7d209b7f189b76b835fb62baa1d2c139f05f9451103f17d SHA512 479a64c89dc1c933e5f04da622e6f7c3516fd3e02035e595c8ca13a3f97f59be1537df404900e9a5108595ba9004b102e0a59d7931fca72f06eccbe6d99630b2 WHIRLPOOL 953d15a977bee18b31bdf86f6c9b2523b43add40527e00746a2de8dfa9d7659b2a7512b76c85ed5df5890124c69caf20b30254a18cfca1a07c81c0b11b7b0c75
 MISC metadata.xml 156 SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215 SHA512 e46682afa9f674a8685beb29de6485f750484180d86f8980a3c5c220861f38495ac6f4ceda7cf21c317c640d0d218af3ea9bc1a406b207124c1ffb4bcc99628b WHIRLPOOL 347b826ae650374a01eb144ef127dea2fb96c8646b9a1e4b142bce523822988c4597bc2980cc29dcbfeabc1e44ba70136ddea73f1837d4c6ef7d5e3e9d1d1268
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlEuA88ACgkQL46suuyRem1ytQCfWV3L4vYH7ee/qsiHGOPRtvAr
+NEIAnRVcgEYhH1e5jHyM6Ttpe6Ohx7io
+=msjd
+-----END PGP SIGNATURE-----
diff --git a/app-i18n/freewnn/files/a017/FreeWnn-1.1.1-a017.dif b/app-i18n/freewnn/files/a017/FreeWnn-1.1.1-a017.dif
deleted file mode 100644
index 310d002f4183..000000000000
--- a/app-i18n/freewnn/files/a017/FreeWnn-1.1.1-a017.dif
+++ /dev/null
@@ -1,547 +0,0 @@
---- Xsi/PubdicPlus/pod.c
-+++ Xsi/PubdicPlus/pod.c	2001/09/04 16:59:45
-@@ -26,13 +26,15 @@
- 
- #include <stdio.h>
- 
--#define bzero(a, c) memset(a, 0, c)
--
- #if __STDC__
- #include <stddef.h>
-+#include <stdlib.h>
-+#include <string.h>
- #else
- extern char *malloc ();
- #endif
-+
-+#define bzero(a, c) memset(a, 0, c)
- 
- #define POD_WCHAR
- 
---- Xsi/Wnn/include/jllib.h
-+++ Xsi/Wnn/include/jllib.h	2001/09/04 18:55:55
-@@ -248,58 +248,58 @@
- #define jl_set_lang(buf, lang)  js_set_lang((buf)->env, lang)
- 
- /* extern function defines */
--extern struct wnn_buf *jl_open_lang ();
--extern struct wnn_env *jl_connect_lang ();
--extern struct wnn_env *jl_env_get ();
--extern struct wnn_jdata *jl_word_info_e ();
--extern w_char *jl_hinsi_name_e ();
-+extern struct wnn_buf *jl_open_lang (const char *, const char *, const char *, const char *, int (*) (const char *), int (*) (const char *), int);
-+extern struct wnn_env *jl_connect_lang (const char *, const char *, const char *, const char *, int (*) (const char *), int (*) (const char *), int);
-+extern struct wnn_env *jl_env_get (struct wnn_buf *);
-+extern struct wnn_jdata *jl_word_info_e (struct wnn_env *, int, int);
-+extern w_char *jl_hinsi_name_e (struct wnn_env *, int);
- 
--extern void jl_close ();
--extern int jl_dic_add_e ();
--extern int jl_dic_comment_set_e ();
--extern int jl_dic_delete_e ();
--extern int jl_dic_list_e ();
--extern int jl_dic_save_all_e ();
--extern int jl_dic_save_e ();
--extern int jl_dic_use_e ();
--extern void jl_disconnect ();
--extern void jl_disconnect_if_server_dead ();
--extern void jl_env_set ();
--extern int jl_fuzokugo_get_e ();
--extern int jl_fuzokugo_set_e ();
--extern void jl_get_zenkouho_kanji ();
--extern int jl_hinsi_dicts_e ();
--extern int jl_hinsi_list_e ();
--extern int jl_hinsi_number_e ();
--extern int jl_isconnect_e ();
--extern int jl_kanji_len ();
--extern int jl_kill ();
--extern int jl_nobi_conv ();
--extern int jl_nobi_conv_e2 ();
--extern int jl_param_get_e ();
--extern int jl_param_set_e ();
--extern int jl_ren_conv ();
--extern int jl_set_env_wnnrc ();
--extern int jl_set_env_wnnrc1 ();
--extern int jl_set_jikouho ();
--extern int jl_set_jikouho_dai ();
--extern int jl_tan_conv ();
--extern int jl_update_hindo ();
--extern int jl_word_add_e ();
--extern int jl_word_comment_set_e ();
--extern int jl_word_delete_e ();
--extern int jl_word_search_by_env_e ();
--extern int jl_word_search_e ();
--extern int jl_word_use_e ();
--extern int jl_yomi_len ();
--extern int jl_zenkouho ();
--extern int jl_zenkouho_dai ();
--extern int wnn_get_area ();
-+extern void jl_close (struct wnn_buf *);
-+extern int jl_dic_add_e (struct wnn_env *, char *, char *, int, int, int, int, char *, char *, int (*) (const char *), int (*) (const char *));
-+extern int jl_dic_comment_set_e (struct wnn_env *, int, w_char *);
-+extern int jl_dic_delete_e (struct wnn_env *, int);
-+extern int jl_dic_list_e (struct wnn_env *, WNN_DIC_INFO **);
-+extern int jl_dic_save_all_e (struct wnn_env *);
-+extern int jl_dic_save_e (struct wnn_env *, int);
-+extern int jl_dic_use_e (struct wnn_env *, int, int);
-+extern void jl_disconnect (struct wnn_env *);
-+extern void jl_disconnect_if_server_dead (struct wnn_env *);
-+extern void jl_env_set (struct wnn_buf *, struct wnn_env *);
-+extern int jl_fuzokugo_get_e (struct wnn_env *, char *);
-+extern int jl_fuzokugo_set_e (struct wnn_env *, char *);
-+extern void jl_get_zenkouho_kanji (struct wnn_buf *, int, w_char *);
-+extern int jl_hinsi_dicts_e (struct wnn_env *, int, int **);
-+extern int jl_hinsi_list_e (struct wnn_env *, int, w_char *, w_char ***);
-+extern int jl_hinsi_number_e (struct wnn_env *, w_char *);
-+extern int jl_isconnect_e (struct wnn_env *);
-+extern int jl_kanji_len (struct wnn_buf *, int, int);
-+extern int jl_kill (struct wnn_buf *, int, int);
-+extern int jl_nobi_conv (struct wnn_buf *, int, int, int, int, int);
-+extern int jl_nobi_conv_e2 (struct wnn_buf *, struct wnn_env *, int, int, int, int, int);
-+extern int jl_param_get_e (struct wnn_env *, struct wnn_param *);
-+extern int jl_param_set_e (struct wnn_env *, struct wnn_param *);
-+extern int jl_ren_conv (struct wnn_buf *, w_char *, int, int, int);
-+extern int jl_set_env_wnnrc (struct wnn_env *, const char *, int (*) (const char *), int (*) (const char *));
-+extern int jl_set_env_wnnrc1 (struct wnn_env *, const char *, int (*) (const char *), int (*) (const char *), int);
-+extern int jl_set_jikouho (struct wnn_buf *, int);
-+extern int jl_set_jikouho_dai (struct wnn_buf *, int);
-+extern int jl_tan_conv (struct wnn_buf *, w_char *, int, int, int, int);
-+extern int jl_update_hindo (struct wnn_buf *, int, int);
-+extern int jl_word_add_e (struct wnn_env *, int, w_char *, w_char *, w_char *, int, int);
-+extern int jl_word_comment_set_e (struct wnn_env *, int, int, w_char *);
-+extern int jl_word_delete_e (struct wnn_env *, int, int);
-+extern int jl_word_search_by_env_e (struct wnn_env *, w_char *, struct wnn_jdata **);
-+extern int jl_word_search_e (struct wnn_env *, int, w_char *, struct wnn_jdata **);
-+extern int jl_word_use_e (struct wnn_env *, int, int);
-+extern int jl_yomi_len (struct wnn_buf *, int, int);
-+extern int jl_zenkouho (struct wnn_buf *, int, int, int);
-+extern int jl_zenkouho_dai (struct wnn_buf *, int, int, int, int);
-+extern int wnn_get_area (struct wnn_buf *, int, int, w_char *, int);
- 
--extern char *wnn_perror ();
--extern char *wnn_perror_lang ();
-+extern char *wnn_perror (void);
-+extern char *wnn_perror_lang (char *);
- 
- #ifdef  CONVERT_by_STROKE
--extern void jl_get_zenkouho_yomi ();
-+extern void jl_get_zenkouho_yomi (struct wnn_buf *, int, w_char *);
- #endif
- #endif /* JLLIB */
---- Xsi/Wnn/jlib/jl.c
-+++ Xsi/Wnn/jlib/jl.c	2001/09/04 19:06:21
-@@ -38,6 +38,8 @@
- #include "commonhd.h"
- #include "wnn_config.h"
- #include <stdio.h>
-+#include <stdlib.h>
-+#include <stdarg.h>
- #include <sys/types.h>
- #ifdef SYSVR2
- #   include <string.h>
-@@ -145,7 +147,7 @@
- static void make_space_for ();
- static void make_space_for_bun ();
- static void make_space_for_zenkouho ();
--static void message_out ();
-+static void message_out (int (*) (const char *), const char *, ...);
- static int ren_conv1 ();
- static void set_dai ();
- static void set_sho ();
-@@ -261,7 +263,7 @@
- static struct wnn_env *
- find_same_env (js, env_n, lang)
-      register WNN_JSERVER_ID *js;
--     register char *env_n;
-+     register const char *env_n;
-      char *lang;
- {
-   register int k;
-@@ -300,7 +302,7 @@
- add_new_env (js, env, env_n, server_n, lang)
-      register WNN_JSERVER_ID *js;
-      register struct wnn_env *env;
--     char *env_n, *server_n, *lang;
-+     const char *env_n, *server_n, *lang;
- {
-   register int k;
- 
-@@ -421,15 +423,16 @@
- 
- struct wnn_env *
- jl_connect_lang (env_n, server_n, lang, wnnrc_n, error_handler, message_handler, timeout)
--     register char *env_n, *server_n, *wnnrc_n, *lang;
--     int (*error_handler) (), (*message_handler) ();
-+     register const char *env_n, *server_n, *wnnrc_n, *lang;
-+     int (*error_handler) (const char *), (*message_handler) (const char *);
-      int timeout;
- {
-   register WNN_JSERVER_ID *js = NULL;
-   struct wnn_env *env;
-   int env_exist;
-   char p_lang[16];
--  register char *p, *l;
-+  register char *p;
-+  const char *l;
-   extern char *getenv ();
-   extern char *_wnn_get_machine_of_serv_defs ();
- 
-@@ -562,8 +565,8 @@
- 
- struct wnn_buf *
- jl_open_lang (env_n, server_n, lang, wnnrc_n, error_handler, message_handler, timeout)
--     char *env_n, *server_n, *wnnrc_n, *lang;
--     int (*error_handler) (), (*message_handler) ();
-+     const char *env_n, *server_n, *wnnrc_n, *lang;
-+     int (*error_handler) (const char *), (*message_handler) (const char *);
-      int timeout;
- {
-   register int k, dmy;
-@@ -1490,7 +1493,7 @@
-      int prio;
-      int rw, hrw, rev;
-      char *pwd_dic, *pwd_hindo;
--     int (*error_handler) (), (*message_handler) ();
-+     int (*error_handler) (const char *), (*message_handler) (const char *);
- {
-   char tmp[256];
-   char pwd[WNN_PASSWD_LEN], hpwd[WNN_PASSWD_LEN];
-@@ -1505,7 +1508,7 @@
-           jl_disconnect (env);
-           return (-1);
-         }
--      if ((int) error_handler == WNN_NO_CREATE || (rw == WNN_DIC_RDONLY))
-+      if (error_handler == (int (*) (const char *)) WNN_NO_CREATE || (rw == WNN_DIC_RDONLY))
-         {
-           sprintf (tmp, "%s \"%s\" %s", msg_get (wnn_msg_cat, 200, NULL, env->lang), dic_name, msg_get (wnn_msg_cat, 201, NULL, env->lang));
-           /*
-@@ -1519,7 +1522,7 @@
-       /*
-          "辞書ファイル \"%s\" が無いよ。作る?(Y/N)",
-        */
--      if ((int) error_handler == WNN_CREATE || call_error_handler (error_handler, tmp))
-+      if (error_handler == (int (*) (const char *)) WNN_CREATE || call_error_handler (error_handler, tmp))
-         {
-           if (create_file (env, dic_name, JISHO, -1,    /* -1 is dummy */
-                            pwd_dic, (hindo_name && *hindo_name) ? "" : pwd_hindo, error_handler, message_handler) == -1)
-@@ -1544,7 +1547,7 @@
-               jl_disconnect (env);
-               return (-1);
-             }
--          if ((int) error_handler == WNN_NO_CREATE || (hrw == WNN_DIC_RDONLY))
-+          if (error_handler == (int (*) (const char *)) WNN_NO_CREATE || (hrw == WNN_DIC_RDONLY))
-             {
-               sprintf (tmp, "%s \"%s\" %s", msg_get (wnn_msg_cat, 203, NULL, env->lang), hindo_name, msg_get (wnn_msg_cat, 201, NULL, env->lang));
-               /*
-@@ -1558,7 +1561,7 @@
-           /*
-              "頻度ファイル \"%s\" が無いよ。作る?(Y/N)",
-            */
--          if ((int) error_handler == WNN_CREATE || call_error_handler (error_handler, tmp))
-+          if (error_handler == (int (*) (const char *)) WNN_CREATE || call_error_handler (error_handler, tmp))
-             {
-               if (create_file (env, hindo_name, HINDO, fid, "", pwd_hindo, error_handler, message_handler) == -1)
-                 return (-1);
-@@ -1587,7 +1590,7 @@
-         }
-       else if (wnn_errorno == WNN_HINDO_NO_MATCH)
-         {
--          if ((int) error_handler == WNN_NO_CREATE)
-+          if (error_handler == (int (*) (const char *)) WNN_NO_CREATE)
-             {
-               return (-1);
-             }
-@@ -1595,7 +1598,7 @@
-           /*
-              "辞書と頻度 \"%s\" の整合性が無いよ。作り直す?(Y/N)",
-            */
--          if (!((int) error_handler == WNN_CREATE || call_error_handler (error_handler, tmp)))
-+          if (!(error_handler == (int (*) (const char *)) WNN_CREATE || call_error_handler (error_handler, tmp)))
-             {
-               return (-1);
-             }
-@@ -1671,7 +1674,7 @@
- create_pwd_file (env, pwd_file, error_handler, message_handler)
-      register struct wnn_env *env;
-      char *pwd_file;
--     int (*error_handler) (), (*message_handler) ();
-+     int (*error_handler) (const char *), (*message_handler) (const char *);
- {
-   FILE *fp;
-   char gomi[256];
-@@ -2731,17 +2734,17 @@
- int
- jl_set_env_wnnrc (env, wnnrc_n, error_handler, message_handler)
-      register struct wnn_env *env;
--     char *wnnrc_n;
--     int (*error_handler) (), (*message_handler) ();
-+     const char *wnnrc_n;
-+     int (*error_handler) (const char *), (*message_handler) (const char *);
- {
-   int level = 0;
-   int x;
-   wnn_errorno = 0;
--  if ((int) error_handler == WNN_CREATE)
-+  if (error_handler == (int (*) (const char *)) WNN_CREATE)
-     {
-       confirm_state = CREATE_WITHOUT_CONFIRM;
-     }
--  else if ((int) error_handler == WNN_NO_CREATE)
-+  else if (error_handler == (int (*) (const char *)) WNN_NO_CREATE)
-     {
-       confirm_state = NO_CREATE;
-     }
-@@ -2757,8 +2760,8 @@
- int
- jl_set_env_wnnrc1 (env, wnnrc_n, error_handler, message_handler, level)
-      register struct wnn_env *env;
--     char *wnnrc_n;
--     int (*error_handler) (), (*message_handler) ();
-+     const char *wnnrc_n;
-+     int (*error_handler) (const char *), (*message_handler) (const char *);
-      int level;
- {
-   register int num;
-@@ -2811,7 +2814,7 @@
-         {
-           /* dic_add */
-           int prio, rdonly, hrdonly, rev;
--          int (*error_handler1) () = (int (*)()) 0;
-+          int (*error_handler1) (const char *) = (int (*) (const char *)) 0;
-           expand_expr_all (s[0], env);
-           if (num < 3 || !REAL_PARAM (s[1]))
-             {
-@@ -2837,11 +2840,11 @@
-           else if (confirm_state == CREATE_WITHOUT_CONFIRM)
-             {
- 
--              error_handler1 = (int (*)()) WNN_CREATE;
-+              error_handler1 = (int (*) (const char *)) WNN_CREATE;
-             }
-           else if (confirm_state == NO_CREATE)
-             {
--              error_handler1 = (int (*)()) WNN_NO_CREATE;
-+              error_handler1 = (int (*) (const char *)) WNN_NO_CREATE;
-             }
-           if (jl_dic_add_e (env, s[0], s[1], rev, prio, rdonly, hrdonly, s[5], s[6], error_handler1, message_handler) == -1 && wnn_errorno != 0)
-             {
-@@ -2972,7 +2975,7 @@
- 
-   if (*s != '~' && *s != '@')
-     return (0);
--  if ((int) strlen (s) >= EXPAND_PATH_LENGTH)
-+  if (strlen (s) >= EXPAND_PATH_LENGTH)
-     return (-1);
- 
-   s1 = s;
-@@ -2995,12 +2998,12 @@
-     {
-       if (*s1)
-         {
--          noerr = expandsuc = (NULL != (u = getpwnam (s1)) && (int) strlen (p = u->pw_dir) + (int) strlen (tmp) < EXPAND_PATH_LENGTH);
-+          noerr = expandsuc = (NULL != (u = getpwnam (s1)) && strlen (p = u->pw_dir) + strlen (tmp) < EXPAND_PATH_LENGTH);
- 
-         }
-       else
-         {
--          noerr = expandsuc = (NULL != (p = getenv ("HOME")) && (int) strlen (p) + (int) strlen (tmp) < EXPAND_PATH_LENGTH);
-+          noerr = expandsuc = (NULL != (p = getenv ("HOME")) && strlen (p) + strlen (tmp) < EXPAND_PATH_LENGTH);
-         }
- 
-     }
-@@ -3008,13 +3011,13 @@
-     {                           /* then, *s must be '@' */
-       if (!strcmp (s1, "HOME"))
-         {
--          noerr = expandsuc = (NULL != (p = getenv ("HOME")) && (int) strlen (p) + (int) strlen (tmp) < EXPAND_PATH_LENGTH);
-+          noerr = expandsuc = (NULL != (p = getenv ("HOME")) && strlen (p) + strlen (tmp) < EXPAND_PATH_LENGTH);
-         }
-       else if (!strcmp (s1, "WNN_DIC_DIR"))
-         {
-           char buf[EXPAND_PATH_LENGTH];
-           expandsuc = 1;
--          noerr = (NULL != (p = getenv ("HOME")) && (int) strlen (p) + (int) strlen (tmp) < EXPAND_PATH_LENGTH);
-+          noerr = (NULL != (p = getenv ("HOME")) && strlen (p) + strlen (tmp) < EXPAND_PATH_LENGTH);
-           strcpy (buf, p);
-           strcat (buf, "/");
- 
-@@ -3031,15 +3034,15 @@
-         }
-       else if (!strcmp (s1, "LIBDIR"))
-         {
--          noerr = expandsuc = ((int) strlen (p = LIBDIR) + (int) strlen (tmp) < EXPAND_PATH_LENGTH);
-+          noerr = expandsuc = (strlen (p = LIBDIR) + strlen (tmp) < EXPAND_PATH_LENGTH);
-         }
-       else if (!strcmp (s1, "ENV"))
-         {                       /* Added */
--          noerr = expandsuc = (NULL != (p = env_name (env)) && (int) strlen (p) + (int) strlen (tmp) < EXPAND_PATH_LENGTH);
-+          noerr = expandsuc = (NULL != (p = env_name (env)) && strlen (p) + strlen (tmp) < EXPAND_PATH_LENGTH);
-         }
-       else if (!strcmp (s1, "USR"))
-         {
--          noerr = expandsuc = (NULL != (p = getlogname ()) && (int) strlen (p) + (int) strlen (tmp) < EXPAND_PATH_LENGTH);
-+          noerr = expandsuc = (NULL != (p = getlogname ()) && strlen (p) + strlen (tmp) < EXPAND_PATH_LENGTH);
-         }
-       else
-         {                       /* @HOME, @LIBDIR @ENV igai ha kaenai */
-@@ -3063,7 +3066,7 @@
- 
-   total = 0;
-   flag = 0;
--  while (*st != NULL)
-+  while (*st != 0)
-     {
-       if (isdigit (*st))
-         {
-@@ -3122,7 +3125,7 @@
-      int d;
-      int fid;
-      char *pwd_dic, *pwd_hindo;
--     int (*error_handler) (), (*message_handler) ();
-+     int (*error_handler) (const char *), (*message_handler) (const char *);
- {
-   char pwd[WNN_PASSWD_LEN], hpwd[WNN_PASSWD_LEN];
-   int rev_dict_type;
-@@ -3230,7 +3233,7 @@
- make_dir_rec1 (env, path, error_handler, message_handler)
-      struct wnn_env *env;
-      register char *path;
--     int (*error_handler) (), (*message_handler) ();
-+     int (*error_handler) (const char *), (*message_handler) (const char *);
- {
-   char gomi[128];
-   register char *c;
-@@ -3253,7 +3256,7 @@
- make_dir1 (env, dirname, error_handler, message_handler)
-      register struct wnn_env *env;
-      register char *dirname;
--     int (*error_handler) (), (*message_handler) ();
-+     int (*error_handler) (const char *), (*message_handler) (const char *);
- {
-   char gomi[128];
-   if (dirname[0] == C_LOCAL)
-@@ -3274,7 +3277,7 @@
-           return (0);           /* dir already exists */
-         }
-     }
--  if ((int) error_handler != WNN_CREATE)
-+  if (error_handler != (int (*) (const char *)) WNN_CREATE)
-     {
-       sprintf (gomi, "%s \"%s\" %s%s", msg_get (wnn_msg_cat, 210, NULL, env->lang), dirname, msg_get (wnn_msg_cat, 201, NULL, env->lang), msg_get (wnn_msg_cat, 202, NULL, env->lang));
-       /*
-@@ -3311,8 +3314,8 @@
- 
- static int
- call_error_handler (error_handler, c)
--     int (*error_handler) ();
--     char *c;
-+     int (*error_handler) (const char *);
-+     const char *c;
- {
-   register int x;
-   x = error_handler (c);
-@@ -3327,16 +3330,16 @@
- }
- 
- static void
--message_out (message_handler, format, s1, s2, s3, s4, s5, s6, s7, s8)
--     int (*message_handler) ();
--     char *format;
--     int s1, s2, s3, s4, s5, s6, s7, s8;
-+message_out (int (*message_handler) (const char *), const char *format, ...)
- {
-   char buf[256];
-+  va_list args;
- 
-   if (message_handler)
-     {
--      sprintf (buf, format, s1, s2, s3, s4, s5, s6, s7, s8);
-+      va_start (args, format);
-+      vsprintf (buf, format, args);
-+      va_end (args);
-       (*message_handler) (buf);
-     }
- }
---- Xsi/Wnn/jlib/js.c
-+++ Xsi/Wnn/jlib/js.c	2001/09/04 17:34:48
-@@ -900,7 +900,7 @@
-      free((char *)env);
-    */
-   set_current_js (env->js_id);
--  handler_of_jserver_dead (NULL);
-+  handler_of_jserver_dead (-1);
-   snd_env_head (&tmp_env, JS_DISCONNECT);
-   snd_flush ();
-   x = get4com ();
---- Xsi/Wnn/jutil/atod.c
-+++ Xsi/Wnn/jutil/atod.c	2001/09/04 16:59:45
-@@ -39,6 +39,8 @@
- 
- #include <stdio.h>
- #include <ctype.h>
-+#include <string.h>
-+#include <stdlib.h>
- #include "commonhd.h"
- #include "wnn_config.h"
- #include "jslib.h"
---- Xsi/Wnn/jutil/atorev.c
-+++ Xsi/Wnn/jutil/atorev.c	2001/09/04 16:59:45
-@@ -35,6 +35,7 @@
- 
- #include <stdio.h>
- #include <ctype.h>
-+#include <stdlib.h>
- #include "commonhd.h"
- #include "jslib.h"
- #include "jh.h"
---- Xsi/Wnn/jutil/dtoa.c
-+++ Xsi/Wnn/jutil/dtoa.c	2001/09/04 16:59:45
-@@ -38,6 +38,8 @@
- #endif /* lint */
- 
- #include <stdio.h>
-+#include <string.h>
-+#include <stdlib.h>
- #include "commonhd.h"
- #include "wnn_config.h"
- #include "jslib.h"
---- Xsi/Wnn/jutil/wddel.c
-+++ Xsi/Wnn/jutil/wddel.c	2001/09/04 16:59:45
-@@ -38,6 +38,7 @@
- #endif /* lint */
- 
- #include <stdio.h>
-+#include <stdlib.h>
- #include "commonhd.h"
- #include "wnn_config.h"
- #include "jllib.h"
---- Xsi/Wnn/jutil/wdreg.c
-+++ Xsi/Wnn/jutil/wdreg.c	2001/09/04 16:59:45
-@@ -38,6 +38,7 @@
- #endif /* lint */
- 
- #include <stdio.h>
-+#include <stdlib.h>
- #include <sys/types.h>
- #include <sys/file.h>
- #include "commonhd.h"
---- Xsi/Wnn/uum/history.c
-+++ Xsi/Wnn/uum/history.c	2001/09/04 16:59:45
-@@ -30,6 +30,7 @@
-  */
- 
- #include <stdio.h>
-+#include <stdlib.h>
- #include "commonhd.h"
- #include "sdefine.h"
- #include "sheader.h"
---- Xsi/Wnn/uum/sheader.h
-+++ Xsi/Wnn/uum/sheader.h	2001/09/04 16:59:45
-@@ -320,6 +320,7 @@
- extern void set_keypad_on ();
- extern void set_keypad_off ();
- extern void set_scroll_region ();
-+#define setenv fwnn_setenv
- extern void setenv ();
- extern int setutmp ();
- extern int st_colum ();
diff --git a/app-i18n/freewnn/files/a017/FreeWnn-lib64.patch b/app-i18n/freewnn/files/a017/FreeWnn-lib64.patch
deleted file mode 100644
index 8f70a02de4eb..000000000000
--- a/app-i18n/freewnn/files/a017/FreeWnn-lib64.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- FreeWnn-1.1.1-a017/Xsi/makerule.mk.in	2002/03/15 11:10:47	1.1
-+++ FreeWnn-1.1.1-a017/Xsi/makerule.mk.in	2002/03/15 11:11:14
-@@ -90,7 +90,7 @@
- ALLDEFINES = $(INCLUDES) -DFUNCPROTO=15 -DNARROWPROTO $(DEFINES)
- CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(ALLDEFINES)
- LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES)
--LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS) -L/usr/lib/termcap
-+LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS) -L@libdir@/termcap
- 
-            CCLINK = $(CC)
- 
diff --git a/app-i18n/freewnn/files/a017/FreeWnn-s390x.patch b/app-i18n/freewnn/files/a017/FreeWnn-s390x.patch
deleted file mode 100644
index a66e27ab4804..000000000000
--- a/app-i18n/freewnn/files/a017/FreeWnn-s390x.patch
+++ /dev/null
@@ -1,217 +0,0 @@
-diff -ru FreeWnn-1.1.1-a017.orig/Xsi/Wnn/jserver/de.c FreeWnn-1.1.1-a017/Xsi/Wnn/jserver/de.c
---- FreeWnn-1.1.1-a017.orig/Xsi/Wnn/jserver/de.c	2000-03-20 17:31:43.000000000 +0100
-+++ FreeWnn-1.1.1-a017/Xsi/Wnn/jserver/de.c	2002-11-03 20:25:27.000000000 +0100
-@@ -158,11 +158,11 @@
- 
- int cur_clp;            /** 現在のクライアントの番号 **/
- 
--static int *all_socks;          /** ビットパターン
-+static fd_set *all_socks;          /** ビットパターン
-                                  which jserver to select を保持 **/
--static int *ready_socks;        /** データのきているソケットの
-+static fd_set *ready_socks;        /** データのきているソケットの
-                                         ビットパターンを保持 **/
--static int *dummy1_socks, *dummy2_socks;
-+static fd_set *dummy1_socks, *dummy2_socks;
- 
- static int no_of_ready_socks;
- static int sel_bwidth,          /** bit width of all_socks **/
-@@ -171,9 +171,14 @@
- static int nofile;              /** No. of files **/
- 
- #define BINTSIZE        (sizeof(int)*8)
-+/*
- #define sock_set(array,pos)     (array[pos/BINTSIZE] |= (1<<(pos%BINTSIZE)))
- #define sock_clr(array,pos)     (array[pos/BINTSIZE] &= ~(1<<(pos%BINTSIZE)))
- #define sock_tst(array,pos)     (array[pos/BINTSIZE] &  (1<<(pos%BINTSIZE)))
-+*/
-+#define sock_set(array,pos)     FD_SET(pos,array)
-+#define sock_clr(array,pos)     FD_CLR(pos,array)
-+#define sock_tst(array,pos)     FD_ISSET(pos,array)
- 
- struct msg_cat *wnn_msg_cat;
- struct msg_cat *js_msg_cat;
-@@ -312,7 +317,7 @@
-       for (;;)
-         {
- #ifdef DEBUG
--          error1 ("main loop: ready_socks = %02X\n", ready_socks);
-+          error1 ("main loop: ready_socks = %02lX\n", ready_socks[0]);
- #endif
-           if (get_client () == -1)
-             break;
-@@ -341,11 +346,11 @@
- 
-   nofile = NOFILE;
-   sel_w = (nofile - 1) / BINTSIZE + 1;
--  all_socks = (int *) calloc (sel_w, (sizeof (int)));
--  ready_socks = (int *) malloc (sel_w * (sizeof (int)));
--  dummy1_socks = (int *) malloc (sel_w * (sizeof (int)));
--  dummy2_socks = (int *) malloc (sel_w * (sizeof (int)));
--  sel_width = sel_w * sizeof (int);     /* byte width */
-+  all_socks = (fd_set *) calloc (sel_w, (sizeof (fd_set)));
-+  ready_socks = (fd_set *) malloc (sel_w * (sizeof (fd_set)));
-+  dummy1_socks = (fd_set *) malloc (sel_w * (sizeof (fd_set)));
-+  dummy2_socks = (fd_set *) malloc (sel_w * (sizeof (fd_set)));
-+  sel_width = sel_w * sizeof (fd_set);     /* byte width */
-   sel_bwidth = sel_width * 8;   /* bit width */
- }
- 
-@@ -366,7 +371,7 @@
-       xerror ("select error");
-     }
- #ifdef DEBUG
--  error1 ("select OK, ready_socks[0]=%02X, n-r-s=%x\n", ready_socks[0], no_of_ready_socks);
-+  error1 ("select OK, ready_socks[0]=%02lX, n-r-s=%x\n", ready_socks[0], no_of_ready_socks);
- #endif
- }
- 
-diff -ru FreeWnn-1.1.1-a017.orig/Xsi/Wnn/uum/jhlp.c FreeWnn-1.1.1-a017/Xsi/Wnn/uum/jhlp.c
---- FreeWnn-1.1.1-a017.orig/Xsi/Wnn/uum/jhlp.c	2000-02-23 17:08:49.000000000 +0100
-+++ FreeWnn-1.1.1-a017/Xsi/Wnn/uum/jhlp.c	2002-11-03 22:25:09.000000000 +0100
-@@ -134,7 +134,7 @@
- static void do_end (), open_pty (), open_ttyp (), do_main (), exec_cmd (), parse_options (), setsize (), get_rubout (), usage (), change_size (), default_usage ();
- 
- /** メイン */
--void
-+int
- main (argc, argv)
-      int argc;
-      char **argv;
-@@ -923,7 +923,7 @@
- 
- /** メインループ */
- 
--int sel_ptn;
-+fd_set sel_ptn;
- int pty_bit;
- int tty_bit;
- int ptyfd;
-@@ -947,7 +947,8 @@
- 
-   pty_bit = 1 << ptyfd;
-   tty_bit = 1 << ttyfd;
--  sel_ptn = pty_bit | tty_bit;
-+  FD_SET (ptyfd, &sel_ptn);
-+  FD_SET (ttyfd, &sel_ptn);
- 
-   if (henkan_off_flag == 0)
-     {
-@@ -1020,8 +1021,9 @@
-   static unsigned char *bufend = outbuf;
-   static unsigned char *bufstart = outbuf;
-   int n;
--  int rfds;
--  int i, j, mask;
-+  fd_set rfds;
-+  int i, j;
-+  fd_set mask;
-   unsigned char *p;
-   extern int henkan_off_flag;
-   struct timeval time_out;      /* If your OS's select was implemented as 
-@@ -1063,9 +1065,9 @@
-       time_out.tv_usec = 200 * 1000;    /* 200 msec 間待つのだゾ! */
-       for (rfds = sel_ptn;
- #ifdef linux
--           (sel_ret = select (20, &rfds, 0, 0, NULL)) < 0 && errno == EINTR;
-+           (sel_ret = select (20, &rfds, NULL, NULL, NULL)) < 0 && errno == EINTR;
- #else
--           (sel_ret = select (20, &rfds, 0, 0, &time_out)) < 0 && errno == EINTR;
-+           (sel_ret = select (20, &rfds, NULL, NULL, &time_out)) < 0 && errno == EINTR;
- #endif
-            rfds = sel_ptn)
-         ;
-@@ -1084,7 +1086,7 @@
- */
-         }
- 
--      if (rfds & pty_bit)
-+      if (FD_ISSET(ptyfd, &rfds))
-         {
-           if ((n = read (ptyfd, buf, BUFSIZ)) <= 0)
-             {
-@@ -1116,13 +1118,13 @@
-                       p += j;
-                       i -= j;
-                     }
--                  mask = 1 << ttyfd;
-+                  FD_SET(ttyfd, &mask);
-                   select (32, 0, &mask, 0, 0);
-                 }
-               pop_cursor ();
-             }
-         }
--      if (rfds & tty_bit)
-+      if (FD_ISSET(ttyfd, &rfds))
-         {
-           if ((n = read (ttyfd, buf, BUFSIZ)) > 0)
-             {
-@@ -1778,7 +1780,7 @@
- {
-   static unsigned char buf[BUFSIZ];
-   int n;
--  int rfds;
-+  fd_set rfds;
- 
-   kk_restore_cursor ();
-   clr_line_all ();
-@@ -1791,7 +1793,7 @@
-           write (ptyfd, buf, n);
-         }
-       rfds = sel_ptn;
--      select (20, &rfds, 0, 0, NULL);
-+      select (20, &rfds, NULL, NULL, NULL);
-       if (rfds & pty_bit)
-         {
-           if ((n = read (ptyfd, buf, BUFSIZ)) <= 0)
-diff -ru FreeWnn-1.1.1-a017.orig/Xsi/Xwnmo/xwnmo/do_socket.c FreeWnn-1.1.1-a017/Xsi/Xwnmo/xwnmo/do_socket.c
---- FreeWnn-1.1.1-a017.orig/Xsi/Xwnmo/xwnmo/do_socket.c	2000-02-23 18:03:22.000000000 +0100
-+++ FreeWnn-1.1.1-a017/Xsi/Xwnmo/xwnmo/do_socket.c	2002-11-03 20:25:17.000000000 +0100
-@@ -90,9 +90,9 @@
- XIMCmblk *cblk;
- XIMCmblk *cur_cblk = NULL;
- 
--int *all_socks;
--int *ready_socks;
--static int *dummy1_socks, *dummy2_socks;
-+fd_set *all_socks;
-+fd_set *ready_socks;
-+static fd_set *dummy1_socks, *dummy2_socks;
- static int sel_width;
- 
- static int nofile;
-@@ -114,9 +114,14 @@
- static int rc = 0;
- 
- #define BINTSIZE        (sizeof(int)*8)
-+/*
- #define sock_set(array,pos)     (array[pos/BINTSIZE] |= (1<<(pos%BINTSIZE)))
- #define sock_clr(array,pos)     (array[pos/BINTSIZE] &= ~(1<<(pos%BINTSIZE)))
--#define sock_tst(array,pos)     (array[pos/BINTSIZE] & (1<<(pos%BINTSIZE)))
-+#define sock_tst(array,pos)     (array[pos/BINTSIZE] &  (1<<(pos%BINTSIZE)))
-+*/
-+#define sock_set(array,pos)     FD_SET(pos,array)
-+#define sock_clr(array,pos)     FD_CLR(pos,array)
-+#define sock_tst(array,pos)     FD_ISSET(pos,array)
- 
- extern int read (), write ();
- 
---- FreeWnn-1.1.1-a017/Xsi/Wnn/jserver/error.c	2002/11/05 14:57:21	1.1
-+++ FreeWnn-1.1.1-a017/Xsi/Wnn/jserver/error.c	2002/11/05 14:58:12
-@@ -47,7 +47,7 @@
- void
- error_exit1 (x, y1, y2, y3, y4, y5)
-      char *x;
--     int y1, y2, y3, y4, y5;
-+     long y1, y2, y3, y4, y5;
- {
-   char buf[512];
- 
-@@ -112,7 +112,7 @@
- void
- error1 (x, y1, y2, y3, y4, y5)
-      register char *x;
--     int y1, y2, y3, y4, y5;
-+     long y1, y2, y3, y4, y5;
- {
-   char buf[512];
diff --git a/app-i18n/freewnn/files/a017/FreeWnn-sighandler.patch b/app-i18n/freewnn/files/a017/FreeWnn-sighandler.patch
deleted file mode 100644
index 768cac2abcbc..000000000000
--- a/app-i18n/freewnn/files/a017/FreeWnn-sighandler.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- FreeWnn-1.1.1-a017.orig/Xsi/Wnn/jserver/de.c	Mon Mar 20 17:31:43 2000
-+++ FreeWnn-1.1.1-a017/Xsi/Wnn/jserver/de.c	Tue Aug 29 12:06:47 2000
-@@ -185,6 +185,19 @@
- 
- char cmd_name[80];
- 
-+#ifndef NOTFORK
-+static void father_sighandler (const int sig)
-+{
-+  if (signal(sig, SIG_DFL) == SIG_ERR)
-+    _exit (2);
-+
-+  if (sig == SIGTERM)
-+    _exit(0);
-+  else
-+    _exit(-1);
-+}
-+#endif
-+
- /* No arguments are used. Only options. */
- int
- main (argc, argv)
-@@ -228,14 +241,14 @@
- #ifndef NOTFORK
-   if (fork ())
-     {
--      signal (SIGCHLD, _exit);
-+      signal (SIGCHLD, father_sighandler);
-       signal (SIGHUP, SIG_IGN);
-       signal (SIGINT, SIG_IGN);
-       signal (SIGQUIT, SIG_IGN);
- #ifdef  SIGTSTP
-       signal (SIGTSTP, SIG_IGN);
- #endif
--      signal (SIGTERM, _exit);
-+      signal (SIGTERM, father_sighandler);
-       pause ();
-     }
- #endif /* !NOTFORK */
diff --git a/app-i18n/freewnn/files/a017/FreeWnn-uum.patch b/app-i18n/freewnn/files/a017/FreeWnn-uum.patch
deleted file mode 100644
index 75a5e38e8c22..000000000000
--- a/app-i18n/freewnn/files/a017/FreeWnn-uum.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff -ur FreeWnn-1.1.1-a017.orig/Xsi/Wnn/uum/jhlp.c FreeWnn-1.1.1-a017/Xsi/Wnn/uum/jhlp.c
---- FreeWnn-1.1.1-a017.orig/Xsi/Wnn/uum/jhlp.c	Wed Feb 23 17:08:49 2000
-+++ FreeWnn-1.1.1-a017/Xsi/Wnn/uum/jhlp.c	Wed Nov  1 19:33:54 2000
-@@ -638,7 +638,7 @@
- #ifdef  SYSVR2
- #define index   strchr
- #endif /* SYSVR2 */
--  extern char *index ();
-+/*  extern char *index ();*/
- 
-   strcpy (ostr, default_getoptstr);
-   strcat (ostr, lang_db->getoptstr);
-@@ -1720,7 +1720,7 @@
-     }
- #endif /* defined(uniosu) */
- 
--#ifndef sgi
-+#if !defined(sgi) && !defined(linux)
-   ptyname (nmbuf, ptynm, ptyno);
-   if (chown (nmbuf, 0, 0) == ERROR)
-     {
-diff -ur FreeWnn-1.1.1-a017.orig/Xsi/Wnn/uum/wnnrc_op.c FreeWnn-1.1.1-a017/Xsi/Wnn/uum/wnnrc_op.c
---- FreeWnn-1.1.1-a017.orig/Xsi/Wnn/uum/wnnrc_op.c	Wed Feb 23 16:31:45 2000
-+++ FreeWnn-1.1.1-a017/Xsi/Wnn/uum/wnnrc_op.c	Mon Oct 30 23:42:17 2000
-@@ -133,7 +133,7 @@
-   struct passwd *u;
-   extern struct passwd *getpwnam ();
- #if defined(SYSVR2) && !defined(AIXV3)
--  extern char *strchr ();
-+/*  extern char *strchr (); */
- #endif /* defined(SYSVR2) && !defined(AIXV3) */
- 
-   if (*s != '~' && *s != '@')
-diff -u FreeWnn-1.1.1-a017.orig/Xsi/makerule.mk.in.~1~ FreeWnn-1.1.1-a017.orig/Xsi/makerule.mk.in
---- FreeWnn-1.1.1-a017.orig/Xsi/makerule.mk.in.~1~	Sun Feb 13 10:15:54 2000
-+++ FreeWnn-1.1.1-a017.orig/Xsi/makerule.mk.in	Wed Nov  1 19:49:39 2000
-@@ -90,7 +90,7 @@
- ALLDEFINES = $(INCLUDES) -DFUNCPROTO=15 -DNARROWPROTO $(DEFINES)
- CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(ALLDEFINES)
- LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES)
--LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS)
-+LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS) -L/usr/lib/termcap
- 
-            CCLINK = $(CC)
- 
-@@ -114,7 +114,7 @@
-       WNNBINDIR = ${PREFIX}/bin
-       WNNINCDIR = @includedir@
-       WNNLIBDIR = @libdir@
--    WNNTERM_LIB = -ltermcap
-+    WNNTERM_LIB = -ltermcap -lcrypt
- 
-   PUBDICPLUSSRC = $(IMTOP)/PubdicPlus
-   WNNCONSDICSRC = $(IMTOP)/Wnn-consortium/dic
diff --git a/app-i18n/freewnn/files/freewnn-1.1.1_alpha20-gentoo.diff b/app-i18n/freewnn/files/freewnn-1.1.1_alpha20-gentoo.diff
deleted file mode 100644
index 8969034a118d..000000000000
--- a/app-i18n/freewnn/files/freewnn-1.1.1_alpha20-gentoo.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur FreeWnn-1.10-pl020.orig/configure FreeWnn-1.10-pl020/configure
---- FreeWnn-1.10-pl020.orig/configure	2002-09-02 02:48:20.000000000 +0900
-+++ FreeWnn-1.10-pl020/configure	2004-06-26 11:29:16.742279625 +0900
-@@ -2514,7 +2514,7 @@
- CDEBUGFLAGS=${CDEBUGFLAGS:-"-O"}
- case $host in
- *-*-linux*)
--    CCOPTIONS="-Dlinux -D_POSIX_SOURCE -D_BSD_SOURCE"
-+    CCOPTIONS="-Dlinux -D_POSIX_SOURCE -D_BSD_SOURCE -D_GNU_SOURCE"
-     CDEBUGFLAGS="-O2 -fno-strength-reduce"
-     ;;
- *-*-freebsd*|*-*-netbsd*|*-*-openbsd*)
-diff -Naur FreeWnn-1.10-pl020.orig/configure.in FreeWnn-1.10-pl020/configure.in
---- FreeWnn-1.10-pl020.orig/configure.in	2002-09-02 02:48:19.000000000 +0900
-+++ FreeWnn-1.10-pl020/configure.in	2004-06-26 11:30:21.886225442 +0900
-@@ -261,7 +261,7 @@
- CDEBUGFLAGS=${CDEBUGFLAGS:-"-O"}
- case $host in
- *-*-linux*)
--    CCOPTIONS="-Dlinux -D_POSIX_SOURCE -D_BSD_SOURCE"
-+    CCOPTIONS="-Dlinux -D_POSIX_SOURCE -D_BSD_SOURCE -D_GNU_SOURCE"
-     CDEBUGFLAGS="-O2 -fno-strength-reduce"
-     ;;
- *-*-freebsd*|*-*-netbsd*|*-*-openbsd*)
diff --git a/app-i18n/freewnn/freewnn-1.1.1_alpha20-r1.ebuild b/app-i18n/freewnn/freewnn-1.1.1_alpha20-r1.ebuild
deleted file mode 100644
index 2f1abe28c263..000000000000
--- a/app-i18n/freewnn/freewnn-1.1.1_alpha20-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/freewnn/freewnn-1.1.1_alpha20-r1.ebuild,v 1.11 2007/04/28 15:42:16 tove Exp $
-
-inherit eutils
-
-MY_P="FreeWnn-${PV/_alpha/-a0}"
-
-DESCRIPTION="Network-Extensible Kana-to-Kanji Conversion System"
-HOMEPAGE="http://www.freewnn.org/"
-SRC_URI="ftp://ftp.freewnn.org/pub/FreeWnn/alpha/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 ~sparc ~x86"
-IUSE="X ipv6"
-
-DEPEND="X? ( x11-libs/libX11 x11-libs/libXmu x11-libs/libXt )"
-
-S="${WORKDIR}/FreeWnn-1.10-pl020"
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	#Change WNNOWNER to root so we don't need to add wnn user
-	sed -i -e "s/WNNOWNER = wnn/WNNOWNER = root/" makerule.mk.in || die
-	epatch "${FILESDIR}"/${P}-gentoo.diff
-}
-
-src_compile() {
-	econf \
-		--disable-cWnn \
-		--disable-kWnn \
-		--without-termcap \
-		`use_with X x` \
-		`use_with ipv6` || die "./configure failed"
-
-	emake -j1 || die
-}
-
-src_install() {
-	# install executables, libs ,dictionaries
-	make DESTDIR="${D}" install || die "installation failed"
-	# install man pages
-	make DESTDIR="${D}" install.man || die "installation of manpages failed"
-	# install docs
-	dodoc ChangeLog* INSTALL* CONTRIBUTORS
-	# install rc script
-	newinitd "${FILESDIR}"/freewnn.initd freewnn
-}
diff --git a/app-i18n/freewnn/freewnn-1.1.1_alpha20.ebuild b/app-i18n/freewnn/freewnn-1.1.1_alpha20.ebuild
deleted file mode 100644
index 4122d547734d..000000000000
--- a/app-i18n/freewnn/freewnn-1.1.1_alpha20.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/freewnn/freewnn-1.1.1_alpha20.ebuild,v 1.14 2007/04/28 15:42:16 tove Exp $
-
-MY_P="FreeWnn-${PV/_alpha/-a0}"
-
-DESCRIPTION="Network-Extensible Kana-to-Kanji Conversion System"
-HOMEPAGE="http://www.freewnn.org/"
-SRC_URI="ftp://ftp.freewnn.org/pub/FreeWnn/alpha/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc sparc alpha -amd64 ia64"
-IUSE="X ipv6"
-
-DEPEND="X? ( x11-libs/libX11 x11-libs/libXmu x11-libs/libXt )"
-
-S="${WORKDIR}/FreeWnn-1.10-pl020"
-
-src_unpack() {
-	unpack ${A}
-
-	#Change WNNOWNER to root so we don't need to add wnn user
-	mv "${S}"/makerule.mk.in "${T}"
-	sed -e "s/WNNOWNER = wnn/WNNOWNER = root/" \
-		"${T}"/makerule.mk.in > "${S}"/makerule.mk.in
-}
-
-src_compile() {
-	econf \
-		--disable-cWnn \
-		--disable-kWnn \
-		--without-termcap \
-		`use_with X x` \
-		`use_with ipv6` || die "./configure failed"
-
-	emake -j1 || die
-	#make || die
-}
-
-src_install() {
-	# install executables, libs ,dictionaries
-	make DESTDIR="${D}" install || die "installation failed"
-	# install man pages
-	make DESTDIR="${D}" install.man || die "installation of manpages failed"
-	# install docs
-	dodoc ChangeLog* INSTALL* CONTRIBUTORS
-	# install rc script
-	newinitd "${FILESDIR}"/freewnn.initd freewnn
-}
diff --git a/app-i18n/freewnn/freewnn-1.1.1_alpha21.ebuild b/app-i18n/freewnn/freewnn-1.1.1_alpha21.ebuild
deleted file mode 100644
index cbba37e3d654..000000000000
--- a/app-i18n/freewnn/freewnn-1.1.1_alpha21.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/freewnn/freewnn-1.1.1_alpha21.ebuild,v 1.11 2007/07/12 13:04:22 armin76 Exp $
-
-inherit eutils
-
-MY_P="FreeWnn-${PV/_alpha/-a0}"
-
-DESCRIPTION="Network-Extensible Kana-to-Kanji Conversion System"
-HOMEPAGE="http://freewnn.sourceforge.jp/
-	http://www.freewnn.org/"
-SRC_URI="mirror://sourceforge.jp/freewnn/17724/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha ~amd64 hppa ia64 ppc ppc64 ~sparc x86"
-IUSE="X ipv6"
-
-DEPEND="X? ( x11-libs/libX11 x11-libs/libXmu x11-libs/libXt )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	#Change WNNOWNER to root so we don't need to add wnn user
-	sed -i -e "s/WNNOWNER = wnn/WNNOWNER = root/" makerule.mk.in || die
-}
-
-src_compile() {
-	econf \
-		--disable-cWnn \
-		--disable-kWnn \
-		--without-termcap \
-		$(use_with X x) \
-		$(use_with ipv6) \
-		|| die "./configure failed"
-	emake -j1 || die
-}
-
-src_install() {
-	# install executables, libs ,dictionaries
-	make DESTDIR="${D}" install || die "installation failed"
-	# install man pages
-	make DESTDIR="${D}" install.man || die "installation of manpages failed"
-	# install docs
-	dodoc ChangeLog* INSTALL* CONTRIBUTORS
-	# install rc script
-	newinitd "${FILESDIR}"/freewnn.initd freewnn
-}