- Remove editors/emacs21, and editors/emacs22 as they're no longer maintained

  upstream
- Also remove dependent ports
- Add UPDATING entry informing users of the same
- Add MOVED entries

Approved by:	portmgr (bapt)

37 files changed, 0 insertions, 1183 deletions

diff --git a/japanese/Makefile b/japanese/Makefile
index 653b2b4913fe..5137ec7dcb07 100644
--- a/japanese/Makefile
+++ b/japanese/Makefile
@@ -54,7 +54,6 @@
     SUBDIR += egg-canna
     SUBDIR += eijiro-fpw
     SUBDIR += elisa8x8
-    SUBDIR += emacs-emcws
     SUBDIR += epwutil
     SUBDIR += esecanna
     SUBDIR += esecanna-module-vje25
@@ -152,7 +151,6 @@
     SUBDIR += libtomoe-gtk
     SUBDIR += lipsf
     SUBDIR += lookup
-    SUBDIR += lookup-emacs21
     SUBDIR += lsd-fpw
     SUBDIR += lynx
     SUBDIR += lynx-current
@@ -168,8 +166,6 @@
     SUBDIR += mg
     SUBDIR += mh
     SUBDIR += migemo
-    SUBDIR += migemo-emacs21
-    SUBDIR += migemo-emacs22
     SUBDIR += migemo-emacs23
     SUBDIR += migemo-xemacs-devel-mule
     SUBDIR += mikachan-ttfonts
