17 files changed, 2 insertions, 338 deletions

diff --git a/MOVED b/MOVED
index bc51df85e540..7d5a78b1d3f3 100644
--- a/MOVED
+++ b/MOVED
@@ -2848,3 +2848,5 @@ graphics/jpeg-mmx|graphics/jpeg|2007-03-08|Has expired: no longer needed.
 graphics/gstreamer-plugins-jpeg-mmx80|graphics/gstreamer-plugins-jpeg80|2007-03-08|graphics/jpeg-mmx was removed
 java/linux-ibm-jdk13||2007-03-09|Has expired: Vulnerabilities in the browser plugin
 java/linux-ibm-jdk14||2007-03-09|Has expired: Vulnerabilities in the browser plugin
+japanese/emacs20-dl-canna||2007-03-09|Has expired: has deprecated dependency
+japanese/emacs20-dl-wnn6||2007-03-09|Has expired: has deprecated dependency
diff --git a/japanese/Makefile b/japanese/Makefile
index e6492db98b72..d385842d0585 100644
--- a/japanese/Makefile
+++ b/japanese/Makefile
@@ -61,8 +61,6 @@
     SUBDIR += elvis
     SUBDIR += emacs-emcws
     SUBDIR += emacs-manual
-    SUBDIR += emacs20-dl-canna
-    SUBDIR += emacs20-dl-wnn6
     SUBDIR += emacs20-emcws
     SUBDIR += epic4
     SUBDIR += epson-ttfonts
