47 files changed, 0 insertions, 2169 deletions

diff --git a/japanese/Makefile b/japanese/Makefile
index 4ee87c98e908..6ed1f046e4de 100644
--- a/japanese/Makefile
+++ b/japanese/Makefile
@@ -33,7 +33,6 @@
     SUBDIR += ctags
     SUBDIR += dbskkd-cdb
     SUBDIR += ddskk
-    SUBDIR += ddskk-emacs20
     SUBDIR += devil-fpw
     SUBDIR += diclookup-emacs20
     SUBDIR += diclookup-mule
@@ -60,7 +59,6 @@
     SUBDIR += elvis
     SUBDIR += emacs-emcws
     SUBDIR += emacs-manual
-    SUBDIR += emacs20-emcws
     SUBDIR += epic4
     SUBDIR += epson-ttfonts
     SUBDIR += epwutil
@@ -181,7 +179,6 @@
     SUBDIR += linux-JM
     SUBDIR += lipsf
     SUBDIR += lookup
-    SUBDIR += lookup-emacs20
     SUBDIR += lookup-emacs21
     SUBDIR += lsd-fpw
     SUBDIR += lynx
@@ -201,7 +198,6 @@
     SUBDIR += mg
     SUBDIR += mh
     SUBDIR += migemo
-    SUBDIR += migemo-emacs20
     SUBDIR += migemo-emacs21
     SUBDIR += migemo-emacs22
     SUBDIR += migemo-xemacs-devel-mule
@@ -218,7 +214,6 @@
     SUBDIR += msdosfs
     SUBDIR += mtools
     SUBDIR += mule-canna
-    SUBDIR += mule-canna+freewnn
     SUBDIR += mule-canna+freewnn+sj3
     SUBDIR += mule-canna+sj3
     SUBDIR += mule-canna+sj3+wnn6
@@ -226,10 +221,7 @@
     SUBDIR += mule-canna+wnn6
     SUBDIR += mule-canna+wnn7
     SUBDIR += mule-freewnn
-    SUBDIR += mule-freewnn+sj3
     SUBDIR += mule-sj3
-    SUBDIR += mule-sj3+wnn6
-    SUBDIR += mule-sj3+wnn7
     SUBDIR += mule-wnn6
     SUBDIR += mule-wnn7
     SUBDIR += multiskkserv
@@ -355,7 +347,6 @@
     SUBDIR += skk-jisyo
     SUBDIR += skk-jisyo-cdb
     SUBDIR += skk-tools
-    SUBDIR += skk10-elisp-emacs20
     SUBDIR += skkfep
     SUBDIR += skkinput
     SUBDIR += skkinput3
