aboutsummaryrefslogtreecommitdiff
path: root/japanese
diff options
context:
space:
mode:
authorDoug Barton <dougb@FreeBSD.org>2011-11-02 01:35:45 +0000
committerDoug Barton <dougb@FreeBSD.org>2011-11-02 01:35:45 +0000
commita1b8c7234f3d864683b1cfabf75c94d3e69f8daa (patch)
tree58d8bed54b0e8f5b37e2efeb21a5ef5725734914 /japanese
parentd2808ff1955d34d3553065194dbc38bb503e154c (diff)
downloadports-a1b8c7234f3d864683b1cfabf75c94d3e69f8daa.tar.gz
ports-a1b8c7234f3d864683b1cfabf75c94d3e69f8daa.zip
Remove ports@ ports that have been DEPRECATED for at least 1 month
audio/shoutcast Unfetchable; website rearranged audio/linux-shoutcast Unfetchable; website rearranged chinese/scim-chewing Does not configure converters/py-cjkcodecs Integrated into every python version in the tree databases/kpogre Does not compile deskutils/mhc Does not fetch deskutils/org-mode.el6 Does not fetch deskutils/gemcal Does not fetch devel/erlang-thrift Does not build dns/domtools Does not fetch editors/richtext Does not compile games/vultures-claw Does not fetch games/bomb Does not fetch games/lgeneral-data Bad plist games/linux-enemyterritory-jaymod Does not fetch games/xphotohunter Does not fetch graphics/gimpshop Fails to patch graphics/lightspark-devel Does not compile graphics/xmms-plazma Does not fetch graphics/py-cgkit Does not fetch, does not compile on ia64, powerpc, or sparc64 japanese/rxvt Does not fetch, fails to build with new utmpx japanese/epic4 Some distfiles do not fetch java/jde Does not fetch java/kaffe Does not fetch korean/gdick HTMLs from the Yahoo! Korea Dictionary cannot be parsed, other runtime problems korean/hanterm-xf86 Does not compile korean/stardict2-dict-kr Does not fetch lang/p5-JavaScript Does not fetch lang/TenDRA Website disappeared; last release 2006, Does not compile on recent FreeBSD-9 mail/freepops Does not build mail/itraxp Does not build misc/tellico Leaves file behind on deinstall net/gsambad Does not fetch net/nocatauth-gateway Uses a UID registered to another port net/nocatauth-server Uses a UID registered to another port net/libosip2 Does not fetch net/kmuddy Does not fetch net/netboot Does not build net-mgmt/jffnms Does not fetch net-p2p/frostwire Does not fetch net-p2p/azureus Does not fetch news/cleanscore Does not fetch news/nntpswitch Does not fetch news/p5-NewsLib Does not fetch russian/cyrproxy Does not fetch science/gerris Does not fetch security/opensaml Does not fetch sysutils/wmbattery Does not fetch sysutils/cpuburn No more public distfiles textproc/tei-guidelines-p4 Does not fetch textproc/tei-p4 Does not fetch textproc/py-hyperestraier Does not fetch textproc/tdtd.el Does not fetch textproc/tei-lite Does not fetch www/phpwiki13 Does not fetch www/p5-Apache-Scoreboard Depends on mod_perl www/p5-B-LexInfo Broken due the new mod_perl2 API www/phpwiki Does not fetch www/smb2www Apache13 is deprecated, migrate to 2.2.x+ now www/spip Checksum is changing daily www/monkey Does not fetch x11-toolkits/jdic Does not fetch x11-toolkits/py-kde Does not compile
Notes
Notes: svn path=/head/; revision=284893
Diffstat (limited to 'japanese')
-rw-r--r--japanese/Makefile2
-rw-r--r--japanese/epic4/Makefile41
-rw-r--r--japanese/epic4/distinfo6
-rw-r--r--japanese/epic4/files/patch-Makefile.in34
-rw-r--r--japanese/epic4/files/patch-config.h11
-rw-r--r--japanese/epic4/files/patch-ctcp.c12
-rw-r--r--japanese/epic4/files/patch-dcc.c11
-rw-r--r--japanese/epic4/files/patch-defs.h264
-rw-r--r--japanese/epic4/files/patch-info.c.sh.in11
-rw-r--r--japanese/epic4/files/patch-input.c356
-rw-r--r--japanese/epic4/files/patch-kanji.c136
-rw-r--r--japanese/epic4/files/patch-kanji.h12
-rw-r--r--japanese/epic4/files/patch-parse.c29
-rw-r--r--japanese/epic4/files/patch-screen.c114
-rw-r--r--japanese/epic4/files/patch-server.c32
-rw-r--r--japanese/epic4/files/patch-status.c11
-rw-r--r--japanese/epic4/files/patch-term.c63
-rw-r--r--japanese/epic4/files/patch-term.h23
-rw-r--r--japanese/epic4/pkg-descr13
-rw-r--r--japanese/epic4/pkg-plist946
-rw-r--r--japanese/rxvt/Makefile52
-rw-r--r--japanese/rxvt/distinfo2
-rw-r--r--japanese/rxvt/files/README.ja131
-rw-r--r--japanese/rxvt/files/ja.menu29
-rw-r--r--japanese/rxvt/files/patch-aa19
-rw-r--r--japanese/rxvt/files/patch-ab91
-rw-r--r--japanese/rxvt/files/patch-ad19
-rw-r--r--japanese/rxvt/files/patch-aj44
-rw-r--r--japanese/rxvt/files/patch-ak36
-rw-r--r--japanese/rxvt/files/patch-al20
-rw-r--r--japanese/rxvt/files/patch-am293
-rw-r--r--japanese/rxvt/files/patch-an19
-rw-r--r--japanese/rxvt/files/terminal.menu60
-rw-r--r--japanese/rxvt/pkg-descr11
-rw-r--r--japanese/rxvt/pkg-message12
-rw-r--r--japanese/rxvt/pkg-plist11
36 files changed, 0 insertions, 2976 deletions
diff --git a/japanese/Makefile b/japanese/Makefile
index da8c2af66c7e..ce3adfb0e395 100644
--- a/japanese/Makefile
+++ b/japanese/Makefile
@@ -59,7 +59,6 @@
SUBDIR += elisa8x8
SUBDIR += elvis
SUBDIR += emacs-emcws
- SUBDIR += epic4
SUBDIR += epwutil
SUBDIR += esecanna
SUBDIR += esecanna-module-vje25
@@ -288,7 +287,6 @@
SUBDIR += rubygem-jpmobile
SUBDIR += rubygem-jpmobile-ipaddresses
SUBDIR += rubygem-jpmobile-terminfo
- SUBDIR += rxvt
SUBDIR += ryaku-fpw
SUBDIR += scim-anthy
SUBDIR += scim-canna
diff --git a/japanese/epic4/Makefile b/japanese/epic4/Makefile
deleted file mode 100644
index aacdafea34e3..000000000000
--- a/japanese/epic4/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-# New ports collection makefile for: epic4-ja
-# Date created: 4 Dec 2000
-# Whom: Akinori MUSHA aka knu <knu@idaemons.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME= epic4
-PORTVERSION= 1.0.1
-# Make these variables overridable for slave ports
-PORTREVISION?= 4
-CATEGORIES?= japanese irc ipv6
-MASTER_SITES= http://ftp.prbh.org/pub/epic/EPIC4-PRODUCTION/ \
- ftp://ftp.icm.edu.pl/vol/rzm0/irc/EPIC/%SUBDIR%/ \
- ftp://ftp.archive.de.uu.net/pub/unix/irc/epic/%SUBDIR%/ \
- ftp://ftp.nl.uu.net/pub/unix/irc/epic/%SUBDIR%/
-
-BROKEN= Some distfiles does not fetch
-MASTER_SITE_SUBDIR= EPIC4-PRODUCTION
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DISTFILE_HELP}
-DIST_SUBDIR= epic4
-EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
-
-PATCH_SITES= http://www.t17.ds.pwr.wroc.pl/~misiek/ipv6/
-PATCHFILES= ${DISTNAME}-ipv6-20010418.patch.gz
-PATCH_DIST_STRIP= -p1
-
-MAINTAINER= ports@FreeBSD.org
-COMMENT= The (E)nhanced (P)rogrammable (I)RC-II (C)lient with Japanese support
-
-USE_BZIP2= yes
-USE_AUTOTOOLS= autoconf213
-
-DISTFILE_HELP= ${PORTNAME}pre2-help.tar.gz
-
-MAN1= epic.1
-
-post-install:
- cd ${PREFIX}/share/epic && ${TAR} zxf ${_DISTDIR}/${DISTFILE_HELP}
-
-.include <bsd.port.mk>
diff --git a/japanese/epic4/distinfo b/japanese/epic4/distinfo
deleted file mode 100644
index f47bfdf7bafe..000000000000
--- a/japanese/epic4/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-SHA256 (epic4/epic4-1.0.1.tar.bz2) = 28040fc827c9d9dda08390c9fcd5b2b8c84b2f8cf106c1385ec94c8af48ff345
-SIZE (epic4/epic4-1.0.1.tar.bz2) = 497716
-SHA256 (epic4/epic4pre2-help.tar.gz) = 593df7770e64abb59cb2fe37a07a772e4bff3771d04b70cbe13462c8d3910ec3
-SIZE (epic4/epic4pre2-help.tar.gz) = 216319
-SHA256 (epic4/epic4-1.0.1-ipv6-20010418.patch.gz) = f316fb274e16cb4ba6e4b9e2596bc01d44f7cb83a1d36862c184faba99a484f6
-SIZE (epic4/epic4-1.0.1-ipv6-20010418.patch.gz) = 20140
diff --git a/japanese/epic4/files/patch-Makefile.in b/japanese/epic4/files/patch-Makefile.in
deleted file mode 100644
index b3990b20d55d..000000000000
--- a/japanese/epic4/files/patch-Makefile.in
+++ /dev/null
@@ -1,34 +0,0 @@
---- source/Makefile.in.orig Tue Jan 6 01:03:32 2004
-+++ source/Makefile.in Tue Jan 6 01:04:25 2004
-@@ -18,7 +18,7 @@
- ircsig.o keys.o lastlog.o list.o log.o mail.o names.o network.o \
- newio.o notice.o notify.o numbers.o output.o parse.o queue.o reg.o \
- screen.o server.o status.o term.o timer.o vars.o who.o window.o \
-- words.o @ALLOCA@
-+ words.o kanji.o @ALLOCA@
-
- INCLUDES = -I@srcdir@/../include -I../include
-
-@@ -97,7 +97,7 @@
- ../include/history.h ../include/hook.h ../include/input.h \
- ../include/output.h ../include/screen.h ../include/window.h \
- ../include/lastlog.h ../include/status.h ../include/stack.h \
-- ../include/vars.h ../include/keys.h expr2.c expr.c
-+ ../include/vars.h ../include/keys.h ../include/kanji.h expr2.c expr.c
- alist.o: alist.c ../include/irc.h ../include/defs.h \
- ../include/config.h ../include/irc_std.h ../include/debug.h \
- ../include/alist.h ../include/ircaux.h ../include/output.h
-@@ -349,7 +349,7 @@
- ../include/irc_std.h ../include/debug.h ../include/ircaux.h \
- ../include/vars.h ../include/term.h ../include/screen.h \
- ../include/window.h ../include/lastlog.h ../include/status.h \
-- ../include/output.h
-+ ../include/output.h ../include/kanji.h
- timer.o: timer.c ../include/irc.h ../include/defs.h \
- ../include/config.h ../include/irc_std.h ../include/debug.h \
- ../include/ircaux.h ../include/window.h ../include/lastlog.h \
-@@ -391,3 +391,4 @@
- ../include/ircaux.h ../include/vars.h ../include/term.h \
- ../include/screen.h ../include/window.h ../include/lastlog.h \
- ../include/status.h ../include/output.h
-+kanji.o: kanji.c ../include/kanji.h
diff --git a/japanese/epic4/files/patch-config.h b/japanese/epic4/files/patch-config.h
deleted file mode 100644
index 179d7b996b0d..000000000000
--- a/japanese/epic4/files/patch-config.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/config.h.orig Sat Sep 23 00:59:49 2000
-+++ include/config.h Mon Dec 4 03:44:17 2000
-@@ -370,7 +370,7 @@
- #define DEFAULT_HELP_PROMPT 1
- #define DEFAULT_HELP_WINDOW 0
- #define DEFAULT_HIDE_PRIVATE_CHANNELS 0
--#define DEFAULT_HIGH_BIT_ESCAPE 2
-+#define DEFAULT_HIGH_BIT_ESCAPE 0
- #define DEFAULT_HIGHLIGHT_CHAR "BOLD"
- #define DEFAULT_HISTORY 150
- #define DEFAULT_HISTORY_CIRCLEQ 1
diff --git a/japanese/epic4/files/patch-ctcp.c b/japanese/epic4/files/patch-ctcp.c
deleted file mode 100644
index b8f4eef94264..000000000000
--- a/japanese/epic4/files/patch-ctcp.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- source/ctcp.c.orig Tue Dec 5 01:11:56 2000
-+++ source/ctcp.c Tue May 27 16:55:04 2003
-@@ -897,7 +897,8 @@
- int len;
-
- /* Make sure that the final \001 doesnt get truncated */
-- len = IRCD_BUFFER_SIZE - (12 + strlen(to));
-+ if ((len = IRCD_BUFFER_SIZE - (12 + strlen(to))) < 0)
-+ return;
- putbuf2 = alloca(len);
-
- if (format)
diff --git a/japanese/epic4/files/patch-dcc.c b/japanese/epic4/files/patch-dcc.c
deleted file mode 100644
index bb588180d6b7..000000000000
--- a/japanese/epic4/files/patch-dcc.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- source/dcc.c.orig Mon May 6 03:36:21 2002
-+++ source/dcc.c Mon May 6 03:36:44 2002
-@@ -1366,7 +1366,7 @@
- /*
- * Figure out something sane for the xfer speed.
- */
-- if (Client->bytes_sent)
-+ if (act_sent)
- {
- strlcpy(speed, calc_speed(act_sent,
- Client->starttime.tv_sec, time(NULL)), 9);
diff --git a/japanese/epic4/files/patch-defs.h b/japanese/epic4/files/patch-defs.h
deleted file mode 100644
index 5f866bf880bc..000000000000
--- a/japanese/epic4/files/patch-defs.h
+++ /dev/null
@@ -1,264 +0,0 @@
---- include/defs.h.orig Mon Dec 4 03:44:17 2000
-+++ include/defs.h Mon Dec 4 03:44:17 2000
-@@ -0,0 +1,261 @@
-+/* include/defs.h. Generated automatically by configure. */
-+/* include/defs.h.in. Generated automatically from configure.in by autoheader. */
-+
-+/* Define if on AIX 3.
-+ System headers sometimes define this.
-+ We just want to avoid a redefinition error message. */
-+#ifndef _ALL_SOURCE
-+/* #undef _ALL_SOURCE */
-+#endif
-+
-+/* Define if using alloca.c. */
-+/* #undef C_ALLOCA */
-+
-+/* Define to one of _getb67, GETB67, getb67 for Cray-2 and Cray-YMP systems.
-+ This function is required for alloca.c support on those systems. */
-+/* #undef CRAY_STACKSEG_END */
-+
-+/* Define if the `getpgrp' function takes no argument. */
-+#define GETPGRP_VOID 1
-+
-+/* Define to `int' if <sys/types.h> doesn't define. */
-+/* #undef gid_t */
-+
-+/* Define if you have alloca, as a function or macro. */
-+#define HAVE_ALLOCA 1
-+
-+/* Define if you have <alloca.h> and it should be used (not on Ultrix). */
-+#define HAVE_ALLOCA_H 1
-+
-+/* Define to `int' if <sys/types.h> doesn't define. */
-+/* #undef mode_t */
-+
-+/* Define if your C compiler doesn't accept -c and -o together. */
-+/* #undef NO_MINUS_C_MINUS_O */
-+
-+/* Define if your Fortran 77 compiler doesn't accept -c and -o together. */
-+/* #undef F77_NO_MINUS_C_MINUS_O */
-+
-+/* Define to `int' if <sys/types.h> doesn't define. */
-+/* #undef pid_t */
-+
-+/* Define if you need to in order for stat and other things to work. */
-+/* #undef _POSIX_SOURCE */
-+
-+/* Define as the return type of signal handlers (int or void). */
-+#define RETSIGTYPE void
-+
-+/* Define to the type of arg1 for select(). */
-+/* #undef SELECT_TYPE_ARG1 */
-+
-+/* Define to the type of args 2, 3 and 4 for select(). */
-+/* #undef SELECT_TYPE_ARG234 */
-+
-+/* Define to the type of arg5 for select(). */
-+/* #undef SELECT_TYPE_ARG5 */
-+
-+/* Define to `unsigned' if <sys/types.h> doesn't define. */
-+/* #undef size_t */
-+
-+/* If using the C implementation of alloca, define if you know the
-+ direction of stack growth for your system; otherwise it will be
-+ automatically deduced at run-time.
-+ STACK_DIRECTION > 0 => grows toward higher addresses
-+ STACK_DIRECTION < 0 => grows toward lower addresses
-+ STACK_DIRECTION = 0 => direction of growth unknown
-+ */
-+/* #undef STACK_DIRECTION */
-+
-+/* Define if you have the ANSI C header files. */
-+#define STDC_HEADERS 1
-+
-+/* Define if `sys_siglist' is declared by <signal.h>. */
-+#define SYS_SIGLIST_DECLARED 1
-+
-+/* Define if you can safely include both <sys/time.h> and <time.h>. */
-+#define TIME_WITH_SYS_TIME 1
-+
-+/* Define to `int' if <sys/types.h> doesn't define. */
-+/* #undef uid_t */
-+
-+/* Define this if you have fpathconf(2) */
-+#define HAVE_FPATHCONF 1
-+
-+/* define this if you have getpass(3) */
-+#define HAVE_GETPASS 1
-+
-+/* define this if you have getpgid(2) */
-+#define HAVE_GETPGID 1
-+
-+/* define this if you have gettimeofday(2) */
-+#define HAVE_GETTIMEOFDAY 1
-+
-+/* Define this if you have killpg(2) */
-+#define HAVE_KILLPG 1
-+
-+/* define this if you have memmove(3) */
-+#define HAVE_MEMMOVE 1
-+
-+/* define this if you have scandir(3) */
-+#define HAVE_SCANDIR 1
-+
-+/* define this if you have setenv(3) */
-+#define HAVE_SETENV 1
-+
-+/* define this if you have setsid(2) */
-+#define HAVE_SETSID 1
-+
-+/* define this if you have snprintf(3) */
-+#define HAVE_SNPRINTF 1
-+
-+/* define this if you have strerror(3) */
-+#define HAVE_STRERROR 1
-+
-+/* define if you have strtoul(3) */
-+#define HAVE_STRTOUL 1
-+
-+/* define this if you have sysconf(3) */
-+#define HAVE_SYSCONF 1
-+
-+/* define this if you have uname(2) */
-+#define HAVE_UNAME 1
-+
-+/* define this if you have vsnprintf(3) */
-+#define HAVE_VSNPRINTF 1
-+
-+/* Define this if you have SUN_LEN in <sys/un.h> */
-+/* #undef HAVE_SUN_LEN */
-+
-+/* define this if you don't have struct linger */
-+/* #undef NO_STRUCT_LINGER */
-+
-+/* define if allow sys/time.h with time.h */
-+#define TIME_WITH_SYS_TIME 1
-+
-+/* Define this if your getpgrp is broken posix */
-+#define GETPGRP_VOID 1
-+
-+/* define this if an unsigned long is 32 bits */
-+/* #undef UNSIGNED_LONG32 */
-+
-+/* define this if an unsigned int is 32 bits */
-+#define UNSIGNED_INT32 1
-+
-+/* define this if you are unsure what is is 32 bits */
-+/* #undef UNKNOWN_32INT */
-+
-+/* Define this if you have inet_aton(). */
-+#define HAVE_INET_ATON 1
-+
-+/* Define this if you need to include sys/select.h */
-+/* #undef NEED_SYS_SELECT_H */
-+
-+/*
-+ * SOCKS 4 && 5 support.
-+ */
-+/* #undef SOCKS */
-+/* #undef USE_SOCKS */
-+/* #undef USE_SOCKS5 */
-+/* #undef connect */
-+/* #undef getsockname */
-+/* #undef bind */
-+/* #undef accept */
-+/* #undef listen */
-+/* #undef select */
-+/* #undef dup */
-+/* #undef dup2 */
-+/* #undef fclose */
-+/* #undef gethostbyname */
-+/* #undef read */
-+/* #undef recv */
-+/* #undef recvfrom */
-+/* #undef rresvport */
-+/* #undef send */
-+/* #undef sendto */
-+/* #undef shutdown */
-+/* #undef write */
-+/* #undef Rconnect */
-+/* #undef Rgetsockname */
-+/* #undef Rgetpeername */
-+/* #undef Rbind */
-+/* #undef Raccept */
-+/* #undef Rlisten */
-+/* #undef Rselect */
-+
-+/* Define this if you have setsid() */
-+#define HAVE_SETSID 1
-+
-+/* Define this if you have tparm(2) */
-+#define HAVE_TPARM 1
-+
-+/* Define this if you have getlogin(3) */
-+#define HAVE_GETLOGIN 1
-+
-+/* Define this if you have terminfo support */
-+#define HAVE_TERMINFO 1
-+
-+/* Define this if you have fchdir() */
-+#define HAVE_FCHDIR 1
-+
-+/* Define this if you have realpath() */
-+#define HAVE_REALPATH 1
-+
-+/* Define this if you have strlcpy() */
-+/* #undef HAVE_STRLCPY */
-+
-+/* Define this if you have strlcat() */
-+/* #undef HAVE_STRLCAT */
-+
-+/* Define this if you have stpcpy() */
-+#define HAVE_STPCPY 1
-+
-+/* The number of bytes in a unsigned int. */
-+#define SIZEOF_UNSIGNED_INT 4
-+
-+/* The number of bytes in a unsigned long. */
-+/* #undef SIZEOF_UNSIGNED_LONG */
-+
-+/* Define if you have the <dirent.h> header file. */
-+#define HAVE_DIRENT_H 1
-+
-+/* Define if you have the <fcntl.h> header file. */
-+#define HAVE_FCNTL_H 1
-+
-+/* Define if you have the <ndir.h> header file. */
-+/* #undef HAVE_NDIR_H */
-+
-+/* Define if you have the <netdb.h> header file. */
-+#define HAVE_NETDB_H 1
-+
-+/* Define if you have the <regex.h> header file. */
-+#define HAVE_REGEX_H 1
-+
-+/* Define if you have the <sys/dir.h> header file. */
-+/* #undef HAVE_SYS_DIR_H */
-+
-+/* Define if you have the <sys/fcntl.h> header file. */
-+#define HAVE_SYS_FCNTL_H 1
-+
-+/* Define if you have the <sys/file.h> header file. */
-+#define HAVE_SYS_FILE_H 1
-+
-+/* Define if you have the <sys/filio.h> header file. */
-+/* #undef HAVE_SYS_FILIO_H */
-+
-+/* Define if you have the <sys/ndir.h> header file. */
-+/* #undef HAVE_SYS_NDIR_H */
-+
-+/* Define if you have the <sys/select.h> header file. */
-+#define HAVE_SYS_SELECT_H 1
-+
-+/* Define if you have the <sys/syslimits.h> header file. */
-+/* #undef HAVE_SYS_SYSLIMITS_H */
-+
-+/* Define if you have the <sys/time.h> header file. */
-+#define HAVE_SYS_TIME_H 1
-+
-+/* Define if you have the <sys/un.h> header file. */
-+#define HAVE_SYS_UN_H 1
-+
-+/* Define if you have the <termcap.h> header file. */
-+#define HAVE_TERMCAP_H 1
diff --git a/japanese/epic4/files/patch-info.c.sh.in b/japanese/epic4/files/patch-info.c.sh.in
deleted file mode 100644
index a4d54dfc7d8e..000000000000
--- a/japanese/epic4/files/patch-info.c.sh.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- source/info.c.sh.in.orig Tue Dec 5 09:11:57 2000
-+++ source/info.c.sh.in Tue Jan 6 01:11:49 2004
-@@ -20,7 +20,7 @@
- */
-
- #ifdef __STDC__
--#define my_paste(x, y, z) x ## y ## z
-+#define my_paste(x, y, z) x y z
- #else
- #define my_paste(x, y, z) x/**/y/**/z
- #endif
diff --git a/japanese/epic4/files/patch-input.c b/japanese/epic4/files/patch-input.c
deleted file mode 100644
index 871de749a30e..000000000000
--- a/japanese/epic4/files/patch-input.c
+++ /dev/null
@@ -1,356 +0,0 @@
---- source/input.c.orig Sat Sep 23 01:07:16 2000
-+++ source/input.c Mon Dec 4 03:49:56 2000
-@@ -31,6 +31,7 @@
- #include "vars.h"
- #include "window.h"
- #include "output.h"
-+#include "kanji.h"
- #include <sys/ioctl.h> /* XXX ugh */
-
- /*
-@@ -70,7 +71,6 @@
- #define INPUT_LINE current_screen->input_line
- #define CUT_BUFFER cut_buffer
- #define SET_CUT_BUFFER(x) malloc_strcpy(&CUT_BUFFER, x);
--
- #define BUILT_IN_KEYBINDING(x) void x (char key, char *string)
-
-
-@@ -81,9 +81,19 @@
-
- while (*str && i < len)
- {
-- term_putchar(*str);
-- str++, i++;
-+ if (ISKANJI(*str) && ISKANJI(*(str+1))) {
-+ if (i < len - 1) {
-+ term_putchar(*str, *(str+1));
-+ str += 2; i += 2;
-+ } else {
-+ break; /* goto END */
-+ }
-+ } else {
-+ term_putchar(*str, '\0');
-+ str++, i++;
-+ }
- }
-+ /* END: */
- return i;
- }
-
-@@ -321,9 +331,16 @@
- */
- if (START_ZONE == WIDTH)
- INPUT_ONSCREEN = 0;
-- else
-+ else {
-+ int pos = THIS_POS;
- INPUT_ONSCREEN = START_ZONE - WIDTH - INPUT_PROMPT_LEN;
--
-+ /* adjust kanji */
-+ while (pos > INPUT_ONSCREEN) {
-+ ISKANJI(INPUT_BUFFER[pos - 1]) ? pos -= 2 : pos--;
-+ }
-+ INPUT_ONSCREEN = pos;
-+ }
-+
- /*
- * And the cursor is simply how many characters away THIS_POS is
- * from the first column on the screen.
-@@ -468,16 +485,28 @@
- {
- if (THIS_CHAR)
- {
-- THIS_POS++;
-- term_cursor_right();
-+ if (ISKANJI (THIS_CHAR)) {
-+ THIS_POS+=2;
-+ term_right(2);
-+ }else{
-+ THIS_POS++;
-+ term_cursor_right();
-+ }
- }
- }
- else
- {
- if (THIS_POS > MIN_POS)
- {
-- THIS_POS--;
-- term_cursor_left();
-+ if (THIS_POS > MIN_POS - 1
-+ && ISKANJI(PREV_CHAR)
-+ && ISKANJI(INPUT_BUFFER[THIS_POS-2])) {
-+ THIS_POS -= 2;
-+ term_left(2);
-+ }else{
-+ THIS_POS--;
-+ term_cursor_left();
-+ }
- }
- }
- update_input(NO_UPDATE);
-@@ -590,7 +619,7 @@
- update_input(UPDATE_JUST_CURSOR);
- }
-
--static void input_delete_char_from_screen (void)
-+static void input_delete_char_from_screen (int count)
- {
- /*
- * Remove the current character from the screen's display.
-@@ -607,7 +636,7 @@
- /*
- * Delete the character. This is the simple part.
- */
-- term_delete(1);
-+ term_delete(count);
-
- /*
- * So right now we have a blank space at the right of the
-@@ -615,14 +644,14 @@
- * is out in that position, we need to find it and display it.
- */
- if (INPUT_ONSCREEN == 0) /* UGH! */
-- pos = last_input_screen->co - INPUT_PROMPT_LEN - 1;
-+ pos = last_input_screen->co - INPUT_PROMPT_LEN - count;
- else
-- pos = INPUT_ONSCREEN + last_input_screen->co - 1;
-+ pos = INPUT_ONSCREEN + last_input_screen->co - count;
-
- if (pos < strlen(INPUT_BUFFER))
- {
-- term_move_cursor(last_input_screen->co - 1, INPUT_LINE);
-- term_putchar(INPUT_BUFFER[pos]);
-+ term_move_cursor(last_input_screen->co - count, INPUT_LINE);
-+ term_putchar(INPUT_BUFFER[pos], '\0');
- term_move_cursor(INPUT_CURSOR, INPUT_LINE);
- }
-
-@@ -637,6 +666,7 @@
- */
- BUILT_IN_KEYBINDING(input_delete_character)
- {
-+ int count;
- cursor_to_input();
-
- /*
-@@ -646,12 +676,14 @@
- if (!THIS_CHAR)
- return;
-
-+ count = ISKANJI(THIS_CHAR) ? 2 : 1;
-+
- /*
- * Remove the current character from the logical buffer
- * and also from the screen.
- */
-- ov_strcpy(&THIS_CHAR, &NEXT_CHAR);
-- input_delete_char_from_screen();
-+ ov_strcpy(&THIS_CHAR, &INPUT_BUFFER[THIS_POS+count]);
-+ input_delete_char_from_screen(count);
- }
-
-
-@@ -804,7 +836,24 @@
- */
- BUILT_IN_KEYBINDING(input_add_character)
- {
-+ static u_char c1 = '\0', c2;
- int display_flag = NO_UPDATE;
-+ int length;
-+
-+ /* add by atsushi */
-+ if (ISKANJI(key)) {
-+ if (c1 == '\0') { /* kanji 1st char */
-+ c1 = key;
-+ return;
-+ }else{ /* kanji 2nd char */
-+ c2 = key;
-+ length = 2;
-+ }
-+ }else{
-+ c1 = key;
-+ length = 1;
-+ }
-+ /* end add */
-
- cursor_to_input();
-
-@@ -812,7 +861,7 @@
- term_echo(last_input_screen->promptlist->echo);
-
- /* Don't permit the input buffer to get too big. */
-- if (THIS_POS >= INPUT_BUFFER_SIZE)
-+ if (THIS_POS + length > INPUT_BUFFER_SIZE) /* change */
- {
- term_echo(1);
- return;
-@@ -832,7 +881,12 @@
- * Add to logical buffer
- */
- ptr = LOCAL_COPY(&(THIS_CHAR));
-- THIS_CHAR = key;
-+ /* add */
-+ THIS_CHAR = c1;
-+ if (length > 1) {
-+ THIS_POS++;
-+ THIS_CHAR = c2;
-+ } /* end add */
- NEXT_CHAR = 0;
- ADD_TO_INPUT(ptr);
-
-@@ -843,7 +897,7 @@
- term_insert(key);
- else
- {
-- term_putchar(key);
-+ term_putchar(c1, c2);
- if (NEXT_CHAR)
- display_flag = UPDATE_FROM_CURSOR;
- else
-@@ -855,26 +909,41 @@
- /*
- * Add to logical buffer
- */
-- THIS_CHAR = key;
-+ /* add */
-+ THIS_CHAR = c1;
-+ if (length > 1) {
-+ THIS_POS++;
-+ THIS_CHAR = c2;
-+ } /* end add */
- NEXT_CHAR = 0;
-
- /* Add to display screen */
-- term_putchar(key);
-+ term_putchar(c1, c2);
- }
- }
-
- /* Overstrike mode. Much simpler. */
-+ /* Maybe we must change here (atsushi) */
- else
- {
-- if (THIS_CHAR == 0)
-+ if (THIS_CHAR == 0)
- NEXT_CHAR = 0;
-- THIS_CHAR = key;
-- term_putchar(key);
-+ THIS_CHAR = c1;
-+ /* add */
-+ if (length > 1) {
-+ THIS_POS++;
-+ if (THIS_CHAR == 0)
-+ NEXT_CHAR = 0;
-+ THIS_CHAR = c2;
-+ } /* end add */
-+
-+ term_putchar(c1, c2);
- }
-
- THIS_POS++;
- update_input(display_flag);
- term_echo(1);
-+ c1 = '\0';
- }
-
- /* input_clear_to_eol: erases from the cursor to the end of the input buffer */
-@@ -935,8 +1004,8 @@
- cursor_to_input();
- if (last_input_screen->buffer_pos > MIN_POS)
- {
-- u_char c1, c2;
-- int pos, end_of_line = 0;
-+ u_char c1[2], c2[2];
-+ int pos, ptr, end_of_line = 0;
-
- /*
- * If we're in the middle of the input buffer,
-@@ -956,6 +1025,9 @@
- {
- pos = THIS_POS - 1;
- end_of_line = 1;
-+ if (ISKANJI(INPUT_BUFFER[pos])) {
-+ pos--;
-+ }
- }
-
- /*
-@@ -968,25 +1040,49 @@
- /*
- * Swap the two characters
- */
-- c1 = INPUT_BUFFER[pos];
-- c2 = INPUT_BUFFER[pos] = INPUT_BUFFER[pos - 1];
-- INPUT_BUFFER[pos - 1] = c1;
-+ if (pos > 1 &&
-+ ISKANJI(INPUT_BUFFER[pos - 1]) &&
-+ ISKANJI(INPUT_BUFFER[pos - 2])) {
-+ c2[0] = INPUT_BUFFER[pos - 2];
-+ c2[1] = INPUT_BUFFER[pos - 1];
-+ ptr = pos - 2;
-+ } else {
-+ c2[0] = INPUT_BUFFER[pos - 1];
-+ c2[1] = '\0';
-+ ptr = pos - 1;
-+ }
-
-+ if (ISKANJI(INPUT_BUFFER[pos])) {
-+ c1[0] = INPUT_BUFFER[ptr++] = INPUT_BUFFER[pos];
-+ c1[1] = INPUT_BUFFER[ptr++] = INPUT_BUFFER[pos + 1];
-+ } else {
-+ c1[0] = INPUT_BUFFER[ptr++] = INPUT_BUFFER[pos];
-+ c1[1] = '\0';
-+ }
-+ /* adjust THIS_POS */
-+ if (!end_of_line)
-+ THIS_POS = ptr;
-+
-+ INPUT_BUFFER[ptr++] = c2[0];
-+ if (c2[1]) {
-+ INPUT_BUFFER[ptr] = c2[1];
-+ }
-+
- /*
- * Adjust the cursor and output the new chars.
- */
-- term_cursor_left();
- if (end_of_line)
-- term_cursor_left();
-- term_putchar(c1);
-- term_putchar(c2);
-+ c1[1] ? term_left(2) : term_cursor_left();
-+ c2[1] ? term_left(2) : term_cursor_left();
-+ term_putchar(c1[0], c1[1]);
-+ term_putchar(c2[0], c2[1]);
-
- /*
- * Move the cursor back onto 'c2', if we're not at
- * the end of the input line.
- */
- if (!end_of_line)
-- term_cursor_left();
-+ c2[1] ? term_left(2) : term_cursor_left();
-
- /*
- * Reset the internal cursor.
-@@ -1232,7 +1328,6 @@
-
- if (xxx_return)
- return;
--
- /* If the high bit is set, mangle it as neccesary. */
- if (key & 0x80)
- {
-@@ -1242,9 +1337,8 @@
- key &= ~0x80;
- }
- else if (!term_eight_bit())
-- key &= ~0x80;
-+ key &= ~0x80;
- }
--
- extended_key = key;
-
- /* If we just hit the quote character, add this character literally */
diff --git a/japanese/epic4/files/patch-kanji.c b/japanese/epic4/files/patch-kanji.c
deleted file mode 100644
index 5a86437c2f85..000000000000
--- a/japanese/epic4/files/patch-kanji.c
+++ /dev/null
@@ -1,136 +0,0 @@
---- source/kanji.c.orig Mon Dec 4 03:44:17 2000
-+++ source/kanji.c Mon Dec 4 03:44:17 2000
-@@ -0,0 +1,133 @@
-+/* kanji.c */
-+#include "kanji.h"
-+
-+#ifndef TRUE
-+#define TRUE 1
-+#endif
-+
-+#ifndef FALSE
-+#define FALSE 0
-+#endif
-+
-+#define ESC '\033'
-+#define KI1 '$'
-+#define KI21 'B'
-+#define KI22 '@'
-+#define KO1 '('
-+#define KO21 'B'
-+#define KO22 'J'
-+#define KO23 'H'
-+
-+#define EUC2JIS(c) (unsigned char)((c) & 0x7f)
-+#define JIS2EUC(c) (char)((c) | 0x80)
-+
-+/* proto types */
-+static int ParseESC(char **jisstr);
-+
-+/* Euc2Jis : convert euc to jis. */
-+/* eucstr : input string (euc) */
-+/* jisstr : output string (jis) */
-+/* limit : output string limit length */
-+int Euc2Jis(unsigned char *eucstr, char *jisstr, int limit)
-+{
-+ int length, shifted;
-+
-+ shifted = FALSE;
-+
-+ while (*eucstr) {
-+ length = 0;
-+ if(ISKANJI(*eucstr)){
-+ if(!shifted){
-+ *jisstr++ = ESC;
-+ *jisstr++ = KI1;
-+ *jisstr++ = KI21;
-+ shifted = TRUE;
-+ length += 3;
-+ }
-+ *jisstr++ = EUC2JIS(*eucstr++);
-+ *jisstr++ = EUC2JIS(*eucstr++);
-+ length += 2;
-+ }else{
-+ if(shifted){
-+ *jisstr++ = ESC;
-+ *jisstr++ = KO1;
-+ *jisstr++ = KO21;
-+ length += 3;
-+ shifted = FALSE;
-+ }
-+ *jisstr++ = *eucstr++;
-+ length += 1;
-+ }
-+
-+ limit -= length;
-+ if(limit < 4){
-+ jisstr -= length;
-+ break; /* goto _break_1; */
-+ }
-+ }
-+ _break_1:
-+ if (shifted) {
-+ *jisstr++ = ESC;
-+ *jisstr++ = KO1;
-+ *jisstr++ = KO21;
-+ }
-+ *jisstr = '\0';
-+ return 0;
-+}
-+
-+
-+/* Jis2Euc : convert jis to euc. */
-+/* jisstr : input string (jis) */
-+/* eucstr : output string (euc) */
-+void Jis2Euc(char *jisstr, unsigned char *eucstr)
-+{
-+ int shifted;
-+ char c;
-+ char* bg = eucstr;
-+
-+ shifted = FALSE;
-+
-+ while ((c = *jisstr++) != '\0') {
-+ if (c == ESC) {
-+ shifted = ParseESC(&jisstr);
-+ }else{
-+ if (shifted) {
-+ if (*jisstr) {
-+ *eucstr++ = JIS2EUC(c);
-+ *eucstr++ = JIS2EUC(*jisstr);
-+ jisstr++;
-+ }
-+ }else{
-+ *eucstr++ = c;
-+ }
-+ }
-+ }
-+ *eucstr = '\0';
-+}
-+
-+
-+/* ParseESC : parse escape code */
-+/* input : esc code */
-+/* output : ESC $ B / ESC $ @ / ESC $ @ : shifted and skip esc code */
-+/* ESC ( B / ESC ( J / ESC ( H : unshifted and skip esc code */
-+int ParseESC(char **jisstr)
-+{
-+ char c1, c2;
-+ int shifted;
-+ char* pos = *jisstr;
-+
-+ shifted = FALSE;
-+ c1 = *pos++; c2 = c1 ? *pos++ : '\0';
-+
-+ if (c1 == KO1) {
-+ if (c2 == KO21 || c2 == KO22 || c2 == KO23) {
-+ *jisstr = pos;
-+ }
-+ } else if (c1 == KI1) {
-+ if (c2 == KI21 || c2 == KI22) {
-+ *jisstr = pos;
-+ shifted = TRUE;
-+ }
-+ }
-+ return shifted;
-+}
diff --git a/japanese/epic4/files/patch-kanji.h b/japanese/epic4/files/patch-kanji.h
deleted file mode 100644
index 35a332e99415..000000000000
--- a/japanese/epic4/files/patch-kanji.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- include/kanji.h.orig Mon Dec 4 03:44:17 2000
-+++ include/kanji.h Mon Dec 4 03:44:17 2000
-@@ -0,0 +1,9 @@
-+/* kanji.h */
-+#ifndef __kanji_h__
-+#define __kanji_h__
-+
-+#define ISKANJI(c) (0x80 & (unsigned char)(c))
-+extern int Euc2Jis(unsigned char *eucstr, char *jisstr, int limit);
-+extern void Jis2Euc(char *jisstr, unsigned char *eucstr);
-+
-+#endif
diff --git a/japanese/epic4/files/patch-parse.c b/japanese/epic4/files/patch-parse.c
deleted file mode 100644
index 44e57f7712f2..000000000000
--- a/japanese/epic4/files/patch-parse.c
+++ /dev/null
@@ -1,29 +0,0 @@
---- source/parse.c.orig Wed Aug 16 02:25:44 2000
-+++ source/parse.c Mon Dec 4 03:44:17 2000
-@@ -30,6 +30,7 @@
- #include "notify.h"
- #include "notice.h"
- #include "timer.h"
-+#include "kanji.h"
-
- #define STRING_CHANNEL '+'
- #define MULTI_CHANNEL '#'
-@@ -1131,7 +1132,7 @@
- * parse_server: parses messages from the server, doing what should be done
- * with them
- */
--void parse_server (char *orig_line)
-+void parse_server (char *raw_line)
- {
- char *from,
- *comm;
-@@ -1143,6 +1144,9 @@
- int cnt;
- char *line = NULL;
- size_t size;
-+ char orig_line[BIG_BUFFER_SIZE];
-+
-+ Jis2Euc(raw_line, orig_line);
-
- if (num_protocol_cmds == -1)
- num_protocol_cmds = NUMBER_OF_COMMANDS;
diff --git a/japanese/epic4/files/patch-screen.c b/japanese/epic4/files/patch-screen.c
deleted file mode 100644
index 9bfd0ac826c4..000000000000
--- a/japanese/epic4/files/patch-screen.c
+++ /dev/null
@@ -1,114 +0,0 @@
---- source/screen.c.orig Thu Aug 10 09:28:50 2000
-+++ source/screen.c Mon Dec 4 03:44:17 2000
-@@ -11,6 +11,7 @@
- */
-
- #define __need_putchar_x__
-+#define __need_putchars_x__
- #define __need_term_flush__
- #include "irc.h"
- #include "alias.h"
-@@ -33,6 +34,7 @@
- #include "commands.h"
- #include "parse.h"
- #include "newio.h"
-+#include "kanji.h"
-
- /*
- * When some code wants to override the default lastlog level, and needs
-@@ -496,6 +498,7 @@
- *words,
- *str,
- *pos_copy;
-+ u_char c1 = '\0';
-
- if (recursion)
- panic("prepare_display() called recursively");
-@@ -673,7 +676,8 @@
-
- default:
- {
-- if (*ptr == ' ' || strchr(words, *ptr))
-+ if (*ptr == ' ' || strchr(words, *ptr)
-+ || (ISKANJI(*ptr) && c1 != '\0'))
- {
- if (indent == 0)
- {
-@@ -681,16 +685,30 @@
- firstwb = pos;
- }
- word_break = pos;
-- if (*ptr != ' ' && ptr[1] &&
-+ if((ISKANJI(*ptr) && c1 != '\0')) {
-+ if (col < max_cols) {
-+ word_break += 2;
-+ buffer[pos++] = c1;
-+ }else{
-+ word_break--;
-+ }
-+ c1 = '\0';
-+ } else if (*ptr != ' ' && ptr[1] &&
- (col + 1 < max_cols))
- word_break++;
-+
- buffer[pos++] = *ptr;
- }
- else
- {
- if (indent == -1)
-- indent = col;
-- buffer[pos++] = *ptr;
-+ indent = col;
-+ if (ISKANJI(*ptr)) {
-+ c1 = *ptr;
-+ } else {
-+ buffer[pos++] = *ptr;
-+ }
-+
- }
- col++;
- break;
-@@ -1494,9 +1512,19 @@
- * a LOT faster, as we have already done the processing once
- * to make output "terminal friendly".
- */
-- if (output)
-- putchar_x(*ptr);
-- out++;
-+ if (ISKANJI(*ptr) && *(ptr + 1)) {
-+ if (output) {
-+ unsigned char k[3];
-+ k[0] = *ptr++; k[1] = *ptr; k[2] = '\0';
-+ putchars_x(k);
-+ }
-+ out += 2;
-+ } else {
-+ if (output) {
-+ putchar_x(*ptr);
-+ }
-+ out++;
-+ }
- }
- }
- ptr++;
-@@ -2562,6 +2590,10 @@
- case 1:
- case 6:
- {
-+ if(ISKANJI(chr) && ISKANJI(this_char())) {
-+ output[pos++] = chr;
-+ output[pos++] = next_char();
-+ } else {
- int my_gcmode = gcmode;
-
- /*
-@@ -2654,7 +2686,8 @@
- case 0:
- break;
- }
-- break;
-+ }
-+ break;
- }
-
-
diff --git a/japanese/epic4/files/patch-server.c b/japanese/epic4/files/patch-server.c
deleted file mode 100644
index c17ff8e1000f..000000000000
--- a/japanese/epic4/files/patch-server.c
+++ /dev/null
@@ -1,32 +0,0 @@
---- source/server.c.orig Fri Sep 29 03:16:55 2000
-+++ source/server.c Mon Dec 4 03:44:17 2000
-@@ -826,6 +826,7 @@
- char buffer[BIG_BUFFER_SIZE * 3 + 1]; /* make this buffer *much*
- * bigger than needed */
- size_t size = BIG_BUFFER_SIZE * 3;
-+ char jis_buffer[BIG_BUFFER_SIZE + 1];
- int len,
- des;
- int server;
-@@ -845,16 +846,18 @@
- yell("mangle_line truncated results! Ick.");
- }
-
-+ Euc2Jis(buffer, jis_buffer, IRCD_BUFFER_SIZE -2);
-+ len = strlen(jis_buffer);
- server_list[server].sent = 1;
- if (len > (IRCD_BUFFER_SIZE - 2) || len == -1)
- buffer[IRCD_BUFFER_SIZE - 2] = 0;
- if (x_debug & DEBUG_OUTBOUND)
- yell("[%d] -> [%s]", des, buffer);
-- strmcat(buffer, "\r\n", IRCD_BUFFER_SIZE);
-+ strmcat(jis_buffer, "\r\n", IRCD_BUFFER_SIZE);
- if (do_hook(SEND_TO_SERVER_LIST, "%d %d %s",
-- server, des, buffer))
-+ server, des, jis_buffer))
- {
-- if (write(des, buffer, strlen(buffer)) == -1 &&
-+ if (write(des, jis_buffer, strlen(jis_buffer)) == -1 &&
- (!get_int_var(NO_FAIL_DISCONNECT_VAR)))
- {
- server_list[server].save_channels = 1;
diff --git a/japanese/epic4/files/patch-status.c b/japanese/epic4/files/patch-status.c
deleted file mode 100644
index fb5fb3a7d8d5..000000000000
--- a/japanese/epic4/files/patch-status.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- source/status.c.orig Tue Dec 5 09:11:57 2000
-+++ source/status.c Tue Jan 6 01:05:58 2004
-@@ -36,7 +36,7 @@
- * Maximum number of "%" expressions in a status line format. If you change
- * this number, you must manually change the sprintf() in make_status
- */
--#define STATUS_FUNCTION(x) static Char * ## x (Window *window, int map, int key)
-+#define STATUS_FUNCTION(x) static Char * x (Window *window, int map, int key)
- #define MAX_FUNCTIONS 40
- #define MAX_STATUS_USER 39
-
diff --git a/japanese/epic4/files/patch-term.c b/japanese/epic4/files/patch-term.c
deleted file mode 100644
index 8229111b0560..000000000000
--- a/japanese/epic4/files/patch-term.c
+++ /dev/null
@@ -1,63 +0,0 @@
---- source/term.c.orig Tue Aug 22 02:48:46 2000
-+++ source/term.c Mon Dec 4 03:44:17 2000
-@@ -9,6 +9,7 @@
- */
-
- #define __need_putchar_x__
-+#define __need_putchars_x__
- #define __need_term_flush__
- #include "irc.h"
- #include "ircaux.h"
-@@ -17,6 +18,7 @@
- #include "window.h"
- #include "screen.h"
- #include "output.h"
-+#include "kanji.h"
-
- /*
- * If "HAVE_TERMINFO" is #define'd then we will use terminfo type function
-@@ -618,8 +620,10 @@
- * we need to worry about here is making sure nothing suspcious, like an
- * escape, makes its way to the output stream.
- */
--void term_putchar (unsigned char c)
-+void term_putchar (unsigned char c1, unsigned char c2)
- {
-+ unsigned char c = c1;
-+
- if (!term_echo_flag)
- {
- putchar_x(' ');
-@@ -656,12 +660,20 @@
- putchar_x('?');
- term_standout_off();
- }
--
-+
-+ /* add */
-+ else if (ISKANJI(c1) && ISKANJI(c2)) {
-+ unsigned char k[3];
-+ /* unsigned char tmp[10]; */
-+
-+ k[0] = c1; k[1] = c2; k[2] = '\0';
-+ putchars_x(k);
-+ }
- /*
- * Everything else is passed through.
- */
-- else
-- putchar_x(c);
-+ else
-+ putchar_x(c);
- }
-
-
-@@ -1303,7 +1315,7 @@
- else if (current_term->TI_ich)
- tputs_x (tparm(current_term->TI_ich, 1));
-
-- term_putchar (c);
-+ term_putchar (c, '\0');
-
- if (current_term->TI_rmir)
- tputs_x(current_term->TI_rmir);
diff --git a/japanese/epic4/files/patch-term.h b/japanese/epic4/files/patch-term.h
deleted file mode 100644
index ab29d5ae9419..000000000000
--- a/japanese/epic4/files/patch-term.h
+++ /dev/null
@@ -1,23 +0,0 @@
---- include/term.h.orig Thu Feb 10 05:07:39 2000
-+++ include/term.h Mon Dec 4 03:44:17 2000
-@@ -30,6 +30,11 @@
- static int putchar_x (int c) { return fputc((int) c, current_ftarget ); }
- #endif
-
-+#ifdef __need_putchars_x__
-+__inline__
-+static int putchars_x (char* c) { return fputs( c, current_ftarget ); }
-+#endif
-+
- #ifdef __need_term_flush__
- __inline__
- static void term_flush (void) { fflush( current_ftarget ); }
-@@ -632,7 +637,7 @@
- int term_init (void);
- int term_resize (void);
- void term_pause (char, char *);
-- void term_putchar (unsigned char);
-+ void term_putchar (unsigned char, unsigned char);
- void term_scroll (int, int, int);
- void term_insert (unsigned char);
- void term_delete (int);
diff --git a/japanese/epic4/pkg-descr b/japanese/epic4/pkg-descr
deleted file mode 100644
index 76862d915a45..000000000000
--- a/japanese/epic4/pkg-descr
+++ /dev/null
@@ -1,13 +0,0 @@
-EPIC4 is a new direction in ircII development. No longer is EPIC 100%
-backwards compatible with ircII, but instead those things where
-compatibility is undesirable have been found and fixed. No gratuitous
-incompatibilities have been added, but lots of new code has been added to
-make EPIC the best ircII client available.
-
-EPIC no longer shares any file names with ircII, so they should happily
-co-exist.
-
-WWW: http://www.epicsol.org/
-
-Japanese support patch was originally done by Atsushi Tagami
-and made available at the following web site.
diff --git a/japanese/epic4/pkg-plist b/japanese/epic4/pkg-plist
deleted file mode 100644
index 23192eb22aee..000000000000
--- a/japanese/epic4/pkg-plist
+++ /dev/null
@@ -1,946 +0,0 @@
-bin/epic
-bin/epic-EPIC4-1.0.1
-libexec/wserv
-share/epic/help/1_General/away
-share/epic/help/1_General/describe
-share/epic/help/1_General/disconnect
-share/epic/help/1_General/ignore
-share/epic/help/1_General/invite
-share/epic/help/1_General/kick
-share/epic/help/1_General/me
-share/epic/help/1_General/mode
-share/epic/help/1_General/msg
-share/epic/help/1_General/nick
-share/epic/help/1_General/notice
-share/epic/help/1_General/notify
-share/epic/help/1_General/ping
-share/epic/help/1_General/query
-share/epic/help/1_General/reconnect
-share/epic/help/1_General/say
-share/epic/help/1_General/server
-share/epic/help/1_General/silence
-share/epic/help/1_General/topic
-share/epic/help/1_General/join
-share/epic/help/1_General/part
-share/epic/help/1_General/quit
-share/epic/help/1_General/channel
-share/epic/help/1_General/leave
-share/epic/help/1_General/bye
-share/epic/help/1_General/signoff
-share/epic/help/1_General/exit
-share/epic/help/1_General/help
-share/epic/help/1_General/ctcp/action
-share/epic/help/1_General/ctcp/clientinfo
-share/epic/help/1_General/ctcp/ctcp
-share/epic/help/1_General/ctcp/echo
-share/epic/help/1_General/ctcp/finger
-share/epic/help/1_General/ctcp/ping
-share/epic/help/1_General/ctcp/time
-share/epic/help/1_General/ctcp/userinfo
-share/epic/help/1_General/ctcp/utc
-share/epic/help/1_General/ctcp/version
-share/epic/help/1_General/dcc/chat
-share/epic/help/1_General/dcc/close
-share/epic/help/1_General/dcc/get
-share/epic/help/1_General/dcc/dcc
-share/epic/help/1_General/dcc/list
-share/epic/help/1_General/dcc/raw
-share/epic/help/1_General/dcc/rename
-share/epic/help/1_General/dcc/send
-share/epic/help/1_General/dcc/resume
-share/epic/help/1_General/dcc/closeall
-share/epic/help/1_General/lastlog
-share/epic/help/1_General/1_General
-share/epic/help/2_Queries/admin
-share/epic/help/2_Queries/date
-share/epic/help/2_Queries/flush
-share/epic/help/2_Queries/host
-share/epic/help/2_Queries/info
-share/epic/help/2_Queries/ison
-share/epic/help/2_Queries/links
-share/epic/help/2_Queries/list
-share/epic/help/2_Queries/lusers
-share/epic/help/2_Queries/map
-share/epic/help/2_Queries/motd
-share/epic/help/2_Queries/names
-share/epic/help/2_Queries/stats
-share/epic/help/2_Queries/trace
-share/epic/help/2_Queries/users
-share/epic/help/2_Queries/version
-share/epic/help/2_Queries/who
-share/epic/help/2_Queries/whois
-share/epic/help/2_Queries/whowas
-share/epic/help/2_Queries/time
-share/epic/help/2_Queries/userhost
-share/epic/help/2_Queries/2_Queries
-share/epic/help/2_Queries/userip
-share/epic/help/3_Operators/connect
-share/epic/help/3_Operators/deop
-share/epic/help/3_Operators/die
-share/epic/help/3_Operators/hash
-share/epic/help/3_Operators/kill
-share/epic/help/3_Operators/oper
-share/epic/help/3_Operators/rehash
-share/epic/help/3_Operators/restart
-share/epic/help/3_Operators/rping
-share/epic/help/3_Operators/squit
-share/epic/help/3_Operators/uping
-share/epic/help/3_Operators/wallops
-share/epic/help/3_Operators/3_Operators
-share/epic/help/4_Misc/bind/backspace
-share/epic/help/4_Misc/bind/backward_character
-share/epic/help/4_Misc/bind/backward_history
-share/epic/help/4_Misc/bind/backward_word
-share/epic/help/4_Misc/bind/beginning_of_line
-share/epic/help/4_Misc/bind/bind
-share/epic/help/4_Misc/bind/bold
-share/epic/help/4_Misc/bind/clear_screen
-share/epic/help/4_Misc/bind/command_completion
-share/epic/help/4_Misc/bind/delete_character
-share/epic/help/4_Misc/bind/delete_next_word
-share/epic/help/4_Misc/bind/delete_previous_word
-share/epic/help/4_Misc/bind/delete_to_previous_space
-share/epic/help/4_Misc/bind/end_of_line
-share/epic/help/4_Misc/bind/enter_digraph
-share/epic/help/4_Misc/bind/enter_menu
-share/epic/help/4_Misc/bind/erase_line
-share/epic/help/4_Misc/bind/erase_to_beg_of_line
-share/epic/help/4_Misc/bind/erase_to_end_of_line
-share/epic/help/4_Misc/bind/forward_character
-share/epic/help/4_Misc/bind/forward_history
-share/epic/help/4_Misc/bind/forward_word
-share/epic/help/4_Misc/bind/highlight_off
-share/epic/help/4_Misc/bind/meta1_character
-share/epic/help/4_Misc/bind/meta4_character
-share/epic/help/4_Misc/bind/next_window
-share/epic/help/4_Misc/bind/nothing
-share/epic/help/4_Misc/bind/parse_command
-share/epic/help/4_Misc/bind/previous_window
-share/epic/help/4_Misc/bind/quit_irc
-share/epic/help/4_Misc/bind/quote_character
-share/epic/help/4_Misc/bind/refresh_inputline
-share/epic/help/4_Misc/bind/refresh_screen
-share/epic/help/4_Misc/bind/reverse
-share/epic/help/4_Misc/bind/scroll_backward
-share/epic/help/4_Misc/bind/scroll_end
-share/epic/help/4_Misc/bind/scroll_forward
-share/epic/help/4_Misc/bind/scroll_start
-share/epic/help/4_Misc/bind/self_insert
-share/epic/help/4_Misc/bind/send_line
-share/epic/help/4_Misc/bind/shove_to_history
-share/epic/help/4_Misc/bind/stop_irc
-share/epic/help/4_Misc/bind/swap_last_window
-share/epic/help/4_Misc/bind/swap_next_window
-share/epic/help/4_Misc/bind/swap_previous_window
-share/epic/help/4_Misc/bind/switch_channels
-share/epic/help/4_Misc/bind/toggle_insert_mode
-share/epic/help/4_Misc/bind/toggle_stop_screen
-share/epic/help/4_Misc/bind/transpose_characters
-share/epic/help/4_Misc/bind/type_text
-share/epic/help/4_Misc/bind/underline
-share/epic/help/4_Misc/bind/unstop_all_windows
-share/epic/help/4_Misc/bind/yank_from_cutbuffer
-share/epic/help/4_Misc/bind/meta2_character
-share/epic/help/4_Misc/bind/meta3_character
-share/epic/help/4_Misc/bind/meta5_character
-share/epic/help/4_Misc/bind/meta6_character
-share/epic/help/4_Misc/bind/meta7_character
-share/epic/help/4_Misc/bind/meta8_character
-share/epic/help/4_Misc/bind/meta9_character
-share/epic/help/4_Misc/bind/unclear_screen
-share/epic/help/4_Misc/bind/meta10_character
-share/epic/help/4_Misc/bind/meta11_character
-share/epic/help/4_Misc/bind/meta12_character
-share/epic/help/4_Misc/bind/meta13_character
-share/epic/help/4_Misc/bind/meta14_character
-share/epic/help/4_Misc/bind/meta15_character
-share/epic/help/4_Misc/bind/meta16_character
-share/epic/help/4_Misc/bind/meta17_character
-share/epic/help/4_Misc/bind/meta18_character
-share/epic/help/4_Misc/bind/meta19_character
-share/epic/help/4_Misc/bind/blink
-share/epic/help/4_Misc/bind/meta20_character
-share/epic/help/4_Misc/bind/meta21_character
-share/epic/help/4_Misc/bind/meta22_character
-share/epic/help/4_Misc/bind/meta23_character
-share/epic/help/4_Misc/bind/meta24_character
-share/epic/help/4_Misc/bind/meta25_character
-share/epic/help/4_Misc/bind/meta26_character
-share/epic/help/4_Misc/bind/meta27_character
-share/epic/help/4_Misc/bind/meta28_character
-share/epic/help/4_Misc/bind/meta29_character
-share/epic/help/4_Misc/bind/meta30_character
-share/epic/help/4_Misc/bind/meta31_character
-share/epic/help/4_Misc/bind/meta32_character
-share/epic/help/4_Misc/bind/meta33_character
-share/epic/help/4_Misc/bind/meta34_character
-share/epic/help/4_Misc/bind/meta35_character
-share/epic/help/4_Misc/bind/meta36_character
-share/epic/help/4_Misc/bind/meta37_character
-share/epic/help/4_Misc/bind/meta38_character
-share/epic/help/4_Misc/bind/meta39_character
-share/epic/help/4_Misc/note
-share/epic/help/4_Misc/set/beep
-share/epic/help/4_Misc/set/always_split_biggest
-share/epic/help/4_Misc/set/auto_new_nick
-share/epic/help/4_Misc/set/auto_rejoin
-share/epic/help/4_Misc/set/auto_unmark_away
-share/epic/help/4_Misc/set/auto_whowas
-share/epic/help/4_Misc/set/beep_max
-share/epic/help/4_Misc/set/beep_on_msg
-share/epic/help/4_Misc/set/beep_when_away
-share/epic/help/4_Misc/set/bold_video
-share/epic/help/4_Misc/set/channel_name_width
-share/epic/help/4_Misc/set/client_information
-share/epic/help/4_Misc/set/clock
-share/epic/help/4_Misc/set/clock_24hour
-share/epic/help/4_Misc/set/clock_alarm
-share/epic/help/4_Misc/set/cmdchars
-share/epic/help/4_Misc/set/command_mode
-share/epic/help/4_Misc/set/comment_hack
-share/epic/help/4_Misc/set/continued_line
-share/epic/help/4_Misc/set/dcc_long_pathnames
-share/epic/help/4_Misc/set/dcc_sliding_window
-share/epic/help/4_Misc/set/dcc_store_path
-share/epic/help/4_Misc/set/debug
-share/epic/help/4_Misc/set/display
-share/epic/help/4_Misc/set/display_ansi
-share/epic/help/4_Misc/set/eight_bit_characters
-share/epic/help/4_Misc/set/encrypt_program
-share/epic/help/4_Misc/set/floating_point_math
-share/epic/help/4_Misc/set/flood_after
-share/epic/help/4_Misc/set/flood_rate
-share/epic/help/4_Misc/set/flood_users
-share/epic/help/4_Misc/set/flood_warning
-share/epic/help/4_Misc/set/full_status_line
-share/epic/help/4_Misc/set/help_pager
-share/epic/help/4_Misc/set/help_path
-share/epic/help/4_Misc/set/help_prompt
-share/epic/help/4_Misc/set/status_voice
-share/epic/help/4_Misc/set/help_window
-share/epic/help/4_Misc/set/hide_private_channels
-share/epic/help/4_Misc/set/highlight_char
-share/epic/help/4_Misc/set/history
-share/epic/help/4_Misc/set/history_file
-share/epic/help/4_Misc/set/hold_mode
-share/epic/help/4_Misc/set/indent
-share/epic/help/4_Misc/set/input_aliases
-share/epic/help/4_Misc/set/input_prompt
-share/epic/help/4_Misc/set/insert_mode
-share/epic/help/4_Misc/set/inverse_video
-share/epic/help/4_Misc/set/lastlog
-share/epic/help/4_Misc/set/lastlog_level
-share/epic/help/4_Misc/set/load_path
-share/epic/help/4_Misc/set/log
-share/epic/help/4_Misc/set/logfile
-share/epic/help/4_Misc/set/mail
-share/epic/help/4_Misc/set/max_recursions
-share/epic/help/4_Misc/set/menu
-share/epic/help/4_Misc/set/mode_stripper
-share/epic/help/4_Misc/set/notify_handler
-share/epic/help/4_Misc/set/notify_level
-share/epic/help/4_Misc/set/notify_on_termination
-share/epic/help/4_Misc/set/novice
-share/epic/help/4_Misc/set/no_ctcp_flood
-share/epic/help/4_Misc/set/num_of_whowas
-share/epic/help/4_Misc/set/pad_char
-share/epic/help/4_Misc/set/realname
-share/epic/help/4_Misc/set/screen_options
-share/epic/help/4_Misc/set/scroll
-share/epic/help/4_Misc/set/scroll_lines
-share/epic/help/4_Misc/set/security
-share/epic/help/4_Misc/set/send_ignore_msg
-share/epic/help/4_Misc/set/set
-share/epic/help/4_Misc/set/shell
-share/epic/help/4_Misc/set/shell_flags
-share/epic/help/4_Misc/set/shell_limit
-share/epic/help/4_Misc/set/show_away_once
-share/epic/help/4_Misc/set/show_channel_names
-share/epic/help/4_Misc/set/show_end_of_msgs
-share/epic/help/4_Misc/set/show_numerics
-share/epic/help/4_Misc/set/show_status_all
-share/epic/help/4_Misc/set/show_who_hopcount
-share/epic/help/4_Misc/set/status_away
-share/epic/help/4_Misc/set/status_channel
-share/epic/help/4_Misc/set/status_chanop
-share/epic/help/4_Misc/set/status_clock
-share/epic/help/4_Misc/set/status_format
-share/epic/help/4_Misc/set/status_hold
-share/epic/help/4_Misc/set/status_hold_lines
-share/epic/help/4_Misc/set/status_insert
-share/epic/help/4_Misc/set/status_mail
-share/epic/help/4_Misc/set/status_mode
-share/epic/help/4_Misc/set/tab
-share/epic/help/4_Misc/set/status_notify
-share/epic/help/4_Misc/set/status_no_repeat
-share/epic/help/4_Misc/set/status_oper
-share/epic/help/4_Misc/set/status_overwrite
-share/epic/help/4_Misc/set/status_query
-share/epic/help/4_Misc/set/status_server
-share/epic/help/4_Misc/set/status_umode
-share/epic/help/4_Misc/set/status_user
-share/epic/help/4_Misc/set/status_user1
-share/epic/help/4_Misc/set/status_user2
-share/epic/help/4_Misc/set/status_user3
-share/epic/help/4_Misc/set/status_user4
-share/epic/help/4_Misc/set/status_user5
-share/epic/help/4_Misc/set/status_user6
-share/epic/help/4_Misc/set/status_user7
-share/epic/help/4_Misc/set/status_user8
-share/epic/help/4_Misc/set/status_user9
-share/epic/help/4_Misc/set/status_window
-share/epic/help/4_Misc/set/suppress_from_remote_server
-share/epic/help/4_Misc/set/suppress_server_motd
-share/epic/help/4_Misc/set/tab_max
-share/epic/help/4_Misc/set/underline_video
-share/epic/help/4_Misc/set/user_information
-share/epic/help/4_Misc/set/verbose_ctcp
-share/epic/help/4_Misc/set/warn_of_ignores
-share/epic/help/4_Misc/set/xterm_options
-share/epic/help/4_Misc/set/status_format1
-share/epic/help/4_Misc/set/status_format2
-share/epic/help/4_Misc/set/connect_timeout
-share/epic/help/4_Misc/set/banner
-share/epic/help/4_Misc/set/dispatch_unknown_command
-share/epic/help/4_Misc/set/quit_message
-share/epic/help/4_Misc/set/auto_rejoin_delay
-share/epic/help/4_Misc/set/auto_reconnect_delay
-share/epic/help/4_Misc/set/notify_interval
-share/epic/help/4_Misc/set/do_notify_immediately
-share/epic/help/4_Misc/set/xterm
-share/epic/help/4_Misc/set/notify_userhost_automatic
-share/epic/help/4_Misc/set/nd_space_max
-share/epic/help/4_Misc/set/clock_format
-share/epic/help/4_Misc/set/banner_expand
-share/epic/help/4_Misc/set/status_nick
-share/epic/help/4_Misc/set/no_control_log
-share/epic/help/4_Misc/set/status_does_expandos
-share/epic/help/4_Misc/set/status_scrollback
-share/epic/help/4_Misc/set/no_fail_disconnect
-share/epic/help/4_Misc/set/scrollback
-share/epic/help/4_Misc/set/cpu_saver_after
-share/epic/help/4_Misc/set/cpu_saver_every
-share/epic/help/4_Misc/set/blink_video
-share/epic/help/4_Misc/set/reverse_video
-share/epic/help/4_Misc/set/high_bit_escape
-share/epic/help/4_Misc/set/dcc_auto_timeout
-share/epic/help/4_Misc/set/color
-share/epic/help/4_Misc/set/mirc_broken_dcc_resume
-share/epic/help/4_Misc/set/scrollback_ratio
-share/epic/help/4_Misc/set/current_window_level
-share/epic/help/4_Misc/set/status_truncate_rhs
-share/epic/help/4_Misc/set/reverse_status_line
-share/epic/help/4_Misc/abort
-share/epic/help/4_Misc/beep
-share/epic/help/4_Misc/cd
-share/epic/help/4_Misc/clear
-share/epic/help/4_Misc/hostname
-share/epic/help/4_Misc/ircuser
-share/epic/help/4_Misc/mesg
-share/epic/help/4_Misc/mload
-share/epic/help/4_Misc/mlist
-share/epic/help/4_Misc/rbind
-share/epic/help/4_Misc/realname
-share/epic/help/4_Misc/summon
-share/epic/help/4_Misc/which
-share/epic/help/4_Misc/ircname
-share/epic/help/4_Misc/digraph
-share/epic/help/4_Misc/history
-share/epic/help/4_Misc/window/add
-share/epic/help/4_Misc/window/back
-share/epic/help/4_Misc/window/balance
-share/epic/help/4_Misc/window/channel
-share/epic/help/4_Misc/window/create
-share/epic/help/4_Misc/window/delete
-share/epic/help/4_Misc/window/goto
-share/epic/help/4_Misc/window/grow
-share/epic/help/4_Misc/window/hide
-share/epic/help/4_Misc/window/hide_others
-share/epic/help/4_Misc/window/hold_mode
-share/epic/help/4_Misc/window/kill
-share/epic/help/4_Misc/window/bind
-share/epic/help/4_Misc/window/kill_others
-share/epic/help/4_Misc/window/last
-share/epic/help/4_Misc/window/lastlog_level
-share/epic/help/4_Misc/window/level
-share/epic/help/4_Misc/window/list
-share/epic/help/4_Misc/window/log
-share/epic/help/4_Misc/window/logfile
-share/epic/help/4_Misc/window/move
-share/epic/help/4_Misc/window/name
-share/epic/help/4_Misc/window/new
-share/epic/help/4_Misc/window/next
-share/epic/help/4_Misc/window/notify
-share/epic/help/4_Misc/window/notify_level
-share/epic/help/4_Misc/window/number
-share/epic/help/4_Misc/window/pop
-share/epic/help/4_Misc/window/previous
-share/epic/help/4_Misc/window/prompt
-share/epic/help/4_Misc/window/push
-share/epic/help/4_Misc/window/refnum
-share/epic/help/4_Misc/window/remove
-share/epic/help/4_Misc/window/scroll
-share/epic/help/4_Misc/window/server
-share/epic/help/4_Misc/window/show
-share/epic/help/4_Misc/window/shrink
-share/epic/help/4_Misc/window/size
-share/epic/help/4_Misc/window/stack
-share/epic/help/4_Misc/window/swap
-share/epic/help/4_Misc/window/window
-share/epic/help/4_Misc/window/killswap
-share/epic/help/4_Misc/window/unbind
-share/epic/help/4_Misc/window/double
-share/epic/help/4_Misc/window/beep_always
-share/epic/help/4_Misc/window/lastlog
-share/epic/help/4_Misc/window/fixed
-share/epic/help/4_Misc/window/skip
-share/epic/help/4_Misc/window/discon
-share/epic/help/4_Misc/window/scratch
-share/epic/help/4_Misc/window/noserv
-share/epic/help/4_Misc/window/echo
-share/epic/help/4_Misc/window/query
-share/epic/help/4_Misc/window/status_special
-share/epic/help/4_Misc/encrypt
-share/epic/help/4_Misc/irchost
-share/epic/help/4_Misc/4_Misc
-share/epic/help/4_Misc/unclear
-share/epic/help/5_Programming/alias
-share/epic/help/5_Programming/assign
-share/epic/help/5_Programming/call
-share/epic/help/5_Programming/comment
-share/epic/help/5_Programming/dump
-share/epic/help/5_Programming/echo
-share/epic/help/5_Programming/eval
-share/epic/help/5_Programming/fe
-share/epic/help/5_Programming/fec
-share/epic/help/5_Programming/for
-share/epic/help/5_Programming/foreach
-share/epic/help/5_Programming/hook
-share/epic/help/5_Programming/if
-share/epic/help/5_Programming/input
-share/epic/help/5_Programming/parsekey
-share/epic/help/5_Programming/pop
-share/epic/help/5_Programming/push
-share/epic/help/5_Programming/queue
-share/epic/help/5_Programming/quote
-share/epic/help/5_Programming/send
-share/epic/help/5_Programming/sendline
-share/epic/help/5_Programming/shift
-share/epic/help/5_Programming/sleep
-share/epic/help/5_Programming/stub
-share/epic/help/5_Programming/switch
-share/epic/help/5_Programming/timer
-share/epic/help/5_Programming/type
-share/epic/help/5_Programming/unless
-share/epic/help/5_Programming/until
-share/epic/help/5_Programming/wait
-share/epic/help/5_Programming/while
-share/epic/help/5_Programming/xecho
-share/epic/help/5_Programming/xtype
-share/epic/help/5_Programming/do
-share/epic/help/5_Programming/on/ctcp
-share/epic/help/5_Programming/on/send_to_server
-share/epic/help/5_Programming/on/action
-share/epic/help/5_Programming/on/channel_nick
-share/epic/help/5_Programming/on/channel_signoff
-share/epic/help/5_Programming/on/connect
-share/epic/help/5_Programming/on/ctcp_reply
-share/epic/help/5_Programming/on/dcc_chat
-share/epic/help/5_Programming/on/dcc_connect
-share/epic/help/5_Programming/on/dcc_lost
-share/epic/help/5_Programming/on/dcc_raw
-share/epic/help/5_Programming/on/dcc_request
-share/epic/help/5_Programming/on/disconnect
-share/epic/help/5_Programming/on/encrypted_notice
-share/epic/help/5_Programming/on/encrypted_privmsg
-share/epic/help/5_Programming/on/exec
-share/epic/help/5_Programming/on/exec_errors
-share/epic/help/5_Programming/on/exec_exit
-share/epic/help/5_Programming/on/exec_prompt
-share/epic/help/5_Programming/on/exit
-share/epic/help/5_Programming/on/flood
-share/epic/help/5_Programming/on/help
-share/epic/help/5_Programming/on/hook
-share/epic/help/5_Programming/on/idle
-share/epic/help/5_Programming/on/input
-share/epic/help/5_Programming/on/invite
-share/epic/help/5_Programming/on/join
-share/epic/help/5_Programming/on/kick
-share/epic/help/5_Programming/on/leave
-share/epic/help/5_Programming/on/list
-share/epic/help/5_Programming/on/mail
-share/epic/help/5_Programming/on/mode
-share/epic/help/5_Programming/on/mode_stripped
-share/epic/help/5_Programming/on/msg
-share/epic/help/5_Programming/on/msg_group
-share/epic/help/5_Programming/on/names
-share/epic/help/5_Programming/on/nickname
-share/epic/help/5_Programming/on/note
-share/epic/help/5_Programming/on/notice
-share/epic/help/5_Programming/on/notify_signoff
-share/epic/help/5_Programming/on/notify_signon
-share/epic/help/5_Programming/on/pong
-share/epic/help/5_Programming/on/public
-share/epic/help/5_Programming/on/public_msg
-share/epic/help/5_Programming/on/public_notice
-share/epic/help/5_Programming/on/public_other
-share/epic/help/5_Programming/on/raw_irc
-share/epic/help/5_Programming/on/send_action
-share/epic/help/5_Programming/on/send_dcc_chat
-share/epic/help/5_Programming/on/send_msg
-share/epic/help/5_Programming/on/send_notice
-share/epic/help/5_Programming/on/send_public
-share/epic/help/5_Programming/on/server_notice
-share/epic/help/5_Programming/on/signoff
-share/epic/help/5_Programming/on/silence
-share/epic/help/5_Programming/on/timer
-share/epic/help/5_Programming/on/topic
-share/epic/help/5_Programming/on/wall
-share/epic/help/5_Programming/on/wallop
-share/epic/help/5_Programming/on/who
-share/epic/help/5_Programming/on/widelist
-share/epic/help/5_Programming/on/window
-share/epic/help/5_Programming/on/window_kill
-share/epic/help/5_Programming/on/on
-share/epic/help/5_Programming/on/odd_server_stuff
-share/epic/help/5_Programming/on/status_update
-share/epic/help/5_Programming/on/set
-share/epic/help/5_Programming/on/oper_notice
-share/epic/help/5_Programming/on/kill
-share/epic/help/5_Programming/on/dcc_list
-share/epic/help/5_Programming/on/window_create
-share/epic/help/5_Programming/on/redirect
-share/epic/help/5_Programming/on/yell
-share/epic/help/5_Programming/on/dcc_offer
-share/epic/help/5_Programming/on/server_lost
-share/epic/help/5_Programming/on/unload
-share/epic/help/5_Programming/on/send_ctcp
-share/epic/help/5_Programming/stack
-share/epic/help/5_Programming/unshift
-share/epic/help/5_Programming/pretend
-share/epic/help/5_Programming/load
-share/epic/help/5_Programming/exec
-share/epic/help/5_Programming/redirect
-share/epic/help/5_Programming/save
-share/epic/help/5_Programming/input_char
-share/epic/help/5_Programming/pause
-share/epic/help/5_Programming/5_Programming
-share/epic/help/5_Programming/repeat
-share/epic/help/5_Programming/local
-share/epic/help/5_Programming/setenv
-share/epic/help/5_Programming/shook
-share/epic/help/5_Programming/continue
-share/epic/help/5_Programming/break
-share/epic/help/5_Programming/return
-share/epic/help/5_Programming/bless
-share/epic/help/5_Programming/xeval
-share/epic/help/5_Programming/package
-share/epic/help/5_Programming/unload
-share/epic/help/5_Programming/blah
-share/epic/help/5_Programming/usleep
-share/epic/help/6_Functions/after
-share/epic/help/6_Functions/writeb
-share/epic/help/6_Functions/write
-share/epic/help/6_Functions/word
-share/epic/help/6_Functions/winvisible
-share/epic/help/6_Functions/winsize
-share/epic/help/6_Functions/winserv
-share/epic/help/6_Functions/winnum
-share/epic/help/6_Functions/winnam
-share/epic/help/6_Functions/which
-share/epic/help/6_Functions/version
-share/epic/help/6_Functions/utime
-share/epic/help/6_Functions/usermode
-share/epic/help/6_Functions/userhost
-share/epic/help/6_Functions/unshift
-share/epic/help/6_Functions/unlink
-share/epic/help/6_Functions/uniq
-share/epic/help/6_Functions/umask
-share/epic/help/6_Functions/twiddle
-share/epic/help/6_Functions/trunc
-share/epic/help/6_Functions/tr
-share/epic/help/6_Functions/tow
-share/epic/help/6_Functions/toupper
-share/epic/help/6_Functions/tolower
-share/epic/help/6_Functions/time
-share/epic/help/6_Functions/tdiff2
-share/epic/help/6_Functions/tdiff
-share/epic/help/6_Functions/notw
-share/epic/help/6_Functions/shift
-share/epic/help/6_Functions/strlen
-share/epic/help/6_Functions/fromw
-share/epic/help/6_Functions/stripansi
-share/epic/help/6_Functions/strip
-share/epic/help/6_Functions/strftime
-share/epic/help/6_Functions/stime
-share/epic/help/6_Functions/srand
-share/epic/help/6_Functions/split
-share/epic/help/6_Functions/splice
-share/epic/help/6_Functions/sort
-share/epic/help/6_Functions/setitem
-share/epic/help/6_Functions/servername
-share/epic/help/6_Functions/sar
-share/epic/help/6_Functions/pass
-share/epic/help/6_Functions/numsort
-share/epic/help/6_Functions/rmdir
-share/epic/help/6_Functions/revw
-share/epic/help/6_Functions/reverse
-share/epic/help/6_Functions/restw
-share/epic/help/6_Functions/repeat
-share/epic/help/6_Functions/rename
-share/epic/help/6_Functions/remw
-share/epic/help/6_Functions/read
-share/epic/help/6_Functions/rand
-share/epic/help/6_Functions/ppid
-share/epic/help/6_Functions/pop
-share/epic/help/6_Functions/pid
-share/epic/help/6_Functions/pattern
-share/epic/help/6_Functions/matchitem
-share/epic/help/6_Functions/match
-share/epic/help/6_Functions/index
-share/epic/help/6_Functions/leftw
-share/epic/help/6_Functions/mid
-share/epic/help/6_Functions/left
-share/epic/help/6_Functions/filter
-share/epic/help/6_Functions/rpattern
-share/epic/help/6_Functions/rmatchitem
-share/epic/help/6_Functions/rmatch
-share/epic/help/6_Functions/rindex
-share/epic/help/6_Functions/rightw
-share/epic/help/6_Functions/right
-share/epic/help/6_Functions/rfilter
-share/epic/help/6_Functions/push
-share/epic/help/6_Functions/open
-share/epic/help/6_Functions/onchannel
-share/epic/help/6_Functions/numwords
-share/epic/help/6_Functions/numonchannel
-share/epic/help/6_Functions/numitems
-share/epic/help/6_Functions/numarrays
-share/epic/help/6_Functions/notify
-share/epic/help/6_Functions/afterw
-share/epic/help/6_Functions/nametoip
-share/epic/help/6_Functions/myservers
-share/epic/help/6_Functions/mychannels
-share/epic/help/6_Functions/mkdir
-share/epic/help/6_Functions/midw
-share/epic/help/6_Functions/listen
-share/epic/help/6_Functions/lastserver
-share/epic/help/6_Functions/key
-share/epic/help/6_Functions/itemtoindex
-share/epic/help/6_Functions/isdigit
-share/epic/help/6_Functions/isalpha
-share/epic/help/6_Functions/ischanop
-share/epic/help/6_Functions/ischannel
-share/epic/help/6_Functions/iptoname
-share/epic/help/6_Functions/indextoitem
-share/epic/help/6_Functions/igetitem
-share/epic/help/6_Functions/ifinditem
-share/epic/help/6_Functions/ifindfirst
-share/epic/help/6_Functions/jot
-share/epic/help/6_Functions/info
-share/epic/help/6_Functions/insertw
-share/epic/help/6_Functions/aliasctl
-share/epic/help/6_Functions/chanusers
-share/epic/help/6_Functions/ascii
-share/epic/help/6_Functions/before
-share/epic/help/6_Functions/beforew
-share/epic/help/6_Functions/center
-share/epic/help/6_Functions/chanmode
-share/epic/help/6_Functions/chmod
-share/epic/help/6_Functions/chngw
-share/epic/help/6_Functions/chops
-share/epic/help/6_Functions/chr
-share/epic/help/6_Functions/close
-share/epic/help/6_Functions/common
-share/epic/help/6_Functions/connect
-share/epic/help/6_Functions/convert
-share/epic/help/6_Functions/copattern
-share/epic/help/6_Functions/crypt
-share/epic/help/6_Functions/curpos
-share/epic/help/6_Functions/decode
-share/epic/help/6_Functions/eof
-share/epic/help/6_Functions/delarray
-share/epic/help/6_Functions/delitem
-share/epic/help/6_Functions/diff
-share/epic/help/6_Functions/encode
-share/epic/help/6_Functions/epic
-share/epic/help/6_Functions/fexist
-share/epic/help/6_Functions/finditem
-share/epic/help/6_Functions/fsize
-share/epic/help/6_Functions/geom
-share/epic/help/6_Functions/getarrays
-share/epic/help/6_Functions/getitem
-share/epic/help/6_Functions/getmatches
-share/epic/help/6_Functions/getrmatches
-share/epic/help/6_Functions/glob
-share/epic/help/6_Functions/idle
-share/epic/help/6_Functions/nochops
-share/epic/help/6_Functions/6_Functions
-share/epic/help/6_Functions/status
-share/epic/help/6_Functions/chanwin
-share/epic/help/6_Functions/findw
-share/epic/help/6_Functions/uhc
-share/epic/help/6_Functions/winbound
-share/epic/help/6_Functions/irclib
-share/epic/help/6_Functions/ftime
-share/epic/help/6_Functions/substr
-share/epic/help/6_Functions/deuhc
-share/epic/help/6_Functions/nohighlight
-share/epic/help/6_Functions/winnicklist
-share/epic/help/6_Functions/winchan
-share/epic/help/6_Functions/fnexist
-share/epic/help/6_Functions/servernick
-share/epic/help/6_Functions/isconnected
-share/epic/help/6_Functions/currchans
-share/epic/help/6_Functions/cexist
-share/epic/help/6_Functions/regex
-share/epic/help/6_Functions/regcomp
-share/epic/help/6_Functions/regexec
-share/epic/help/6_Functions/regerror
-share/epic/help/6_Functions/regfree
-share/epic/help/6_Functions/getenv
-share/epic/help/6_Functions/msar
-share/epic/help/6_Functions/pipe
-share/epic/help/6_Functions/count
-share/epic/help/6_Functions/igmask
-share/epic/help/6_Functions/randread
-share/epic/help/6_Functions/rigmask
-share/epic/help/6_Functions/leftpc
-share/epic/help/6_Functions/cparse
-share/epic/help/6_Functions/uname
-share/epic/help/6_Functions/querywin
-share/epic/help/6_Functions/winrefs
-share/epic/help/6_Functions/mask
-share/epic/help/6_Functions/ischanvoice
-share/epic/help/6_Functions/chop
-share/epic/help/6_Functions/winlevel
-share/epic/help/6_Functions/igtype
-share/epic/help/6_Functions/rigtype
-share/epic/help/6_Functions/getuid
-share/epic/help/6_Functions/getgid
-share/epic/help/6_Functions/getpgrp
-share/epic/help/6_Functions/getlogin
-share/epic/help/6_Functions/iscurchan
-share/epic/help/6_Functions/channel
-share/epic/help/6_Functions/pad
-share/epic/help/6_Functions/remws
-share/epic/help/6_Functions/printlen
-share/epic/help/6_Functions/stripansicodes
-share/epic/help/6_Functions/isnumber
-share/epic/help/6_Functions/rest
-share/epic/help/6_Functions/getsets
-share/epic/help/6_Functions/servnum
-share/epic/help/6_Functions/servports
-share/epic/help/6_Functions/igetmatches
-share/epic/help/6_Functions/igetrmatches
-share/epic/help/6_Functions/gettmatch
-share/epic/help/6_Functions/stripc
-share/epic/help/7_Docs/New_User
-share/epic/help/7_Docs/Etiquette
-share/epic/help/7_Docs/Copyright
-share/epic/help/7_Docs/Text_Highlight
-share/epic/help/7_Docs/Server_List
-share/epic/help/7_Docs/Signals
-share/epic/help/7_Docs/Expressions
-share/epic/help/7_Docs/Environment
-share/epic/help/7_Docs/Updates
-share/epic/help/7_Docs/Introduction
-share/epic/help/7_Docs/About_EPIC
-share/epic/help/7_Docs/Command_Line
-share/epic/help/7_Docs/Patterns
-share/epic/help/7_Docs/Serial_Numbers
-share/epic/help/7_Docs/Status_Line
-share/epic/help/7_Docs/Programming
-share/epic/help/7_Docs/Special_Vars
-share/epic/help/7_Docs/Arrays
-share/epic/help/7_Docs/Security
-share/epic/help/7_Docs/Key_Bindings
-share/epic/help/7_Docs/Compile_Opts
-share/epic/help/7_Docs/7_Docs
-share/epic/help/7_Docs/Server_Numerics
-share/epic/help/8_Scripts/2.8script
-share/epic/help/8_Scripts/action
-share/epic/help/8_Scripts/alias
-share/epic/help/8_Scripts/autokick
-share/epic/help/8_Scripts/autoop
-share/epic/help/8_Scripts/away
-share/epic/help/8_Scripts/basical
-share/epic/help/8_Scripts/bigcheese
-share/epic/help/8_Scripts/brc
-share/epic/help/8_Scripts/channel
-share/epic/help/8_Scripts/columns
-share/epic/help/8_Scripts/commander
-share/epic/help/8_Scripts/compl.mods
-share/epic/help/8_Scripts/complete
-share/epic/help/8_Scripts/country
-share/epic/help/8_Scripts/cursor
-share/epic/help/8_Scripts/deban
-share/epic/help/8_Scripts/deutsch
-share/epic/help/8_Scripts/disc
-share/epic/help/8_Scripts/edit
-share/epic/help/8_Scripts/english
-share/epic/help/8_Scripts/environment
-share/epic/help/8_Scripts/events
-share/epic/help/8_Scripts/events.hop
-share/epic/help/8_Scripts/fake-dcc
-share/epic/help/8_Scripts/fe
-share/epic/help/8_Scripts/files
-share/epic/help/8_Scripts/finger
-share/epic/help/8_Scripts/guh
-share/epic/help/8_Scripts/fnet
-share/epic/help/8_Scripts/follow
-share/epic/help/8_Scripts/functions
-share/epic/help/8_Scripts/funnyban
-share/epic/help/8_Scripts/genalias
-share/epic/help/8_Scripts/global
-share/epic/help/8_Scripts/history
-share/epic/help/8_Scripts/history-match
-share/epic/help/8_Scripts/imap
-share/epic/help/8_Scripts/ircprimer
-share/epic/help/8_Scripts/ircrc
-share/epic/help/8_Scripts/keybinds
-share/epic/help/8_Scripts/kickmenu
-share/epic/help/8_Scripts/killpath
-share/epic/help/8_Scripts/kpstat
-share/epic/help/8_Scripts/list
-share/epic/help/8_Scripts/local
-share/epic/help/8_Scripts/log
-share/epic/help/8_Scripts/ls
-share/epic/help/8_Scripts/lynx_ircrc
-share/epic/help/8_Scripts/meta
-share/epic/help/8_Scripts/meta1
-share/epic/help/8_Scripts/modes
-share/epic/help/8_Scripts/more
-share/epic/help/8_Scripts/msg
-share/epic/help/8_Scripts/mudirc
-share/epic/help/8_Scripts/mudlike
-share/epic/help/8_Scripts/multi
-share/epic/help/8_Scripts/nemesis
-share/epic/help/8_Scripts/netsplit
-share/epic/help/8_Scripts/netsplit.env
-share/epic/help/8_Scripts/newaway
-share/epic/help/8_Scripts/newformat
-share/epic/help/8_Scripts/ping
-share/epic/help/8_Scripts/nicks
-share/epic/help/8_Scripts/old-dcc
-share/epic/help/8_Scripts/oldping
-share/epic/help/8_Scripts/prefix
-share/epic/help/8_Scripts/recursion
-share/epic/help/8_Scripts/repeat
-share/epic/help/8_Scripts/screen
-share/epic/help/8_Scripts/shell
-share/epic/help/8_Scripts/silent
-share/epic/help/8_Scripts/smileys
-share/epic/help/8_Scripts/sound
-share/epic/help/8_Scripts/spfix
-share/epic/help/8_Scripts/starutils
-share/epic/help/8_Scripts/stat
-share/epic/help/8_Scripts/tabkey
-share/epic/help/8_Scripts/tabkey.wc
-share/epic/help/8_Scripts/tc
-share/epic/help/8_Scripts/time
-share/epic/help/8_Scripts/tls
-share/epic/help/8_Scripts/troy
-share/epic/help/8_Scripts/uhnotify
-share/epic/help/8_Scripts/uping
-share/epic/help/8_Scripts/wallopstat
-share/epic/help/8_Scripts/webster
-share/epic/help/8_Scripts/window
-share/epic/help/8_Scripts/less
-share/epic/help/8_Scripts/8_Scripts
-share/epic/help/8_Scripts/pipe
-share/epic/help/8_Scripts/man
-share/epic/help/README_FIRST
-share/epic/script/2.8script
-share/epic/script/alias
-share/epic/script/autokick
-share/epic/script/autoop
-share/epic/script/away
-share/epic/script/basical
-share/epic/script/columns
-share/epic/script/country
-share/epic/script/dcc_timeout
-share/epic/script/deban
-share/epic/script/debug.irc
-share/epic/script/dig
-share/epic/script/dns
-share/epic/script/edit
-share/epic/script/edit_topic
-share/epic/script/efnext
-share/epic/script/environment
-share/epic/script/events
-share/epic/script/events.hop
-share/epic/script/fake-dcc
-share/epic/script/fe
-share/epic/script/files
-share/epic/script/functions
-share/epic/script/genalias
-share/epic/script/grep
-share/epic/script/global
-share/epic/script/guh
-share/epic/script/hybrid6
-share/epic/script/imap
-share/epic/script/ip-to-int
-share/epic/script/ircprimer
-share/epic/script/keybinds
-share/epic/script/killpath
-share/epic/script/kpstat
-share/epic/script/langtrans
-share/epic/script/less
-share/epic/script/less-pipe
-share/epic/script/list
-share/epic/script/local.examp
-share/epic/script/ls
-share/epic/script/man
-share/epic/script/meta
-share/epic/script/more
-share/epic/script/motd
-share/epic/script/mudirc
-share/epic/script/netsplit
-share/epic/script/netsplit.env
-share/epic/script/newaway
-share/epic/script/newformat
-share/epic/script/nicks
-share/epic/script/nopaste
-share/epic/script/old-dcc
-share/epic/script/pipe
-share/epic/script/prefix
-share/epic/script/recursion
-share/epic/script/repeat
-share/epic/script/revdcc
-share/epic/script/scan
-share/epic/script/scandir
-share/epic/script/screen
-share/epic/script/sdiff
-share/epic/script/setmail
-share/epic/script/silent
-share/epic/script/sound
-share/epic/script/starutils
-share/epic/script/stat
-share/epic/script/status_lag
-share/epic/script/tabkey
-share/epic/script/tabkey.th
-share/epic/script/tc
-share/epic/script/time
-share/epic/script/tls
-share/epic/script/utime
-share/epic/script/vi-binds
-share/epic/script/webster
-share/epic/script/window
-@dirrm share/epic/script
-@dirrm share/epic/help/1_General/ctcp
-@dirrm share/epic/help/1_General/dcc
-@dirrm share/epic/help/1_General
-@dirrm share/epic/help/2_Queries
-@dirrm share/epic/help/3_Operators
-@dirrm share/epic/help/4_Misc/bind
-@dirrm share/epic/help/4_Misc/set
-@dirrm share/epic/help/4_Misc/window
-@dirrm share/epic/help/4_Misc
-@dirrm share/epic/help/5_Programming/on
-@dirrm share/epic/help/5_Programming
-@dirrm share/epic/help/6_Functions
-@dirrm share/epic/help/7_Docs
-@dirrm share/epic/help/8_Scripts
-@dirrm share/epic/help
-@dirrm share/epic
diff --git a/japanese/rxvt/Makefile b/japanese/rxvt/Makefile
deleted file mode 100644
index 3d73cd3560d9..000000000000
--- a/japanese/rxvt/Makefile
+++ /dev/null
@@ -1,52 +0,0 @@
-# New ports collection Makefile for: ja-rxvt
-# Date created: 11 May 1999
-# Whom: HONDA Yasuhiro <honda@kashio.info.mie-u.ac.jp>
-#
-# $FreeBSD$
-#
-
-PORTNAME= rxvt
-PORTVERSION= 2.7.2
-PORTREVISION= 2
-CATEGORIES= japanese x11
-MASTER_SITES= ftp://ftp.rxvt.org/pub/rxvt/
-
-MAINTAINER= ports@FreeBSD.org
-COMMENT= An xterm replacement that supports pixmap background and Japanese
-
-BROKEN= Does not fetch
-
-USE_XORG= x11 ice xt xpm
-GNU_CONFIGURE= yes
-USE_BZIP2= yes
-MAN1= rxvt.1 rclock.1
-CONFIGURE_ARGS= --enable-xpm-background --enable-transparency \
- --enable-menubar --enable-graphics --enable-xim \
- --enable-languages --with-encoding=eucj \
- --disable-backspace-key --disable-delete-key \
- --enable-utmp --enable-wtmp \
- --with-xpm --with-xpm-includes=${LOCALBASE}/include/X11 \
- --with-xpm-library=${LOCALBASE}/lib
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
-
-DOCDIR= ${PREFIX}/share/doc/ja/rxvt
-RXVTLIB= ${PREFIX}/lib/X11/rxvt
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} > 900007
-BROKEN= fails to build with new utmpx
-.endif
-
-pre-install:
- @${MKDIR} ${DOCDIR}
- @${INSTALL_DATA} ${FILESDIR}/README.ja ${DOCDIR}
- @${MKDIR} ${RXVTLIB}
- @${INSTALL_DATA} ${FILESDIR}/ja.menu ${RXVTLIB}
- @${INSTALL_DATA} ${FILESDIR}/terminal.menu ${RXVTLIB}
-
-post-install:
- @${CHMOD} 4711 ${PREFIX}/bin/rxvt
-
-.include <bsd.port.post.mk>
diff --git a/japanese/rxvt/distinfo b/japanese/rxvt/distinfo
deleted file mode 100644
index f2ffc6b54000..000000000000
--- a/japanese/rxvt/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (rxvt-2.7.2.tar.bz2) = c39fd2208f336666c61468aaaacad0b7f4dbdd50cf65906d438bf449ce731c20
-SIZE (rxvt-2.7.2.tar.bz2) = 257944
diff --git a/japanese/rxvt/files/README.ja b/japanese/rxvt/files/README.ja
deleted file mode 100644
index dd9fe67722f6..000000000000
--- a/japanese/rxvt/files/README.ja
+++ /dev/null
@@ -1,131 +0,0 @@
-rxvtのXIMサポートについて
--------------------------------------------------------------------------------
-
-目次:
-
- 1. 概要
- 2. rxvtのXIMに関する機能
- 3. 日本語の表示
- 4. 日本語入力の方法
- 5. input method、入力のスタイルの設定
- 6. 問題点
- 7. その他
-
--------------------------------------------------------------------------------
-
-1. 概要
-
-rxvtでは、kinput2やVJE-Deltaなどの XIM (X Input Method) Protocol
-をサポートしているinput methodでOverTheSpot, OffTheSpot, Rootの
-3つのスタイルで日本語を入力する事ができます。
-このREADMEでは、日本語の表示や入力に関する説明をします。
-
-
-2. rxvtのXIMに関する機能
-
-rxvtのXIMに関する機能は以下の通りです。
-
- OverTheSpot, OffTheSpot, Rootの3つのスタイルで日本語入力が可能
- rxvtを起動した後にinput methodを起動してinput methodが有効になる
- 一旦input methodを殺してから再び起動してinput methodが有効になる
- .Xresourcesとコマンドラインオプションでinput methodと
- 入力のスタイルを指定可能 (OverTheSpot, OffTheSpot, Root)
-
-
-3. 日本語の表示
-
-rxvtはデフォルトの状態で日本語(文字コード ISO-2022-JP, 日本語EUC)を
-表示できます。デフォルトではシフトJISは表示する事ができません。
-シフトJISを表示したい場合は、コマンドラインのオプションで
--km sjis を付けて起動します。
-
-(例)
-% rxvt -km sjis &
-
-起動する時にいちいちオプションを付けるのが面倒な場合は、
-ホームディレクトリの .Xresources に以下のように書いておきましょう。
-
-(例)
-Rxvt*multichar_encoding: sjis
-
-表示する文字コードをシフトJISにすると逆に日本語EUCを
-表示する事ができなくなります。ISO-2022-JPでは表示できます。
-表示する文字コードがシフトJISの時はrxvtを起動する時に
-ロケールをja_JP.SJISに設定していないとkinput2などで日本語を
-入力する時に文字を確定すると文字が読めなくなってしまいます。
-
-
-4. 日本語入力の方法
-
-例えば、kinput2を使って日本語を入力したい場合は、
-以下のようにコマンドを入力します。
-
-% setenv LANG ja_JP.EUC
-% setenv XMODIFIERS @im=kinput2
-% rxvt &
-% kinput2 &
-
-(例はcshでの場合です。)
-
-環境変数LANGはホームディレクトリの.cshrcなどで設定していれば
-rxvtを起動する前にわざわざ設定する必要はありません。
-kinput2はrxvtより先に起動しても後に起動しても構いません。
-Shift + Space キーで日本語入力を開始する事ができます。
-.Xresourcesまたはコマンドラインオプションを使って
-input methodの設定を行っている場合は環境変数 XMODIFIERS は
-設定しなくても構いません。他のinput methodを使用する場合は、
-上の例の"kinput2"の所を使用するinput methodのコマンド名に置き換えて下さい。
-
-
-5. input method、入力のスタイルの設定
-
-rxvtでは.Xresoucesとコマンドラインオプションで
-input methodと入力のスタイルを設定できます。
-
-例えば、kinput2を使ってOverTheSpotスタイルで
-日本語を入力するように設定する場合、ホームディレクトリの
-.Xresourcesに以下のように書いておきます。
-
-(例)
-Rxvt*inputMethod: kinput2
-Rxvt*preeditType: OverTheSpot
-
-inputMethodには使用するinput methodを、preeditTypeには入力のスタイル
-("Root"または"OverTheSpot"のどちらか)を指定して下さい。
-preeditTypeはデフォルトではOverTheSpotになっています。
-
-また、-im というオプションでinput methodを、-ptというオプションで
-入力のスタイルを指定する事もできます。
-先程と同じように設定する場合には以下のようにrxvtを起動します。
-
-(例)
-% rxvt -im kinput2 -pt OverTheSpot &
-
-なお、コマンドラインオプションと.Xresourcesの両方で設定した場合は
-コマンドラインオプションの方が優先されます。
-
-
-6. 問題点
-
-input methodが有効になっているrxvtの上でkillコマンドを使って
-input methodを殺すと、 rxvtがエラーメッセージを吐いて
-終了してしまう事があります。
-
-
-7. その他
-
-rxvtのXIMのサポートは阪本 崇さんのrxvt-2.4.4非公式patchを
-基にして、萬谷 暢崇がOffTheSpotの入力のサポートの実装
-などを行いました。
-
-現在の所、kinput2 version2.0 fix4 と
-VJE-Delta Ver 2.5 for Linux/BSD [FREE TRIAL VERSION] で
-日本語の入力ができる事を確認しています。
-
-また、rxvtのXIMサポートに関するWebページは
-http://www.nobutaka.com/programs/rxvt.html にあります。
-もしrxvtのXIMサポートに関するご意見などがございましたら、
-萬谷 暢崇 <nobutaka@nobutaka.com> までお願いします。
-
--------------------------------------------------------------------------------
-1999年2月12日 萬谷 暢崇 <nobutaka@nobutaka.com>
diff --git a/japanese/rxvt/files/ja.menu b/japanese/rxvt/files/ja.menu
deleted file mode 100644
index ee93971fb4c9..000000000000
--- a/japanese/rxvt/files/ja.menu
+++ /dev/null
@@ -1,29 +0,0 @@
-#-------------------------------------------------------------------------
-[menu:shell]
-[clear]
-[title:shell]
-# [pixmap:name]
-
-# not necessarily useful, but an example of using the rxvt menuBar
-
-# assuming we have ksh with Emacs bindings
-<u>^P<d>^N<r>^F<l>^B
-
-/Commands/*
-{manual} man
-{manual apropos} man -k
-{manual whatis} man -f
-{-}
-{Exit Shell} exit\r
-
-/Programs/*
-{Mule} mule &\r
-{Mule(no X)} mule -nw\r
-{Mail} Mail\r
-{WWW} lynx\r
-
-[read:terminal]
-[show]
-[done:shell]
-
-#--------------------------------------------------------------------- eof
diff --git a/japanese/rxvt/files/patch-aa b/japanese/rxvt/files/patch-aa
deleted file mode 100644
index 9dc3329bde60..000000000000
--- a/japanese/rxvt/files/patch-aa
+++ /dev/null
@@ -1,19 +0,0 @@
-*** Makefile.in.orig Tue Dec 21 19:07:54 1999
---- Makefile.in Mon Jan 10 15:29:15 2000
-***************
-*** 9,15 ****
- first_rule: all
- dummy:
-
-! subdirs = src doc rclock src/graphics src/test
-
- DIST = INSTALL README.configure configure Makefile Makefile.in ChangeLog
-
---- 9,15 ----
- first_rule: all
- dummy:
-
-! subdirs = src doc rclock
-
- DIST = INSTALL README.configure configure Makefile Makefile.in ChangeLog
-
diff --git a/japanese/rxvt/files/patch-ab b/japanese/rxvt/files/patch-ab
deleted file mode 100644
index 8c59d733d087..000000000000
--- a/japanese/rxvt/files/patch-ab
+++ /dev/null
@@ -1,91 +0,0 @@
-*** doc/Makefile.in.orig Tue Sep 28 16:04:39 1999
---- doc/Makefile.in Tue Jan 11 09:24:00 2000
-***************
-*** 38,47 ****
-
- #-------------------------------------------------------------------------
-
-! all: rxvt.1
-
-! rxvt.1: rxvt.tbl Makefile
-! @if test x$(TBL) = x; then : ; else echo "Making rxvt.1"; $(TBL) $(srcdir)/rxvt.tbl > rxvt.1 ; fi
-
- SEDREPLACE = -e 's%@RXVT_VERSION@%$(VERSION)%g;'\
- -e 's%@RXVT_LSMDATE@%$(LSMDATE)%g;'\
---- 38,46 ----
-
- #-------------------------------------------------------------------------
-
-! all: alldoc
-
-! rxvt.1:
-
- SEDREPLACE = -e 's%@RXVT_VERSION@%$(VERSION)%g;'\
- -e 's%@RXVT_LSMDATE@%$(LSMDATE)%g;'\
-***************
-*** 56,62 ****
-
- tags allbin:
-
-! alldoc: $(basedir)/$(VERNAME).lsm rxvt.1 rxvt.html rxvtRef.html rxvtRef.txt
-
- yodl/versioninfo.yo: yodl/versioninfo.yo.in ../src/version.h
- $(SED) $(SEDREPLACE) < $(srcdir)/yodl/versioninfo.yo.in > $@
---- 55,61 ----
-
- tags allbin:
-
-! alldoc: rxvt.1 rxvt.html rxvtRef.html rxvtRef.txt
-
- yodl/versioninfo.yo: yodl/versioninfo.yo.in ../src/version.h
- $(SED) $(SEDREPLACE) < $(srcdir)/yodl/versioninfo.yo.in > $@
-***************
-*** 67,80 ****
- rxvt.tbl: yodl/rxvt.yo $(YODL_RXVT) yodl/versioninfo.yo yodl/masonyodl.yo
- (cd $(srcdir)/yodl; yodl2man -o../rxvt.tbl rxvt.yo)
-
-! rxvt.html: yodl/rxvt.yo $(YODL_RXVT) yodl/versioninfo.yo yodl/masonyodl.yo
-! (cd $(srcdir)/yodl; yodl2html -o../rxvt.html rxvt.yo)
-
-! rxvtRef.html: $(YODL_RREF) yodl/rxvtRef.yo yodl/masonyodl.yo
-! (cd $(srcdir)/yodl; yodl2html -o../rxvtRef.html rxvtRef.yo)
-
-! rxvtRef.txt: $(YODL_RREF) yodl/rxvtRef.yo yodl/masonyodl.yo
-! (cd $(srcdir)/yodl; yodl2txt -o../rxvtRef.txt rxvtRef.yo)
-
- clean:
- $(RMF) rxvt.man *~ yodl/*~
---- 66,76 ----
- rxvt.tbl: yodl/rxvt.yo $(YODL_RXVT) yodl/versioninfo.yo yodl/masonyodl.yo
- (cd $(srcdir)/yodl; yodl2man -o../rxvt.tbl rxvt.yo)
-
-! rxvt.html:
-
-! rxvtRef.html:
-
-! rxvtRef.txt:
-
- clean:
- $(RMF) rxvt.man *~ yodl/*~
-***************
-*** 84,91 ****
-
- distclean:
-
-! install:
-! $(INSTALL_DATA) rxvt.1 $(DESTDIR)$(mandir)/$(manprefix)rxvt.$(manext)
-
- uninstall:
- -cd $(mandir); $(RMF) $(manprefix)rxvt.$(manext)
---- 80,90 ----
-
- distclean:
-
-! install: rxvt.1 rxvt.html rxvtRef.html rxvtRef.txt
-! $(INSTALL_DATA) rxvt.1 $(mandir)/$(manprefix)rxvt.$(manext)
-! $(INSTALL_DATA) rxvt.html $(prefix)/share/doc/ja/rxvt/rxvt.html
-! $(INSTALL_DATA) rxvtRef.html $(prefix)/share/doc/ja/rxvt/rxvtRef.html
-! $(INSTALL_DATA) rxvtRef.txt $(prefix)/share/doc/ja/rxvt/rxvtRef.txt
-
- uninstall:
- -cd $(mandir); $(RMF) $(manprefix)rxvt.$(manext)
diff --git a/japanese/rxvt/files/patch-ad b/japanese/rxvt/files/patch-ad
deleted file mode 100644
index cc8ba59ffdab..000000000000
--- a/japanese/rxvt/files/patch-ad
+++ /dev/null
@@ -1,19 +0,0 @@
-*** src/command.c.orig Sun Dec 19 12:18:03 1999
---- src/command.c Tue Jan 11 09:25:48 2000
-***************
-*** 436,442 ****
- ttydev = tty_name;
-
- # define PTYCHAR1 "pqrstuvwxyz"
-! # define PTYCHAR2 "0123456789abcdef"
- for (c1 = PTYCHAR1; *c1; c1++) {
- ptydev[len] = ttydev[len] = *c1;
- for (c2 = PTYCHAR2; *c2; c2++) {
---- 436,442 ----
- ttydev = tty_name;
-
- # define PTYCHAR1 "pqrstuvwxyz"
-! # define PTYCHAR2 "0123456789abcdefghijklmnopqrstuv"
- for (c1 = PTYCHAR1; *c1; c1++) {
- ptydev[len] = ttydev[len] = *c1;
- for (c2 = PTYCHAR2; *c2; c2++) {
diff --git a/japanese/rxvt/files/patch-aj b/japanese/rxvt/files/patch-aj
deleted file mode 100644
index c3cfa5e548de..000000000000
--- a/japanese/rxvt/files/patch-aj
+++ /dev/null
@@ -1,44 +0,0 @@
-*** src/feature.h.orig Tue Dec 21 19:05:42 1999
---- src/feature.h Tue Jan 11 09:28:32 2000
-***************
-*** 148,154 ****
- * This has been superceded and is only for you older users
- */
- /* #define HOTKEY_CTRL */
-! /* #define HOTKEY_META */
-
- /*
- * To use
---- 148,154 ----
- * This has been superceded and is only for you older users
- */
- /* #define HOTKEY_CTRL */
-! #define HOTKEY_META
-
- /*
- * To use
-***************
-*** 390,400 ****
- * Sizes between multi-char fonts sets (MFONT_LIST) and single-char font
- * sets (NFONT_LIST) have been matched up
- */
-! #define NFONTS 7
- #define FONT0_IDX 2
-! #define NFONT_LIST "7x14", "6x10", "6x13", "8x13", "8x16", "10x20", "12x24"
- #ifdef MULTICHAR_SET /* multichar glyph language support */
-! # define MFONT_LIST NULL, NULL, NULL, NULL, NULL, NULL, NULL
- #endif
-
- #endif
---- 390,400 ----
- * Sizes between multi-char fonts sets (MFONT_LIST) and single-char font
- * sets (NFONT_LIST) have been matched up
- */
-! #define NFONTS 5
- #define FONT0_IDX 2
-! #define NFONT_LIST "7x14", "a10", "r12", "8x16", "12x24"
- #ifdef MULTICHAR_SET /* multichar glyph language support */
-! # define MFONT_LIST "k14", "k10", "k12", "kanji16", "kanji24"
- #endif
-
- #endif
diff --git a/japanese/rxvt/files/patch-ak b/japanese/rxvt/files/patch-ak
deleted file mode 100644
index 9e5ea4843136..000000000000
--- a/japanese/rxvt/files/patch-ak
+++ /dev/null
@@ -1,36 +0,0 @@
-*** autoconf/config.h.in.orig Tue Aug 17 15:55:41 1999
---- autoconf/config.h.in Fri Sep 10 21:10:39 1999
-***************
-*** 161,167 ****
- #undef HAVE_UTMP_HOST
-
- /* Define location of utmp */
-! #undef RXVT_UTMP_FILE
-
- /* Define in utmpx.h has struct utmpx */
- #undef HAVE_STRUCT_UTMPX
---- 161,167 ----
- #undef HAVE_UTMP_HOST
-
- /* Define location of utmp */
-! #define RXVT_UTMP_FILE "/var/run/utmp"
-
- /* Define in utmpx.h has struct utmpx */
- #undef HAVE_STRUCT_UTMPX
-***************
-*** 173,179 ****
- #undef RXVT_UTMPX_FILE
-
- /* Define location of wtmp */
-! #undef RXVT_WTMP_FILE
-
- /* Define location of wtmpx */
- #undef RXVT_WTMPX_FILE
---- 173,179 ----
- #undef RXVT_UTMPX_FILE
-
- /* Define location of wtmp */
-! #define RXVT_WTMP_FILE "/var/log/wtmp"
-
- /* Define location of wtmpx */
- #undef RXVT_WTMPX_FILE
diff --git a/japanese/rxvt/files/patch-al b/japanese/rxvt/files/patch-al
deleted file mode 100644
index 1092b8becc57..000000000000
--- a/japanese/rxvt/files/patch-al
+++ /dev/null
@@ -1,20 +0,0 @@
-*** rclock/Makefile.in.orig Thu Nov 26 14:28:11 1998
---- rclock/Makefile.in Tue Jan 11 10:00:16 2000
-***************
-*** 25,32 ****
- .c.o:
- $(CC) -c $(CPPFLAGS) $(XINC) -I. -I$(basedir) -I$(srcdir) $(DEFS) $(CFLAGS) $<
- #-------------------------------------------------------------------------
-! all:
-! clock: alldoc allbin
-
- rclock: $(OBJS)
- $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(XLIB)
---- 25,31 ----
- .c.o:
- $(CC) -c $(CPPFLAGS) $(XINC) -I. -I$(basedir) -I$(srcdir) $(DEFS) $(CFLAGS) $<
- #-------------------------------------------------------------------------
-! all: alldoc allbin
-
- rclock: $(OBJS)
- $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(XLIB)
diff --git a/japanese/rxvt/files/patch-am b/japanese/rxvt/files/patch-am
deleted file mode 100644
index 7c126a228e11..000000000000
--- a/japanese/rxvt/files/patch-am
+++ /dev/null
@@ -1,293 +0,0 @@
-*** rclock/rclock.c.orig Mon Apr 20 16:31:04 1998
---- rclock/rclock.c Tue Jan 11 09:50:48 2000
-***************
-*** 69,74 ****
---- 69,89 ----
-
- #include <X11/Intrinsic.h> /* Xlib, Xutil, Xresource, Xfuncproto */
-
-+ #ifndef NO_XLOCALE
-+ # if (XtSpecificationRelease < 6)
-+ # define NO_XLOCALE
-+ # endif
-+ #endif
-+
-+ #ifndef NO_XSETLOCALE
-+ # define X_LOCALE
-+ # include <X11/Xlocale.h>
-+ #else
-+ # ifndef NO_SETLOCALE
-+ # include <locale.h>
-+ # endif
-+ #endif /* NO_XLOCALE */
-+
- #define APL_CLASS "Clock"
- #define APL_NAME "rclock"
- #define MSG_CLASS "Appointment"
-***************
-*** 122,129 ****
---- 137,150 ----
- int width, height;
- } msgButton;
-
-+ #ifdef MULTICHAR_SET
-+ static XFontSet Xfont;
-+ static XFontSetExtents *extent;
-+ #define FontHeight() ((extent->max_logical_extent.height)*4/5 + (extent->max_logical_extent.height)/5)
-+ #else
- static XFontStruct * Xfont;
- #define FontHeight() (Xfont->ascent + Xfont->descent)
-+ #endif
- static int Msg_Mapped = 0; /* message window mapped? */
- static int reminderTime = -1;
- static char message [256] = "";
-***************
-*** 184,189 ****
---- 205,216 ----
- #define REPLACE 0
- #define UPDATE 1
-
-+ /* subroutine for MULTICHAR_SET declarations */
-+ #ifdef MULTICHAR_SET
-+ static XFontSet XLoadQueryFontSet(Display *, const char *);
-+ #define XFreeFont XFreeFontSet
-+ #define XTextWidth XmbTextEscapement
-+ #endif
- /*----------------------------------------------------------------------*/
-
- static void
-***************
-*** 201,206 ****
---- 228,236 ----
- { "-fg color", "foreground color" },
- #ifdef REMINDERS
- { "-fn fontname", "normal font for messages" },
-+ #ifdef MULTICHAR_SET
-+ { "-fm fontname", "multibyte font for messages" },
-+ #endif /* MULTICHAR_SET */
- #endif
- #ifdef ICONWIN
- { "-iconic", "start iconic" },
-***************
-*** 277,283 ****
---- 307,317 ----
- XGCValues gcv;
-
- #ifdef REMINDERS
-+ #ifndef MULTICHAR_SET
- const char * rs_font = FONT_NAME;
-+ #else
-+ char rs_font[BUFSIZ];
-+ #endif /* MULTICHAR_SET */
-
- /* find the ~/.rclock file */
- if ((val = getenv ("HOME")) != NULL)
-***************
-*** 314,319 ****
---- 348,356 ----
- if ((display_name = getenv ("DISPLAY")) == NULL)
- display_name = ":0";
-
-+ #ifdef MULTICHAR_SET
-+ rs_font[0] = '\0';
-+ #endif /* MULTICHAR_SET */
- /* parse the command line */
- for (i = 1; i < argc; i += 2)
- {
-***************
-*** 345,351 ****
---- 382,401 ----
- else if (!strcmp (opt, "fg")) rs_color [fgColor] = val;
- else if (!strcmp (opt, "bg")) rs_color [bgColor] = val;
- #ifdef REMINDERS
-+ #ifndef MULTICHAR_SET
- else if (!strcmp (opt, "fn")) rs_font = val;
-+ #else
-+ else if (!strcmp (opt, "fn"))
-+ {
-+ strncat(rs_font, val, BUFSIZ);
-+ strncat(rs_font, ",", BUFSIZ);
-+ }
-+ else if (!strcmp (opt, "fm"))
-+ {
-+ strncat(rs_font, val, BUFSIZ);
-+ strncat(rs_font, ",", BUFSIZ);
-+ }
-+ #endif /* MULTICHAR_SET */
- #endif
- else if (!strcmp (opt, "update"))
- {
-***************
-*** 384,389 ****
---- 434,449 ----
- }
- }
-
-+ #ifdef MULTICHAR_SET
-+ if (strlen(rs_font) > 0) rs_font[strlen(rs_font) - 1] = '\0';
-+ else strncpy(rs_font, FONT_NAME, BUFSIZ);
-+ #endif /* MULTICHAR_SET */
-+
-+ #if !defined(NO_XSETLOCALE) || !defined(NO_SETLOCALE)
-+ /* set locale */
-+ setlocale(LC_CTYPE, "");
-+ #endif
-+
- /* open display */
- Xdisplay = XOpenDisplay (display_name);
- if (!Xdisplay)
-***************
-*** 418,430 ****
---- 478,499 ----
-
- #ifdef REMINDERS
- /* load the font for messages */
-+ #ifdef MULTICHAR_SET
-+ if ((Xfont = XLoadQueryFontSet (Xdisplay, rs_font)) == NULL)
-+ #else
- if ((Xfont = XLoadQueryFont (Xdisplay, rs_font)) == NULL)
-+ #endif /* MULTICHAR_SET */
- {
- print_error ("can't load font \"%s\"", rs_font);
- goto Abort;
- }
-+ #ifndef MULTICHAR_SET
- gcv.font = Xfont->fid;
-+ #endif /* MULTICHAR_SET */
- #endif
-+ #ifdef MULTICHAR_SET
-+ extent = XExtentsOfFontSet(Xfont);
-+ #endif /* MULTICHAR_SET */
-
- Create_Windows (argc, argv);
- /* Create the graphics contexts */
-***************
-*** 433,439 ****
---- 502,510 ----
-
- Xgc = XCreateGC (Xdisplay, Clock.win,
- #ifdef REMINDERS
-+ #ifndef MULTICHAR_SET
- GCFont |
-+ #endif /* MULTICHAR_SET */
- #endif
- GCForeground | GCBackground, &gcv);
-
-***************
-*** 441,447 ****
- gcv.background = PixColors [fgColor];
- Xrvgc = XCreateGC (Xdisplay, Clock.win,
- #ifdef REMINDERS
-! GCFont |
- #endif
- GCForeground | GCBackground, &gcv);
-
---- 512,520 ----
- gcv.background = PixColors [fgColor];
- Xrvgc = XCreateGC (Xdisplay, Clock.win,
- #ifdef REMINDERS
-! #ifndef MULTICHAR_SET
-! GCFont |
-! #endif /* MULTICHAR_SET */
- #endif
- GCForeground | GCBackground, &gcv);
-
-***************
-*** 806,836 ****
---- 879,941 ----
- next = end + 2;
- }
-
-+ #ifdef MULTICHAR_SET
-+ XmbDrawString (Xdisplay, Msg.win, Xfont,
-+ #else
- XDrawString (Xdisplay, Msg.win,
-+ #endif /* MULTICHAR_SET */
- Xgc,
- (Msg.width -
- XTextWidth (Xfont, beg, (end-beg))) / 2,
-+ #ifdef MULTICHAR_SET
-+ 10 + extent->max_logical_extent.height*4/5 + FontHeight () * lines,
-+ #else
- 10 + Xfont->ascent + FontHeight () * lines,
-+ #endif /* MULTICHAR_SET */
- beg, (end-beg));
- }
-
-+ #ifdef MULTICHAR_SET
-+ XmbDrawString (Xdisplay, msgButton.Dismiss, Xfont,
-+ #else
- XDrawString (Xdisplay, msgButton.Dismiss,
-+ #endif /* MULTICHAR_SET */
- Xrvgc,
- (msgButton.width - XTextWidth (Xfont, "Done", 4)) / 2,
-+ #ifdef MULTICHAR_SET
-+ extent->max_logical_extent.height*4/5 + 2,
-+ #else
- Xfont->ascent + 2,
-+ #endif /* MULTICHAR_SET */
- "Done", 4);
-
-+ #ifdef MULTICHAR_SET
-+ XmbDrawString (Xdisplay, msgButton.Defer, Xfont,
-+ #else
- XDrawString (Xdisplay, msgButton.Defer,
-+ #endif /* MULTICHAR_SET */
- Xrvgc,
- (msgButton.width - XTextWidth (Xfont, "Defer", 5)) / 2,
-+ #ifdef MULTICHAR_SET
-+ extent->max_logical_extent.height*4/5 + 2,
-+ #else
- Xfont->ascent + 2,
-+ #endif /* MULTICHAR_SET */
- "Defer", 5);
-
- # ifndef NO_REMINDER_EXEC
-+ #ifdef MULTICHAR_SET
-+ XmbDrawString (Xdisplay, msgButton.Start, Xfont,
-+ #else
- XDrawString (Xdisplay, msgButton.Start,
-+ #endif /* MULTICHAR_SET */
- Xrvgc,
- (msgButton.width - XTextWidth (Xfont, "Start", 5)) / 2,
-+ #ifdef MULTICHAR_SET
-+ extent->max_logical_extent.height*4/5 + 2,
-+ #else
- Xfont->ascent + 2,
-+ #endif /* MULTICHAR_SET */
- "Start", 5);
-
- if (strlen (execPrgm) > 1)
-***************
-*** 1469,1472 ****
---- 1574,1603 ----
- fprintf (stderr,"\n");
- va_end (arg_ptr);
- }
-+
-+ #ifdef MULTICHAR_SET
-+ /*
-+ * XLoadQueryFontSet
-+ */
-+ XFontSet XLoadQueryFontSet(Display *disp, const char *fontset_name)
-+ {
-+ XFontSet fontset;
-+ int missing_charset_count;
-+ char **missing_charset_list;
-+ char *def_string;
-+
-+ fontset = XCreateFontSet(disp, fontset_name,
-+ &missing_charset_list,
-+ &missing_charset_count,
-+ &def_string);
-+ /*
-+ if (missing_charset_count) {
-+ fprintf(stderr, "Missing charsets in FontSet(%s) creation.\n",
-+ fontset_name);
-+ XFreeStringList(missing_charset_list);
-+ }
-+ */
-+ return fontset;
-+ }
-+ #endif /* MULTICHAR_SET */
- /*----------------------- end-of-file (C source) -----------------------*/
diff --git a/japanese/rxvt/files/patch-an b/japanese/rxvt/files/patch-an
deleted file mode 100644
index 99717ab6a02d..000000000000
--- a/japanese/rxvt/files/patch-an
+++ /dev/null
@@ -1,19 +0,0 @@
-*** src/rxvt.h.orig Sat Dec 18 16:41:47 1999
---- src/rxvt.h Tue Jan 11 20:59:24 2000
-***************
-*** 247,253 ****
- # define COLORTERMENVFULL COLORTERMENV
- #endif
- #ifndef TERMENV
-! # ifdef KANJI
- # define TERMENV "kterm"
- # else
- # define TERMENV "xterm"
---- 247,253 ----
- # define COLORTERMENVFULL COLORTERMENV
- #endif
- #ifndef TERMENV
-! # if MULTICHAR_ENCODING == EUCJ || MULTICHAR_ENCODING == SJIS
- # define TERMENV "kterm"
- # else
- # define TERMENV "xterm"
diff --git a/japanese/rxvt/files/terminal.menu b/japanese/rxvt/files/terminal.menu
deleted file mode 100644
index 72160df19004..000000000000
--- a/japanese/rxvt/files/terminal.menu
+++ /dev/null
@@ -1,60 +0,0 @@
-# standard settings for a `terminal' control menu
-# only attach to an existing menubar
-[menu]
-
-/Terminal/*
-./Font/*
-{Normal} ^@\E]50;#
-{Larger}{(M->)} ^@\E]50;#+
-{Smaller}{(M-<)}^@\E]50;#-
-{-}
-{Font 1} ^@\E]50;#1
-{Font 2} ^@\E]50;#2
-{Font 3} ^@\E]50;#3
-{Font 4} ^@\E]50;#4
-../Screen/*
-{ReverseVideo} ^@\E[?5t
-{Toggle Width} ^@\E[?3t
-{Cursor} ^@\E[?25t
-{Switch} ^@\E[?47t
-{-}
-{menuBar} ^@\E[?10t
-{refresh menu} ^@\E[?10h
-{scrollBar} ^@\E[?30t
-{-}
-{Toggle scroll-on-TTY} ^@\E[?1010t
-{Toggle scroll-on-Key} ^@\E[?1011t
-../Keys/*
-{XTerm} ^@\E[?35t
-{Backspace} ^@\E[?67t
-{Cursor} ^@\E[?1t
-{KeyPad} ^@\E[?66t
-../
-{-}
-./Pixmap/*
-{None} ^@\E[m\E]20;\a
-#{-}
-# load .xpm files (assuming Rxvt*path: has been properly set)
-# notice there are 2 ways to do this task
-#{background5} ^@\E]20;background5
-#{Mona} ^@\E]10;[pixmap:monalisa;100]
-#{world} ^@\E]20;world
-{-}
-./Attrib/*
-{Full} ^@\E]20;;100x100+50+50;?
-{Tiled} ^@\E]20;;0
-{Centre} ^@\E]20;;=+50+50;?
-{-}
-# set `quick arrow' keys
-{Zoom}{200/50%} ^@\E]10;[:<b>\^@\\E]20;;<r>200x0<l>50x0<u>0x200<d>0x50<e>;?:]
-{Pos}{5%} ^@\E]10;[:<b>\^@\\E]20;;<r>+5+0<l>-5+0<u>+0-5<d>+0+5<e>;?:]
-../
-../
-{-}
-{Version} ^@\E[8n
-/
-
-# make sure the change gets updated
-[show]
-[done]
-#--------------------------------------------------------------------- eof
diff --git a/japanese/rxvt/pkg-descr b/japanese/rxvt/pkg-descr
deleted file mode 100644
index 76dd79a139b7..000000000000
--- a/japanese/rxvt/pkg-descr
+++ /dev/null
@@ -1,11 +0,0 @@
-Rxvt is an xterm replacement which uses a little less memory, and is
-suitable for use on machines with small memories. Tek4010 support
-is removed.
-
-This supports Japanese input with X Input Method (XIM) Protocol.
-Supported input styles are `OverTheSpot', 'OffTheSpot' and `Root'.
-More information can be found at:
- http://www.nobutaka.com/programs/rxvt.html
-Documents are at /usr/X11R6/share/doc/ja/rxvt/.
-
-WWW: http://www.rxvt.org/
diff --git a/japanese/rxvt/pkg-message b/japanese/rxvt/pkg-message
deleted file mode 100644
index 2155de3b971f..000000000000
--- a/japanese/rxvt/pkg-message
+++ /dev/null
@@ -1,12 +0,0 @@
-
- See /usr/X11R6/share/doc/ja/rxvt/README.ja for more information
-about using Japanese XIM.
-
- If you want to enjoy menuBar features, add following 2 line
-
- Rxvt*path: /usr/X11R6/lib/X11/rxvt/
- Rxvt*menu: ja
-
-to your ~/.Xdefaults.
-
-Documents are at /usr/X11R6/share/doc/ja/rxvt/.
diff --git a/japanese/rxvt/pkg-plist b/japanese/rxvt/pkg-plist
deleted file mode 100644
index cc459259e50f..000000000000
--- a/japanese/rxvt/pkg-plist
+++ /dev/null
@@ -1,11 +0,0 @@
-bin/rxvt
-@exec chmod 4711 %D/bin/rxvt
-share/doc/ja/rxvt/README.ja
-share/doc/ja/rxvt/rxvt.html
-share/doc/ja/rxvt/rxvtRef.html
-share/doc/ja/rxvt/rxvtRef.txt
-lib/X11/rxvt/ja.menu
-lib/X11/rxvt/terminal.menu
-bin/rclock
-@dirrm share/doc/ja/rxvt
-@dirrm lib/X11/rxvt