diff --git a/japanese/emacs20-dl-canna/Makefile b/japanese/emacs20-dl-canna/Makefile
deleted file mode 100644
index be252e73657b..000000000000
--- a/japanese/emacs20-dl-canna/Makefile
+++ /dev/null
@@ -1,59 +0,0 @@
-# New ports collection makefile for:	emacs20-dl-canna
-# Date created:		10 October 1998
-# Whom:			shige
-#
-# $FreeBSD$
-#
-
-PORTNAME=	emacs20-dl-canna
-PORTVERSION=	1.4
-PORTREVISION=	1
-CATEGORIES=	japanese editors
-MASTER_SITES=	ftp://ftp.m17n.org/pub/mule/dynamic-loading/emacs-canna/ \
-		${MASTER_SITE_PORTS_JP} 
-DISTNAME=	emacs-canna-${PORTVERSION}
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Dynamic loading module input method `Canna' on Emacs
-
-LIB_DEPENDS=	canna.1:${PORTSDIR}/japanese/Canna
-# Building this port requires emacs-dl source tree: ${EMACSDL_DIR}:configure
-BUILD_DEPENDS=	emacs-dl-${EMACS_VER}:${EMACSDL_DIR} \
-		${NONEXISTENT}:${EMACSDL_DIR}:configure \
-		${APEL_DEPENDS}:${PORTSDIR}/editors/apel-emacs20
-RUN_DEPENDS=	emacs-dl-${EMACS_VER}:${EMACSDL_DIR} \
-		${APEL_DEPENDS}:${PORTSDIR}/editors/apel-emacs20
-
-DEPRECATED=	has deprecated dependency
-EXPIRATION_DATE=	2007-03-01
-
-GNU_CONFIGURE=	YES
-CONFIGURE_ARGS=	--with-canna-includes=${PREFIX}/include \
-		--with-canna-libraries=${PREFIX}/lib \
-		--with-emacs-srcdir=${EMACSDL_SRCDIR}
-CONFIGURE_ENV=	EMACS="emacs-dl-${EMACS_VER}"
-PLIST_SUB=	EMACS_VER=${EMACS_VER} EMACS_ARCH=${MACHINE_ARCH}--freebsd \
-		DLCANNA_VER=${DLCANNA_VER} LISPDIR=${LISPDIR} DOCDIR=${DOCDIR}
-
-# ports variables
-EMACS_VER=	20.7
-EMACSDL_DIR=	${.CURDIR}/../../editors/emacs20-dl
-EMACSDL_SRCDIR=	${WRKDIRPREFIX}${EMACSDL_DIR}/work/emacs-${EMACS_VER}/src
-APEL_DEPENDS=	${PREFIX}/share/emacs/${EMACS_VER}/site-lisp/emu/emu.el
-LISPDIR=	share/emacs/site-lisp
-DOCDIR=		share/doc/emacs20-dl-canna
-DLCANNA_VER=	1.4
-# hack to allow parallel build to work
-.if defined(PACKAGE_BUILDING)
-USE_GMAKE=	yes
-USE_AUTOTOOLS=	autoconf:213:env
-.endif
-
-post-install:
-.if !defined(NOPORTDOCS)
-	@[ -d ${PREFIX}/${DOCDIR} ] || ${MKDIR} ${PREFIX}/${DOCDIR}
-	@${INSTALL_DATA} ${WRKSRC}/README.ja ${PREFIX}/${DOCDIR}
-	@${INSTALL_DATA} ${WRKSRC}/ChangeLog ${PREFIX}/${DOCDIR}
-.endif
-
-.include <bsd.port.mk>
diff --git a/japanese/emacs20-dl-canna/distinfo b/japanese/emacs20-dl-canna/distinfo
deleted file mode 100644
index 97665757af09..000000000000
--- a/japanese/emacs20-dl-canna/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (emacs-canna-1.4.tar.gz) = a2d97b1db9a1fad7b50783606bed327c
-SHA256 (emacs-canna-1.4.tar.gz) = f4e99502ffd1d5f90fdd894cf5a9f196caab311b2b17fda8dcd91467d8b60344
-SIZE (emacs-canna-1.4.tar.gz) = 27823
diff --git a/japanese/emacs20-dl-canna/files/patch-ab b/japanese/emacs20-dl-canna/files/patch-ab
deleted file mode 100644
index 4371c9220e23..000000000000
--- a/japanese/emacs20-dl-canna/files/patch-ab
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig	Wed Mar  3 04:11:42 1999
-+++ configure	Tue Mar 16 15:06:02 1999
-@@ -1,5 +1,5 @@
- #!/bin/sh
- 
--EMACS=emacs
-+[ "X${EMACS}" = "X" ] && EMACS=emacs
- 
--eval $EMACS -batch -q -no-site-file -l CANNA-CONFIG -f config-canna
-+eval $EMACS -batch -q -no-site-file -l CANNA-CONFIG -f config-canna $*
diff --git a/japanese/emacs20-dl-canna/files/patch-ac b/japanese/emacs20-dl-canna/files/patch-ac
deleted file mode 100644
index 628af28907b9..000000000000
--- a/japanese/emacs20-dl-canna/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- CANNA-CONFIG.orig	Wed Mar  3 04:11:40 1999
-+++ CANNA-CONFIG	Tue Mar 16 15:38:55 1999
-@@ -17,6 +17,8 @@
- 	     (setq canna-includes (substring arg (match-end 0))))
- 	    ((string-match "^--with-canna-libraries=" arg)
- 	     (setq canna-libraries (substring arg (match-end 0))))
-+	    ((string-match "^--with-emacs-srcdir=" arg)
-+	     (setq srcdir (substring arg (match-end 0))))
- 	    )
-       (setq command-line-args-left (cdr command-line-args-left))
-       )
diff --git a/japanese/emacs20-dl-canna/files/patch-ad b/japanese/emacs20-dl-canna/files/patch-ad
deleted file mode 100644
index 060581f7eeb2..000000000000
--- a/japanese/emacs20-dl-canna/files/patch-ad
+++ /dev/null
@@ -1,11 +0,0 @@
---- CANNA-CFG.~1~	Fri Jan 16 17:51:11 1998
-+++ CANNA-CFG	Wed Feb 23 17:27:42 2000
-@@ -38,7 +38,7 @@
- ;;(setq PREFIX "~/")
- 
- ;; Please specify prefix for ``CANNA'' [optional]
--(setq CANNA_PREFIX "")
-+(setq CANNA_PREFIX "canna")
- 
- 
- 
diff --git a/japanese/emacs20-dl-canna/pkg-descr b/japanese/emacs20-dl-canna/pkg-descr
deleted file mode 100644
index ed1072789207..000000000000
--- a/japanese/emacs20-dl-canna/pkg-descr
+++ /dev/null
@@ -1,46 +0,0 @@
-Input method module `Canna' for Emacs with dynamic loading enhancement.
-
-This is an input method module Canna for Emacs.
-*** Setting for Fontset on Emacs20 ***
-
-To use japanese fonts on emacs20, put in your $HOME/.emacs as follows:
-
-	(set-language-environment "Japanese")
-	(setq default-frame-alist
-		(append '((font . "fontset-16")) default-frame-alist))
-
-And put in your $HOME/.Xdefaults as follows for example:
-
-Emacs*Fontset-0:  -*-fixed-medium-r-normal--16-*-*-*-*-*-fontset-16,\
-	ascii:-*-fixed-medium-r-normal-*-16-*-iso8859-1,\
-	japanese-jisx0208:-*-fixed-medium-r-normal-*-16-*-jisx0208*,\
-	chinese-gb2312:-*-*-medium-r-normal--16-*-*-*-*-*-gb2312*,\
-	korean-ksc5601:-*-*-medium-r-normal--16-*-*-*-*-*-ksc5601*
-
-
-*** Setting for Canna ***
-
-To use Canna, put in your $HOME/.emacs as follows:
-
-	(load "canna")
-	(canna)
-
-This input-method toggle key-binding is C-o.
-
-or if you want to use canna-leim, as follows:
-
-	(require 'canna-leim)
-	(set-input-method "japanese-canna")
-
-This input-method toggle key-binding is C-\.
-
-And you must use emacs-dl-20.5 (not emacs-20.5!).
-
-This dynamic loading module sources and emacs20 dynamic loading patch
-is placed on the following URL:
-
-	ftp://ftp.m17n.org/pub/mule/dynamic-loading/
-
-WWW: http://www.m17n.org/mule/dynamic-loading/
-
---- Porting by shige <shige@FreeBSD.ORG>.
diff --git a/japanese/emacs20-dl-canna/pkg-plist b/japanese/emacs20-dl-canna/pkg-plist
deleted file mode 100644
index 45d933eeae93..000000000000
--- a/japanese/emacs20-dl-canna/pkg-plist
+++ /dev/null
@@ -1,10 +0,0 @@
-libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/canna.so.%%DLCANNA_VER%%
-libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/canna.so
-%%LISPDIR%%/canna/canna.el
-%%LISPDIR%%/canna/canna.elc
-%%LISPDIR%%/canna/canna-leim.el
-%%LISPDIR%%/canna/canna-leim.elc
-%%PORTDOCS%%%%DOCDIR%%/README.ja
-%%PORTDOCS%%%%DOCDIR%%/ChangeLog
-@dirrm %%LISPDIR%%/canna
-%%PORTDOCS%%@dirrm %%DOCDIR%%
diff --git a/japanese/emacs20-dl-wnn6/Makefile b/japanese/emacs20-dl-wnn6/Makefile
deleted file mode 100644
index 5da894bba5fc..000000000000
--- a/japanese/emacs20-dl-wnn6/Makefile
+++ /dev/null
@@ -1,55 +0,0 @@
-# New ports collection makefile for:	emacs20-dl-wnn6
-# Date created:		10 October 1998
-# Whom:			shige
-#
-# $FreeBSD$
-#
-
-PORTNAME=	emacs20-dl-wnn6
-PORTVERSION=	0.3.6
-PORTREVISION=	2
-CATEGORIES=	japanese editors
-MASTER_SITES=	http://tokuda-www.cs.titech.ac.jp/~katsuya/emacs/
-DISTNAME=	dl-wnn-${PORTVERSION}
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Dynamic loading module input method `Wnn' on Emacs
-
-LIB_DEPENDS=	wnn6.2:${.CURDIR}/../../japanese/Wnn6-lib
-BUILD_DEPENDS=	emacs-dl-${EMACS_VER}:${EMACSDL_DIR} \
-		${NONEXISTENT}:${EMACSDL_DIR}:configure
-RUN_DEPENDS=	emacs-dl-${EMACS_VER}:${EMACSDL_DIR}
-
-DEPRECATED=	has deprecated dependency
-EXPIRATION_DATE=	2007-03-01
-
-USE_AUTOTOOLS=	autoconf:213:env
-USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-wnn6 \
-		--with-wnn-includes=${PREFIX}/include/wnn6/wnn \
-		--with-wnn-libraries=${PREFIX}/lib \
-		--with-emacs-src=${EMACSDL_SRCDIR}
-CONFIGURE_ENV=	EMACS=${PREFIX}/bin/emacs-dl-${EMACS_VER}
-PLIST_SUB=	EMACS_VER=${EMACS_VER} EMACS_ARCH=${MACHINE_ARCH}--freebsd \
-		DOCDIR=${DOCDIR}
-
-DOCDIR=		share/doc/emacs20-dl-wnn6
-EMACS_VER=	20.7
-EMACSDL_DIR=	${.CURDIR}/../../editors/emacs20-dl
-EMACSDL_SRCDIR=	${WRKDIRPREFIX}${EMACSDL_DIR}/work/emacs-${EMACS_VER}
-# hack to allow parallel build to work
-.if defined(PARALLEL_PACKAGE_BUILD)
-USE_GMAKE=	yes
-.endif
-
-post-install:
-	@${LN} -sf ${PREFIX}/share/emacs/site-lisp/egg/eggrc-wnn \
-		${PREFIX}/share/emacs/site-lisp/egg/.eggrc
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/${DOCDIR}
-	@${INSTALL_DATA} ${WRKSRC}/README.ja ${PREFIX}/${DOCDIR}
-	@${INSTALL_DATA} ${WRKSRC}/ChangeLog ${PREFIX}/${DOCDIR}
-.endif
-
-.include <bsd.port.mk>
diff --git a/japanese/emacs20-dl-wnn6/distinfo b/japanese/emacs20-dl-wnn6/distinfo
deleted file mode 100644
index fdbec244c989..000000000000
--- a/japanese/emacs20-dl-wnn6/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (dl-wnn-0.3.6.tar.gz) = 2536c86f845fad4b40af4bbe37332ffc
-SHA256 (dl-wnn-0.3.6.tar.gz) = 55e18b4b6f67596fa6f87486165eb0b873860419ee85168157f7b45ba264b0fa
-SIZE (dl-wnn-0.3.6.tar.gz) = 151469
diff --git a/japanese/emacs20-dl-wnn6/files/patch-aa b/japanese/emacs20-dl-wnn6/files/patch-aa
deleted file mode 100644
index 5484277d57e9..000000000000
--- a/japanese/emacs20-dl-wnn6/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Makefile.in.orig	Wed Mar 10 08:35:29 1999
-+++ src/Makefile.in	Mon Aug  9 21:54:03 1999
-@@ -15,7 +15,7 @@
- CFLAGS = -g -O2
- ALL_CFLAGS = $(CFLAGS) -nostdlib -shared -fPIC -pipe -I$(emacssrc)/src
- WNN_CFLAGS = -I$(wnn_includes) -DWNN_EMACS -DWNN_EMACS_DL $(wnn_define)
--WNN_LDFLAGS = -L$(wnn_libraries) -lwnn
-+WNN_LDFLAGS = -L$(wnn_libraries) -lwnn6
- 
- all: wnn.so
- 
diff --git a/japanese/emacs20-dl-wnn6/files/patch-ab b/japanese/emacs20-dl-wnn6/files/patch-ab
deleted file mode 100644
index 6f368ec18856..000000000000
--- a/japanese/emacs20-dl-wnn6/files/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/wnn.c.orig	Sun Oct 11 11:03:42 1998
-+++ src/wnn.c	Sun Oct 11 13:51:17 1998
-@@ -297,9 +297,9 @@
- #include <ctype.h>
- 
- #include "config.h"
--#include "commonhd.h"
--#include "cplib.h"
--#include "jllib.h"
-+#include <commonhd.h>
-+#include <cplib.h>
-+#include <jllib.h>
- 
- /* UCHAR が二重定義されるので */
- #define _UCHAR_T
diff --git a/japanese/emacs20-dl-wnn6/files/patch-ac b/japanese/emacs20-dl-wnn6/files/patch-ac
deleted file mode 100644
index 575d9115b93d..000000000000
--- a/japanese/emacs20-dl-wnn6/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- lisp/Makefile.in.orig	Sun Oct 11 14:06:21 1998
-+++ lisp/Makefile.in	Sun Oct 11 14:06:30 1998
-@@ -18,7 +18,7 @@
- 
- install::
- 	$(SHELL) $(top_srcdir)/mkinstalldirs $(lispdir)
--	for p in *.elc eggrc-*; do \
-+	for p in *.el *.elc eggrc-*; do \
- 	  echo " $(INSTALL_DATA) $$p $(lispdir)/$$p"; \
- 	  $(INSTALL_DATA) $$p $(lispdir)/$$p; \
- 	done
diff --git a/japanese/emacs20-dl-wnn6/files/patch-ad b/japanese/emacs20-dl-wnn6/files/patch-ad
deleted file mode 100644
index 6a73e8e48df6..000000000000
--- a/japanese/emacs20-dl-wnn6/files/patch-ad
+++ /dev/null
@@ -1,11 +0,0 @@
---- lisp/its/Makefile.in.orig	Sun Oct 11 14:06:41 1998
-+++ lisp/its/Makefile.in	Sun Oct 11 14:06:52 1998
-@@ -17,7 +17,7 @@
- 
- install::
- 	$(SHELL) $(top_srcdir)/mkinstalldirs $(lispdir)/its
--	for p in *.elc; do \
-+	for p in *.el *.elc; do \
- 	  echo " $(INSTALL_DATA) $$p $(lispdir)/its/$$p"; \
- 	  $(INSTALL_DATA) $$p $(lispdir)/its/$$p; \
- 	done
diff --git a/japanese/emacs20-dl-wnn6/pkg-descr b/japanese/emacs20-dl-wnn6/pkg-descr
deleted file mode 100644
index ca4185f4e494..000000000000
--- a/japanese/emacs20-dl-wnn6/pkg-descr
+++ /dev/null
@@ -1,38 +0,0 @@
-Input method module `Wnn' for Emacs with dynamic loading enhancement.
-
-This is an input method module Wnn for Emacs.
-
-
-*** Setting for Fontset on Emacs20 ***
-
-To use japanese fonts on emacs20, put in your $HOME/.emacs as follows:
-
-	(set-language-environment "Japanese")
-	(setq default-frame-alist
-		(append '((font . "fontset-16")) default-frame-alist))
-
-And put in your $HOME/.Xdefaults as follows for example:
-
-Emacs*Fontset-0:  -*-fixed-medium-r-normal--16-*-*-*-*-*-fontset-16,\
-	ascii:-*-fixed-medium-r-normal-*-16-*-iso8859-1,\
-	japanese-jisx0208:-*-fixed-medium-r-normal-*-16-*-jisx0208*,\
-	chinese-gb2312:-*-*-medium-r-normal--16-*-*-*-*-*-gb2312*,\
-	korean-ksc5601:-*-*-medium-r-normal--16-*-*-*-*-*-ksc5601*
-
-
-*** Setting for egg-wnn ***
-
-To use Wnn, put in your $HOME/.emacs as follows:
-
-	(autoload 'egg "egg" "Initialize EGG." t)
-
-and M-x egg on emacs-dl-20.5 (not emacs-20.5!).
-
-This dynamic loading module sources and emacs20 dynamic loading module patch
-is placed on the following URL:
-
-	ftp://ftp.m17n.org/pub/mule/dynamic-loading/
-
-WWW: http://tokuda-www.cs.titech.ac.jp/~katsuya/emacs/
-
---- Porting by shige <shige@FreeBSD.ORG>.
diff --git a/japanese/emacs20-dl-wnn6/pkg-plist b/japanese/emacs20-dl-wnn6/pkg-plist
deleted file mode 100644
index 1e4797cd4d69..000000000000
--- a/japanese/emacs20-dl-wnn6/pkg-plist
+++ /dev/null
@@ -1,42 +0,0 @@
-libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/wnn.so
-share/emacs/site-lisp/egg/busyu.el
-share/emacs/site-lisp/egg/busyu.elc
-share/emacs/site-lisp/egg/egg.el
-share/emacs/site-lisp/egg/egg.elc
-share/emacs/site-lisp/egg/egg-jsymbol.el
-share/emacs/site-lisp/egg/egg-jsymbol.elc
-share/emacs/site-lisp/egg/egg-keymap.el
-share/emacs/site-lisp/egg/egg-keymap.elc
-share/emacs/site-lisp/egg/isearch-ext.el
-share/emacs/site-lisp/egg/isearch-ext.elc
-share/emacs/site-lisp/egg/wnn-egg.el
-share/emacs/site-lisp/egg/wnn-egg.elc
-share/emacs/site-lisp/egg/wnn-client.el
-share/emacs/site-lisp/egg/eggrc-sj3
-share/emacs/site-lisp/egg/eggrc-v41
-share/emacs/site-lisp/egg/eggrc-wnn
-@exec ln -sf %D/%F %D/share/emacs/site-lisp/egg/.eggrc
-@unexec rm -f %D/share/emacs/site-lisp/egg/.eggrc
-share/emacs/site-lisp/egg/its/han-kata.el
-share/emacs/site-lisp/egg/its/han-kata.elc
-share/emacs/site-lisp/egg/its/hangul.el
-share/emacs/site-lisp/egg/its/hangul.elc
-share/emacs/site-lisp/egg/its/hankaku.el
-share/emacs/site-lisp/egg/its/hankaku.elc
-share/emacs/site-lisp/egg/its/hira.el
-share/emacs/site-lisp/egg/its/hira.elc
-share/emacs/site-lisp/egg/its/kanainput.el
-share/emacs/site-lisp/egg/its/kanainput.elc
-share/emacs/site-lisp/egg/its/kata.el
-share/emacs/site-lisp/egg/its/kata.elc
-share/emacs/site-lisp/egg/its/pinyin.el
-share/emacs/site-lisp/egg/its/pinyin.elc
-share/emacs/site-lisp/egg/its/zenkaku.el
-share/emacs/site-lisp/egg/its/zenkaku.elc
-share/emacs/site-lisp/egg/its/zhuyin.el
-share/emacs/site-lisp/egg/its/zhuyin.elc
-@dirrm share/emacs/site-lisp/egg/its
-@dirrm share/emacs/site-lisp/egg
-%%PORTDOCS%%%%DOCDIR%%/README.ja
-%%PORTDOCS%%%%DOCDIR%%/ChangeLog
-%%PORTDOCS%%@dirrm %%DOCDIR%%