diff --git a/japanese/emacs-emcws/Makefile b/japanese/emacs-emcws/Makefile
deleted file mode 100644
index 23d8abf442e2..000000000000
--- a/japanese/emacs-emcws/Makefile
+++ /dev/null
@@ -1,221 +0,0 @@
-# Created by: NAKAJI Hiroyuki <nakaji@jp.freebsd.org>
-# $FreeBSD$
-
-PORTNAME=	emcws
-PORTVERSION=	${EMACS_VER}
-PORTREVISION=	16
-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}-20031213.gz
-PATCH_DIST_STRIP=	-p1
-.if defined(WITH_MENUBAR_FONTSET)
-PATCH_SITES+=		http://www.nijino.com/ari/emacs/
-PATCHFILES+=		emacs-21.1-fontset.patch emacs-21.2-menu-encode.patch
-.endif
-
-MAINTAINER=	nakaji@jp.freebsd.org
-COMMENT=	Emacs + Canna + Wnn + Sj3
-
-LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png
-
-USE_EMACS=		yes
-EMACS_PORT_NAME=	emacs21
-
-CONFLICTS=	emacs-19.* emacs-20.* emacs-22.* \
-		ja-emcws-20.* \
-		xemacs-[0-9]* xemacs-devel-[0-9]* \
-		xemacs-mule-[0-9]* xemacs-devel-mule-[0-9]*
-
-WRKSRC=		${WRKDIR}/emacs-${EMACS_VER}
-
-USE_AUTOTOOLS=	autoconf213
-USES=		gmake
-
-# Change these as you like.
-WITH_WNN6?=	NO
-WITH_WNN7?=	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_XORG=	x11 xaw
-.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_WNN7} == "yes" || ${WITH_WNN7} == "YES")
-CONFIGURE_ARGS+=--with-wnn --with-wnn-includes=${LOCALBASE}/include/wnn7/wnn \
-		--with-wnn-libraries=${LOCALBASE}/lib/libwnn7.so
-LIB_DEPENDS+=	wnn7.1:${PORTSDIR}/japanese/Wnn7-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-lib
-.endif
-
-.if (${WITH_SJ3} == "yes" || ${WITH_SJ3} == "YES")
-CONFIGURE_ARGS+=	--with-sj3
-BUILD_DEPENDS+=		sj3serv:${PORTSDIR}/japanese/sj3-lib
-.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_WNN7} == "yes" || ${WITH_WNN7} == "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=	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}
-
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "ia64"
-BROKEN=		Segfault during build on ia64
-CFLAGS:=	${CFLAGS:C/-O.?/-O0/g}
-.endif
-
-pre-everything::
-	@${CAT} ${FILESDIR}/emcws-message
-.if !defined(WITH_MENUBAR_FONTSET)
-	@${ECHO_MSG} "====>"
-	@${ECHO_MSG} "====> To enable menubar fontset support, define WITH_MENUBAR_FONTSET"
-	@${ECHO_MSG} "====>"
-.endif
-
-pre-build:
-	${FIND} ${WRKSRC} \( -name \*.orig -o -name \*~ \) -exec ${RM} -f \{} \;
-	${RM} -rf ${WRKSRC}/info/*
-	@(cd ${WRKSRC}/src/../lisp; \
-	${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} compile-files EMACS=${EMACS_CMD})
-	@(cd ${WRKSRC}/src; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} emacs)
-	@(cd ${WRKSRC}/src/../lisp; \
-	${WRKSRC}/src/emacs -batch -q -f batch-byte-compile \
-	egg.el wnn-egg.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
-
-post-install:
-.if defined(WITH_MENUBAR_FONTSET)
-	@${ECHO_MSG} "====>"
-	@${ECHO_MSG} "====> To use Japanese menu, you need menu-tree.el which is available from http://www.is.titech.ac.jp/~yagi/emacs/menu-tree.el"
-	@${ECHO_MSG} "====>"
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/japanese/emacs-emcws/distinfo b/japanese/emacs-emcws/distinfo
deleted file mode 100644
index 6b96ce040727..000000000000
--- a/japanese/emacs-emcws/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-SHA256 (emacs-21.3.tar.gz) = 95364d2478349d48015cb58433cd890f2a9548d32c9e5813f9dab2b2f9fbea90
-SIZE (emacs-21.3.tar.gz) = 20399831
-SHA256 (emcws-21.3-20031213.gz) = 8d6ea57a037807336e8b74b4b916d981bd7934ce45d91523c02fc155889ff546
-SIZE (emcws-21.3-20031213.gz) = 190300
-SHA256 (emacs-21.1-fontset.patch) = 05820a588065a2975843febe3a407e1286c2f06abeac78fb7754317ce83d8b53
-SIZE (emacs-21.1-fontset.patch) = 8647
-SHA256 (emacs-21.2-menu-encode.patch) = aa63732d15596f1683960a69dd8c02a04ac74cac6401d9995803d67b62177df8
-SIZE (emacs-21.2-menu-encode.patch) = 3517
diff --git a/japanese/emacs-emcws/files/emcws-message b/japanese/emacs-emcws/files/emcws-message
deleted file mode 100644
index 68c78f22f1e4..000000000000
--- a/japanese/emacs-emcws/files/emcws-message
+++ /dev/null
@@ -1,17 +0,0 @@
-****************************************************************************
- NOTE: Warning message about Emcws
-
- You can define which input method you use with following variables.
-
-	WITH_WNN6	to use Wnn6
-	WITH_WNN7	to use Wnn7
-	WITH_FREEWNN	to use FreeWnn
-	WITH_CANNA	to use Canna
-	WITH_SJ3	to use sj3
-
- In default, WITH_WNN7 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/emacs-emcws/files/patch-Makefile.in b/japanese/emacs-emcws/files/patch-Makefile.in
deleted file mode 100644
index 63b440560094..000000000000
--- a/japanese/emacs-emcws/files/patch-Makefile.in
+++ /dev/null
@@ -1,17 +0,0 @@
---- Makefile.in.orig	Thu Mar  7 00:13:23 2002
-+++ Makefile.in	Thu Mar  7 00:14:30 2002
-@@ -348,14 +348,6 @@
- ## as a workaround for a bug in tar on Ultrix 4.2.
- install-arch-indep: mkdir info
- 	-set ${COPYDESTS} ; \
--	unset CDPATH; \
--	for dir in ${COPYDIR} ; do \
--	  if [ `(cd $$1 && /bin/pwd)` != `(cd $${dir} && /bin/pwd)` ] ; then \
--	    rm -rf $$1 ; \
--	  fi ; \
--	  shift ; \
--	done
--	-set ${COPYDESTS} ; \
- 	mkdir ${COPYDESTS} ; \
- 	chmod ugo+rx ${COPYDESTS} ; \
- 	unset CDPATH; \
diff --git a/japanese/emacs-emcws/files/patch-configure.in b/japanese/emacs-emcws/files/patch-configure.in
deleted file mode 100644
index fe67db93fcff..000000000000
--- a/japanese/emacs-emcws/files/patch-configure.in
+++ /dev/null
@@ -1,60 +0,0 @@
---- configure.in.orig	Fri Mar 19 11:20:26 2004
-+++ configure.in	Fri Mar 19 11:22:24 2004
-@@ -36,18 +36,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,
-@@ -224,6 +232,18 @@
- machine='' opsys='' unported=no
- case "${canonical}" in
- 
-+  ## FreeBSD ports
-+  *-*-freebsd* )
-+    opsys=freebsd
-+    case "${canonical}" in
-+      alpha*-*-freebsd*)       machine=alpha ;;
-+      amd64-*-freebsd*)        machine=amd64 ;;
-+      ia64-*-freebsd*)         machine=ia64 ;;
-+      i[3456]86-*-freebsd*)    machine=intel386 ;;
-+      sparc64-*-freebsd*)      machine=sparc ;;
-+    esac
-+  ;;
-+
-   ## NetBSD ports
-   *-*-netbsd* )
-     opsys=netbsd
-@@ -1077,7 +1097,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/emacs-emcws/files/patch-lib-src:Makefile.in b/japanese/emacs-emcws/files/patch-lib-src:Makefile.in
deleted file mode 100644
index 4226f59f9f96..000000000000
--- a/japanese/emacs-emcws/files/patch-lib-src:Makefile.in
+++ /dev/null
@@ -1,27 +0,0 @@
---- lib-src/Makefile.in.orig	Wed Aug 30 02:12:42 2000
-+++ lib-src/Makefile.in	Thu Oct 11 01:54:10 2001
-@@ -85,6 +85,7 @@
- INSTALL = @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
- # By default, we uphold the dignity of our programs.
- INSTALL_STRIP =
- 
-@@ -278,7 +279,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 +291,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/emacs-emcws/files/patch-lib-src:movemail.c b/japanese/emacs-emcws/files/patch-lib-src:movemail.c
deleted file mode 100644
index c47286937302..000000000000
--- a/japanese/emacs-emcws/files/patch-lib-src:movemail.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib-src/movemail.c.orig	Mon Feb 14 11:29:49 2005
-+++ lib-src/movemail.c	Mon Feb 14 11:33:06 2005
-@@ -787,7 +787,7 @@
-       mbx_delimit_begin (mbf);
-       if (pop_retr (server, i, mbf) != OK)
- 	{
--	  error (Errmsg, 0, 0);
-+	  error ("%s", Errmsg, 0);
- 	  close (mbfi);
- 	  return (1);
- 	}
diff --git a/japanese/emacs-emcws/files/patch-lisp:Makefile.in b/japanese/emacs-emcws/files/patch-lisp:Makefile.in
deleted file mode 100644
index b72eba25c7a6..000000000000
--- a/japanese/emacs-emcws/files/patch-lisp:Makefile.in
+++ /dev/null
@@ -1,29 +0,0 @@
---- lisp/Makefile.in.orig	Wed Apr 10 17:50:14 2002
-+++ lisp/Makefile.in	Wed Apr 10 17:53:38 2002
-@@ -91,7 +91,25 @@
- 	$(lisp)/term/vt420.el \
- 	$(lisp)/term/wyse50.el \
- 	$(lisp)/term/xterm.el \
--	$(lisp)/version.el
-+	$(lisp)/version.el \
-+	$(lisp)/busyu.el \
-+	$(lisp)/can-n-egg.el \
-+	$(lisp)/canna.el \
-+	$(lisp)/egg-jsymbol.el \
-+	$(lisp)/egg-keymap.el \
-+	$(lisp)/egg.el \
-+	$(lisp)/isearch-ext.el \
-+	$(lisp)/its/han-kata.el \
-+	$(lisp)/its/hankaku.el \
-+	$(lisp)/its/hira.el \
-+	$(lisp)/its/kanainput.el \
-+	$(lisp)/its/kata.el \
-+	$(lisp)/its/zenkaku.el \
-+	$(lisp)/mule-inst.el \
-+	$(lisp)/sj3-client.el \
-+	$(lisp)/sj3-egg.el \
-+	$(lisp)/wnn-client.el \
-+	$(lisp)/wnn-egg.el
- 
- # Files to compile before others during a bootstrap.  This is done to
- # speed up the bootstrap process.  The CC files are compiled first
diff --git a/japanese/emacs-emcws/files/patch-lisp:help.el b/japanese/emacs-emcws/files/patch-lisp:help.el
deleted file mode 100644
index bafafe333db5..000000000000
--- a/japanese/emacs-emcws/files/patch-lisp:help.el
+++ /dev/null
@@ -1,13 +0,0 @@
---- lisp/help.el.orig	Mon Oct  1 16:01:24 2001
-+++ lisp/help.el	Wed Apr 10 16:55:14 2002
-@@ -593,8 +593,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/emacs-emcws/files/patch-lisp:loadup.el b/japanese/emacs-emcws/files/patch-lisp:loadup.el
deleted file mode 100644
index 5f93219c9143..000000000000
--- a/japanese/emacs-emcws/files/patch-lisp:loadup.el
+++ /dev/null
@@ -1,26 +0,0 @@
---- lisp/loadup.el.orig	Wed Apr 10 16:53:14 2002
-+++ lisp/loadup.el	Wed Apr 10 16:55:48 2002
-@@ -264,7 +264,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))
-@@ -300,11 +300,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/emacs-emcws/files/patch-lisp:vc-hooks.el b/japanese/emacs-emcws/files/patch-lisp:vc-hooks.el
deleted file mode 100644
index 8675c85f9e37..000000000000
--- a/japanese/emacs-emcws/files/patch-lisp:vc-hooks.el
+++ /dev/null
@@ -1,24 +0,0 @@
---- lisp/vc-hooks.el.orig	Mon Nov 12 23:37:38 2001
-+++ lisp/vc-hooks.el	Tue Nov 13 12:56:08 2001
-@@ -475,10 +475,9 @@
-   (if regexp
-       (concat (regexp-quote (file-name-nondirectory file))
-               "\\.~[0-9.]+" (unless manual "\\.") "~")
--    (expand-file-name (concat (file-name-nondirectory file) 
--                              ".~" (or rev (vc-workfile-version file)) 
--                              (unless manual ".") "~")
--                      (file-name-directory file))))
-+    (concat (make-backup-file-name-1 file)
-+	    ".~" (or rev (vc-workfile-version file))
-+	    (unless manual ".") "~")))
- 
- (defun vc-delete-automatic-version-backups (file)
-   "Delete all existing automatic version backups for FILE."
-@@ -509,6 +508,7 @@
- 	 (vc-up-to-date-p file)
- 	 (eq (vc-checkout-model file) 'implicit)
- 	 (vc-call make-version-backups-p file)
-+	 vc-make-backup-files
-          (vc-make-version-backup file))))
- 
- (defun vc-after-save ()
diff --git a/japanese/emacs-emcws/files/patch-lisp_dired.el b/japanese/emacs-emcws/files/patch-lisp_dired.el
deleted file mode 100644
index e4aa2e1cefe8..000000000000
--- a/japanese/emacs-emcws/files/patch-lisp_dired.el
+++ /dev/null
@@ -1,19 +0,0 @@
---- lisp/dired.el.orig	Fri Feb  7 20:48:13 2003
-+++ lisp/dired.el	Thu Mar 27 12:12:15 2003
-@@ -1535,6 +1535,7 @@
- 			          "\\|" yyyy s s "?"
- 			          "\\|" s "?" yyyy
- 			     "\\)"))
-+	 (freebsd-ja (concat s mm "/" dd s "\\(" HH:MM "\\|" s yyyy "\\)"))
- 	 (japanese
- 	  (concat mm k "?" s dd k "?" s "+"
- 		  "\\(" HH:MM "\\|" yyyy k "?" "\\)")))
-@@ -1546,7 +1547,7 @@
- 	 ;; This avoids recognizing `jservice  10  1024' as a date in the line:
- 	 ;; drwxr-xr-x  3 jservice  10  1024 Jul  2  1997 esg-host
-     (concat ".*[0-9][kKMGTPEZY]?" 
--	    s "\\(" western "\\|" japanese "\\|" iso "\\)" s))
-+	    s "\\(" western "\\|" freebsd-ja "\\|" japanese "\\|" iso "\\)" s))
-   "Regular expression to match up to the file name in a directory listing.
- The default value is designed to recognize dates and times
- regardless of the language.")
diff --git a/japanese/emacs-emcws/files/patch-man:Makefile.in b/japanese/emacs-emcws/files/patch-man:Makefile.in
deleted file mode 100644
index 23e59c2673f6..000000000000
--- a/japanese/emacs-emcws/files/patch-man:Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- man/Makefile.in.orig	Thu Apr 26 02:17:33 2001
-+++ man/Makefile.in	Mon Oct 22 20:43:45 2001
-@@ -31,7 +31,7 @@
- 
- 
- # The makeinfo program is part of the Texinfo distribution.
--MAKEINFO = makeinfo
-+MAKEINFO = makeinfo --no-split
- INFO_TARGETS = ../info/emacs ../info/ccmode ../info/cl \
- 	        ../info/dired-x ../info/ediff ../info/forms ../info/gnus \
- 		../info/info ../info/message ../info/mh-e ../info/reftex \
diff --git a/japanese/emacs-emcws/files/patch-src-xfns.c b/japanese/emacs-emcws/files/patch-src-xfns.c
deleted file mode 100644
index 82d69e484658..000000000000
--- a/japanese/emacs-emcws/files/patch-src-xfns.c
+++ /dev/null
@@ -1,38 +0,0 @@
---- src/xfns.c.orig	2002-12-06 18:05:35.000000000 +0100
-+++ src/xfns.c	2012-05-02 19:50:40.000000000 +0200
-@@ -8541,7 +8541,7 @@
- {
-   xassert (png_ptr != NULL);
-   image_error ("PNG error: %s", build_string (msg), Qnil);
--  longjmp (png_ptr->jmpbuf, 1);
-+  longjmp (png_jmpbuf(png_ptr), 1);
- }
- 
- 
-@@ -8641,7 +8641,7 @@
- 
-       /* Check PNG signature.  */
-       if (fread (sig, 1, sizeof sig, fp) != sizeof sig
--	  || !png_check_sig (sig, sizeof sig))
-+	  || png_sig_cmp (sig, 0, sizeof sig))
- 	{
- 	  image_error ("Not a PNG file: `%s'", file, Qnil);
- 	  UNGCPRO;
-@@ -8658,7 +8658,7 @@
- 
-       /* Check PNG signature.  */
-       if (tbr.len < sizeof sig
--	  || !png_check_sig (tbr.bytes, sizeof sig))
-+	  || png_sig_cmp (tbr.bytes, 0, sizeof sig))
- 	{
- 	  image_error ("Not a PNG image: `%s'", img->spec, Qnil);
- 	  UNGCPRO;
-@@ -8699,7 +8699,7 @@
- 
-   /* Set error jump-back.  We come back here when the PNG library
-      detects an error.  */
--  if (setjmp (png_ptr->jmpbuf))
-+  if (setjmp (png_jmpbuf(png_ptr)))
-     {
-     error:
-       if (png_ptr)
diff --git a/japanese/emacs-emcws/files/patch-src:Makefile.in b/japanese/emacs-emcws/files/patch-src:Makefile.in
deleted file mode 100644
index d0e31255cc3b..000000000000
--- a/japanese/emacs-emcws/files/patch-src:Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/Makefile.in.orig	Mon Dec 17 23:09:32 2001
-+++ src/Makefile.in	Mon Oct 21 13:37:26 2002
-@@ -155,6 +155,10 @@
- /* This holds special options for linking temacs
-    that should be used for linking anything else.  */
- #ifndef LD_SWITCH_SYSTEM_TEMACS
-+#if defined(__FreeBSD_version) && (__FreeBSD_version >= 500042)
-+#define LD_SWITCH_SYSTEM_TEMACS -znocombreloc
-+#else
- #define LD_SWITCH_SYSTEM_TEMACS
-+#endif
- #endif
- 
diff --git a/japanese/emacs-emcws/files/patch-src:alloc.c b/japanese/emacs-emcws/files/patch-src:alloc.c
deleted file mode 100644
index 0ae9270b0d1f..000000000000
--- a/japanese/emacs-emcws/files/patch-src:alloc.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/alloc.c.orig	Thu Sep 12 13:50:01 2002
-+++ src/alloc.c	Thu Sep 12 13:48:11 2002
-@@ -3723,7 +3723,11 @@
-   /* This trick flushes the register windows so that all the state of
-      the process is contained in the stack.  */
- #ifdef sparc
-+#ifdef __sparc64__
-+  asm ("flushw");
-+#else
-   asm ("ta 3");
-+#endif
- #endif
-   
-   /* Save registers that we need to see on the stack.  We need to see
diff --git a/japanese/emacs-emcws/files/patch-src:filelock.c b/japanese/emacs-emcws/files/patch-src:filelock.c
deleted file mode 100644
index 8d52b7ee4c64..000000000000
--- a/japanese/emacs-emcws/files/patch-src:filelock.c
+++ /dev/null
@@ -1,28 +0,0 @@
---- src/filelock.c.orig	2010-11-04 11:03:51.000000000 +0900
-+++ src/filelock.c	2010-11-04 11:15:59.000000000 +0900
-@@ -65,7 +65,13 @@
- 
- #ifdef CLASH_DETECTION
- 
-+#if __FreeBSD_version >= 900007
-+#include <utmpx.h>
-+#undef BOOT_TIME
-+#define ut_time ut_tv.tv_sec
-+#else
- #include <utmp.h>
-+#endif
- 
- /* A file whose last-modified time is just after the most recent boot.
-    Define this to be NULL to disable checking for this file.  */
-@@ -256,7 +262,11 @@
-      char *filename;
-      int newest;
- {
-+#if __FreeBSD_version >= 900007
-+  struct utmpx ut, *utp;
-+#else
-   struct utmp ut, *utp;
-+#endif
-   int desc;
- 
-   if (filename)
diff --git a/japanese/emacs-emcws/files/patch-src:m:alpha.h b/japanese/emacs-emcws/files/patch-src:m:alpha.h
deleted file mode 100644
index 080a33650114..000000000000
--- a/japanese/emacs-emcws/files/patch-src:m:alpha.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/m/alpha.h.orig	Mon Oct  2 23:30:39 2000
-+++ src/m/alpha.h	Wed Feb 13 09:05:57 2002
-@@ -198,7 +198,7 @@
- 
- #ifndef NOT_C_CODE
- /* We need these because pointers are larger than the default ints.  */
--#if !defined(__NetBSD__) && !defined(__OpenBSD__)
-+#if !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__FreeBSD__)
- #include <alloca.h>
- #endif
- 
diff --git a/japanese/emacs-emcws/files/patch-src:m:amd64.h b/japanese/emacs-emcws/files/patch-src:m:amd64.h
deleted file mode 100644
index 3129433e59b5..000000000000
--- a/japanese/emacs-emcws/files/patch-src:m:amd64.h
+++ /dev/null
@@ -1,184 +0,0 @@
---- src/m/amd64.h~      Wed Dec 31 18:00:00 1969
-+++ src/m/amd64.h       Thu Dec 18 00:21:51 2003
-@@ -0,0 +1,181 @@
-+/* machine description file For the amd64 chip.
-+   Copyright (C) 1994, 1997, 1999 Free Software Foundation, Inc.
-+
-+This file is part of GNU Emacs.
-+
-+GNU Emacs 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 1, or (at your option)
-+any later version.
-+
-+GNU Emacs 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 GNU Emacs; see the file COPYING.  If not, write to
-+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-+Boston, MA 02111-1307, USA.  */
-+
-+
-+/* The following line tells the configuration script what sort of
-+   operating system this machine is likely to run.
-+   USUAL-OPSYS="note"
-+
-+NOTE-START
-+Use -opsystem=freebsd
-+NOTE-END
-+
-+*/
-+
-+#define BITS_PER_LONG 64
-+#define BITS_PER_EMACS_INT 64
-+#ifndef _LP64
-+#define _LP64
-+#endif
-+
-+/* Define WORDS_BIG_ENDIAN iff lowest-numbered byte in a word
-+   is the most significant byte.  */
-+
-+#undef WORDS_BIG_ENDIAN
-+
-+/* Define NO_ARG_ARRAY if you cannot take the address of the first of a
-+ * group of arguments and treat it as an array of the arguments.  */
-+
-+#define NO_ARG_ARRAY
-+
-+/* Now define a symbol for the cpu type, if your compiler
-+   does not define it automatically:
-+   Ones defined so far include vax, m68000, ns16000, pyramid,
-+   orion, tahoe, APOLLO and many others */
-+
-+/* __amd64__ defined automatically */
-+
-+
-+/* Use type EMACS_INT rather than a union, to represent Lisp_Object */
-+/* This is desirable for most machines.  */
-+
-+#define NO_UNION_TYPE
-+
-+/* Define the type to use.  */
-+#define EMACS_INT long
-+#define EMACS_UINT unsigned long
-+#define SPECIAL_EMACS_INT
-+
-+/* Define EXPLICIT_SIGN_EXTEND if XINT must explicitly sign-extend
-+   the 24-bit bit field into an int.  In other words, if bit fields
-+   are always unsigned.
-+
-+   If you use NO_UNION_TYPE, this flag does not matter.  */
-+
-+#undef EXPLICIT_SIGN_EXTEND
-+
-+/* Data type of load average, as read out of kmem.  */
-+
-+#define LOAD_AVE_TYPE long
-+
-+/* Convert that into an integer that is 100 for a load average of 1.0  */
-+
-+#define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE)
-+
-+/* Define C_ALLOCA if this machine does not support a true alloca
-+   and the one written in C should be used instead.
-+   Define HAVE_ALLOCA to say that the system provides a properly
-+   working alloca function and it should be used.
-+   Define neither one if an assembler-language alloca
-+   in the file alloca.s should be used.  */
-+
-+#define HAVE_ALLOCA
-+
-+/* GNU malloc and the relocating allocator do not work together
-+   with X.   [Who wrote that?]  */
-+
-+/* May 1995: reportedly [Rainer Schoepf <schoepf at uni-mainz.de>] both the
-+   system and the gnu malloc system work with "alpha-dec-osf3.0" and
-+   "alpha-dec-osf3.2".  */
-+
-+/* May 1995: it seems to me [Morten Welinder <terra at diku.dk>] that both
-+   mallocs work with "alpha-dec-osf2.0", but I daren't break anything
-+   right now.  Feel free to play if you want.  */
-+
-+/* #define SYSTEM_MALLOC */
-+
-+#ifdef __ELF__
-+/* With ELF, make sure that all common symbols get allocated to in the
-+   data section.  Otherwise, the dump of temacs may miss variables in
-+   the shared library that have been initialized.  For example, with
-+   GNU libc, __malloc_initialized would normally be resolved to the
-+   shared library's .bss section, which is fatal.  */
-+# ifdef __GNUC__
-+#  define C_SWITCH_MACHINE     -fno-common
-+# else
-+#  error What gives?  Fix me if DEC Unix supports ELF now.
-+# endif
-+#endif
-+
-+#if defined(__OpenBSD__)
-+#define ORDINARY_LINK
-+#endif
-+
-+#ifdef __ELF__
-+#undef UNEXEC
-+#define UNEXEC unexelf.o
-+#endif
-+
-+#if defined (LINUX) && __GNU_LIBRARY__ - 0 < 6
-+/* This controls a conditional in main.  */
-+#define LINUX_SBRK_BUG
-+#endif
-+
-+
-+#define PNTR_COMPARISON_TYPE unsigned long
-+
-+/* On the 64 bit architecture, we can use 60 bits for addresses */
-+
-+#define VALBITS         60
-+
-+
-+/* This definition of MARKBIT is necessary because of the comparison of
-+   ARRAY_MARK_FLAG and MARKBIT in an #if in lisp.h, which cpp doesn't like. */
-+
-+/* #define MARKBIT         0x8000000000000000L */
-+
-+
-+/* Define XINT and XUINT so that they can take arguments of type int */
-+
-+#define XINT(a)  (((long) (a) << (BITS_PER_LONG - VALBITS)) >> (BITS_PER_LONG - VALBITS))
-+#define XUINT(a) ((long) (a) & VALMASK)
-+
-+/* Define XPNTR to avoid or'ing with DATA_SEG_BITS */
-+
-+#define XPNTR(a) XUINT (a)
-+
-+#ifndef NOT_C_CODE
-+/* We need these because pointers are larger than the default ints.  */
-+#if !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__FreeBSD__)
-+#include <alloca.h>
-+#endif
-+#endif /* not NOT_C_CODE */
-+
-+/* On the Alpha it's best to avoid including TERMIO since struct
-+   termio and struct termios are mutually incompatible.  */
-+/* #define NO_TERMIO */
-+
-+#if defined (LINUX) || defined (__NetBSD__) || defined (__OpenBSD__)
-+# define TEXT_END ({ extern int _etext; &_etext; })
-+# ifndef __ELF__
-+#  define COFF
-+#  define DATA_END ({ extern int _EDATA; &_EDATA; })
-+# endif /* notdef __ELF__ */
-+#endif
-+
-+#if (defined (__NetBSD__) || defined (__OpenBSD__)) && defined (__ELF__)
-+#define HAVE_TEXT_START
-+#endif
-+
-+/* Many Alpha implementations (e.g. gas 2.8) can't handle DBL_MIN:
-+   they generate code that uses a signaling NaN instead of DBL_MIN.
-+   Define DBL_MIN_REPLACEMENT to be the next value larger than DBL_MIN:
-+   this avoids the assembler bug.  */
-+/* #define DBL_MIN_REPLACEMENT 2.2250738585072019e-308 */
diff --git a/japanese/emacs-emcws/files/patch-src:m:ia64.h b/japanese/emacs-emcws/files/patch-src:m:ia64.h
deleted file mode 100644
index 34f7a1eec276..000000000000
--- a/japanese/emacs-emcws/files/patch-src:m:ia64.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/m/ia64.h.orig	Fri Sep 29 06:00:37 2000
-+++ src/m/ia64.h	Thu Nov 20 13:44:02 2003
-@@ -147,7 +147,7 @@
- 
- #ifndef NOT_C_CODE
- /* We need these because pointers are larger than the default ints.  */
--# if !defined(__NetBSD__) && !defined(__OpenBSD__)
-+# if !defined(__NetBSD__) && !defined(__OpenBSD__)  && !defined(__FreeBSD__)
- #  include <alloca.h>
- # else
- #  include <stdlib.h>
diff --git a/japanese/emacs-emcws/files/patch-src:m:sparc.h b/japanese/emacs-emcws/files/patch-src:m:sparc.h
deleted file mode 100644
index 8d594f5b5cef..000000000000
--- a/japanese/emacs-emcws/files/patch-src:m:sparc.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/m/sparc.h.orig	Thu Sep 12 02:25:09 2002
-+++ src/m/sparc.h	Thu Sep 12 12:33:36 2002
-@@ -89,7 +89,7 @@
- #define PURESIZE 130000
- #endif
- 
--#if !defined (__NetBSD__) && !defined (__linux__) && !defined (__OpenBSD__)
-+#if !defined (__NetBSD__) && !defined (__linux__) && !defined (__OpenBSD__) && !defined(__FreeBSD__)
- /* This really belongs in s/sun.h.  */
- 
- /* Say that the text segment of a.out includes the header;
diff --git a/japanese/emacs-emcws/files/patch-src:mem-limits.h b/japanese/emacs-emcws/files/patch-src:mem-limits.h
deleted file mode 100644
index c58dd778e2ec..000000000000
--- a/japanese/emacs-emcws/files/patch-src:mem-limits.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/mem-limits.h.~1~        Wed Mar  8 12:49:46 2000
-+++ src/mem-limits.h    Wed Dec 17 03:15:24 2003
-@@ -98,7 +98,7 @@
- static POINTER data_space_start;
-
- /* Number of bytes of writable memory we can expect to be able to get */
--static unsigned long lim_data;
-+static rlim_t lim_data;
-
- #ifdef NO_LIM_DATA
- static void
diff --git a/japanese/emacs-emcws/files/patch-src:process.c b/japanese/emacs-emcws/files/patch-src:process.c
deleted file mode 100644
index d55970c9bd02..000000000000
--- a/japanese/emacs-emcws/files/patch-src:process.c
+++ /dev/null
@@ -1,91 +0,0 @@
---- src/process.c.orig	Mon Mar 17 07:06:56 2003
-+++ src/process.c	Tue Aug 12 01:17:12 2003
-@@ -1850,6 +1850,7 @@
-   for (lres = res; lres; lres = lres->ai_next)
-     {
-       s = socket (lres->ai_family, lres->ai_socktype, lres->ai_protocol);
-+
-       if (s < 0)
- 	{
- 	  xerrno = errno;
-@@ -1882,19 +1883,43 @@
- 	 It'd be nice to be able to control the connect timeout
- 	 though.  Would non-blocking connect calls be portable?  */
-       turn_on_atimers (0);
-+      
-       ret = connect (s, lres->ai_addr, lres->ai_addrlen);
-       xerrno = errno;
-       turn_on_atimers (1);
- 
--      if (ret == 0 || xerrno == EISCONN)
-+      if (ret == 0 || xerrno == EISCONN )
- 	/* The unwind-protect will be discarded afterwards.
- 	   Likewise for immediate_quit.  */
- 	break;
- 
-       immediate_quit = 0;
- 
--      if (xerrno == EINTR)
--	goto loop;
-+#if 1
-+      if ( (errno == EINTR ) || (errno == EINPROGRESS)){
-+	fd_set fds;
-+	int e;
-+	struct timeval tv;
-+	tv.tv_sec =60;
-+	tv.tv_usec = 0;
-+	FD_ZERO(&fds);
-+	FD_SET(s, &fds);
-+      resel:
-+	e = select(s+1, NULL, &fds, NULL, &tv);
-+
-+	if( e == -1){
-+	  if(errno == EINTR)
-+	    goto resel;
-+	  else
-+	    xerrno = ETIMEDOUT;
-+	}
-+	else {
-+	  xerrno = 0;
-+	  break;
-+	}
-+      }
-+#endif
-+
-       if (xerrno == EADDRINUSE && retry < 20)
- 	{
- 	  /* A delay here is needed on some FreeBSD systems,
-@@ -2000,11 +2025,30 @@
-       && errno != EISCONN)
-     {
-       int xerrno = errno;
--
-+      
-       immediate_quit = 0;
- 
--      if (errno == EINTR)
--	goto loop;
-+#if 1
-+      if ( (errno == EINTR ) || (errno == EINPROGRESS)){
-+	fd_set fds;
-+	int e;
-+	struct timeval tv;
-+	tv.tv_sec =60;
-+	tv_tv_usec = 0;
-+	FD_CLEAR(&fds);
-+	FD_SET(s, &fds);
-+      resel:
-+	e = select(s+1, NULL, fds, NULL, &tv);
-+	if( e != 0){
-+	  if(errno == EINTR)
-+	    goto resel;
-+	  else
-+	    xerrno = ETIMEDOUT;
-+	}
-+	else 
-+	  xerrno = 0;
-+      }
-+#endif
-       if (errno == EADDRINUSE && retry < 20)
- 	{
- 	  /* A delay here is needed on some FreeBSD systems,
diff --git a/japanese/emacs-emcws/files/patch-src:s:freebsd.h b/japanese/emacs-emcws/files/patch-src:s:freebsd.h
deleted file mode 100644
index 2eb9ea8823ee..000000000000
--- a/japanese/emacs-emcws/files/patch-src:s:freebsd.h
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/s/freebsd.h.orig	Tue Feb 20 19:52:17 2001
-+++ src/s/freebsd.h	Mon Feb 18 11:51:50 2002
-@@ -68,6 +68,11 @@
- #define LIBS_SYSTEM -lutil
- #if __FreeBSD_version < 400000
- #define LIBS_TERMCAP -ltermcap
-+#else
-+#ifdef HAVE_LIBNCURSES
-+#define TERMINFO
-+#define LIBS_TERMCAP -lncurses
-+#endif
- #endif
- 
- #define SYSV_SYSTEM_DIR
diff --git a/japanese/emacs-emcws/files/patch-src:wnnfns.c b/japanese/emacs-emcws/files/patch-src:wnnfns.c
deleted file mode 100644
index 0fe3b849f7da..000000000000
--- a/japanese/emacs-emcws/files/patch-src:wnnfns.c
+++ /dev/null
@@ -1,57 +0,0 @@
---- src/wnnfns.c.orig	Mon Dec 25 18:05:08 2006
-+++ src/wnnfns.c	Mon Dec 25 18:07:15 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/emacs-emcws/files/patch-src:xterm.c b/japanese/emacs-emcws/files/patch-src:xterm.c
deleted file mode 100644
index 01ec93bec95e..000000000000
--- a/japanese/emacs-emcws/files/patch-src:xterm.c
+++ /dev/null
@@ -1,42 +0,0 @@
---- src/xterm.c.orig	Tue Oct 15 23:21:45 2002
-+++ src/xterm.c	Wed Aug 31 09:18:48 2005
-@@ -118,8 +118,6 @@
- #ifdef HAVE_XAW3D
- #include <X11/Xaw3d/Simple.h>
- #include <X11/Xaw3d/Scrollbar.h>
--#define ARROW_SCROLLBAR
--#include <X11/Xaw3d/ScrollbarP.h>
- #else /* !HAVE_XAW3D */
- #include <X11/Xaw/Simple.h>
- #include <X11/Xaw/Scrollbar.h>
-@@ -8863,30 +8861,12 @@
- 	  XawScrollbarSetThumb (widget, top, shown);
- 	else
- 	  {
--#ifdef HAVE_XAW3D
--	    ScrollbarWidget sb = (ScrollbarWidget) widget;
--	    int scroll_mode = 0;
--	    
--	    /* `scroll_mode' only exists with Xaw3d + ARROW_SCROLLBAR.  */
--	    if (xaw3d_arrow_scroll)
--	      {
--		/* Xaw3d stupidly ignores resize requests while dragging
--		   so we have to make it believe it's not in dragging mode.  */
--		scroll_mode = sb->scrollbar.scroll_mode;
--		if (scroll_mode == 2)
--		  sb->scrollbar.scroll_mode = 0;
--	      }
--#endif
- 	    /* Try to make the scrolling a tad smoother.  */
- 	    if (!xaw3d_pick_top)
- 	      shown = min (shown, old_shown);
- 	    
- 	    XawScrollbarSetThumb (widget, top, shown);
- 	    
--#ifdef HAVE_XAW3D
--	    if (xaw3d_arrow_scroll && scroll_mode == 2)
--	      sb->scrollbar.scroll_mode = scroll_mode;
--#endif
- 	  }
-       }
-   }
diff --git a/japanese/emacs-emcws/files/patch-src:xterm.h b/japanese/emacs-emcws/files/patch-src:xterm.h
deleted file mode 100644
index a0faee236ed5..000000000000
--- a/japanese/emacs-emcws/files/patch-src:xterm.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/xterm.h.orig	Mon Feb 28 13:53:40 2005
-+++ src/xterm.h	Mon Feb 28 13:53:57 2005
-@@ -21,8 +21,8 @@
- 
- #include <X11/Xlib.h>
- #include <X11/cursorfont.h>
--#include <X11/Xutil.h>
- #include <X11/keysym.h>
-+#include <X11/Xutil.h>
- #include <X11/Xatom.h>
- #include <X11/Xresource.h>
diff --git a/japanese/emacs-emcws/files/site-init.el.tmpl b/japanese/emacs-emcws/files/site-init.el.tmpl
deleted file mode 100644
index aff4abda29ad..000000000000
--- a/japanese/emacs-emcws/files/site-init.el.tmpl
+++ /dev/null
@@ -1,10 +0,0 @@
-;;; site-init.el -- site-dependent initialization file
-
-;;
-;; Init file for FreeBSD port: emacs21-emcws
-;;
-
-; change a default file name of the internal DOC-string.
-(Snarf-documentation "%%DOC_FILE%%")
-
-;;; site-init.el ends here
diff --git a/japanese/emacs-emcws/pkg-descr b/japanese/emacs-emcws/pkg-descr
deleted file mode 100644
index 58c2b6a110d8..000000000000
--- a/japanese/emacs-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/emacs-emcws/pkg-plist b/japanese/emacs-emcws/pkg-plist
deleted file mode 100644
index aa09b8165e00..000000000000
--- a/japanese/emacs-emcws/pkg-plist
+++ /dev/null
@@ -1,52 +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/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/emacs-emcws/scripts/configure b/japanese/emacs-emcws/scripts/configure
deleted file mode 100644
index decb83c576f6..000000000000
--- a/japanese/emacs-emcws/scripts/configure
+++ /dev/null
@@ -1,6 +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
diff --git a/japanese/lookup-emacs21/Makefile b/japanese/lookup-emacs21/Makefile
deleted file mode 100644
index 8b79aa2b8f36..000000000000
--- a/japanese/lookup-emacs21/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-# Created by: Satoshi Taoka <taoka@FreeBSD.org>
-# $FreeBSD$
-
-MASTERDIR=	${.CURDIR}/../lookup
-
-USE_EMACS=	yes
-EMACS_PORT_NAME=	emacs21
-
-.include "${MASTERDIR}/Makefile"
diff --git a/japanese/migemo-emacs21/Makefile b/japanese/migemo-emacs21/Makefile
deleted file mode 100644
index 1e00bbe246e1..000000000000
--- a/japanese/migemo-emacs21/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# Created by: MANTANI Nobutaka <nobutaka@nobutaka.com>
-# $FreeBSD$
-
-PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
-COMMENT=	Japanese incremental search tool for emacs21
-MASTERDIR=	${.CURDIR}/../../japanese/migemo
-PKGDIR=	${.CURDIR}
-PLIST=		${MASTERDIR}/pkg-plist
-PKGMESSAGE=	${MASTERDIR}/pkg-message
-
-USE_EMACS=	yes
-EMACS_PORT_NAME=	emacs21
-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
-
-CONFLICTS=	ja-migemo-emacs23-[0-9]* \
-	ja-migemo-emacs22-[0-9]*
-
-HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-emacs=${EMACS_CMD}
-ALL_TARGET=	migemo.elc
-
-PLIST_SUB=	MIGEMO="@comment " ELISP=""
-SLAVE_PORT=	yes
-
-do-install:
-	${INSTALL_DATA} ${WRKSRC}/migemo.el ${STAGEDIR}${PREFIX}/${EMACS_LIBDIR}/site-lisp
-	${INSTALL_DATA} ${WRKSRC}/migemo.elc ${STAGEDIR}${PREFIX}/${EMACS_LIBDIR}/site-lisp
-
-.include "${MASTERDIR}/Makefile"
diff --git a/japanese/migemo-emacs21/pkg-descr b/japanese/migemo-emacs21/pkg-descr
deleted file mode 100644
index 7e9cc1490258..000000000000
--- a/japanese/migemo-emacs21/pkg-descr
+++ /dev/null
@@ -1,8 +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/
diff --git a/japanese/migemo-emacs22/Makefile b/japanese/migemo-emacs22/Makefile
deleted file mode 100644
index 5c884cf92783..000000000000
--- a/japanese/migemo-emacs22/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# Created by: MANTANI Nobutaka <nobutaka@FreeBSD.org>
-# $FreeBSD$
-
-PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
-COMMENT=	Japanese incremental search tool for emacs
-MASTERDIR=	${.CURDIR}/../../japanese/migemo
-PKGDIR=	${.CURDIR}
-PLIST=		${MASTERDIR}/pkg-plist
-PKGMESSAGE=	${MASTERDIR}/pkg-message
-
-USE_EMACS=	yes
-EMACS_PORT_NAME=	emacs22
-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
-
-CONFLICTS=	ja-migemo-emacs23-[0-9]* \
-	ja-migemo-emacs21-[0-9]*
-
-HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-emacs=${EMACS_CMD}
-ALL_TARGET=	migemo.elc
-
-PLIST_SUB=	MIGEMO="@comment " ELISP=""
-SLAVE_PORT=	yes
-
-do-install:
-	${INSTALL_DATA} ${WRKSRC}/migemo.el ${STAGEDIR}${PREFIX}/${EMACS_LIBDIR}/site-lisp
-	${INSTALL_DATA} ${WRKSRC}/migemo.elc ${STAGEDIR}${PREFIX}/${EMACS_LIBDIR}/site-lisp
-
-.include "${MASTERDIR}/Makefile"
diff --git a/japanese/migemo-emacs22/pkg-descr b/japanese/migemo-emacs22/pkg-descr
deleted file mode 100644
index 7e9cc1490258..000000000000
--- a/japanese/migemo-emacs22/pkg-descr
+++ /dev/null
@@ -1,8 +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/