diff --git a/japanese/ddskk-emacs20/Makefile b/japanese/ddskk-emacs20/Makefile
deleted file mode 100644
index 2a1f06ee19d8..000000000000
--- a/japanese/ddskk-emacs20/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# New ports collection makefile for:   ddskk for emacs20
-# Date created:                23 Feb 2001
-# Whom:                        Yoichi NAKAYAMA <yoichi@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-MASTERDIR=	${.CURDIR}/../ddskk
-
-DEPRECATED=	emacs20 and related ports are obsolete; please use a more recent version
-EXPIRATION_DATE=	2007-08-19
-
-USE_EMACS=	yes
-EMACS_PORT_NAME=	emacs20
-
-.include "${MASTERDIR}/Makefile"
diff --git a/japanese/emacs20-emcws/Makefile b/japanese/emacs20-emcws/Makefile
deleted file mode 100644
index 4a20258c1a68..000000000000
--- a/japanese/emacs20-emcws/Makefile
+++ /dev/null
@@ -1,200 +0,0 @@
-# New ports collection makefile for:	GNU emacs
-# Version required:	20.7
-# Date created:		08 Oct. 2000
-# Whom:			NAKAJI Hiroyuki <nakaji@jp.freebsd.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	emcws
-PORTVERSION=	20.7
-PORTREVISION=	7
-CATEGORIES=	japanese editors ipv6
-MASTER_SITES=	${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	emacs
-DISTNAME=	emacs-${PORTVERSION}
-
-PATCH_SITES=	ftp://ftp.ki.nu/pub/emcws/ \
-		ftp://ftp.jpl.org/pub/misc/
-PATCHFILES=	emcws-${EMACS_VER}-20020208.gz
-PATCH_DIST_STRIP=	-p1
-
-MAINTAINER=	nakaji@jp.freebsd.org
-COMMENT=	Emacs + Canna + Wnn + Sj3
-
-DEPRECATED=	emacs20 and related ports are obsolete; please use a more recent version
-EXPIRATION_DATE=	2007-08-19
-
-BUILD_DEPENDS=	emacs-${EMACS_VER}:${PORTSDIR}/editors/emacs20
-RUN_DEPENDS=	emacs-${EMACS_VER}:${PORTSDIR}/editors/emacs20
-
-DEPRECATED=	editors/emacs20 is also deprecated
-
-CONFLICTS=	emacs-19.* emacs-21.* emacs-22.* \
-		ja-emcws-21.* \
-		xemacs-[0-9]* xemacs-devel-[0-9]* \
-		xemacs-mule-[0-9]* xemacs-devel-mule-[0-9]*
-
-WRKSRC=		${WRKDIR}/emacs-${EMACS_VER}
-
-LATEST_LINK=	ja-emcws20
-
-USE_AUTOTOOLS=	autoconf:213
-USE_GMAKE=	YES
-EMACS_VER=	20.7
-
-# Change these as you like.
-WITH_WNN6?=	YES
-WITH_FREEWNN?=	NO
-WITH_CANNA?=	YES
-WITH_SJ3?=	NO
-
-CONFIGURE_TARGET=	${MACHINE_ARCH}--freebsd
-
-.if !defined(NO_X11)
-CONFIGURE_ARGS=	--with-x-toolkit --with-pop
-USE_XLIB=	YES
-.else
-CONFIGURE_ARGS=	--with-x=no --with-pop
-.endif
-
-.if (${WITH_WNN6} == "yes" || ${WITH_WNN6} == "YES")
-CONFIGURE_ARGS+=--with-wnn --with-wnn-includes=${LOCALBASE}/include/wnn6/wnn \
-		--with-wnn-libraries=${LOCALBASE}/lib/libwnn6.so
-LIB_DEPENDS+=	wnn6.2:${PORTSDIR}/japanese/Wnn6-lib
-.endif
-
-.if (${WITH_FREEWNN} == "yes" || ${WITH_FREEWNN} == "YES")
-CONFIGURE_ARGS+=--with-wnn --with-wnn-includes=${LOCALBASE}/include/wnn \
-		--with-wnn-libraries=${LOCALBASE}/lib/libwnn.so
-LIB_DEPENDS+=	wnn.0:${PORTSDIR}/japanese/FreeWnn-lib
-.endif
-
-.if (${WITH_CANNA} == "yes" || ${WITH_CANNA} == "YES")
-CONFIGURE_ARGS+=	--with-canna \
-			--with-canna-includes=${LOCALBASE}/include \
-			--with-canna-libraries=${LOCALBASE}/lib
-LIB_DEPENDS+=		canna.1:${PORTSDIR}/japanese/Canna
-.endif
-
-.if (${WITH_SJ3} == "yes" || ${WITH_SJ3} == "YES")
-CONFIGURE_ARGS+=	--with-sj3
-BUILD_DEPENDS+=		sj3serv:${PORTSDIR}/japanese/sj3
-.endif
-
-DOC_FILE=	DOC-EMCWS-${EMACS_VER}.1
-EMCWS_ELCS=	busyu.el \
-		can-n-egg.el \
-		canna.el \
-		egg-jsymbol.el \
-		egg-keymap.el \
-		egg.el \
-		eggrc-sj3 \
-		eggrc-v41 \
-		eggrc-wnn \
-		isearch-ext.el \
-		isearch-ext.elc \
-		its/han-kata.el \
-		its/hankaku.el \
-		its/hira.el \
-		its/kanainput.el \
-		its/kata.el \
-		its/zenkaku.el \
-		mule-inst.el \
-		sj3-client.el \
-		sj3-egg.el \
-		wnn-client.el \
-		wnn-egg.el
-
-.if (${WITH_WNN6} == "yes" || ${WITH_WNN6} == "YES") || (${WITH_FREEWNN} == "yes" || ${WITH_FREEWNN} == "YES")
-EMCWS_ELCS+=	egg.elc \
-		wnn-egg.elc
-PLIST_SUB+=	WITH_WNN=""
-.else
-PLIST_SUB+=	WITH_WNN="@comment "
-.endif
-
-.if (${WITH_CANNA} == "yes" || ${WITH_CANNA} == "YES")
-EMCWS_ELCS+=	canna.elc
-PLIST_SUB+=	WITH_CANNA=""
-.else
-PLIST_SUB+=	WITH_CANNA="@comment "
-.endif
-
-.if (${WITH_SJ3} == "yes" || ${WITH_SJ3} == "YES")
-EMCWS_ELCS+=	sj3-client.elc \
-		sj3-egg.elc
-PLIST_SUB+=	WITH_SJ3=""
-.else
-PLIST_SUB+=	WITH_SJ3="@comment "
-.endif
-
-MULE_PATCHED_ELS=	ange-ftp.el ange-ftp.elc \
-			help.el help.elc \
-			international/ccl.el international/mule-cmds.el \
-			international/mule-conf.el international/mule.el \
-			international/titdic-cnv.el \
-			international/ccl.elc international/mule-cmds.elc \
-			international/mule.elc \
-			international/titdic-cnv.elc \
-			loaddefs.el loadup.el
-
-PLIST_SUB+=	EMACS_VER=${EMACS_VER} EMACS_ARCH=${CONFIGURE_TARGET} \
-		DOC_FILE=${DOC_FILE}
-
-SCRIPTS_ENV=	SED=${SED} MV=${MV} \
-		DOC_FILE=${DOC_FILE}
-
-pre-fetch:
-	@${CAT} ${FILESDIR}/emcws-message
-
-pre-build:
-	${FIND} ${WRKSRC} \( -name \*.orig -o -name \*~ \) -exec ${RM} -f \{} \;
-	${RM} -rf ${WRKSRC}/info/*
-	@(cd ${WRKSRC}/src; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} emacs)
-	@(cd ${WRKSRC}/src/../lisp; \
-	${WRKSRC}/src/emacs -batch -q -f batch-byte-compile \
-	egg.el wnn-egg.el \
-	ange-ftp.el help.el international/ccl.el international/mule-cmds.el \
-	international/mule.el international/titdic-cnv.el)
-	${RM} -f ${WRKSRC}/src/emacs ${WRKSRC}/src/emacs-${EMACS_VER}.1
-	${RM} -f ${WRKSRC}/etc/${DOC_FILE}
-	${RM} -f ${WRKSRC}/lib-src/fns-emcws-${EMACS_VER}.1.el
-
-do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/src/emacs ${PREFIX}/bin/emcws-${EMACS_VER}
-	@${RM} -f ${PREFIX}/bin/emcws
-	@${LN} ${PREFIX}/bin/emcws-${EMACS_VER} ${PREFIX}/bin/emcws
-	@test -d ${PREFIX}/share/emacs/${EMACS_VER}-emcws/etc || \
-		${MKDIR} ${PREFIX}/share/emacs/${EMACS_VER}-emcws/etc
-	@${INSTALL_DATA} ${WRKSRC}/etc/${DOC_FILE} ${PREFIX}/share/emacs/${EMACS_VER}-emcws/etc/${DOC_FILE}
-	@test -d ${PREFIX}/share/emacs/${EMACS_VER}-emcws/lisp/its || \
-		${MKDIR} ${PREFIX}/share/emacs/${EMACS_VER}-emcws/lisp/its
-	@for i in ${EMCWS_ELCS}; do \
-		${INSTALL_DATA} ${WRKSRC}/lisp/$$i \
-		${PREFIX}/share/emacs/${EMACS_VER}-emcws/lisp/$$i; \
-	done
-	@test -d ${PREFIX}/share/emacs/${EMACS_VER}-emcws/lisp/international || \
-		${MKDIR} ${PREFIX}/share/emacs/${EMACS_VER}-emcws/lisp/international
-	@for i in ${MULE_PATCHED_ELS}; do \
-		${INSTALL_DATA} ${WRKSRC}/lisp/$$i \
-		${PREFIX}/share/emacs/${EMACS_VER}-emcws/lisp/$$i; \
-	done
-	@test -d ${PREFIX}/libexec/emacs/${EMACS_VER}/${CONFIGURE_TARGET} || \
-		${MKDIR} ${PREFIX}/libexec/emacs/${EMACS_VER}/${CONFIGURE_TARGET}
-	@${INSTALL_DATA} ${WRKSRC}/lib-src/fns-emcws-${EMACS_VER}.1.el \
-		${PREFIX}/libexec/emacs/${EMACS_VER}/${CONFIGURE_TARGET}/fns-emcws-${EMACS_VER}.1.el
-	@test -d ${PREFIX}/share/emacs/${EMACS_VER}-emcws/site-lisp || \
-		${MKDIR} ${PREFIX}/share/emacs/${EMACS_VER}-emcws/site-lisp
-	@if [ ! -f ${PREFIX}/share/emacs/${EMACS_VER}-emcws/site-lisp/subdirs.el ]; then \
-	  (${ECHO_CMD} "(if (fboundp 'normal-top-level-add-subdirs-to-load-path)"; \
-	   ${ECHO_CMD} "    (normal-top-level-add-subdirs-to-load-path))") \
-	  > ${PREFIX}/share/emacs/${EMACS_VER}-emcws/site-lisp/subdirs.el ; \
-	fi
-	@if [ ! -f ${PREFIX}/share/emacs/${EMACS_VER}-emcws/lisp/subdirs.el ]; then \
-	  (${ECHO_CMD} "(if (fboundp 'normal-top-level-add-subdirs-to-load-path)"; \
-	   ${ECHO_CMD} "    (normal-top-level-add-subdirs-to-load-path))") \
-	  > ${PREFIX}/share/emacs/${EMACS_VER}-emcws/lisp/subdirs.el ; \
-	fi
-
-.include <bsd.port.mk>
diff --git a/japanese/emacs20-emcws/distinfo b/japanese/emacs20-emcws/distinfo
deleted file mode 100644
index 19a5595bd83b..000000000000
--- a/japanese/emacs20-emcws/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 (emacs-20.7.tar.gz) = c732cf5e668d4ac67d9418ecb103ecf5
-SHA256 (emacs-20.7.tar.gz) = c73b753072ee3307787d597aaf5713a0652153a5a8037760f75cd8ffdcdcaea7
-SIZE (emacs-20.7.tar.gz) = 15043428
-MD5 (emcws-20.7-20020208.gz) = 750b2df254aed3b6775755ffc277f989
-SHA256 (emcws-20.7-20020208.gz) = ef84027fab89e4c6cea5314618f441d56621ec7d58bef2136ef8c1172afc6b53
-SIZE (emcws-20.7-20020208.gz) = 203459
diff --git a/japanese/emacs20-emcws/files/emcws-message b/japanese/emacs20-emcws/files/emcws-message
deleted file mode 100644
index 01d8c23960e3..000000000000
--- a/japanese/emacs20-emcws/files/emcws-message
+++ /dev/null
@@ -1,16 +0,0 @@
-****************************************************************************
- NOTE: Warning message about Emcws
-
- You can define which input method you use with following variables.
-
-	WITH_WNN6	to use Wnn6
-	WITH_FREEWNN	to use FreeWnn
-	WITH_CANNA	to use Canna
-	WITH_SJ3	to use sj3
-
- In default, WITH_WNN6 and WITH_CANNA are set.
-
- If you want to use Emcws with Canna and FreeWnn, run
-
-	make install WITH_FREEWNN=yes WITH_CANNA=yes
-****************************************************************************
diff --git a/japanese/emacs20-emcws/files/patch-af b/japanese/emacs20-emcws/files/patch-af
deleted file mode 100644
index f2013a374044..000000000000
--- a/japanese/emacs20-emcws/files/patch-af
+++ /dev/null
@@ -1,695 +0,0 @@
---- src/unexfreebsd.c.orig	Wed Dec  3 17:28:14 1997
-+++ src/unexfreebsd.c	Wed Dec  3 17:34:02 1997
-@@ -0,0 +1,692 @@
-+/* Code to do an unexec for FreeBSD for a temacs linked -Bdynamic.
-+   Derived from unexnetbsd.c, which was derived from unexsunos4.c
-+   Copyright (C) 1992, 1993 Free Software Foundation, Inc.
-+
-+This file is part of XEmacs.
-+
-+XEmacs is free software; you can redistribute it and/or modify it
-+under the terms of the GNU General Public License as published by the
-+Free Software Foundation; either version 2, or (at your option) any
-+later version.
-+
-+XEmacs is distributed in the hope that it will be useful, but WITHOUT
-+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-+for more details.
-+
-+You should have received a copy of the GNU General Public License
-+along with XEmacs; see the file COPYING.  If not, write to
-+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-+Boston, MA 02111-1307, USA.  */
-+
-+/* Synched up with: Not in FSF? */
-+
-+/*
-+Created 29-Oct-92 by Harlan Sexton
-+Tweaked 06-Aug-93 by Dean Michaels to work with sun3.
-+Converted 01-Dec-93 by Paul Mackerras to work with NetBSD shared libraries.
-+Tweaked 26-Feb-94 by Shawn Carey for use with FreeBSD-1.1 shared libraries.
-+*/
-+
-+/********************** Included .h Files **************************/
-+
-+#include <config.h>
-+
-+#include <stdarg.h>
-+#include <sys/param.h>
-+#include <sys/mman.h>
-+#include <sys/file.h>
-+#include <sys/stat.h>
-+#include <sys/types.h>
-+#include <string.h>
-+#include <stdio.h>
-+#include <a.out.h>
-+#include <unistd.h>
-+#include <ctype.h>
-+#include <stab.h>
-+#include <dirent.h>
-+#include <link.h>
-+
-+/********************** Macros *************************************/
-+
-+#define SYS_ERR		strerror(errno)
-+
-+#define MASK_UP(x,p_of_two) \
-+ ((((unsigned long) (x)) + ((p_of_two) - 1)) & (~((p_of_two) - 1)))
-+
-+#define MASK_DOWN(x,p_of_two) (((unsigned long) (x)) & (~((p_of_two) - 1)))
-+
-+/********************** Typedefs and Structs ***********************/
-+
-+struct translation_struct
-+{
-+  long txtaddr;
-+  long txtoff;
-+  long dataddr;
-+  long datoff;
-+  long bssaddr;
-+  long endaddr;
-+};
-+
-+/********************** Function Prototypes/Declarations ***********/
-+
-+static void unexec_error (const char *m, int use_errno, ...);
-+static int unexec_open (char *filename, int flag, int mode);
-+static caddr_t unexec_mmap (int fd, size_t len, int prot, int flags);
-+static long unexec_seek (int fd, long position);
-+static void unexec_read (int fd, long position, char *buf, int bytes);
-+static void unexec_write (int fd, long position, char *buf, int bytes);
-+static void unexec_pad (int fd, int bytes);
-+static void unexec_fstat (int fd, struct stat *statptr);
-+static void unexec_fchmod (int fd, int mode);
-+static long unexec_addr_to_offset (long addr, struct translation_struct *ts);
-+static void copy_relocation_site (struct relocation_info *ri, 
-+                                  caddr_t from_base_addr, 
-+                                  caddr_t to_base_addr, 
-+                                  struct translation_struct *ts);
-+static void reset_symtab (struct nlist *start, struct nlist *end, 
-+                          char *strtab, long edata_value, long end_value,
-+                          int shlib_image);
-+static void reset_ldso_symtab (struct nzlist *start, struct nzlist *end, 
-+                          char *strtab, long edata_value, long end_value,
-+                          int shlib_image);
-+int run_time_remap (char *dummy);
-+
-+/********************** Variables **********************************/
-+
-+/* for reporting error messages from system calls */
-+extern int errno;
-+extern int _DYNAMIC;
-+extern char **environ;             
-+
-+static unsigned long sbrk_of_0_at_unexec;
-+             
-+/*******************************************************************/
-+
-+static void
-+unexec_error (const char *fmt, int use_errno, ...)
-+{
-+  const char *err_msg = SYS_ERR;
-+  va_list args;
-+
-+  fprintf (stderr, "unexec - ");
-+  va_start (args, use_errno);
-+  vfprintf (stderr, fmt, args);
-+  va_end (args);
-+
-+  if (use_errno)
-+    fprintf (stderr, ": %s", err_msg);
-+  fprintf (stderr, "\n");
-+  exit (1);
-+  return;
-+}
-+
-+static int
-+unexec_open (char *filename, int flag, int mode)
-+{
-+  int fd;
-+
-+  errno = 0;
-+
-+  fd = open (filename, flag, mode);
-+
-+  if (fd < 0)
-+    unexec_error ("Failure opening file %s", 1, filename);
-+  return fd;
-+}
-+
-+static caddr_t
-+unexec_mmap (int fd, size_t len, int prot, int flags)
-+{
-+  caddr_t return_val;
-+
-+  unexec_seek (fd, 0);
-+  errno = 0;
-+  return_val = mmap (0, len, prot, flags, fd, 0);
-+
-+  if (return_val == (caddr_t) -1)
-+    unexec_error ("Failure mmap'ing file", 1);
-+  return return_val;
-+}
-+
-+
-+static long
-+unexec_seek (int fd, long position)
-+{
-+  long seek_value;
-+
-+  if (fd <= 0)
-+    unexec_error ("No file open in which to seek", 0);
-+
-+  errno = 0;
-+
-+  if (position < 0)
-+    seek_value = (long) lseek (fd, 0, L_INCR);
-+  else
-+    seek_value = (long) lseek (fd, position, L_SET);
-+
-+  if (seek_value < 0)
-+    unexec_error ("Failed to do a seek to 0x%x in %s", 1,
-+                  position, "unexec() output file");
-+
-+  return seek_value;
-+}
-+
-+static void
-+unexec_read (int fd, long position, char *buf, int bytes)
-+{
-+  int n_read;
-+  int remains = bytes;
-+  position = unexec_seek (fd, position);
-+
-+  if (bytes < 0)
-+    unexec_error ("Attempted read of %d bytes", 0, bytes);
-+
-+  errno = 0;
-+
-+  while (remains > 0)
-+    {
-+      n_read = read (fd, buf, remains);
-+      if (n_read <= 0)
-+        unexec_error ("Read failed for 0x%x bytes at offset 0x%x in %s",
-+                      1, bytes, position, "unexec() output file");
-+      buf += n_read;
-+      remains -= n_read;
-+    }
-+
-+  return;
-+}
-+
-+static void
-+unexec_write (int fd, long position, char *buf, int bytes)
-+{
-+  int n_written;
-+  int remains = bytes;
-+  position = unexec_seek (fd, position);
-+
-+  if (bytes < 0)
-+    unexec_error ("Attempted write of %d bytes in %s",
-+                  0, bytes, "unexec() output file");
-+
-+  errno = 0;
-+
-+  while (remains > 0)
-+    {
-+      n_written = write (fd, buf, remains);
-+      if (n_written <= 0)
-+        unexec_error ("Write failed for 0x%x bytes at offset 0x%x in %s",
-+                      1, bytes, position, "unexec() output file");
-+      buf += n_written;
-+      remains -= n_written;
-+    }
-+
-+  return;
-+}
-+
-+static void 
-+unexec_pad (int fd, int bytes)
-+{
-+  if (bytes > 0)
-+    {
-+      char buf[1024];
-+      int remaining = bytes;
-+
-+      memset (buf, 0, sizeof (buf));
-+
-+      while (remaining > 0)
-+        {
-+          int this_write = (remaining > sizeof(buf))?sizeof(buf):remaining;
-+          unexec_write (fd, -1, buf, this_write);
-+          remaining -= this_write;
-+        }
-+    }
-+}
-+
-+static void
-+unexec_fstat (int fd, struct stat *statptr)
-+{
-+  errno = 0;
-+  if (-1 == fstat (fd, statptr))
-+    unexec_error ("fstat() failed for descriptor %d", 1, fd);
-+  return;
-+}
-+
-+static void
-+unexec_fchmod (int fd, int mode)
-+{
-+  errno = 0;
-+  if (-1 == fchmod (fd, mode))
-+    unexec_error ("fchmod() failed for descriptor %d", 1, fd);
-+  return;
-+}
-+
-+static long
-+unexec_addr_to_offset (long addr, struct translation_struct *ts)
-+                             
-+{
-+  if ((addr < ts->txtaddr) || (addr >= ts->bssaddr))
-+    return -1;
-+  else if (addr >= ts->dataddr)
-+    return ((long) ((addr - ts->dataddr) + ts->datoff));
-+  else 
-+    return ((long) ((addr - ts->txtaddr) + ts->txtoff));
-+}
-+
-+
-+/*
-+ * "LD.SO" DATA AND SYMBOL TABLE OPERATIONS 
-+ */
-+
-+static void
-+copy_relocation_site (struct relocation_info *ri, 
-+                      caddr_t from_base_addr,
-+                      caddr_t to_base_addr,
-+                      struct translation_struct *ts)
-+{
-+  long offset;
-+  caddr_t from, to;
-+
-+  /* We can get relocation sites in the bss region, for objects whose
-+     contents are copied from a shared library.  We don't need or want
-+     to restore these at present. */
-+#ifndef sparc
-+  if (ri->r_copy)
-+    return;
-+#else
-+  /* Struct relocation_info_sparc doesn't have member r_copy.
-+     Instead, we use the address to check if this is run-time-copied. */
-+  if (ri->r_address >= ts->bssaddr && ri->r_address < ts->endaddr)
-+    return;
-+#endif
-+
-+  offset = unexec_addr_to_offset (ri->r_address, ts);
-+  if (offset == -1)
-+    unexec_error ("bad relocation address 0x%x (0x%x)", 0, ri->r_address,
-+		  ((long *)ri)[1]);
-+
-+  from = from_base_addr + offset;
-+  to = to_base_addr + offset;
-+  /* This stuff should be in a md_ file somewhere... */
-+#ifndef sparc
-+  switch (ri->r_length)
-+    {
-+    case 0:
-+      *((char *) to) = *((char *) from);
-+      break;
-+    case 1:
-+      *((short *) to) = *((short *) from);
-+      break;
-+    case 2:
-+      *((long *) to) = *((long *) from);
-+      break;
-+    default:
-+      unexec_error ("unknown reloc length %d seen during unexec()",
-+		    0, ri->r_length);
-+      break;
-+    }
-+#else /* sparc */
-+  switch (ri->r_type)
-+    {
-+    case RELOC_8:
-+    case RELOC_DISP8:
-+      *((char *) to) = *((char *) from);
-+      break;
-+    case RELOC_16:
-+    case RELOC_DISP16:
-+      *((short *) to) = *((short *) from);
-+      break;     
-+    case RELOC_LO10:
-+    case RELOC_13:     
-+    case RELOC_22:     
-+    case RELOC_HI22:
-+    case RELOC_WDISP22:
-+    case RELOC_WDISP30:
-+    case RELOC_32:
-+    case RELOC_DISP32:
-+    case RELOC_GLOB_DAT:
-+      *((long *) to) = *((long *) from);
-+      break;
-+    case RELOC_JMP_SLOT:
-+      {
-+        long *target = (long *) to;
-+        long *source = (long *) from;
-+        *target = *source;
-+        target++;
-+        source++;
-+        *target = *source;
-+        target++;
-+        source++;
-+        *target = *source;
-+      }
-+      break;
-+    default:
-+      unexec_error ("unknown reloc type %d seen during unexec()",
-+		    0, ri->r_type);
-+      break;
-+    }
-+#endif /* sparc */
-+}
-+
-+static void
-+reset_symtab (struct nlist *start, struct nlist *end, char *strtab,
-+              long edata_value, long end_value, int shlib_image)
-+{
-+  struct nlist *tmp = start;
-+  int found_edata = 0;
-+  int found_end = 0;
-+     
-+  while (tmp < end)
-+    {
-+      int type = tmp->n_type;
-+
-+      if ((type == (N_UNDF | N_EXT)) &&
-+          (tmp->n_value != 0))
-+        unexec_error ("unexec'ing image has COMMON symbols in it -- we quit!",
-+		      0);
-+     
-+      if (!(type & N_STAB))
-+        {
-+          if (!found_edata &&
-+              (type == (N_EXT | N_DATA)) &&
-+              tmp->n_un.n_strx &&
-+              !strcmp ("_edata", strtab + tmp->n_un.n_strx))
-+            {
-+              tmp->n_value = edata_value;
-+              found_edata = 1;
-+            }
-+
-+
-+          if ((type & N_TYPE) == N_BSS)
-+            {
-+              if (!found_end &&
-+                  (type == (N_EXT | N_BSS)) &&
-+                  tmp->n_un.n_strx &&
-+                  !strcmp ("_end", strtab + tmp->n_un.n_strx))
-+                {
-+                  tmp->n_value = end_value;
-+                  found_end = 1;
-+                }
-+              else if (type & N_EXT)
-+                tmp->n_type = N_DATA | N_EXT;
-+              else
-+                tmp->n_type = N_DATA;
-+            }
-+
-+          /* the way things are being handled here, having sbrk() in the
-+             image is fatal for an image linked with shared lib's (although 
-+             the code could be modified to support it), but this should 
-+             never happen anyway */
-+          if (shlib_image &&
-+              (type == (N_EXT | N_TEXT)) &&
-+              tmp->n_un.n_strx &&
-+              !strcmp ("_sbrk", strtab + tmp->n_un.n_strx))
-+            unexec_error ("unexec'd shlib image has sbrk() in it -- we quit!",
-+                          0);
-+        }
-+
-+      tmp++;
-+    }
-+} 
-+     
-+static void
-+reset_ldso_symtab (struct nzlist *start, struct nzlist *end, char *strtab,
-+              long edata_value, long end_value, int shlib_image)
-+{
-+  struct nzlist *tmp = start;
-+  int found_edata = 0;
-+  int found_end = 0;
-+     
-+  while (tmp < end) {
-+    int type = tmp->nz_type;
-+/*
-+ * the following code breaks under FreeBSD-1.1-BETA, but everything
-+ * seems to work perfectly if it's commented out.  This did not break
-+ * anything until the changes to ld.so were made.
-+ */
-+/*
-+    if ((type == (N_UNDF | N_EXT)) && (tmp->nz_value != 0))
-+      unexec_error("unexec'ing image has COMMON symbols in rel -- we quit!",0);
-+*/
-+    if (!(type & N_STAB)) {
-+      if (!found_edata &&
-+	  (type == (N_EXT | N_DATA)) &&
-+	  !strcmp ("_edata", strtab + tmp->nz_strx)) {
-+	tmp->nz_value = edata_value;
-+	found_edata = 1;
-+      }
-+
-+      if ((type & N_TYPE) == N_BSS) {
-+	if (!found_end &&
-+	    (type == (N_EXT | N_BSS)) &&
-+	    !strcmp ("_end", strtab + tmp->nz_strx)) {
-+	  tmp->nz_value = end_value;
-+	  found_end = 1;
-+	} else if (type & N_EXT)
-+	  tmp->nz_type = N_DATA | N_EXT;
-+	else
-+	  tmp->nz_type = N_DATA;
-+      }
-+
-+      /* the way things are being handled here, having sbrk() in the
-+	 image is fatal for an image linked with shared lib's (although 
-+	 the code could be modified to support it), but this should 
-+	 never happen anyway */
-+      if (shlib_image &&
-+	  (type == (N_EXT | N_TEXT)) &&
-+	  !strcmp ("_sbrk", strtab + tmp->nz_strx))
-+	unexec_error("unexec'd shlib image has sbrk() ref -- we quit!", 0);
-+    }
-+    tmp++;
-+  }
-+} 
-+     
-+extern int getpagesize (void);
-+
-+/*
-+ * EXPORTED FUNCTIONS 
-+ */
-+
-+/* this has to be a global variable to prevent the optimizers from
-+ * assuming that it can not be 0.  
-+*/
-+static void *dynamic_addr = (void *) &_DYNAMIC;
-+
-+int
-+unexec (char *new_name, char *old_name,
-+        unsigned int emacs_edata, unsigned int dummy1, unsigned int dummy2)
-+{
-+  /* ld.so data */
-+  struct _dynamic *ld = 0;
-+  struct section_dispatch_table *ld2 = 0;
-+  /* old and new state */
-+  int old_fd;
-+  int new_fd;
-+  caddr_t old_base_addr;
-+  caddr_t new_base_addr;
-+  struct exec old_hdr;
-+  struct exec new_hdr;
-+  struct stat old_buf;
-+  struct stat new_buf;
-+  /* some process specific "constants" */
-+  unsigned long n_pagsiz, new_edata;
-+  long page_size = getpagesize ();
-+  caddr_t plt_end;
-+  caddr_t current_break = (caddr_t) sbrk (0);
-+
-+  if (!page_size)
-+    unexec_error ("unexec() failed because we can't get the size of a page!",
-+                  0);
-+
-+  /* see if this is a -Bdynamic image -- if so, find ld.so structures */
-+  if (dynamic_addr)
-+    {
-+      ld = (struct _dynamic *) dynamic_addr;
-+      ld2 = ld->d_un.d_sdt;
-+      if (ld->d_version < LD_VERSION_BSD)
-+        unexec_error ("%s linked with obsolete version of ld -- we quit!",
-+                      0, old_name);
-+    }
-+
-+  /* open the old and new files, figuring out how big the old one is
-+     so that we can map it in */
-+  old_fd = unexec_open (old_name, O_RDONLY, 0);
-+  new_fd = unexec_open (new_name, O_RDWR | O_CREAT | O_TRUNC, 0666);
-+
-+  /* setup the header and the statbuf for old_fd */
-+  unexec_read (old_fd, 0, (char *) &old_hdr, sizeof (old_hdr));
-+  unexec_fstat (old_fd, &old_buf);
-+
-+
-+  /* set up some important constants */
-+  n_pagsiz = __LDPGSZ;
-+  if (dynamic_addr)
-+    plt_end = (caddr_t) MASK_UP (ld2->sdt_plt + ld2->sdt_plt_sz, sizeof (double));
-+  else
-+    plt_end = (caddr_t) N_DATADDR (old_hdr);
-+
-+#if 0
-+  /* never write protect the variable "environ", defined in /lib/crt0.o, and
-+     set in process.c and callproc.c */
-+  mprotect_bottom_addr = ((unsigned long) &environ) + sizeof (char **);
-+  /* never protect ABOVE the end of data emacs_edata specified */
-+  mprotect_top_addr = MIN (emacs_edata, N_DATADDR (old_hdr) + old_hdr.a_data);
-+#endif
-+
-+  /* Set up the image of the old file */
-+  old_base_addr = unexec_mmap (old_fd, old_buf.st_size, PROT_READ,
-+			       MAP_FILE | MAP_PRIVATE);
-+  close (old_fd);
-+
-+  /* set up the new exec */
-+  new_hdr = old_hdr;
-+  new_edata = (unsigned long) MASK_UP (current_break, n_pagsiz);
-+  new_hdr.a_data = new_edata - ((unsigned long) N_DATADDR (old_hdr));
-+  new_hdr.a_bss  = 0;
-+
-+  /* set up this variable, in case we want to reset "the break" 
-+     when restarting */
-+  sbrk_of_0_at_unexec = ((unsigned long) MASK_UP (current_break, n_pagsiz));
-+     
-+  /* Write out the first approximation to the new file. The sizes of
-+     each section will be correct, but there will be a number of 
-+     corrections that will need to be made. */
-+  {
-+    long old_datoff = N_DATOFF (old_hdr);
-+    long old_dataddr = N_DATADDR (old_hdr);
-+    long new_treloff = N_RELOFF (new_hdr);
-+    long old_treloff = N_RELOFF (old_hdr);
-+    long ld_so_size = ((unsigned long) plt_end) - old_dataddr;
-+    long real_data_size = current_break - plt_end;
-+    long pad_size = 
-+      MASK_UP (current_break, n_pagsiz) - ((unsigned long) current_break);
-+
-+
-+    /* First, write the text segment with new header -- copy everything until
-+       the start of the data segment from the old file, and then go back and 
-+       write the new header. */
-+    unexec_write (new_fd, 0, old_base_addr, old_datoff + ld_so_size);
-+    unexec_write (new_fd, 0, (char *) &new_hdr, sizeof (new_hdr));
-+
-+    /* Copy the rest of the data segment from the running image. */
-+    unexec_write (new_fd, old_datoff + ld_so_size, 
-+                  plt_end, real_data_size);
-+
-+    /* pad out the data segment */
-+    unexec_pad (new_fd, pad_size);
-+    
-+    /* Finally, copy the symbol table information from the old file. */
-+    unexec_write (new_fd, new_treloff,
-+                  old_base_addr + old_treloff,
-+                  old_buf.st_size - old_treloff);
-+  }
-+     
-+     
-+  /* Next, map in the output file so that we can jump around fixing it
-+     up. We retain the old file so that we can refer to it. */
-+  unexec_fstat (new_fd, &new_buf);
-+  new_base_addr = unexec_mmap (new_fd, 
-+                               MASK_UP (new_buf.st_size, page_size),
-+                               PROT_READ | PROT_WRITE,
-+			       MAP_FILE | MAP_SHARED);
-+
-+
-+
-+  /* We need to do 2 things. First, make sure that _edata and _end (and
-+     hence, curbrk) are set to the correct values. At the same time, for
-+     neatness and to help with debugging, mark all the types of all ld.so
-+     and nm BSS symbols in the new file to be DATA, and make sure that
-+     there are no COMMON symbols in the output file, as any references to
-+     these can lose really big. Second, reset all of the ld.so "relocation
-+     sites" in the new file to have the values that appear in the old file
-+     -- the failure to do this was the biggest loser in the old version of
-+     this code. */
-+
-+  /* STEP 1 */
-+  /* Reset the regular symbol table first. */
-+  reset_symtab ((struct nlist *) (new_base_addr + N_SYMOFF(new_hdr)),
-+		(struct nlist *) (new_base_addr + N_SYMOFF(new_hdr) +
-+				  new_hdr.a_syms),
-+		(char *) (new_base_addr + N_STROFF(new_hdr)),
-+		new_edata, new_edata,
-+		!!dynamic_addr);
-+
-+  /* Now reset the ld.so symbol table. */
-+  if (dynamic_addr)
-+    {
-+      struct translation_struct ts;
-+      struct relocation_info *tmp, *end;
-+      caddr_t syms, strings;
-+
-+      /* set up the structure that we use to translate addresses in the
-+	 old file into file offsets */
-+      ts.txtaddr = N_TXTADDR (old_hdr);
-+      ts.txtoff = N_TXTOFF (old_hdr);
-+      ts.dataddr = N_DATADDR (old_hdr);
-+      ts.datoff = N_DATOFF (old_hdr);
-+      ts.bssaddr = N_DATADDR (old_hdr) + old_hdr.a_data;
-+      ts.endaddr = ts.bssaddr + old_hdr.a_bss;
-+
-+      syms = new_base_addr + unexec_addr_to_offset(ld2->sdt_nzlist, &ts);
-+      strings = new_base_addr + unexec_addr_to_offset(ld2->sdt_strings, &ts);
-+      reset_ldso_symtab ((struct nzlist *) syms, (struct nzlist *) strings,
-+			 (char *) strings,
-+			 new_edata, new_edata,
-+			 !!dynamic_addr);
-+
-+      /* STEP 2 */
-+      tmp = (struct relocation_info *)
-+	(old_base_addr + unexec_addr_to_offset(ld2->sdt_rel, &ts));
-+      end = (struct relocation_info *)
-+	(old_base_addr + unexec_addr_to_offset(ld2->sdt_hash, &ts));
-+      while (tmp < end)
-+	{
-+	  copy_relocation_site (tmp, old_base_addr, new_base_addr, &ts);
-+	  tmp++;
-+	}
-+    }
-+     
-+  /* get rid of the mmap-ed file space and make the output file 
-+     executable -- then quit */
-+  munmap (new_base_addr, MASK_UP (new_buf.st_size, page_size));
-+  munmap (old_base_addr, MASK_UP (old_buf.st_size, page_size));
-+  unexec_fchmod (new_fd, 0755);
-+  close (new_fd);
-+  return 0;
-+}
-+
-+
-+int
-+run_time_remap (char *dummy)
-+{
-+  unsigned long current_sbrk = (unsigned long) sbrk (0);
-+
-+  if (sbrk_of_0_at_unexec > current_sbrk)
-+    {
-+      errno = 0;
-+      if (brk ((caddr_t) sbrk_of_0_at_unexec))
-+	fprintf (stderr, "failed to change brk addr to 0x%lx: %s\n", 
-+		 sbrk_of_0_at_unexec, SYS_ERR);
-+    }
-+             
-+  return 0;
-+}
diff --git a/japanese/emacs20-emcws/files/patch-ah b/japanese/emacs20-emcws/files/patch-ah
deleted file mode 100644
index 5a24e77c253b..000000000000
--- a/japanese/emacs20-emcws/files/patch-ah
+++ /dev/null
@@ -1,29 +0,0 @@
---- lib-src/Makefile.in.orig	Sat Aug  1 20:22:55 1998
-+++ lib-src/Makefile.in	Sat Feb 13 17:30:37 1999
-@@ -218,7 +218,7 @@
- LIBMAIL=-lmail
- #endif
- 
--LOADLIBES=LIBS_SYSTEM LIBS_MACHINE LIB_STANDARD_LIBSRC
-+LOADLIBES=LIBS_SYSTEM LIBS_MACHINE LIB_STANDARD_LIBSRC -lcompat
- 
- /* We need to #define emacs to get the right versions of some files.
-    Some other files - those shared with other GNU utilities - need
-@@ -278,7 +278,7 @@
-         if [ `(cd ${archlibdir} && /bin/pwd)` \
-              != `(cd ${srcdir} && /bin/pwd)` ]; then \
- 	  for file in ${SCRIPTS}; do \
--	    $(INSTALL_PROGRAM) ${srcdir}/$$file ${archlibdir}/$$file; \
-+	    $(INSTALL_SCRIPT) ${srcdir}/$$file ${archlibdir}/$$file; \
- 	  done ; \
- 	fi
- 
-@@ -290,7 +290,7 @@
- 	  chmod a+rx ${bindir}/$${file}; \
- 	done
- 	for file in ${INSTALLABLE_SCRIPTS} ; do \
--	  $(INSTALL_PROGRAM) ${srcdir}/$${file} ${bindir}/$${file} ; \
-+	  $(INSTALL_SCRIPT) ${srcdir}/$${file} ${bindir}/$${file} ; \
- 	  chmod a+rx ${bindir}/$${file}; \
- 	done
- 
diff --git a/japanese/emacs20-emcws/files/patch-ai b/japanese/emacs20-emcws/files/patch-ai
deleted file mode 100644
index 1ae2376d3fed..000000000000
--- a/japanese/emacs20-emcws/files/patch-ai
+++ /dev/null
@@ -1,17 +0,0 @@
---- src/unexelf.c.orig	Mon Aug 10 11:33:12 1998
-+++ src/unexelf.c	Sun Jan  3 20:54:08 1999
-@@ -512,6 +512,14 @@
- # include <link.h>	/* get ElfW etc */
- #endif
- 
-+#ifdef __FreeBSD__
-+# ifdef __STDC__
-+#  define ElfW(type)	Elf_##type
-+# else
-+#  define ElfW(type)	Elf_/**/type
-+# endif
-+#endif
-+
- #ifndef ElfW
- # ifdef __STDC__
- #  define ElfW(type)	Elf32_##type
diff --git a/japanese/emacs20-emcws/files/patch-aj b/japanese/emacs20-emcws/files/patch-aj
deleted file mode 100644
index b11a244c6e41..000000000000
--- a/japanese/emacs20-emcws/files/patch-aj
+++ /dev/null
@@ -1,31 +0,0 @@
---- src/m/alpha.h.orig	Wed Oct 29 16:47:37 1997
-+++ src/m/alpha.h	Sun Jan  3 20:05:49 1999
-@@ -239,7 +239,7 @@
- 
- #ifndef NOT_C_CODE
- /* We need these because pointers are larger than the default ints.  */
--#if !defined(__NetBSD__) && !defined(__OpenBSD__)
-+#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
- #include <alloca.h>
- #else
- #include <stdlib.h>
-@@ -308,7 +308,8 @@
-    termio and struct termios are mutually incompatible.  */
- #define NO_TERMIO
- 
--#if defined (LINUX) || defined (__NetBSD__) || defined (__OpenBSD__)
-+#if defined (LINUX) || \
-+	defined(__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__)
- # define TEXT_END ({ extern int _etext; &_etext; })
- # ifndef __ELF__
- #  define COFF
-@@ -316,7 +317,8 @@
- # endif /* notdef __ELF__ */
- #endif
- 
--#if (defined (__NetBSD__) || defined (__OpenBSD__)) && defined (__ELF__)
-+#if (defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__)) \
-+	&& defined (__ELF__)
- #define HAVE_TEXT_START
- #endif
- 
diff --git a/japanese/emacs20-emcws/files/patch-ca b/japanese/emacs20-emcws/files/patch-ca
deleted file mode 100644
index a9b1ff49de2e..000000000000
--- a/japanese/emacs20-emcws/files/patch-ca
+++ /dev/null
@@ -1,31 +0,0 @@
---- src/Makefile.in.orig	Sat Mar 11 12:49:45 2000
-+++ src/Makefile.in	Sat Mar 11 12:52:04 2000
-@@ -126,6 +126,10 @@
- #define LIBS_MACHINE
- #endif
- 
-+#ifndef LIBS_XPG
-+#define LIBS_XPG
-+#endif
-+
- #ifndef LIB_MATH
- # ifdef LISP_FLOAT_TYPE
- #  define LIB_MATH -lm
-@@ -579,7 +583,7 @@
- #define LIBS_TERMCAP
- termcapobj = termcap.o tparam.o
- #else /* LIBS_TERMCAP */
--termcapobj = tparam.o
-+termcapobj = terminfo.o
- #endif /* LIBS_TERMCAP */
- #endif /* ! defined (TERMINFO) */
- 
-@@ -864,7 +868,7 @@
-    duplicated symbols.  If the standard libraries were compiled
-    with GCC, we might need gnulib again after them.  */
- LIBES = $(LOADLIBES) $(LDLIBS) $(LIBX) LIBS_SYSTEM LIBS_MACHINE LIBS_TERMCAP \
--   LIBS_MULE LIBS_DEBUG $(GNULIB_VAR) LIB_MATH LIB_STANDARD $(GNULIB_VAR)
-+   LIBS_XPG LIBS_MULE LIBS_DEBUG $(GNULIB_VAR) LIB_MATH LIB_STANDARD $(GNULIB_VAR)
- 
- /* Enable recompilation of certain other files depending on system type.  */
- 
diff --git a/japanese/emacs20-emcws/files/patch-cb b/japanese/emacs20-emcws/files/patch-cb
deleted file mode 100644
index 077639dcf80c..000000000000
--- a/japanese/emacs20-emcws/files/patch-cb
+++ /dev/null
@@ -1,42 +0,0 @@
---- src/s/freebsd.h.orig	Tue May  2 21:29:10 2000
-+++ src/s/freebsd.h	Mon Nov  4 11:29:52 2002
-@@ -47,6 +47,13 @@
- #define LIBS_TERMCAP -ltermcap
- #endif
- 
-+/* Use XPG4 Library for FreeBSD */
-+#if __FreeBSD_version >= 220000
-+#ifdef USE_XPG
-+#define LIBS_XPG -lxpg4
-+#endif
-+#endif
-+
- #define SYSV_SYSTEM_DIR
- 
- /* freebsd has POSIX-style pgrp behavior. */
-@@ -56,9 +63,16 @@
- #ifdef __ELF__
- 
- #define LD_SWITCH_SYSTEM
-+
-+#ifdef __alpha__
-+#define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crtbegin.o
-+#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtend.o
-+#else
- #define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crti.o /usr/lib/crtbegin.o
--#define UNEXEC unexelf.o
- #define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtend.o /usr/lib/crtn.o
-+#endif
-+
-+#define UNEXEC unexelf.o
- #undef LIB_GCC
- #define LIB_GCC
- 
-@@ -150,3 +164,7 @@
-    be seen again in a later read(2), without the CRs.  */
- 
- #define BROKEN_PTY_READ_AFTER_EAGAIN 1
-+
-+#if __FreeBSD_version >= 500000
-+#define LD_SWITCH_SYSTEM_TEMACS -znocombreloc
-+#endif
diff --git a/japanese/emacs20-emcws/files/patch-cc b/japanese/emacs20-emcws/files/patch-cc
deleted file mode 100644
index 8202cf7c5e3a..000000000000
--- a/japanese/emacs20-emcws/files/patch-cc
+++ /dev/null
@@ -1,36 +0,0 @@
---- configure.in.orig	Sat Mar 11 12:55:54 2000
-+++ configure.in	Sat Mar 11 12:58:33 2000
-@@ -42,6 +42,9 @@
- AC_ARG_WITH(hesiod,
- [  --with-hesiod           support Hesiod to get the POP server host],
- [AC_DEFINE(HESIOD)])
-+AC_ARG_WITH(xpg4,
-+[  --with-xpg4             support XPG4 library on FreeBSD system],
-+[AC_DEFINE(USE_XPG)])
- dnl
- AC_ARG_WITH(wnn,
- [  --with-wnn              obsolete, same as --with-wnn4])
-@@ -179,6 +182,15 @@
- machine='' opsys='' unported=no
- case "${canonical}" in
- 
-+  ## FreeBSD ports
-+  *-*-freebsd* )
-+    opsys=freebsd
-+    case "${canonical}" in
-+      alpha*-*-freebsd*)	machine=alpha ;;
-+      i[3456]86-*-freebsd*)	machine=intel386 ;;
-+    esac
-+  ;;
-+
-   ## NetBSD ports
-   *-*-netbsd* )
-     opsys=netbsd
-@@ -985,7 +997,6 @@
- 				;;
-       *-sysv4.2uw* )	  	opsys=unixware; NON_GNU_CPP=/lib/cpp ;;
-       *-386bsd* )	        opsys=386bsd ;;
--      *-freebsd* )	        opsys=freebsd ;;
-       *-nextstep* )             opsys=nextstep ;;
-       ## Otherwise, we'll fall through to the generic opsys code at the bottom.
-     esac
diff --git a/japanese/emacs20-emcws/files/patch-cd b/japanese/emacs20-emcws/files/patch-cd
deleted file mode 100644
index 9792250f67b9..000000000000
--- a/japanese/emacs20-emcws/files/patch-cd
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/config.in.orig	Sat Nov 21 09:00:30 1998
-+++ src/config.in	Sat Nov 21 09:00:58 1998
-@@ -118,6 +118,9 @@
- /* Define to support using a Hesiod database to find the POP server.  */
- #undef HESIOD
- 
-+/* Define to support using a XPG4 library on FreeBSD system. */
-+#undef USE_XPG
-+
- /* Some things figured out by the configure script, grouped as they are in
-    configure.in.  */
- #ifndef _ALL_SOURCE  /* suppress warning if this is pre-defined */
diff --git a/japanese/emacs20-emcws/files/patch-cf b/japanese/emacs20-emcws/files/patch-cf
deleted file mode 100644
index d4273610df7a..000000000000
--- a/japanese/emacs20-emcws/files/patch-cf
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/config.in.orig	Sun Jul 16 13:11:42 2000
-+++ src/config.in	Sun Jul 16 13:12:48 2000
-@@ -237,6 +237,7 @@
- #undef HAVE_GETCWD
- #undef HAVE_SHUTDOWN
- #undef HAVE_STRFTIME
-+#undef HAVE_GETADDRINFO
- #undef HAVE_GRANTPT
- #undef HAVE_GETPT
- 
diff --git a/japanese/emacs20-emcws/files/patch-cg b/japanese/emacs20-emcws/files/patch-cg
deleted file mode 100644
index 1973aff47d10..000000000000
--- a/japanese/emacs20-emcws/files/patch-cg
+++ /dev/null
@@ -1,149 +0,0 @@
---- src/process.c-dist Fri Aug 14 22:51:44 1998
-+++ src/process.c      Fri Jul 30 12:21:11 1999
-@@ -1,7 +1,18 @@
-+/*
-+ * Locally hacked process.c to add ipv6 support. -wsr
-+ *
-+ * The configure.in file should define "HAVE_GETADDRINFO" if it is found 
-+ * in libc.
-+ * 
-+ */
-+
- /* Asynchronous subprocess control for GNU Emacs.
-    Copyright (C) 1985, 86, 87, 88, 93, 94, 95, 96, 1998
-       Free Software Foundation, Inc.
- 
-+   ipv6 changes are
-+   Copyright (C) 1999 Wolfgang S. Rupprecht
-+
- This file is part of GNU Emacs.
- 
- GNU Emacs is free software; you can redistribute it and/or modify
-@@ -1808,15 +1819,22 @@
- {
-   Lisp_Object proc;
-   register int i;
-+
-+#ifndef HAVE_GETADDRINFO
-   struct sockaddr_in address;
-   struct servent *svc_info;
-   struct hostent *host_info_ptr, host_info;
-   char *(addr_list[2]);
-   IN_ADDR numeric_addr;
--  int s, outch, inch;
--  char errstring[80];
--  int port;
-   struct hostent host_info_fixed;
-+  int port;
-+#else /* HAVE_GETADDRINFO */
-+  struct addrinfo hints, *res, *lres;
-+  int ret = 0;
-+  int xerrno = 0;
-+  char *portstring, portbuf [128];
-+#endif /* HAVE_GETADDRINFO */
-+  int s = -1, outch, inch;
-   struct gcpro gcpro1, gcpro2, gcpro3, gcpro4;
-   int retry = 0;
-   int count = specpdl_ptr - specpdl;
-@@ -1829,6 +1847,22 @@
-   GCPRO4 (name, buffer, host, service);
-   CHECK_STRING (name, 0);
-   CHECK_STRING (host, 0);
-+
-+#ifdef HAVE_GETADDRINFO
-+  /*
-+   * caution: service can either be a string or int.
-+   * Convert to a C string for later use by getaddrinfo.
-+   */
-+  if (INTEGERP (service)) {
-+      snprintf (portbuf, sizeof (portbuf), "%d", XINT (service));
-+      portstring = portbuf;
-+  }
-+  else
-+    {
-+      CHECK_STRING (service, 0);
-+      portstring = XSTRING (service)->data;
-+    }
-+#else /* HAVE_GETADDRINFO */
-   if (INTEGERP (service))
-     port = htons ((unsigned short) XINT (service));
-   else
-@@ -1839,6 +1873,8 @@
-       error ("Unknown service \"%s\"", XSTRING (service)->data);
-       port = svc_info->s_port;
-     }
-+#endif /* HAVE_GETADDRINFO */
-+
- 
-   /* Slow down polling to every ten seconds.
-      Some kernels have a bug which causes retrying connect to fail
-@@ -1848,6 +1884,62 @@
- #endif
- 
- #ifndef TERM
-+#ifdef HAVE_GETADDRINFO               /* We have a modern OS. -wsr */
-+  {
-+      immediate_quit = 1;
-+      QUIT;
-+      memset(&hints, 0, sizeof(hints));
-+      hints.ai_flags = 0;
-+      hints.ai_family = AF_UNSPEC;
-+      hints.ai_socktype = SOCK_STREAM;
-+      hints.ai_protocol = 0;
-+      ret = getaddrinfo(XSTRING (host)->data, portstring, &hints, &res);
-+      if (ret){
-+        error("%s/%s %s", XSTRING (host)->data, portstring,
-+              gai_strerror(ret));
-+      }
-+      immediate_quit = 0;
-+  }
-+
-+  for (lres = res; lres ; lres = lres->ai_next) { /* address loop */
-+      s = socket(lres->ai_family, lres->ai_socktype, lres->ai_protocol);
-+      if (s < 0) 
-+        continue;
-+
-+      /* Kernel bugs (on Ultrix at least) cause lossage (not just EINTR)
-+       when connect is interrupted.  So let's not let it get interrupted.
-+       Note we do not turn off polling, because polling is only used
-+       when not interrupt_input, and thus not normally used on the systems
-+       which have this bug.  On systems which use polling, there's no way
-+       to quit if polling is turned off.  */
-+      if (interrupt_input)
-+        unrequest_sigio ();
-+
-+      immediate_quit = 1;
-+      QUIT;
-+
-+      ret = connect(s, lres->ai_addr, lres->ai_addrlen);
-+      if (ret){
-+        close(s);
-+        s= -1;
-+        continue;
-+      }
-+
-+      break;
-+  } /* address loop */
-+
-+  freeaddrinfo(res);
-+  if (s < 0)
-+  {
-+      if (interrupt_input)
-+        request_sigio ();
-+
-+      errno = xerrno;
-+      report_file_error ("connection failed",
-+                       Fcons (host, Fcons (name, Qnil)));
-+  }
-+#else /* HAVE_GETADDRINFO */
-+
-   while (1)
-     {
- #ifdef TRY_AGAIN
-@@ -1938,6 +2030,7 @@
-       report_file_error ("connection failed",
-                        Fcons (host, Fcons (name, Qnil)));
-     }
-+#endif /* HAVE_GETADDRINFO */
- 
-   immediate_quit = 0;
diff --git a/japanese/emacs20-emcws/files/patch-ch b/japanese/emacs20-emcws/files/patch-ch
deleted file mode 100644
index 4dd63d08857d..000000000000
--- a/japanese/emacs20-emcws/files/patch-ch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.in-dist  Tue Jun 30 15:15:05 1998
-+++ configure.in       Wed Jul 28 10:38:16 1999
-@@ -1613,7 +1613,7 @@
- rename closedir mkdir rmdir sysinfo \
- random lrand48 bcopy bcmp logb frexp fmod rint cbrt ftime res_init setsid \
- strerror fpathconf select mktime euidaccess getpagesize tzset setlocale \
--utimes setrlimit setpgid getcwd shutdown strftime)
-+utimes setrlimit setpgid getcwd shutdown strftime getaddrinfo)
- 
- # Check this now, so that we will NOT find the above functions in ncurses.
- # That is because we have not set up to link ncurses in lib-src.
diff --git a/japanese/emacs20-emcws/files/patch-da b/japanese/emacs20-emcws/files/patch-da
deleted file mode 100644
index 6b265eec285d..000000000000
--- a/japanese/emacs20-emcws/files/patch-da
+++ /dev/null
@@ -1,33 +0,0 @@
---- configure.in.orig	Fri Feb 22 15:50:26 2002
-+++ configure.in	Fri Feb 22 15:55:10 2002
-@@ -35,18 +35,26 @@
- dnl A case that the LEIM package does not exist.
- dnl
-   locallisppath='${datadir}/emacs/${version}$(EMACS_POSTFIX)/site-lisp:'\
--'${datadir}/emacs/site-lisp'
-+'${datadir}/emacs/site-lisp:'\
-+'${datadir}/emacs/${version}/site-lisp:'\
-+'${datadir}/emacs/${version}$(EMACS_POSTFIX)/lisp:'\
-+'${datadir}/emacs/${version}/lisp'
- else
- dnl
- dnl A case that the LEIM package exists.
- dnl
-   locallisppath='${datadir}/emacs/${version}$(EMACS_POSTFIX)/site-lisp:'\
--'${datadir}/emacs/site-lisp:${datadir}/emacs/${version}$(EMACS_POSTFIX)/leim'
-+'${datadir}/emacs/site-lisp:'\
-+'${datadir}/emacs/${version}$(EMACS_POSTFIX)/leim:'\
-+'${datadir}/emacs/${version}/site-lisp:'\
-+'${datadir}/emacs/${version}/leim:'\
-+'${datadir}/emacs/${version}$(EMACS_POSTFIX)/lisp:'\
-+'${datadir}/emacs/${version}/lisp'
- fi
- 
- lisppath='${locallisppath}:${lispdir}'
--etcdir='${datadir}/emacs/${version}$(EMACS_POSTFIX)/etc'
--archlibdir='${libexecdir}/emacs/${version}$(EMACS_POSTFIX)/${configuration}'
-+etcdir='${datadir}/emacs/${version}/etc'
-+archlibdir='${libexecdir}/emacs/${version}/${configuration}'
- docdir='${datadir}/emacs/${version}$(EMACS_POSTFIX)/etc'
- 
- AC_ARG_WITH(gcc,
diff --git a/japanese/emacs20-emcws/files/patch-ea b/japanese/emacs20-emcws/files/patch-ea
deleted file mode 100644
index 6d88c4506061..000000000000
--- a/japanese/emacs20-emcws/files/patch-ea
+++ /dev/null
@@ -1,13 +0,0 @@
---- lisp/help.el.orig	Wed Nov 28 20:55:37 2001
-+++ lisp/help.el	Wed Nov 28 20:56:04 2001
-@@ -561,8 +561,8 @@
-     (load (expand-file-name
- 	   ;; fns-XX.YY.ZZ.el does not work on DOS filesystem.
- 	   (if (eq system-type 'ms-dos)
--	       "fns.el"
--	     (format "fns-%s.el" emacs-version))
-+	       "fnsemcws.el"
-+	     (format "fns-emcws-%s.el" emacs-version))
- 	   exec-directory)
- 	  ;; The file name fns-%s.el already has a .el extension.
- 	  nil nil t)
diff --git a/japanese/emacs20-emcws/files/patch-eb b/japanese/emacs20-emcws/files/patch-eb
deleted file mode 100644
index 3b471abbd975..000000000000
--- a/japanese/emacs20-emcws/files/patch-eb
+++ /dev/null
@@ -1,26 +0,0 @@
---- lisp/loadup.el.orig	Sun Dec  2 22:10:51 2001
-+++ lisp/loadup.el	Sun Dec  2 22:12:10 2001
-@@ -246,7 +246,7 @@
-       (if (memq system-type '(ms-dos windows-nt))
- 	  (setq name (expand-file-name
- 		      (if (fboundp 'x-create-frame) "DOC-X" "DOC") "../etc"))
--	(setq name (concat (expand-file-name "../etc/DOC-") name))
-+	(setq name (concat (expand-file-name "../etc/DOC-EMCWS-") name))
- 	(if (file-exists-p name)
- 	    (delete-file name))
- 	(copy-file (expand-file-name "../etc/DOC") name t))
-@@ -280,11 +280,11 @@
- 		    (expand-file-name
- 		     (cond 
- 		      ((eq system-type 'ms-dos)
--		       "../lib-src/fns.el")
-+		       "../lib-src/fnsemcws.el")
- 		      ((eq system-type 'windows-nt)
--		       (format "../../../lib-src/fns-%s.el" emacs-version))
-+		       (format "../../../lib-src/fns-emcws-%s.el" emacs-version))
- 		      (t
--		       (format "../lib-src/fns-%s.el" emacs-version)))
-+		       (format "../lib-src/fns-emcws-%s.el" emacs-version)))
- 		     invocation-directory))
-       (erase-buffer)
-       (setq load-history nil))
diff --git a/japanese/emacs20-emcws/files/patch-src_emacs.c b/japanese/emacs20-emcws/files/patch-src_emacs.c
deleted file mode 100644
index 0bdce9d19e58..000000000000
--- a/japanese/emacs20-emcws/files/patch-src_emacs.c
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD: /tmp/pcvs/ports/japanese/emacs20-emcws/files/Attic/patch-src_emacs.c,v 1.1 2002-10-30 13:30:28 taoka Exp $
-
---- src/emacs.c.orig	Wed May 24 15:58:54 2000
-+++ src/emacs.c	Mon Jul 29 23:23:20 2002
-@@ -602,7 +602,6 @@
-   char stack_bottom_variable;
-   int skip_args = 0;
-   extern int errno;
--  extern int sys_nerr;
- #ifdef HAVE_SETRLIMIT
-   struct rlimit rlim;
- #endif
diff --git a/japanese/emacs20-emcws/files/patch-src_wnnfns.c b/japanese/emacs20-emcws/files/patch-src_wnnfns.c
deleted file mode 100644
index 487ea8be4590..000000000000
--- a/japanese/emacs20-emcws/files/patch-src_wnnfns.c
+++ /dev/null
@@ -1,57 +0,0 @@
---- src/wnnfns.c.orig	Mon Dec 25 19:49:21 2006
-+++ src/wnnfns.c	Mon Dec 25 19:50:02 2006
-@@ -341,6 +341,9 @@
- static int wnnfns_norm;
- static unsigned char lc_wnn_server_type[NSERVER] = {LCJP, LCCN, LCINV, LCKR};
- 
-+static int yes_or_no();
-+static void puts2();
-+
- /* Lisp Variables and Constants Definition */
- Lisp_Object	Qjserver;
- Lisp_Object	Qcserver;
-@@ -452,8 +455,6 @@
-      int			nargs;
-      register Lisp_Object	*args;
- {
--  static int yes_or_no();
--  static void puts2();
-   struct gcpro gcpro1;
-   int	snum;
-   CHECK_STRING (args[0], 0);
-@@ -1293,8 +1294,6 @@
-      int                        nargs;
-      register Lisp_Object       *args;
- {
--  static int yes_or_no();
--  static void puts2();
-   struct gcpro gcpro1;
-   int   snum;
-   CHECK_STRING (args[0], 0);
-@@ -1329,8 +1328,6 @@
-      int                        nargs;
-      register Lisp_Object       *args;
- {
--  static int yes_or_no();
--  static void puts2();
-   struct gcpro gcpro1;
-   int   snum;
-   CHECK_STRING (args[0], 0);
-@@ -1365,8 +1362,6 @@
-      int                        nargs;
-      register Lisp_Object       *args;
- {
--  static int yes_or_no();
--  static void puts2();
-   struct gcpro gcpro1;
-   int   snum;
-   int	dic_no;
-@@ -1427,8 +1422,6 @@
-      int                        nargs;
-      register Lisp_Object       *args;
- {
--  static int yes_or_no();
--  static void puts2();
-   struct gcpro gcpro1;
-   int   snum;
-   int   dic_no;
diff --git a/japanese/emacs20-emcws/files/site-init.el.tmpl b/japanese/emacs20-emcws/files/site-init.el.tmpl
deleted file mode 100644
index 364b9d3e8e1c..000000000000
--- a/japanese/emacs20-emcws/files/site-init.el.tmpl
+++ /dev/null
@@ -1,10 +0,0 @@
-;;; site-init.el -- site-dependent initialization file
-
-;;
-;; Init file for FreeBSD port: emacs20-emcws
-;;
-
-; change a default file name of the internal DOC-string.
-(Snarf-documentation "%%DOC_FILE%%")
-
-;;; site-init.el ends here
diff --git a/japanese/emacs20-emcws/pkg-descr b/japanese/emacs20-emcws/pkg-descr
deleted file mode 100644
index 58c2b6a110d8..000000000000
--- a/japanese/emacs20-emcws/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-Emcws stands for Emacs + Canna + Wnn + Sj3,
-which is interim solutions to input 2 bytes chars by communicating with
-Kana Kanji conversion server. 
-
-WWW: ftp://ftp.ki.nu/pub/emcws/README.html
diff --git a/japanese/emacs20-emcws/pkg-plist b/japanese/emacs20-emcws/pkg-plist
deleted file mode 100644
index 74832aad395c..000000000000
--- a/japanese/emacs20-emcws/pkg-plist
+++ /dev/null
@@ -1,54 +0,0 @@
-bin/emcws-%%EMACS_VER%%
-bin/emcws
-libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/fns-emcws-%%EMACS_VER%%.1.el
-share/emacs/%%EMACS_VER%%-emcws/etc/%%DOC_FILE%%
-share/emacs/%%EMACS_VER%%-emcws/lisp/ange-ftp.el
-share/emacs/%%EMACS_VER%%-emcws/lisp/ange-ftp.elc
-share/emacs/%%EMACS_VER%%-emcws/lisp/busyu.el
-share/emacs/%%EMACS_VER%%-emcws/lisp/can-n-egg.el
-share/emacs/%%EMACS_VER%%-emcws/lisp/canna.el
-%%WITH_CANNA%%share/emacs/%%EMACS_VER%%-emcws/lisp/canna.elc
-share/emacs/%%EMACS_VER%%-emcws/lisp/egg-jsymbol.el
-share/emacs/%%EMACS_VER%%-emcws/lisp/egg-keymap.el
-share/emacs/%%EMACS_VER%%-emcws/lisp/egg.el
-%%WITH_WNN%%share/emacs/%%EMACS_VER%%-emcws/lisp/egg.elc
-share/emacs/%%EMACS_VER%%-emcws/lisp/eggrc-sj3
-share/emacs/%%EMACS_VER%%-emcws/lisp/eggrc-v41
-share/emacs/%%EMACS_VER%%-emcws/lisp/eggrc-wnn
-share/emacs/%%EMACS_VER%%-emcws/lisp/help.el
-share/emacs/%%EMACS_VER%%-emcws/lisp/help.elc
-share/emacs/%%EMACS_VER%%-emcws/lisp/isearch-ext.el
-share/emacs/%%EMACS_VER%%-emcws/lisp/isearch-ext.elc
-share/emacs/%%EMACS_VER%%-emcws/lisp/international/ccl.el
-share/emacs/%%EMACS_VER%%-emcws/lisp/international/ccl.elc
-share/emacs/%%EMACS_VER%%-emcws/lisp/international/mule-cmds.el
-share/emacs/%%EMACS_VER%%-emcws/lisp/international/mule-cmds.elc
-share/emacs/%%EMACS_VER%%-emcws/lisp/international/mule-conf.el
-share/emacs/%%EMACS_VER%%-emcws/lisp/international/mule.el
-share/emacs/%%EMACS_VER%%-emcws/lisp/international/mule.elc
-share/emacs/%%EMACS_VER%%-emcws/lisp/international/titdic-cnv.el
-share/emacs/%%EMACS_VER%%-emcws/lisp/international/titdic-cnv.elc
-share/emacs/%%EMACS_VER%%-emcws/lisp/its/han-kata.el
-share/emacs/%%EMACS_VER%%-emcws/lisp/its/hankaku.el
-share/emacs/%%EMACS_VER%%-emcws/lisp/its/hira.el
-share/emacs/%%EMACS_VER%%-emcws/lisp/its/kanainput.el
-share/emacs/%%EMACS_VER%%-emcws/lisp/its/kata.el
-share/emacs/%%EMACS_VER%%-emcws/lisp/its/zenkaku.el
-share/emacs/%%EMACS_VER%%-emcws/lisp/loaddefs.el
-share/emacs/%%EMACS_VER%%-emcws/lisp/loadup.el
-share/emacs/%%EMACS_VER%%-emcws/lisp/mule-inst.el
-share/emacs/%%EMACS_VER%%-emcws/lisp/sj3-client.el
-%%WITH_SJ3%%share/emacs/%%EMACS_VER%%-emcws/lisp/sj3-client.elc
-share/emacs/%%EMACS_VER%%-emcws/lisp/sj3-egg.el
-%%WITH_SJ3%%share/emacs/%%EMACS_VER%%-emcws/lisp/sj3-egg.elc
-share/emacs/%%EMACS_VER%%-emcws/lisp/wnn-client.el
-share/emacs/%%EMACS_VER%%-emcws/lisp/wnn-egg.el
-%%WITH_WNN%%share/emacs/%%EMACS_VER%%-emcws/lisp/wnn-egg.elc
-share/emacs/%%EMACS_VER%%-emcws/site-lisp/subdirs.el
-share/emacs/%%EMACS_VER%%-emcws/lisp/subdirs.el
-@dirrm share/emacs/%%EMACS_VER%%-emcws/lisp/its
-@dirrm share/emacs/%%EMACS_VER%%-emcws/lisp/international
-@dirrm share/emacs/%%EMACS_VER%%-emcws/lisp
-@dirrm share/emacs/%%EMACS_VER%%-emcws/site-lisp
-@dirrm share/emacs/%%EMACS_VER%%-emcws/etc
-@dirrm share/emacs/%%EMACS_VER%%-emcws
diff --git a/japanese/emacs20-emcws/scripts/configure b/japanese/emacs20-emcws/scripts/configure
deleted file mode 100644
index f588d1f09b77..000000000000
--- a/japanese/emacs20-emcws/scripts/configure
+++ /dev/null
@@ -1,14 +0,0 @@
-#! /bin/sh
-
-for f in site-init.el; do
-	${SED} -e "s,%%DOC_FILE%%,${DOC_FILE},g" \
-		< ${FILESDIR}/${f}.tmpl > ${WRKSRC}/lisp/${f}
-done
-
-cd ${WRKSRC}
-
-if [ -f /usr/lib/aout/crt0.o -a ! -f /usr/lib/crt0.o ]; then
-    ${SED} -e "s|/usr/lib/crt0\.o|/usr/lib/aout/crt0.o|g" \
-	src/s/freebsd.h > src/s/freebsd.h.new || exit
-    ${MV} -f src/s/freebsd.h.new src/s/freebsd.h
-fi
diff --git a/japanese/lookup-emacs20/Makefile b/japanese/lookup-emacs20/Makefile
deleted file mode 100644
index 1cb147a460d3..000000000000
--- a/japanese/lookup-emacs20/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# New ports collection makefile for:	lookup for Emacs20
-# Date created:		98/11/19
-# Whom:			Satoshi Taoka <taoka@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-RUN_DEPENDS=	${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/bitmap/bitmap.el:${PORTSDIR}/editors/bitmap-emacs20 \
-
-MASTERDIR=	${.CURDIR}/../lookup
-
-DEPRECATED=	emacs20 and related ports are obsolete; please use a more recent version
-EXPIRATION_DATE=	2007-08-19
-
-USE_EMACS=	yes
-EMACS_PORT_NAME=	emacs20
-
-.include	"${MASTERDIR}/Makefile"
diff --git a/japanese/lookup-emacs20/pkg-descr b/japanese/lookup-emacs20/pkg-descr
deleted file mode 100644
index 4eae1e431ab4..000000000000
--- a/japanese/lookup-emacs20/pkg-descr
+++ /dev/null
@@ -1,11 +0,0 @@
-Lookup is a search interface to electronic dictionaries within Emacs.
-You can use various sources (such as CD-ROM books, dictionary server on
-the network, and so on) as dictionaries by the simple operation.
-
-Lookup works on GNU Emacs 19.28 or later, XEmacs 20.3 or later, Mule
-2.3, and Meadow 1.0 or later.
-
-NOTE: This package is a "meta-port" to depend on bitmap-emacs20 and
-ja-lookup-mule.
-
-WWW: http://openlab.ring.gr.jp/edict/lookup/index.html
diff --git a/japanese/lookup-emacs20/pkg-plist b/japanese/lookup-emacs20/pkg-plist
deleted file mode 100644
index 1218740e6db4..000000000000
--- a/japanese/lookup-emacs20/pkg-plist
+++ /dev/null
@@ -1,49 +0,0 @@
-%%ELISPDIR%%/lookup/evi.el
-%%ELISPDIR%%/lookup/evi.elc
-%%ELISPDIR%%/lookup/evi-mule.el
-%%ELISPDIR%%/lookup/evi-mule.elc
-%%ELISPDIR%%/lookup/lookup.el
-%%ELISPDIR%%/lookup/lookup.elc
-%%ELISPDIR%%/lookup/lookup-utils.el
-%%ELISPDIR%%/lookup/lookup-utils.elc
-%%ELISPDIR%%/lookup/lookup-types.el
-%%ELISPDIR%%/lookup/lookup-types.elc
-%%ELISPDIR%%/lookup/lookup-vse.el
-%%ELISPDIR%%/lookup/lookup-vse.elc
-%%ELISPDIR%%/lookup/lookup-package.el
-%%ELISPDIR%%/lookup/lookup-package.elc
-%%ELISPDIR%%/lookup/lookup-kanji.el
-%%ELISPDIR%%/lookup/lookup-kanji.elc
-%%ELISPDIR%%/lookup/lookup-entry.el
-%%ELISPDIR%%/lookup/lookup-entry.elc
-%%ELISPDIR%%/lookup/lookup-content.el
-%%ELISPDIR%%/lookup/lookup-content.elc
-%%ELISPDIR%%/lookup/lookup-select.el
-%%ELISPDIR%%/lookup/lookup-select.elc
-%%ELISPDIR%%/lookup/ndic.el
-%%ELISPDIR%%/lookup/ndic.elc
-%%ELISPDIR%%/lookup/ndeb.el
-%%ELISPDIR%%/lookup/ndeb.elc
-%%ELISPDIR%%/lookup/ndeb-binary.el
-%%ELISPDIR%%/lookup/ndeb-binary.elc
-%%ELISPDIR%%/lookup/ndtp.el
-%%ELISPDIR%%/lookup/ndtp.elc
-%%ELISPDIR%%/lookup/ndict.el
-%%ELISPDIR%%/lookup/ndict.elc
-%%ELISPDIR%%/lookup/ndkks.el
-%%ELISPDIR%%/lookup/ndkks.elc
-%%ELISPDIR%%/lookup/ndspell.el
-%%ELISPDIR%%/lookup/ndspell.elc
-%%ELISPDIR%%/lookup/ndcookie.el
-%%ELISPDIR%%/lookup/ndcookie.elc
-%%ELISPDIR%%/lookup/ndmisc.el
-%%ELISPDIR%%/lookup/ndmisc.elc
-%%ELISPDIR%%/lookup/ndsrd.el
-%%ELISPDIR%%/lookup/ndsrd.elc
-%%ELISPDIR%%/lookup/sdicf.el
-%%ELISPDIR%%/lookup/sdicf.elc
-%%ELISPDIR%%/lookup/stem-english.el
-%%ELISPDIR%%/lookup/stem-english.elc
-%%ELISPDIR%%/lookup/lookup-vars.el
-%%ELISPDIR%%/lookup/lookup-vars.elc
-@dirrm %%ELISPDIR%%/lookup
diff --git a/japanese/migemo-emacs20/Makefile b/japanese/migemo-emacs20/Makefile
deleted file mode 100644
index 32c3a7a87969..000000000000
--- a/japanese/migemo-emacs20/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# New ports collection makefile for:	Migemo (for emacs20)
-# Date created:		19 February 2001
-# Whom:			MANTANI Nobutaka <nobutaka@nobutaka.com>
-#
-# $FreeBSD$
-#
-
-PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
-COMMENT=	Japanese incremental search tool for emacs20
-MASTERDIR=      ${.CURDIR}/../../japanese/migemo
-PKGDIR=         ${.CURDIR}
-PLIST=          ${MASTERDIR}/pkg-plist
-PKGMESSAGE=     ${MASTERDIR}/pkg-message
-
-DEPRECATED=	emacs20 and related ports are obsolete; please use a more recent version
-EXPIRATION_DATE=	2007-08-19
-
-USE_EMACS=	yes
-EMACS_PORT_NAME=	emacs20
-BUILD_DEPENDS=	${LOCALBASE}/${EMACS_LIBDIR_WITH_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT_NAME}
-RUN_DEPENDS=	${LOCALBASE}/${EMACS_LIBDIR_WITH_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT_NAME} \
-		migemo:${PORTSDIR}/japanese/migemo
-
-HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-emacs=${EMACS_CMD}
-ALL_TARGET=	migemo.elc
-
-PLIST_SUB=	MIGEMO="@comment " ELISP=""
-
-do-install:
-	${INSTALL_DATA} ${WRKSRC}/migemo.el ${PREFIX}/${EMACS_LIBDIR}/site-lisp
-	${INSTALL_DATA} ${WRKSRC}/migemo.elc ${PREFIX}/${EMACS_LIBDIR}/site-lisp
-.include "${MASTERDIR}/Makefile"
diff --git a/japanese/migemo-emacs20/pkg-descr b/japanese/migemo-emacs20/pkg-descr
deleted file mode 100644
index a62fc3603cc2..000000000000
--- a/japanese/migemo-emacs20/pkg-descr
+++ /dev/null
@@ -1,11 +0,0 @@
-Migemo is a Japanese incremental search tool for Emacs.
-You can search Japanese words on Emacs without Kanji conversion.
-
-To use Migemo, you must set following elisp to your own .emacs file.
-
-(load-library "migemo")
-
-WWW: http://migemo.namazu.org/
-
---
-MANTANI Nobutaka <nobutaka@nobutaka.com>
diff --git a/japanese/mule-canna+freewnn/Makefile b/japanese/mule-canna+freewnn/Makefile
deleted file mode 100644
index 192d477317ce..000000000000
--- a/japanese/mule-canna+freewnn/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# New ports collection makefile for:	mule with Canna and FreeWnn
-# Date created:		7 July 1997
-# Whom:			Satoshi Taoka <taoka@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PKGNAMESUFFIX=	-canna+freewnn
-CATEGORIES=	japanese
-COMMENT=	Multilingual emacs, with Canna and FreeWnn support built-in
-
-DEPRECATED=	emacs19 and related ports are obsolete; please use a more recent version
-EXPIRATION_DATE=	2007-08-19
-
-CANNA=		yes
-FREEWNN=	yes
-
-MASTERDIR=	${.CURDIR}/../../editors/mule
-PKGDIR=		${.CURDIR}
-
-.include "${MASTERDIR}/Makefile"
diff --git a/japanese/mule-canna+freewnn/pkg-descr b/japanese/mule-canna+freewnn/pkg-descr
deleted file mode 100644
index 1904d8bd4406..000000000000
--- a/japanese/mule-canna+freewnn/pkg-descr
+++ /dev/null
@@ -1,32 +0,0 @@
-This package contains only the executables for mule-2.3, a multilingual
-editor based on emacs-19.34.
-
-You should install the mule-common-2.3 package containing emacs lisp
-files, info pages, and so on (except executables) for mule-2.3.
-
-This package is built with Japanese support, using Canna or FreeWnn.
-It supports the following input methods: jeonkak, hangul for
-Korean (Hanja), and quanjiao, zhuyin, erpin for Chinese (check out
-${LOCALBASE}/lib/mule/site-lisp/site-start.el).
-
-This package and the package, mule-common-2.3, *will* clobber any
-existing emacs installation.  In particular, the executables and man
-pages of etags/ctags are installed, and the info pages that come with
-the original emacs get installed too.
-
-Although this shouldn't cause any problems to run both mule and emacs,
-it may cause some confusion when one of them is pkg_delete'd.  If
-someone has a solution to this, please tell me.
-
-A info "dir" file is supplied in the ${PORTSDIR}/editors/mule-common/files/
-subdirectory of the ports package.  Copy it into your /usr/local/info
-to read mule info pages, but also make sure you also add everything
-that may have been added to that file!
-
-[Notice]
-Mr. Yoshio KATAYAMA <kate@pfu.co.jp> fixed many bugs for mule-2.3.
-Patches for those are in 'mule-2.3-19.34.patch-YYMMDD.tar.gz' and are
-applied in this port.
-
-- S. Taoka
-taoka@FreeBSD.org
diff --git a/japanese/mule-freewnn+sj3/Makefile b/japanese/mule-freewnn+sj3/Makefile
deleted file mode 100644
index 0ed304fc8c32..000000000000
--- a/japanese/mule-freewnn+sj3/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# New ports collection makefile for:	mule with sj3 and FreeWnn
-# Date created:		7 July 1997
-# Whom:			Satoshi Taoka <taoka@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PKGNAMESUFFIX=	-freewnn+sj3
-CATEGORIES=	japanese
-COMMENT=	A multilingual emacs, with sj3 and FreeWnn support built in (Only the executables)
-
-DEPRECATED=	emacs19 and related ports are obsolete; please use a more recent version
-EXPIRATION_DATE=	2007-08-19
-
-SJ3=		yes
-FREEWNN=	yes
-
-MASTERDIR=	${.CURDIR}/../../editors/mule
-PKGDIR=		${.CURDIR}
-
-.include	"${MASTERDIR}/Makefile"
diff --git a/japanese/mule-freewnn+sj3/pkg-descr b/japanese/mule-freewnn+sj3/pkg-descr
deleted file mode 100644
index 270128237356..000000000000
--- a/japanese/mule-freewnn+sj3/pkg-descr
+++ /dev/null
@@ -1,40 +0,0 @@
-This package contains only the executables for mule-2.3, a multilingual
-editor based on emacs-19.34.
-
-You should install the mule-common-2.3 package containing emacs lisp
-files, info pages, and so on (except executables) for mule-2.3.
-
-This package is built with Japanese support, using sj3(*1) or FreeWnn.
-It supports the following input methods: jeonkak, hangul for
-Korean (Hanja), and quanjiao, zhuyin, erpin for Chinese (check out
-${LOCALBASE}/lib/mule/site-lisp/site-start.el).
-
-This package and the package, mule-common-2.3, *will* clobber any
-existing emacs installation.  In particular, the executables and man
-pages of etags/ctags are installed, and the info pages that come with
-the original emacs get installed too.
-
-Although this shouldn't cause any problems to run both mule and emacs,
-it may cause some confusion when one of them is pkg_delete'd.  If
-someone has a solution to this, please tell me.
-
-A info "dir" file is supplied in the ${PORTSDIR}/editors/mule-common/files/
-subdirectory of the ports package.  Copy it into your /usr/local/info
-to read mule info pages, but also make sure you also add everything
-that may have been added to that file!
-
-[Notice]
-Mr. Yoshio KATAYAMA <kate@pfu.co.jp> fixed many bugs for mule-2.3.
-Patches for those are in 'mule-2.3-19.34.patch-YYMMDD.tar.gz' and are
-applied in this port.
-
-- S. Taoka
-taoka@FreeBSD.org
-
-------------------------------
-(*1)
-If you want to use 'sj3' as a Japanese input method, then you should
-insert the following two lines into ~/.emacs.
-
-(load "sj3-egg")
-(setq egg-default-startup-file "eggrc-sj3")
diff --git a/japanese/mule-freewnn+sj3/pkg-install b/japanese/mule-freewnn+sj3/pkg-install
deleted file mode 100644
index 3a04bb08351c..000000000000
--- a/japanese/mule-freewnn+sj3/pkg-install
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-if [ "$2" != "POST-INSTALL" ]; then exit 0; fi
-echo "####################################################################"
-echo "If you want to use 'SJ3' as a japanese input method, then you should"
-echo "insert the following two lines into ~/.emacs"
-echo ""
-echo "(load \"sj3-egg\")"
-echo "(setq egg-default-startup-file \"eggrc-sj3\")"
-echo "####################################################################"
diff --git a/japanese/mule-sj3+wnn6/Makefile b/japanese/mule-sj3+wnn6/Makefile
deleted file mode 100644
index 5004213e6426..000000000000
--- a/japanese/mule-sj3+wnn6/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# New ports collection makefile for:	mule with sj3 and Wnn6
-# Date created:		7 July 1997
-# Whom:			Satoshi Taoka <taoka@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PKGNAMESUFFIX=	-sj3+wnn6
-CATEGORIES=	japanese
-COMMENT=	Multilingual emacs, with sj3, Wnn4, and Wnn6 support built-in
-
-DEPRECATED=	emacs19 and related ports are obsolete; please use a more recent version
-EXPIRATION_DATE=	2007-08-19
-
-SJ3=		yes
-WNN6=		yes
-
-MASTERDIR=	${.CURDIR}/../../editors/mule
-PKGDIR=		${.CURDIR}
-
-.include	"${MASTERDIR}/Makefile"
diff --git a/japanese/mule-sj3+wnn6/pkg-descr b/japanese/mule-sj3+wnn6/pkg-descr
deleted file mode 100644
index a48459d761ee..000000000000
--- a/japanese/mule-sj3+wnn6/pkg-descr
+++ /dev/null
@@ -1,40 +0,0 @@
-This package contains only the executables for mule-2.3, a multilingual
-editor based on emacs-19.34.
-
-You should install the mule-common-2.3 package containing emacs lisp
-files, info pages, and so on (except executables) for mule-2.3.
-
-This package is built with Japanese support, using sj3(*1) or Wnn6.
-It supports the following input methods: jeonkak, hangul for
-Korean (Hanja), and quanjiao, zhuyin, erpin for Chinese (check out
-${LOCALBASE}/lib/mule/site-lisp/site-start.el).
-
-This package and the package, mule-common-2.3, *will* clobber any
-existing emacs installation.  In particular, the executables and man
-pages of etags/ctags are installed, and the info pages that come with
-the original emacs get installed too.
-
-Although this shouldn't cause any problems to run both mule and emacs,
-it may cause some confusion when one of them is pkg_delete'd.  If
-someone has a solution to this, please tell me.
-
-A info "dir" file is supplied in the ${PORTSDIR}/editors/mule-common/files/
-subdirectory of the ports package.  Copy it into your /usr/local/info
-to read mule info pages, but also make sure you also add everything
-that may have been added to that file!
-
-[Notice]
-Mr. Yoshio KATAYAMA <kate@pfu.co.jp> fixed many bugs for mule-2.3.
-Patches for those are in 'mule-2.3-19.34.patch-YYMMDD.tar.gz' and are
-applied in this port.
-
-- S. Taoka
-taoka@FreeBSD.org
-
-------------------------------
-(*1)
-If you want to use 'sj3' as a Japanese input method, then you should
-insert the following two lines into ~/.emacs.
-
-(load "sj3-egg")
-(setq egg-default-startup-file "eggrc-sj3")
diff --git a/japanese/mule-sj3+wnn6/pkg-install b/japanese/mule-sj3+wnn6/pkg-install
deleted file mode 100644
index 3a04bb08351c..000000000000
--- a/japanese/mule-sj3+wnn6/pkg-install
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-if [ "$2" != "POST-INSTALL" ]; then exit 0; fi
-echo "####################################################################"
-echo "If you want to use 'SJ3' as a japanese input method, then you should"
-echo "insert the following two lines into ~/.emacs"
-echo ""
-echo "(load \"sj3-egg\")"
-echo "(setq egg-default-startup-file \"eggrc-sj3\")"
-echo "####################################################################"
diff --git a/japanese/mule-sj3+wnn7/Makefile b/japanese/mule-sj3+wnn7/Makefile
deleted file mode 100644
index 292988d3c190..000000000000
--- a/japanese/mule-sj3+wnn7/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# New ports collection makefile for:	mule with sj3 and Wnn7
-# Date created:		01/07/18
-# Whom:			Satoshi Taoka <taoka@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-CATEGORIES=	japanese
-COMMENT=	A multilingual emacs, with sj3, FreeWnn, Wnn6 and Wnn7 support built-in
-
-DEPRECATED=	emacs19 and related ports are obsolete; please use a more recent version
-EXPIRATION_DATE=	2007-08-19
-
-SJ3=		yes
-WNN7=		yes
-
-MASTERDIR=	${.CURDIR}/../../editors/mule
-PKGDIR=		${.CURDIR}
-
-.include	"${MASTERDIR}/Makefile"
diff --git a/japanese/mule-sj3+wnn7/pkg-descr b/japanese/mule-sj3+wnn7/pkg-descr
deleted file mode 100644
index a48459d761ee..000000000000
--- a/japanese/mule-sj3+wnn7/pkg-descr
+++ /dev/null
@@ -1,40 +0,0 @@
-This package contains only the executables for mule-2.3, a multilingual
-editor based on emacs-19.34.
-
-You should install the mule-common-2.3 package containing emacs lisp
-files, info pages, and so on (except executables) for mule-2.3.
-
-This package is built with Japanese support, using sj3(*1) or Wnn6.
-It supports the following input methods: jeonkak, hangul for
-Korean (Hanja), and quanjiao, zhuyin, erpin for Chinese (check out
-${LOCALBASE}/lib/mule/site-lisp/site-start.el).
-
-This package and the package, mule-common-2.3, *will* clobber any
-existing emacs installation.  In particular, the executables and man
-pages of etags/ctags are installed, and the info pages that come with
-the original emacs get installed too.
-
-Although this shouldn't cause any problems to run both mule and emacs,
-it may cause some confusion when one of them is pkg_delete'd.  If
-someone has a solution to this, please tell me.
-
-A info "dir" file is supplied in the ${PORTSDIR}/editors/mule-common/files/
-subdirectory of the ports package.  Copy it into your /usr/local/info
-to read mule info pages, but also make sure you also add everything
-that may have been added to that file!
-
-[Notice]
-Mr. Yoshio KATAYAMA <kate@pfu.co.jp> fixed many bugs for mule-2.3.
-Patches for those are in 'mule-2.3-19.34.patch-YYMMDD.tar.gz' and are
-applied in this port.
-
-- S. Taoka
-taoka@FreeBSD.org
-
-------------------------------
-(*1)
-If you want to use 'sj3' as a Japanese input method, then you should
-insert the following two lines into ~/.emacs.
-
-(load "sj3-egg")
-(setq egg-default-startup-file "eggrc-sj3")
diff --git a/japanese/mule-sj3+wnn7/pkg-install b/japanese/mule-sj3+wnn7/pkg-install
deleted file mode 100644
index 3a04bb08351c..000000000000
--- a/japanese/mule-sj3+wnn7/pkg-install
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-if [ "$2" != "POST-INSTALL" ]; then exit 0; fi
-echo "####################################################################"
-echo "If you want to use 'SJ3' as a japanese input method, then you should"
-echo "insert the following two lines into ~/.emacs"
-echo ""
-echo "(load \"sj3-egg\")"
-echo "(setq egg-default-startup-file \"eggrc-sj3\")"
-echo "####################################################################"
diff --git a/japanese/skk10-elisp-emacs20/Makefile b/japanese/skk10-elisp-emacs20/Makefile
deleted file mode 100644
index 5777312cc72b..000000000000
--- a/japanese/skk10-elisp-emacs20/Makefile
+++ /dev/null
@@ -1,116 +0,0 @@
-# New ports collection makefile for:	skk10-elisp-emacs20
-# Date created:		21 September 1999
-# Whom:			Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	skk-elisp
-PORTVERSION=	${SKK10_VER}
-PORTREVISION=	1
-PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
-CATEGORIES=	japanese elisp
-MASTER_SITES=	http://openlab.ring.gr.jp/skk/maintrunk/legacy/
-DISTNAME=	skk${SKK10_VER}
-
-MAINTAINER?=	ports@FreeBSD.org
-COMMENT=	Emacs-lisp frontend for the SKK-10 Japanese Input Method
-
-DEPRECATED=	emacs20 and related ports are obsolete; please use a more recent version
-EXPIRATION_DATE=	2007-08-19
-
-USE_BZIP2=	YES
-
-SKK10_VER=	10.62a
-
-# This port is a master port.
-PORT_CLASS?=	master
-
-.if (${PORT_CLASS} == "master")
-# emacsen-port-name
-USE_EMACS=	yes
-EMACS_PORT_NAME?=	emacs20
-.endif
-
-INFO=		skk
-
-.include <bsd.port.pre.mk>
-
-.if defined(EMACS_PORT_NAME)
-# dependency: apel
-BUILD_DEPENDS+=	${LOCALBASE}/${EMACS_LIBDIR_WITH_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT_NAME}
-RUN_DEPENDS+=	${LOCALBASE}/${EMACS_LIBDIR_WITH_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT_NAME}
-.else
-.BEGIN:
-	@${ECHO} "Error: Bad port."
-	@${ECHO} "You must define EMACS_PORT_NAME."
-	@${FALSE}
-.endif
-
-WRKSRC=		${WRKDIR}/skk-${SKK10_VER}
-ALL_TARGET?=	elc
-MAKE_ARGS=	EMACS=${EMACS_CMD}
-PLIST_SUB=	EMACS=${EMACS_CMD} EMACS_LIBDIR=${EMACS_LIBDIR} \
-		SKK_JISYODIR=${SKKJISYODIR} SKK_DOCDIR=${SKK_DOCDIR} \
-		SKK_STARTUPEL=${SKK_STARTUPEL}
-
-# information of skk-jisyo
-SKKJISYODIR=	share/skk
-SKK_DOCDIR=	share/doc/skk10
-SKKJISYO_SIZE?=	L
-SKKJISYO?=	SKK-JISYO.${SKKJISYO_SIZE}
-SKK_MASTERDIR=	${PORTSDIR}/japanese/skk-jisyo
-SKK_STARTUPEL=	skk-startup.el
-
-# dependency: skk-jisyo
-RUN_DEPENDS+=	${LOCALBASE}/${SKKJISYODIR}/${SKKJISYO}:${SKK_MASTERDIR}
-
-OPTIONAL_LISPS=		skk-lookup.el
-EXPERIMENTAL_LISPS=	experimental/skk-abbrev.el \
-			experimental/dbm/skk-dbm.el \
-			experimental/skk-dcomp.el \
-			experimental/skk-hankaku-mode.el \
-			experimental/skk-jisx0201.el \
-			experimental/skk-study.el \
-			experimental/tut-code/skk-def.el \
-			experimental/tut-code/skk-tutcdef.el \
-			experimental/tut-code/skk-tutcode.el
-
-# install experimantal lisps [handy optional]
-#pre-build:
-#	@(cd ${WRKSRC} ; \
-#		${LN} experimental/skk-abbrev.el . ; \
-#		${LN} experimental/skk-dcomp.el . ; \
-#		${LN} experimental/skk-hankaku-mode.el . ; \
-#		${LN} experimental/skk-jisx0201.el . ; \
-#		${LN} experimental/skk-lookup.el . ; \
-#		${LN} experimental/skk-study.el . ; \
-#	)
-
-post-install:
-	@${MAKE} startup-install
-	@${MKDIR} ${LOCALBASE}/${SKK_DOCDIR}
-	@(cd ${WRKSRC} ;\
-		for i in ${OPTIONAL_LISPS} ; do \
-			${INSTALL_DATA} $${i} \
-				${LOCALBASE}/${EMACS_LIBDIR}/site-lisp/skk ;\
-		done ;\
-	)
-	@(cd ${WRKSRC} ;\
-		for i in ${EXPERIMENTAL_LISPS} ; do \
-			${INSTALL_DATA} $${i} ${LOCALBASE}/${SKK_DOCDIR} ;\
-		done ;\
-	)
-.if !defined(NOPORTDOCS)
-	@${INSTALL_DATA} ${WRKSRC}/READMEs/* ${LOCALBASE}/${SKK_DOCDIR}
-	@${INSTALL_DATA} ${WRKSRC}/experimental/GUIDELINE \
-					${LOCALBASE}/${SKK_DOCDIR}
-	@${INSTALL_DATA} ${WRKSRC}/experimental/dbm/README.dbm \
-					${LOCALBASE}/${SKK_DOCDIR}
-.endif
-
-startup-install:
-	@${INSTALL_DATA} ${FILESDIR}/${SKK_STARTUPEL} \
-		${LOCALBASE}/${EMACS_LIBDIR}/site-lisp/skk
-
-.include <bsd.port.post.mk>
diff --git a/japanese/skk10-elisp-emacs20/distinfo b/japanese/skk10-elisp-emacs20/distinfo
deleted file mode 100644
index 103ea7026f9a..000000000000
--- a/japanese/skk10-elisp-emacs20/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (skk10.62a.tar.bz2) = ae372c2d021f70e1ec99606d6a5af4df
-SHA256 (skk10.62a.tar.bz2) = d11a2c6373a4902023910197a96322ad57127f7c8097c994ce35301fc5cdc91f
-SIZE (skk10.62a.tar.bz2) = 310998
diff --git a/japanese/skk10-elisp-emacs20/files/patch-aa b/japanese/skk10-elisp-emacs20/files/patch-aa
deleted file mode 100644
index c9ed40dbda94..000000000000
--- a/japanese/skk10-elisp-emacs20/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- SKK-MK.orig	Mon Oct 30 06:40:42 2000
-+++ SKK-MK	Tue Oct 31 14:23:12 2000
-@@ -326,7 +326,7 @@
-       (setq x (expand-file-name (car targets) DOCDIR))
-       (find-file x)
-       (setq obuf (current-buffer))
--      (texinfo-format-buffer)
-+      (texinfo-format-buffer t)
-       (save-buffer)
-       (kill-buffer (current-buffer))	; info
-       (kill-buffer obuf)		; texi
diff --git a/japanese/skk10-elisp-emacs20/files/skk-startup.el b/japanese/skk10-elisp-emacs20/files/skk-startup.el
deleted file mode 100644
index f4a0ae717dd6..000000000000
--- a/japanese/skk10-elisp-emacs20/files/skk-startup.el
+++ /dev/null
@@ -1,33 +0,0 @@
-;;
-;; @(#)skk-startup.el -- skk startup elisp file.	-- shige@FreeBSD.ORG
-;;
-
-;; keybindings
-(global-set-key "\C-x\C-j" 'skk-mode)
-(global-set-key "\C-xt" 'skk-tutorial)
-
-;; autoloads
-(autoload 'skk-mode "skk" nil t)
-(autoload 'skk-tutorial "skk-tut" nil t)
-(autoload 'skk-check-jisyo "skk-tools" nil t)
-(autoload 'skk-merge "skk-tools" nil t)
-(autoload 'skk-diff "skk-tools" nil t)
-(autoload 'skk-isearch-mode-setup "skk-isearch" nil t)
-(autoload 'skk-isearch-mode-cleanup "skk-isearch" nil t)
-
-;; addhooks
-(add-hook 'isearch-mode-hook
-	  (function 
-	   (lambda ()
-	     (and (boundp 'skk-mode) skk-mode (skk-isearch-mode-setup))
-	     )))
-(add-hook 'isearch-mode-end-hook
-	  (function
-	   (lambda ()
-	     (and (boundp 'skk-mode) skk-mode
-		  (skk-isearch-mode-cleanup)
-		  (skk-set-cursor-color-properly))
-	     )))
-
-;; provide
-(provide 'skk-startup)
diff --git a/japanese/skk10-elisp-emacs20/pkg-descr b/japanese/skk10-elisp-emacs20/pkg-descr
deleted file mode 100644
index bd3fd2280ebd..000000000000
--- a/japanese/skk10-elisp-emacs20/pkg-descr
+++ /dev/null
@@ -1,16 +0,0 @@
-SKK (Simple Kana Kanji Convertor) is a very fast and efficient Japanese input
-method system, written in emacs-lisp. SKK runs on Emacsen with
-Mule features.
-SKK-10 is a development version of SKK.
-This package is Emacs-lisp frontend for the SKK.
-
-To use SKK, put in your $HOME/.emacs as follows:
-
-	(require 'skk-startup)
-
-This input-method toggle key-binding is C-x C-j.
-And tutorial mode key-binding is C-x t.
-
-WWW: http://openlab.ring.gr.jp/skk/
-
---- Porting by shige <shige@FreeBSD.org>
diff --git a/japanese/skk10-elisp-emacs20/pkg-plist b/japanese/skk10-elisp-emacs20/pkg-plist
deleted file mode 100644
index bb66a5dd13f3..000000000000
--- a/japanese/skk10-elisp-emacs20/pkg-plist
+++ /dev/null
@@ -1,68 +0,0 @@
-%%EMACS_LIBDIR%%/site-lisp/skk/queue-m.el
-%%EMACS_LIBDIR%%/site-lisp/skk/queue-m.elc
-%%EMACS_LIBDIR%%/site-lisp/skk/skk-auto.el
-%%EMACS_LIBDIR%%/site-lisp/skk/skk-auto.elc
-%%EMACS_LIBDIR%%/site-lisp/skk/skk-autoloads.el
-%%EMACS_LIBDIR%%/site-lisp/skk/skk-autoloads.elc
-%%EMACS_LIBDIR%%/site-lisp/skk/skk-comp.el
-%%EMACS_LIBDIR%%/site-lisp/skk/skk-comp.elc
-%%EMACS_LIBDIR%%/site-lisp/skk/skk-cursor.el
-%%EMACS_LIBDIR%%/site-lisp/skk/skk-cursor.elc
-%%EMACS_LIBDIR%%/site-lisp/skk/skk-develop.el
-%%EMACS_LIBDIR%%/site-lisp/skk/skk-develop.elc
-%%EMACS_LIBDIR%%/site-lisp/skk/skk-foreword.el
-%%EMACS_LIBDIR%%/site-lisp/skk/skk-foreword.elc
-%%EMACS_LIBDIR%%/site-lisp/skk/skk-gadget.el
-%%EMACS_LIBDIR%%/site-lisp/skk/skk-gadget.elc
-%%EMACS_LIBDIR%%/site-lisp/skk/skk-isearch.el
-%%EMACS_LIBDIR%%/site-lisp/skk/skk-isearch.elc
-%%EMACS_LIBDIR%%/site-lisp/skk/skk-kakasi.el
-%%EMACS_LIBDIR%%/site-lisp/skk/skk-kakasi.elc
-%%EMACS_LIBDIR%%/site-lisp/skk/skk-kcode.el
-%%EMACS_LIBDIR%%/site-lisp/skk/skk-kcode.elc
-%%EMACS_LIBDIR%%/site-lisp/skk/skk-leim.el
-%%EMACS_LIBDIR%%/site-lisp/skk/skk-leim.elc
-%%EMACS_LIBDIR%%/site-lisp/skk/skk-look.el
-%%EMACS_LIBDIR%%/site-lisp/skk/skk-look.elc
-%%EMACS_LIBDIR%%/site-lisp/skk/skk-lookup.el
-@unexec rm -f %D/%%EMACS_LIBDIR%%/site-lisp/skk/skk-lookup.elc
-%%EMACS_LIBDIR%%/site-lisp/skk/skk-num.el
-%%EMACS_LIBDIR%%/site-lisp/skk/skk-num.elc
-%%EMACS_LIBDIR%%/site-lisp/skk/skk-obsolete.el
-%%EMACS_LIBDIR%%/site-lisp/skk/skk-obsolete.elc
-%%EMACS_LIBDIR%%/site-lisp/skk/skk-server.el
-%%EMACS_LIBDIR%%/site-lisp/skk/skk-server.elc
-%%EMACS_LIBDIR%%/site-lisp/skk/skk-tut.el
-%%EMACS_LIBDIR%%/site-lisp/skk/skk-tut.elc
-%%EMACS_LIBDIR%%/site-lisp/skk/skk-viper.el
-%%EMACS_LIBDIR%%/site-lisp/skk/skk-viper.elc
-%%EMACS_LIBDIR%%/site-lisp/skk/skk.el
-%%EMACS_LIBDIR%%/site-lisp/skk/skk.elc
-%%EMACS_LIBDIR%%/site-lisp/skk/%%SKK_STARTUPEL%%
-@dirrm %%EMACS_LIBDIR%%/site-lisp/skk
-%%SKK_JISYODIR%%/SKK.tut
-%%SKK_JISYODIR%%/SKK.tut.E
-%%SKK_DOCDIR%%/AUTHORS
-%%SKK_DOCDIR%%/COPYING
-%%SKK_DOCDIR%%/Contributors
-%%SKK_DOCDIR%%/CVS_digest
-%%SKK_DOCDIR%%/CVS_on_Windows
-%%SKK_DOCDIR%%/FAQ.txt
-%%SKK_DOCDIR%%/GUIDELINE
-%%SKK_DOCDIR%%/INSTALL
-%%SKK_DOCDIR%%/NEWS
-%%SKK_DOCDIR%%/PROPOSAL
-%%SKK_DOCDIR%%/README
-%%SKK_DOCDIR%%/README.VIP
-%%SKK_DOCDIR%%/README.dbm
-%%SKK_DOCDIR%%/README.win
-%%SKK_DOCDIR%%/skk-abbrev.el
-%%SKK_DOCDIR%%/skk-dbm.el
-%%SKK_DOCDIR%%/skk-dcomp.el
-%%SKK_DOCDIR%%/skk-def.el
-%%SKK_DOCDIR%%/skk-hankaku-mode.el
-%%SKK_DOCDIR%%/skk-jisx0201.el
-%%SKK_DOCDIR%%/skk-study.el
-%%SKK_DOCDIR%%/skk-tutcdef.el
-%%SKK_DOCDIR%%/skk-tutcode.el
-@dirrm %%SKK_DOCDIR%%