39 files changed, 29 insertions, 2106 deletions

diff --git a/mail/Makefile b/mail/Makefile
index b87c24df0f60..b8f0af1f5d10 100644
--- a/mail/Makefile
+++ b/mail/Makefile
@@ -95,6 +95,7 @@
     SUBDIR += mew-mule
     SUBDIR += mew-xemacs21
     SUBDIR += mew-xemacs21-mule
+    SUBDIR += mew2
     SUBDIR += mew2-emacs20
     SUBDIR += mew2-xemacs21
     SUBDIR += mew2-xemacs21-mule
diff --git a/mail/mew2-emacs20/Makefile b/mail/mew2-emacs20/Makefile
index b4a133c20a63..8f361c433798 100644
--- a/mail/mew2-emacs20/Makefile
+++ b/mail/mew2-emacs20/Makefile
@@ -1,108 +1,22 @@
-# New ports collection makefile for: Mew
+# New ports collection makefile for: Mew (for xemacs21)
 # Date created:		21 November 1997
 # Whom:			Kiriyama Kazuhiko <kiri@kiri.toba-cmt.ac.jp>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	mew
-PORTVERSION=	${MEW_VER}
-CATEGORIES=	mail elisp
-MASTER_SITES=	ftp://ftp.mew.org/pub/Mew/ \
-		ftp://ftp.kyushu-u.ac.jp/pub/Misc/mew/ \
-		${MASTER_SITE_PORTS_JP}
-PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
-
 MAINTAINER?=	kiri@FreeBSD.org
 
 # Mew major version
 MEW_MAJOR_VER?=	2
 
-# distfile version
-MEW_VER=	${MEW_MAJOR_VER}.1
-
-# document install directory by install-doc target
-MEW_DOCDIR?=	share/doc/${PORTNAME}${MEW_MAJOR_VER}
-
-# emacs port setup
-EMACS_PORT_NAME?=	emacs20
-
-# target name for make build and install
-ALL_TARGET?=	all info jinfo
-INSTALL_TARGET?=	install install-info install-jinfo install-etc
-
-# environments
-MAKE_ENV+=	EMACS_LIBDIR=${EMACS_LIBDIR} MEW_MAJOR_VER=${MEW_MAJOR_VER}
-PLIST_SUB+=	MEW_MAJOR_VER=${MEW_MAJOR_VER}
+# This is a slave port.
+MASTERDIR=	${.CURDIR}/../mew${MEW_MAJOR_VER}
 
-# manuals
-MAN1=		mewcat.1 mewdecode.1 mewencode.1 mewls.1
+# use pkg-* files in ${.CURDIR}
+PKGDIR=		${.CURDIR}
 
-post-patch:
-	for f in mew-key.el info/mew.texi; do \
-		${PERL} -i -pe 's,%%MEW_MAJOR_VER%%,${MEW_MAJOR_VER},g' ${WRKSRC}/$${f}; \
-	done
-
-post-install:
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/${MEW_DOCDIR}
-	(cd ${WRKSRC} ; \
-		${INSTALL_DATA} 00* ${PREFIX}/${MEW_DOCDIR}/ ; \
-		for dir in contrib; do \
-			${CP} -R $${dir} ${PREFIX}/${MEW_DOCDIR}/ ; \
-		done)
-	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/${MEW_DOCDIR}
-.endif
-
-############################################################
-## Make DESCR,COMMENT and PLIST (only for MAINTAINER use)
-############################################################
-#COMMENT_TEXT=	'Message interface to Emacs Window (version ${MEW_MAJOR_VER}) for ${EMACS_PORT_NAME}'
-#.if ${EMACS_PORT_NAME} == "xemacs21" || ${EMACS_PORT_NAME} == "xemacs21-mule"
-#ELISPDIR=	${PREFIX}/${EMACS_PACKAGESDIR}/lisp/${PORTNAME}${MEW_MAJOR_VER}
-#INFODIR=	${PREFIX}/${EMACS_PACKAGESDIR}/info
-#ETCDIR=		${PREFIX}/${EMACS_PACKAGESDIR}/etc/${PORTNAME}${MEW_MAJOR_VER}
-#.else
-#ELISPDIR=	${PREFIX}/${EMACS_SITE_LISPDIR}/${PORTNAME}${MEW_MAJOR_VER}
-#INFODIR=	${PREFIX}/info
-#ETCDIR=		${PREFIX}/${EMACS_LIBDIR}/etc/${PORTNAME}${MEW_MAJOR_VER}
-#.endif
-#SCRIPTS_ENV+=	EMACS_PORTSDIR=${EMACS_PORTSDIR:S,^${PORTSDIR}/,,} \
-#		PKGNAME=${PKGNAME} ELISPDIR=${ELISPDIR} INFODIR=${INFODIR} \
-#		ETCDIR=${ETCDIR} EMACS_CMD=${EMACS_CMD:S,${PREFIX}/bin/,,} \
-#		PORTNAME=${PORTNAME} EMACS_PORT_NAME=${EMACS_PORT_NAME}
-#
-#pre-plist:
-#	mkdir -p ${ELISPDIR} ${INFODIR} ${ETCDIR} \
-#		${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp
-#
-#pre-arrange:
-#	${ECHO} ${COMMENT_TEXT} > ${PKGDIR}/pkg-comment
-#	${SETENV} ${SCRIPTS_ENV} WRKTMPDIR=${PKGDIR} TMPL_FILES=pkg-descr \
-#		MEW_MAJOR_VER=${MEW_MAJOR_VER} \
-#		${SH} ${FILESDIR}/tmpl2file.sh
-#	${SETENV} EMACS_PORT_NAME=${EMACS_PORT_NAME} WRKTMPDIR=${PKGDIR} \
-#		${SH} ${FILESDIR}/message.sh
-#	${CHOWN} kiri:staff ${PKGDIR}/pkg-comment ${PKGDIR}/pkg-descr ${PKGDIR}/pkg-message
-#
-#arrange:
-#.if ${EMACS_PORT_NAME} == "xemacs21" || ${EMACS_PORT_NAME} == "xemacs21-mule"
-#	${MAKE} PLIST_SUB_EXCLS="${PLIST_SUB_EXCLS}" \
-#		DIRRM2RMDIRS="${ETCDIR:S,^${PREFIX}/,,:S,/${PORTNAME}${MEW_MAJOR_VER}$,,} \
-#			${ELISPDIR:S,^${PREFIX}/,,:S,/${PORTNAME}${MEW_MAJOR_VER}$,,} \
-#			${EMACS_PACKAGESDIR} ${EMACS_PACKAGESDIR}/lisp \
-#			${EMACS_PACKAGESDIR}/info ${EMACS_PACKAGESDIR}/etc \
-#			${EMACS_PACKAGESDIR}/man ${EMACS_PACKAGESDIR}/pkginfo" \
-#		DIRRMDEPTH=2 plist
-#.else
-#	${MAKE} PLIST_SUB_EXCLS="${PLIST_SUB_EXCLS}" \
-#		DIRRM2RMDIRS="${ETCDIR:S,^${PREFIX}/,,:S,/${PORTNAME}${MEW_MAJOR_VER}$,,} \
-#			${ELISPDIR:S,^${PREFIX}/,,:S,/${PORTNAME}${MEW_MAJOR_VER}$,,} \
-#			${EMACS_LIBDIR}/${EMACS_VER}/site-lisp \
-#			${EMACS_LIBDIR}/${EMACS_VER}" \
-#		INFOFILES="mew.info mew.jis.info" DIRRMDEPTH=2 plist
-#.endif
-#	${INSTALL} -c -m 644 -o kiri -g staff ${WRKPLIST} ${PLIST}
-#	${PERL} -i -pe 's@((?!mew)...|^.{0,2})%%MEW_MAJOR_VER%%@$$1\x32@g' ${PLIST}
+# set emacs port
+EMACS_PORT_NAME=	emacs20
 
-.include <bsd.port.mk>
+.include "${MASTERDIR}/Makefile"
diff --git a/mail/mew2-emacs20/distinfo b/mail/mew2-emacs20/distinfo
deleted file mode 100644
index 232144109fa2..000000000000
--- a/mail/mew2-emacs20/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (mew-2.1.tar.gz) = db70bd87397f31ad10d97d62ecc5f427
diff --git a/mail/mew2-emacs20/files/Addrbook b/mail/mew2-emacs20/files/Addrbook
deleted file mode 100644
index 45ad31e9223c..000000000000
--- a/mail/mew2-emacs20/files/Addrbook
+++ /dev/null
@@ -1,25 +0,0 @@
-; See comments at end of this file
-; This file is almost empty as MH now supports personal aliases.
-
-;everyone: *
-
-; Blank lines and lines beginning with a ; are ignored.
-; < file	-> read more aliases from "file"
-; foo: fum      -> simple replacement
-; foo: fum, fie -> list replacement
-; foo: < file   -> list replacement from "file"
-; foo: = group  -> list replacement from UNIX group
-; foo: + group  -> list replacement by ALL users in /etc/passwd
-;		      with gid == group
-; foo: *        -> list replacement by ALL users in /etc/passwd
-;                     with uid >= 200
-; foo*: fum     -> matches foo<string> (including the empty string)
-;
-; using a ';' instead of a ':' indicates that the alias should be displayed
-; along with the addresses used (normally, the addresses replace the alias
-; completely)
-ML-FreeBSD: FreeBSD-users-jp@jp.freebsd.org
-ML-fvwm:    fvwm-users-jp@skylark.ics.es.osaka-u.ac.jp
-ML-SKK:     skk@sato.kuis.kyoto-u.ac.jp
-ML-infotalk:infotalk-request@square.brl.ntt.jp
-ML-skkfep:  skkfep@chanchan.suri.co.jp
diff --git a/mail/mew2-emacs20/files/dot.emacs.el.in b/mail/mew2-emacs20/files/dot.emacs.el.in
deleted file mode 100644
index 8cfe348595fa..000000000000
--- a/mail/mew2-emacs20/files/dot.emacs.el.in
+++ /dev/null
@@ -1,95 +0,0 @@
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; Mew ;;;;;;;;;
-;;;       Mew (Ver.%%version%%)                                             ;;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;;
-;;; Site configuration
-;;;
-%%REQUIRE%%
-(autoload 'mew "mew" nil t)
-(autoload 'mew-send "mew" nil t)
-(setq mew-mail-domain-list '("%%nameserver%%"))
-(setq mew-icon-directory "%%emacsdir%%/etc/mew")
-;;;
-;;; Window tips
-;;;
-;; If you use XEmacs and your video chip provides only limited
-;; color map(e.g. 256), put the following line to avoid exhaustion
-;; of colors.
-;(setq mew-demo-picture nil)
-(cond
- ((string-match "XEmacs" emacs-version)
-;  (setq url-be-asynchronous t)
-;  (setq-default buffer-file-coding-system 'iso-2022-jp)
-;  (setq keyboard-coding-system    'iso-2022-jp)
-;  (setq terminal-coding-system    'iso-2022-jp)
-  (add-menu-item '("Apps") "Read Mail (Mew)" 'mew t "Read Mail (VM)...")
-  (add-menu-item '("Apps") "Send Mail (Mew)" 'mew-send t "Read Mail (VM)...")
-;  (delete-menu-item '("Apps" "Read Mail (VM)..."))
-;  (delete-menu-item '("Apps" "Read Mail (MH)..."))
-;  (delete-menu-item '("Apps" "Send mail..."))
-  (setq toolbar-mail-reader 'Mew)
-  (setq toolbar-mail-commands-alist
-	(cons '(Mew . mew) toolbar-mail-commands-alist))
-  )
- ((string< "20" emacs-version)
-;  (setq standard-fontset-spec14
-;	"-*-fixed-medium-r-normal-*-14-*-*-*-*-*-fontset-standard")
-;  (create-fontset-from-fontset-spec standard-fontset-spec14 nil 'noerror)
-;  (set-default-font standard-fontset-spec14)
-  (setup-japanese-environment)
-  )
- (t ;; Mule 2.3 or Emacs 19
-  )
- )
-;;;
-;;; Citation tip
-;;;
-(setq mew-cite-fields '("From:" "Subject:" "Date:" "Message-ID:"))
-(setq mew-cite-format "From: %s\nSubject: %s\nDate: %s\nMessage-ID: %s\n\n")
-(setq mew-cite-prefix-function 'mew-cite-prefix-username)
-;(setq mew-cite-fields '("Message-ID:" "From:"))
-;(setq mew-cite-format "Message-ID: %s の記事にて\n%s さんは書かれました :\n\n")
-;; Change citation according to the message body language.
-;(setq mew-cite-fields '("Message-ID:" "From:"))
-;(defadvice mew-draft-cite (before my-add activate)
-;  (save-excursion
-;    (set-buffer (or mew-message-citation-buffer (mew-buffer-message)))
-;    (if (string= (mew-charset-guess-region (point-min) (point-max))
-;                 "us-ascii" )
-;        ;; us-ascii
-;        (setq mew-cite-format "In Message-ID: %s\n%s wrote  :\n\n")
-;      ;; others
-;      (setq mew-cite-format "Message-ID: %s の記事にて\n%s さんは書かれました :\n\n") )))
-;;;
-;;; Signature tip
-;;;
-;; Change signature according to the message body language.
-;(setq mew-signature-file "~/.signature")
-;(make-local-variable 'mew-signature-file)
-;(defadvice mew-draft-insert-signature (before my-add activate)
-;  ;; 本文が英語なら mew-signature-file に ~/.signature.eng を代入する。
-;  ;; 本文が英語以外なら mew-signature-file に ~/.signature を代入する。
-;  ;; ~/.signature.eng に英語用の署名を書いておくこと。
-;  (save-match-data
-;    (let ((eng (string-match "\\.eng$" mew-signature-file)))
-;      (if (string= (mew-charset-guess-region (point-min) (point-max))
-;                   "us-ascii" )
-;          (if (not eng)
-;              (setq mew-signature-file (concat mew-signature-file ".eng")) )
-;        (if eng
-;            (setq mew-signature-file (substring mew-signature-file 0 -4)) )))))
-;
-(setq mew-signature-insert-last t)
-(add-hook 'mew-send-hook 'mew-draft-insert-signature)
-;;;
-;;; Thread tip
-;;;
-;; Now threading is insufficient,but partially makes enough by comment out following line.
-;(setq mew-prog-imls-arg-list '("--thread=yes" "--indent=2"))
-;;;
-;;; Miscellaneous
-;;;
-(setq mew-underline-lines-use t)
-(setq mew-use-highlight-body t)
-;; If you use Wnn4/6,sj3 or Canna, comment out following line.
-;(setq mew-use-overlay-keymap nil)
diff --git a/mail/mew2-emacs20/files/message.sh b/mail/mew2-emacs20/files/message.sh
deleted file mode 100644
index c4941cbfed1b..000000000000
--- a/mail/mew2-emacs20/files/message.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
- 
-case ${EMACS_PORT_NAME} in
-    emacs20)
-	cat <<EOF > ${WRKTMPDIR}/pkg-message
-*************************************************************************
-* You must set at least following elisps to your own dot.emacs file:    *
-*                                                                       *
-*       (autoload 'mew "mew" nil t)                                     *
-*       (autoload 'mew-send "mew" nil t)                                *
-*       (setq mew-mail-domain "domain of e-mail address")               *
-*       (setq mew-pop-server "your POP server")    ;; if not localhost  *
-*       (setq mew-smtp-server "your SMTP server")  ;; if not localhost  *
-*       (setq mew-prog-pgpkey      "fetch")         ;; for PGP use      *
-*       (setq mew-prog-pgpkey-arg  '("-q" "-o" "-"));; for PGP use      *
-*                                                                       *
-*************************************************************************
-EOF
-	;;
-    xemacs21*)
-	cat <<EOF > ${WRKTMPDIR}/pkg-message
-*************************************************************************
-* You must set at least following elisps to your own dot.emacs file:    *
-*                                                                       *
-*       (autoload 'mew "mew" nil t)                                     *
-*       (autoload 'mew-send "mew" nil t)                                *
-*       (setq mew-mail-domain "domain of e-mail address")               *
-*       (setq mew-pop-server "your POP server")    ;; if not localhost  *
-*       (setq mew-smtp-server "your SMTP server")  ;; if not localhost  *
-*       (setq mew-icon-directory "icon directory") ;; if using XEmacs   *
-*       (setq mew-prog-pgpkey      "fetch")         ;; for PGP use      *
-*       (setq mew-prog-pgpkey-arg  '("-q" "-o" "-"));; for PGP use      *
-*                                                                       *
-*************************************************************************
-EOF
-	;;
-esac
diff --git a/mail/mew2-emacs20/files/patch-aa b/mail/mew2-emacs20/files/patch-aa
deleted file mode 100644
index ba398cffa9ea..000000000000
--- a/mail/mew2-emacs20/files/patch-aa
+++ /dev/null
@@ -1,171 +0,0 @@
---- Makefile.orig	Wed Jul 18 08:20:40 2001
-+++ Makefile	Fri Aug  3 22:18:35 2001
-@@ -19,14 +19,14 @@
- ## EDIT THE FOLLOWINGS
- ##
- 
--prefix=/usr/local
-+prefix=${PREFIX}
- infodir=$(prefix)/info
- 
- ##
- ## Compile engines
- ##
- 
--EMACS = emacs
-+EMACS = ${EMACS_CMD}
- #EMACS = xemacs
- #EMACS = mule
- 
-@@ -34,7 +34,7 @@
- ## A directory where mew*.el[c] will be installed.
- ##
- 
--elispdir = $(prefix)/share/emacs/site-lisp/mew
-+elispdir = $(prefix)/${EMACS_LIBDIR}/site-lisp/mew${MEW_MAJOR_VER}
- #elispdir  = $(prefix)/lib/$(EMACS)/site-lisp
- #elispdir = $(prefix)/lib/emacs
- 
-@@ -42,7 +42,10 @@
- ## A directory where etc file will be installed.
- ##
- 
--etcdir = $(prefix)/lib/$(EMACS)/etc/Mew
-+etcdir = $(prefix)/${EMACS_LIBDIR}/etc/mew${MEW_MAJOR_VER}
-+
-+# For XEmacs packages
-+XPKGDIR=	$(prefix)/${EMACS_PACKAGESDIR}
- 
- ################################################################
- ##
-@@ -67,6 +70,8 @@
- 	mew-key.elc     mew-thread.elc  mew-smime.elc	\
- 	mew-theme.elc	mew.elc
- 
-+OBJS_PKG=	 auto-autoloads.elc custom-load.elc
-+
- SRCS =	mew-addrbook.el	mew-attach.el	mew-blvs.el	\
- 	mew-bq.el	mew-cache.el	mew-complete.el	\
- 	mew-config.el	mew-const.el	mew-decode.el	\
-@@ -87,6 +92,8 @@
- 	mew-thread.el	mew-smime.el	mew-theme.el	\
- 	mew.el
- 
-+SRCS_PKG=	auto-autoloads.el custom-load.el
-+
- TEMPFILE = temp.el
- 
- CP = cp
-@@ -103,7 +110,9 @@
- 
- ################################################################
- 
--el: $(TEMPFILE) mew.el
-+el: $(OBJS)
-+
-+$(OBJS): $(TEMPFILE) mew.el
- 	@echo 'Compiling EL files of Mew ... '
- 	@echo 'PLEASE IGNORE WARNINGS IF DISPLAYED. TAKE IT EASY!'
- 	$(EMACS) -batch -q -no-site-file -l ./$(TEMPFILE) -f mew-compile
-@@ -116,11 +125,11 @@
- 	@echo ')))' >> $(TEMPFILE)
- 
- install-el: $(OBJS)
--	-@if [ ! -d $(elispdir) ]; then \
-+	if [ ! -d $(elispdir) ]; then \
- 		$(MKDIR) $(elispdir); \
- 	fi
--	$(CP) $(SRCS) $(elispdir)
--	$(CP) $(OBJS) $(elispdir)
-+	${BSD_INSTALL_DATA} $(SRCS) $(elispdir)
-+	${BSD_INSTALL_DATA} $(OBJS) $(elispdir)
- 
- ################################################################
- 
-@@ -136,7 +145,9 @@
- 	cd info; $(MAKE) info EMACS=$(EMACS)
- 
- install-info:
--	cd info; $(MAKE) install-info infodir=$(infodir)
-+	${MKDIR} $(infodir)
-+	cd info; $(MAKE) install-info infodir=$(infodir) \
-+		XEMACS_VER_OVER20="${XEMACS_VER_OVER20}"
- 
- ################################################################
- 
-@@ -144,15 +155,72 @@
- 	cd info; $(MAKE) jinfo EMACS=$(EMACS)
- 
- install-jinfo:
--	cd info; $(MAKE) install-jinfo infodir=$(infodir)
-+	${MKDIR} $(infodir)
-+	cd info; $(MAKE) install-jinfo infodir=$(infodir) \
-+		XEMACS_VER_OVER20="${XEMACS_VER_OVER20}"
-+
-+install-man:
-+	${MKDIR} ${MANDIR}
-+	cd info; $(MAKE) install-man MANDIR=$(MANDIR)
- 
- ################################################################
- 
- install-etc:
--	-@if [ ! -d $(etcdir) ]; then \
-+	if [ ! -d $(etcdir) ]; then \
- 		$(MKDIR) $(etcdir); \
- 	fi
--	cd etc; $(CP) -r * $(etcdir)/
-+	cd etc; $(CP) -R * $(etcdir)/
-+
-+################################################################
-+
-+package: ${OBJS} ${OBJS_PKG} bin
-+
-+${OBJS_PKG}: ${SRCS_PKG}
-+	${EMACS} -vanilla -batch -eval "(push \"./\" load-path)" -l bytecomp \
-+		-f batch-byte-compile ${.ALLSRC}
-+
-+auto-autoloads.el : ${OBJS} _pkg.el
-+	${EMACS} -vanilla -batch \
-+		-eval "(setq autoload-package-name \"${XEMACS_PKGNAME}\")" \
-+		-l autoload -f batch-update-directory .
-+	${RM} -f auto-autoloads.el~
-+
-+custom-load.el : ${OBJS}
-+	${EMACS} -vanilla -batch -l cus-dep -f Custom-make-dependencies .
-+	if [ ! -f ${.TARGET} ]; then \
-+		touch ${.TARGET}; \
-+	fi
-+
-+_pkg.el:
-+	@echo Creating _pkg.el
-+	@echo ";;;###autoload" 				>  _pkg.el
-+	@echo "(package-provide '${XEMACS_PKGNAME}" 	>> _pkg.el
-+	@echo "		 :version $(XEMACS_PKGVER)"	>> _pkg.el
-+	@echo "		 :type 'regular)" 		>> _pkg.el
-+
-+install-mule-package: install-package
-+	${MAKE} infodir=${XPKGDIR}/info XEMACS_VER_OVER20="yes" install-jinfo
-+	${MAKE} manifest
-+
-+install-package:
-+	${MKDIR} ${XPKGDIR}/pkginfo
-+	${MAKE} install-bin
-+	${MAKE} elispdir=${XPKGDIR}/lisp/mew${MEW_MAJOR_VER} install-el
-+	${BSD_INSTALL_DATA} _pkg.el ${OBJS_PKG} ${SRCS_PKG} \
-+		${XPKGDIR}/lisp/mew${MEW_MAJOR_VER}
-+	${MAKE} infodir=${XPKGDIR}/info XEMACS_VER_OVER20="yes" \
-+						install-info
-+	${MAKE} MANDIR=${XPKGDIR}/man/mew${MEW_MAJOR_VER} install-man
-+	${MAKE} etcdir=${XPKGDIR}/etc/mew${MEW_MAJOR_VER} install-etc
-+	${MAKE} manifest
-+
-+manifest:
-+	(cd ${XPKGDIR}; \
-+		ls -d1 lisp/mew${MEW_MAJOR_VER}/* info/mew${MEW_MAJOR_VER}.* \
-+			man/mew${MEW_MAJOR_VER}/* etc/mew${MEW_MAJOR_VER}/* \
-+			> ${XPKGDIR}/pkginfo/MANIFEST.mew${MEW_MAJOR_VER})
-+	${ECHO} "pkginfo/MANIFEST.mew${MEW_MAJOR_VER}" \
-+		>> ${XPKGDIR}/pkginfo/MANIFEST.mew${MEW_MAJOR_VER}
- 
- ################################################################
- 
diff --git a/mail/mew2-emacs20/files/patch-ab b/mail/mew2-emacs20/files/patch-ab
deleted file mode 100644
index cde8b6340a44..000000000000
--- a/mail/mew2-emacs20/files/patch-ab
+++ /dev/null
@@ -1,28 +0,0 @@
---- bin/Makefile.in.orig	Mon Sep 24 21:40:37 2001
-+++ bin/Makefile.in	Tue Nov 20 10:10:42 2001
-@@ -65,7 +65,7 @@
- 	$(CC) $(COFLAG) $(OBJ1) $(LIBS)
- 	$(RM) $(ALT)
- 	for f in $(ALT); do \
--	  $(LN) $(PRG1) $${f}; done
-+	  $(LN) -sf $(PRG1) $${f}; done
- 
- $(PRG2): $(OBJ2)
- 	$(CC) $(COFLAG) $(CFLAGS) $(OBJ2)
-@@ -88,14 +88,14 @@
- 	fi
- 	$(INSTALL) -m 555 $(PRG1) $(bindir)
- 	for f in $(ALT); do \
--	  $(RM) $(bindir)/$${f}; $(LN) $(bindir)/$(PRG1) $(bindir)/$${f}; done
-+ 	  $(RM) $(bindir)/$${f}; $(LN) -sf $(bindir)/$(PRG1) $(bindir)/$${f}; done
- 	$(INSTALL) -m 555 $(PRG2) $(bindir)
- 	-@if [ ! -d $(mandir) ]; then \
- 		$(MKDIR) $(mandir); \
- 	fi
- 	$(INSTALL) -m 444 $(MAN1) $(mandir)
- 	for f in $(MALT); do \
--	  $(RM) $(mandir)/$${f}; $(LN) $(mandir)/$(MAN1) $(mandir)/$${f}; done
-+ 	  $(RM) $(mandir)/$${f}; $(LN) -sf $(mandir)/$(MAN1) $(mandir)/$${f}; done
- 	$(INSTALL) -m 444 $(MAN2) $(mandir)
- 
- ##
diff --git a/mail/mew2-emacs20/files/patch-ac b/mail/mew2-emacs20/files/patch-ac
deleted file mode 100644
index 1b3351685988..000000000000
--- a/mail/mew2-emacs20/files/patch-ac
+++ /dev/null
@@ -1,95 +0,0 @@
---- info/Makefile.orig	Fri Aug 17 21:26:00 2001
-+++ info/Makefile	Tue Nov 20 10:18:58 2001
-@@ -28,9 +28,9 @@
- #INSTALLINFO_OPTIONS = --section Emacs Emacs
- #INSTALLINFO_JOPTIONS =
- #infodir = 
--INSTALLINFO_ARGS  = mew.info $(infodir)/dir
-+INSTALLINFO_ARGS  = mew${MEW_MAJOR_VER}.info $(infodir)/dir
- #INSTALLINFO_ARGS  = mew.info 
--INSTALLINFO_JARGS = mew.jis.info $(infodir)/dir
-+INSTALLINFO_JARGS = mew${MEW_MAJOR_VER}.jis.info $(infodir)/dir
- 
- 
- RM = rm -f
-@@ -44,50 +44,60 @@
- ## DO NOT EDIT THE FOLLOWINGS
- ##
- 
--INFO  = mew.info mew.info-1 mew.info-2 mew.info-3
--JINFO = mew.jis.info mew.jis.info-1 mew.jis.info-2 mew.jis.info-3
-+INFO  = mew${MEW_MAJOR_VER}.info mew${MEW_MAJOR_VER}.info-1 mew${MEW_MAJOR_VER}.info-2 mew${MEW_MAJOR_VER}.info-3
-+JINFO = mew${MEW_MAJOR_VER}.jis.info mew${MEW_MAJOR_VER}.jis.info-1 mew${MEW_MAJOR_VER}.jis.info-2
-+MANUALS= 00readme mew.texi
- 
- all: info
- info:
--	sed -e 's/@setfilename mew.jis.info/@setfilename mew.info/' \
-+	sed -e "s/@setfilename mew${MEW_MAJOR_VER}\.jis\.info/@setfilename mew${MEW_MAJOR_VER}\.info/" \
- 	    -e 's/@set jp/@set us/' mew.texi > tmp.texi
- 	mv tmp.texi mew.texi
--	$(RM) mew.info*
--	$(TOUCH) mew.info
-+	$(RM) mew${MEW_MAJOR_VER}.info*
-+	$(TOUCH) mew${MEW_MAJOR_VER}.info
- 	$(EMACS) -batch -q -no-site-file -l texinfmt \
- 		-f batch-texinfo-format mew.texi
- 
- jinfo:
--	sed -e 's/@setfilename mew.info/@setfilename mew.jis.info/' \
-+	sed -e "s/@setfilename mew${MEW_MAJOR_VER}\.info/@setfilename mew${MEW_MAJOR_VER}\.jis.info/" \
- 	    -e 's/@set us/@set jp/' mew.texi > tmp.texi
- 	mv tmp.texi mew.texi
--	$(RM) mew.jis.info*
--	$(TOUCH) mew.jis.info
-+	$(RM) mew${MEW_MAJOR_VER}.jis.info*
-+	$(TOUCH) mew${MEW_MAJOR_VER}.jis.info
- 	$(EMACS) -batch -q -no-site-file -l texinfmt \
- 		-f batch-texinfo-format mew.texi
- 
- install: install-info
- install-info:
--	-@if [ ! -d $(infodir) ]; then \
-+	-if [ ! -d $(infodir) ]; then \
- 		$(MKDIR) $(infodir); \
- 	fi; \
--	cp $(INFO) $(infodir)
--	-@if [ -x "$(INSTALLINFO)" ]; then \
--		$(INSTALLINFO) $(INSTALLINFO_OPTIONS) $(INSTALLINFO_ARGS); \
--	else \
--		echo "Don't forget to edit $(infodir)/dir for Mew."; \
-+	${BSD_INSTALL_DATA} $(INFO) $(infodir)/
-+	-if [ -z "${XEMACS_VER_OVER20}" ]; then \
-+		if [ -x "$(INSTALLINFO)" ]; then \
-+			$(INSTALLINFO) $(INSTALLINFO_OPTIONS) $(INSTALLINFO_ARGS); \
-+		else \
-+			echo "Don't forget to edit $(infodir)/dir for Mew."; \
-+		fi; \
- 	fi
- 
- install-jinfo:
--	-@if [ ! -d $(infodir) ]; then \
-+	-if [ ! -d $(infodir) ]; then \
- 		$(MKDIR) $(infodir); \
- 	fi; \
--	cp $(JINFO) $(infodir)
--	-@if [ -x "$(INSTALLINFO)" ]; then \
--		$(INSTALLINFO) $(INSTALLINFO_JOPTIONS) $(INSTALLINFO_JARGS); \
--	else \
--		echo "Don't forget to edit $(infodir)/dir for Mew."; \
-+	${BSD_INSTALL_DATA} $(JINFO) $(infodir)/
-+	-if [ -z "${XEMACS_VER_OVER20}" ]; then \
-+		if [ -x "$(INSTALLINFO)" ]; then \
-+			$(INSTALLINFO) $(INSTALLINFO_JOPTIONS) $(INSTALLINFO_JARGS); \
-+		else \
-+			echo "Don't forget to edit $(infodir)/dir for Mew."; \
-+		fi; \
- 	fi
-+
-+install-man:
-+	${MKDIR} ${MANDIR}
-+	${BSD_INSTALL_DATA} ${MANUALS} ${MANDIR}
-+
- ##
- ## End of Makefile
- ##
diff --git a/mail/mew2-emacs20/files/patch-ad b/mail/mew2-emacs20/files/patch-ad
deleted file mode 100644
index 933ef45d9e73..000000000000
--- a/mail/mew2-emacs20/files/patch-ad
+++ /dev/null
@@ -1,27 +0,0 @@
---- info/mew.texi~	Thu Aug  2 22:31:28 2001
-+++ info/mew.texi	Fri Aug  3 11:01:40 2001
-@@ -1,6 +1,6 @@
- \input texinfo  @c -*-texinfo-*-
- @c %**start of header
--@setfilename mew.jis.info
-+@setfilename mew%%MEW_MAJOR_VER%%.jis.info
- @settitle Mew (Messaging in the Emacs World)
- @c %**end of header
- 
-@@ -41,14 +41,14 @@
- @ifset jp
- @dircategory Message User Agent
- @direntry
--* Mew-J: (mew.jis.info).     Messaging in the Emacs World.
-+* Mew-J: (mew%%MEW_MAJOR_VER%%.jis.info).     Messaging in the Emacs World.
- @end direntry
- @end ifset
- 
- @ifset us
- @dircategory Message User Agent
- @direntry
--* Mew: (mew.info).           Messaging in the Emacs World.
-+* Mew: (mew%%MEW_MAJOR_VER%%.info).           Messaging in the Emacs World.
- @end direntry
- @end ifset
- 
diff --git a/mail/mew2-emacs20/files/patch-ae b/mail/mew2-emacs20/files/patch-ae
deleted file mode 100644
index d1647a30fb9c..000000000000
--- a/mail/mew2-emacs20/files/patch-ae
+++ /dev/null
@@ -1,11 +0,0 @@
---- mew-key.el~	Wed Jul 18 08:19:11 2001
-+++ mew-key.el	Fri Aug  3 11:30:10 2001
-@@ -507,7 +507,7 @@
- ;;;
- 
- (defvar mew-icon-directory (if (fboundp 'locate-data-directory)
--			       (locate-data-directory "mew") nil))
-+			       (locate-data-directory "mew%%MEW_MAJOR_VER%%") nil))
- 
- (defvar mew-icon-separate nil)
- (defvar mew-icon-blank nil)
diff --git a/mail/mew2-emacs20/files/patch-af b/mail/mew2-emacs20/files/patch-af
deleted file mode 100644
index 7bb77f4ae56e..000000000000
--- a/mail/mew2-emacs20/files/patch-af
+++ /dev/null
@@ -1,55 +0,0 @@
---- bin/mewls.c.orig	Sat Sep  8 11:07:12 2001
-+++ bin/mewls.c	Tue Nov 20 10:26:04 2001
-@@ -124,8 +124,8 @@
- private void init_fields(char *);
- private void print_field(char *, int, char *, char *);
- private void init_search(char *, int);
--private char *strcasechr(char *, int);
--private char *strcasestr(char *, char *);
-+private char *mystrcasechr(char *, int);
-+private char *mystrcasestr(char *, char *);
- private int  print_for_scan(FILE *, char *, char *);
- private int  print_for_sort(FILE *, char *, char *);
- private int  print_for_pick(FILE *, char *, char *);
-@@ -473,7 +473,7 @@
- }
- 
- private char *
--strcasechr(char *s, int c)
-+mystrcasechr(char *s, int c)
- {
- 	int lc = tolower(c);
- 	int uc = toupper(c);
-@@ -486,12 +486,12 @@
- }
- 
- private char *
--strcasestr(char *s1, char *s2)
-+mystrcasestr(char *s1, char *s2)
- {
- 	char *p;
- 	unsigned int len = strlen(s2);
- 
--	for (p = s1; (p = strcasechr(p, *s2)) != NULL; p++)
-+	for (p = s1; (p = mystrcasechr(p, *s2)) != NULL; p++)
- 		if (strncasecmp(p, s2, len) == 0)
- 			return p;
- 	return NULL;
-@@ -513,7 +513,7 @@
- 				return TRUE;
- 			}
- 		} else {
--			if (strcasestr(p, value) != NULL) {
-+			if (mystrcasestr(p, value) != NULL) {
- 				*end = tmp;
- 				return TRUE;
- 			}
-@@ -540,7 +540,7 @@
- 					return TRUE;
- 				}
- 			} else {
--				if (strcasestr(beg, value) != NULL) {
-+				if (mystrcasestr(beg, value) != NULL) {
- 					*end = tmp;
- 					return TRUE;
- 				}
diff --git a/mail/mew2-emacs20/files/pkg-descr.tmpl b/mail/mew2-emacs20/files/pkg-descr.tmpl
deleted file mode 100644
index 60fa7d3f4f6e..000000000000
--- a/mail/mew2-emacs20/files/pkg-descr.tmpl
+++ /dev/null
@@ -1,19 +0,0 @@
-Mew is a "Message interface to Emacs Window" to integrate
-
-   - Email
-   - MIME(Multipurpose Internet Mail Extensions)
-   - PGP(Pretty Good Privacy)
-
-and to make it easy to view and compose them. With Mew you can send a
-picture of a birthday cake with the song "Happy Birthday to you" to your
-friend, which is encrypted by strong cryptograph.
-
-This port is the Mew%%MEW_MAJOR_VER%%(Mew with version %%MEW_MAJOR_VER%%) for %%EMACS_CMD%%(%%EMACS_PORTSDIR%%). 
-The Mew%%MEW_MAJOR_VER%% port and corresponding Emacs port are listed bellow and elisp
-`site-lisp' directory(elisp load path), info path and etc directory(only
-effective for xemacs ports) are shown as well. 
-
-mail/%%PORTNAME%%%%MEW_MAJOR_VER%%-%%EMACS_PORT_NAME%%(%%PKGNAME%%) ===> %%EMACS_PORTSDIR%%(%%EMACS_CMD%%) 
-	Lisp directory : %%ELISPDIR%%
-	Info directory : %%INFODIR%%
-	ETC directory  : %%ETCDIR%%
diff --git a/mail/mew2-emacs20/files/tmpl2file.sh b/mail/mew2-emacs20/files/tmpl2file.sh
deleted file mode 100644
index d8e1a662ca53..000000000000
--- a/mail/mew2-emacs20/files/tmpl2file.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-for f in ${TMPL_FILES}; do
-	sed \
-		-e "s,%%EMACS_CMD%%,${EMACS_CMD},g" \
-		-e "s,%%EMACS_PORTSDIR%%,${EMACS_PORTSDIR},g" \
-		-e "s,%%PKGNAME%%,${PKGNAME},g" \
-		-e "s,%%EMACS_PORT_NAME%%,${EMACS_PORT_NAME},g" \
-		-e "s,%%MEW_MAJOR_VER%%,${MEW_MAJOR_VER},g" \
-		-e "s,%%PORTNAME%%,${PORTNAME},g" \
-		-e "s,%%ELISPDIR%%,${ELISPDIR},g" \
-		-e "s,%%INFODIR%%,${INFODIR},g" \
-		-e "s,%%ETCDIR%%,${ETCDIR},g" \
-		< ${FILESDIR}/${f}.tmpl > ${WRKTMPDIR}/${f}
-done
diff --git a/mail/mew2-emacs20/files/user-install.in b/mail/mew2-emacs20/files/user-install.in
deleted file mode 100644
index ee1a7ad4d9f4..000000000000
--- a/mail/mew2-emacs20/files/user-install.in
+++ /dev/null
@@ -1,374 +0,0 @@
-#!/bin/sh
-
-PREFIX=%%PREFIX%%
-EMACSDIR=%%EMACSDIR%%
-ELISPDIR=%%ELISPDIR%%
-SAMPLEDIR=%%SAMPLEDIR%%
-
-AWK=%%AWK%%
-CAT=%%CAT%%
-CP=%%CP%%
-ECHO=%%ECHO%%
-MKDIR="%%MKDIR%%"
-RM=%%RM%%
-SED=%%SED%%
-TOUCH=%%TOUCH%%
-DIALOG=/usr/bin/dialog
-
-select()
-{
-	local Language key
-	Language="\
-Choose a language when you write mails.\n\
-    (Now is \"${language}\" selected.)"
-	${DIALOG} --title "Choose the Language" \
-	--hline "Select Items and Quit when finished" \
-	--menu "${Language}" -1 -1 2 \
-	English		"English" \
-	Japanese	"japanese" \
-		2>	/tmp/menu.$$
-	retval=$?
-	key=`${CAT} /tmp/menu.$$|${SED} -e 's/\"//g'`
-	${RM} -f /tmp/menu.$$
-	case $retval in
-		0) if [ -z ${key} ]; then return; fi ;;
-		1) return ;;
-		255) return ;;
-	esac
-	language=${key}
-#	echo citation:key=${key},dot_emacs=${dot_emacs}>>/tmp/temp
-}
-
-input_data()
-# argument No.1 ($1) : Key words (string)
-# argument No.2 ($2) : Variable for the Key words (string)
-# argument No.3 ($3) : unit for the variable (string)
-{
-	local key
-#	echo '$1='$1
-#	echo '$2='$2
-#	echo '$3='$3
-#	exit 1
-#	echo '${nameserver}='${mail_address}
-#	eval echo '${'$2'}'
-	eval key='${'$2'}'
-#	echo key=${key}
-#	exit 1
-	if [ ! -z ${key} ]; then
-		${DIALOG} --title "Confirm $1" \
-		--hline "Press Yes/No" \
-		--yesno "$1 $3 has set \"${key}\". Is this OK?" -1 -1
-		retval=$?
-		if [ X"${retval}" = "X0" -o X"${retval}" = "X255" ]; then  return; fi
-	fi
-	${DIALOG} --title "Set $1 $3" \
-	--hline "Write $1 $3" \
-	--inputbox "Specify $1 $3" -1 -1 \
-		2>  /tmp/input.$$
-	eval $2=`${CAT} /tmp/input.$$`
-	${RM} -f /tmp/input.$$
-}
-
-options()
-{
-	local Options keys del_keys
-	Options="\
-Please select Mew functions that you want to. To select a function, \n\
-use the arrow keys to move to it and press [SPACE]. To de-select it, \n\
-press [SPACE] again.  Select OK or Cancel to leave this menu."
-	del_keys="Highlight Citation Cite_Change Sign_Change"
-	${DIALOG} --title "Select Mew functions" \
-	--hline "" \
-	--checklist "${Options}" -1 -1 4 \
-	Highlight	"highlight body for Mew(Japanese)" ${options_Highlight} \
-	Citation	"Citation with the mail." ${options_Citation} \
-	Cite_Change	"Change citation English <--> Japanese." ${options_Cite_Change} \
-	Sign_Change	"Change signature English <--> Japanese." ${options_Sign_Change} \
-		2> /tmp/checklist.$$
-	retval=$?
-	keys=`${CAT} /tmp/checklist.$$|${SED} -e 's/\"//g'`
-	${RM} -f /tmp/checklist.$$
-	case $retval in
-		1)   return ;;
-		255) return ;;
-	esac
-	dot_emacs=""
-#	echo keys=$keys
-	for k in ${keys}; do
-		del_keys=`${ECHO} ${del_keys}|${SED} -e "s/ *${k}//g"`
-#		echo del_keys=${del_keys}
-#		echo k=$k
-		case ${k} in
-		Highlight)
-			dot_emacs="${dot_emacs} dot.emacs-highlight-body.el"
-			options_Highlight=ON
-			;;
-		Citation)
-			citation
-#			echo options:key=${k},dot_emacs=${dot_emacs}>>/tmp/temp
-			options_Citation=ON
-			;;
-		Cite_Change)
-			dot_emacs="${dot_emacs} dot.emacs-cite-change.el"
-			options_Cite_Change=ON
-			;;
-		Sign_Change)
-			dot_emacs="${dot_emacs} dot.emacs-signature-change.el"
-			options_Sign_Change=ON
-			;;
-		esac
-	done
-#	exit 1
-	for k in ${del_keys}; do
-#		echo k=$k
-		case ${k} in
-		Highlight)
-			dot_emacs=`${ECHO} ${dot_emacs}|${SED} -e "s/ *dot\.emacs-highlight-body\.el//"`
-			options_Highlight=OFF
-			;;
-		Citation)
-			options_Citation=OFF
-			;;
-		Cite_Change)
-			dot_emacs=`${ECHO} ${dot_emacs}|${SED} -e "s/ *dot\.emacs-cite-change\.el//"`
-			options_Cite_Change=OFF
-			;;
-		Sign_Change)
-			dot_emacs=`${ECHO} ${dot_emacs}|${SED} -e "s/ *dot\.emacs-signature-change\.el//"`
-			options_Sign_Change=OFF
-			;;
-		esac
-	done
-#	echo dot_emacs=${dot_emacs}
-#	echo del_keys=${del_keys}
-#	exit 1
-}
-
-citation()
-{
-	dot_emacs=`${ECHO} ${dot_emacs}|${SED} -e "s/ *dot\.emacs-cite.[a-z]*//g"`
-	case ${language} in
-	English)
-		dot_emacs="${dot_emacs} dot.emacs-cite.el"
-		;;
-	Japanese)
-		dot_emacs="${dot_emacs} dot.emacs-cite.ja.el"
-		;;
-	esac
-#	echo citation:key=${key},dot_emacs=${dot_emacs}>>/tmp/temp
-}
-
-case ${TERM} in
-emacs)
-	${ECHO} "Here is \"Emacs\" shell. Try on other terminal."
-	exit 1
-	;;
-esac
-
-version="%%VERSION%%"
-#version="1.92"
-
-SEDCMD='${SED}
-	-e "s,%%prefix%%,${PREFIX},g"
-	-e "s,%%emacsdir%%,${EMACSDIR},g"
-	-e "s,%%elispdir%%,${ELISPDIR},g"
-	-e "s,%%version%%,${version},g"
-	-e "s,%%nameserver%%,${nameserver},g"
-	-e "s,%%mail_address%%,${mail_address},g"
-	-e "s,%%domain_name%%,${domain_name},g"
-	-e "s,%%default_domain_name%%,${default_domain_name},g"
-	-e "s,%%signature%%,${signature},g"'
-
-###
-# Check ~/.backup directory exist.
-#
-${MKDIR} ${HOME}/.backup
-
-###
-# Backup all files.
-#
-${CP} ${HOME}/${dot_emacs_file} ${HOME}/.backup/${dot_emacs_file}.$$
-${CP} ${HOME}/.im/Config ${HOME}/.backup/Config.$$
-
-###
-# Check ~/.im/Config file exist.
-#
-if [ ! -f ${HOME}/.im/Config ]; then
-	${ECHO} "${HOME}/.im/Config: Not found. Do imsetup first."
-	exit 1
-else
-	mail_address=`${AWK} '/^Address=/{sub(/^Address=/,"");print}' ${HOME}/.im/Config`
-	domain_name=`${AWK} '/^FromDomain=/{sub(/^FromDomain=/,"");print}' ${HOME}/.im/Config`
-	default_domain_name=`${AWK} '/^ToDomain=/{sub(/^ToDomain=/,"");print}' ${HOME}/.im/Config`
-	if [ X"${mail_address}" = "X%%mail_address%%" ]; then
-		mail_address=""
-	else
-		${CP} ${HOME}/.im/Config ${HOME}/.backup/Config
-		${SED} -e 's/^\(Address=\).*$/\1%%mail_address%%/' \
-			< ${HOME}/.backup/Config > ${HOME}/.im/Config
-	fi
-	if [ X"${domain_name}" = "X%%domain_name%%" ]; then
-		domain_name=""
-	else
-		${CP} ${HOME}/.im/Config ${HOME}/.backup/Config
-		${SED} -e 's/^\(FromDomain=\).*$/\1%%domain_name%%/' \
-			< ${HOME}/.backup/Config > ${HOME}/.im/Config
-	fi
-	if [ X"${default_domain_name}" = "X%%default_domain_name%%" ]; then
-		default_domain_name=""
-	else
-		${CP} ${HOME}/.im/Config ${HOME}/.backup/Config
-		${SED} -e 's/^\(ToDomain=\).*$/\1%%default_domain_name%%/' \
-			< ${HOME}/.backup/Config > ${HOME}/.im/Config
-	fi
-fi
-
-###
-# Copy "aliases" if none
-#
-if [ ! -f ${HOME}/.im/Aliases ]; then	
-	${CP} ${SAMPLEDIR}/Aliases ${HOME}/.im
-fi
-
-###
-# Set user environment : nameserver, signature
-#
-options_Highlight=OFF
-options_Citation=OFF
-options_Cite_Change=OFF
-options_Sign_Change=OFF
-language=English
-dot_emacs_file=.emacs
-
-PreSet="\
-This is the main menu of the Mew configuration pre-settings. Please \n\
-select one of the options below by using the arrow keys or typing the \n\
-first character of the option name you intend to set. Invoke an option \n\
-by pressing [ENTER] or [TAB-ENTER] to exit the settings."
-
-answer=None
-while [ ! X"${answer}" = "XQuit" ]; do
-	${DIALOG} --title "Pre-set Mew configurations" \
-	--hline "To select an item press [Enter] on the item" \
-	--menu "${PreSet}" -1 -1 3 \
-	Language	"Determine language in use on Mew" \
-	DotEmacs	"Choose dot.emacs files being to use" \
-	Quit		"Quit this menu" \
-		2>	/tmp/menu.$$
-	retval=$?
-	answer=`${CAT} /tmp/menu.$$|${SED} -e 's/\"//g'`
-	${RM} -f /tmp/menu.$$
-	case $retval in
-		0) if [ -z ${answer} ]; then ${ECHO} "Nothing selected"; contiue; fi ;;
-		1) break ;;
-		255) break ;;
-	esac
-	case ${answer} in
-		Language)
-			select
-			;;
-		DotEmacs)
-			input_data "Emacs dot.emacs file name" "dot_emacs_file" ""
-			;;
-		Quit)
-			answer=Quit
-			;;
-	esac
-done
-
-#echo language=${language}
-#echo dot_emacs_file=${dot_emacs_file}
-#exit 1
-
-MainMenu="\
-This is the main menu of the Mew configuration settings. Please select \n\
-one of the options below by using the arrow keys or typing the first \n\
-character of the option name you intend to set. Invoke an option by \n\
-pressing [ENTER] or [TAB-ENTER] to exit the settings."
-
-answer=None
-while [ ! X"${answer}" = "XQuit" ]; do
-	${DIALOG} --title "Set Mew configurations" \
-	--hline "Select Items and Quit when finished" \
-	--menu "${MainMenu}" -1 -1 6 \
-	NameServer	"Name server Domain name" \
-	MailAddress	"Your mail address (with FQDN)" \
-	DomainName	"Your domain name" \
-	DefaultDomain	"Default domain name in abbrivation" \
-	Options		"Various options on using Mew" \
-	Quit		"Quit this menu" \
-		2>	/tmp/menu.$$
-	retval=$?
-	answer=`${CAT} /tmp/menu.$$`
-	${RM} -f /tmp/menu.$$
-	case $retval in
-		0)	if [ -z ${answer} ]; then
-				${ECHO} "Nothing selected"
-				exit 1
-			fi
-			;;
-		1)	${ECHO} "Cancel pressed."
-			exit 1
-			;;
-		255)	${ECHO} "ESC pressed."
-			exit 1
-			;;
-	esac
-	case ${answer} in
-		NameServer)
-			input_data "Name Server" "nameserver" ""
-			;;
-		MailAddress)
-			input_data "Mail Address" "mail_address" ""
-			;;
-		DomainName)
-			input_data "Domain Name" "domain_name" ""
-			;;
-		DefaultDomain)
-			input_data "Default Domain Name" "default_domain_name" ""
-			;;
-		Options)
-#			options
-			;;
-		Quit)
-			answer=Quit
-			;;
-	esac
-done
-
-#echo 'nameserver='${nameserver}
-#echo 'mail_address='${mail_address}
-#echo 'domain_name='${domain_name}
-#echo 'defaut_domain_name='${default_domain_name}
-
-#exit 1
-
-###
-# Custumize startup files with selected options.
-#
-dot_emacs="dot.emacs.el ${dot_emacs}"
-eval ${SEDCMD} < ${HOME}/.im/Config > ${HOME}/.backup/Config
-
-###
-# Add Mew startup setting to ~/.emacs
-#
-if [ -f ${dot_emacs_file} ]; then
-    ${SED} -e '/^;;;* Mew ;*$/,/^;;; *Mew end$/d' < ${HOME}/${dot_emacs_file} \
-	> ${HOME}/.backup/${dot_emacs_file}
-else
-    ${ECHO} "Create new \"dot.emacs\" file: ${dot_emacs_file}"
-fi
-
-#echo 'dot_emacs='${dot_emacs}
-for f in ${dot_emacs}; do
-	${CAT} ${SAMPLEDIR}/dot.emacs/${f} |\
-		eval ${SEDCMD} >> ${HOME}/.backup/${dot_emacs_file}
-done
-${ECHO} ";;;                                                       Mew end" \
-	>> ${HOME}/.backup/${dot_emacs_file}
-${CP} ${HOME}/.backup/${dot_emacs_file} ${HOME}/${dot_emacs_file}
-
-###
-# Copy im Config file  to ~/.im
-#
-${CP} ${HOME}/.backup/Config ${HOME}/.im/Config
diff --git a/mail/mew2-xemacs21-mule/Makefile b/mail/mew2-xemacs21-mule/Makefile
index 7a5016ca440b..4ef2c12d9af9 100644
--- a/mail/mew2-xemacs21-mule/Makefile
+++ b/mail/mew2-xemacs21-mule/Makefile
@@ -11,7 +11,7 @@ MAINTAINER=	kiri@FreeBSD.org
 MEW_MAJOR_VER=	2
 
 # This is a slave port.
-MASTERDIR=	${.CURDIR}/../mew${MEW_MAJOR_VER}-emacs20
+MASTERDIR=	${.CURDIR}/../mew${MEW_MAJOR_VER}
 
 # Set emacs port
 EMACS_PORT_NAME=	xemacs21-mule
diff --git a/mail/mew2-xemacs21/Makefile b/mail/mew2-xemacs21/Makefile
index f66b28d4668e..2b4d0461f36a 100644
--- a/mail/mew2-xemacs21/Makefile
+++ b/mail/mew2-xemacs21/Makefile
@@ -11,7 +11,7 @@ MAINTAINER=	kiri@FreeBSD.org
 MEW_MAJOR_VER=	2
 
 # This is a slave port.
-MASTERDIR=	${.CURDIR}/../mew${MEW_MAJOR_VER}-emacs20
+MASTERDIR=	${.CURDIR}/../mew${MEW_MAJOR_VER}
 
 # set emacs port
 EMACS_PORT_NAME=	xemacs21
diff --git a/mail/mew2/Makefile b/mail/mew2/Makefile
index b4a133c20a63..bd2ca7ea3946 100644
--- a/mail/mew2/Makefile
+++ b/mail/mew2/Makefile
@@ -25,7 +25,7 @@ MEW_VER=	${MEW_MAJOR_VER}.1
 MEW_DOCDIR?=	share/doc/${PORTNAME}${MEW_MAJOR_VER}
 
 # emacs port setup
-EMACS_PORT_NAME?=	emacs20
+EMACS_PORT_NAME?=	emacs21
 
 # target name for make build and install
 ALL_TARGET?=	all info jinfo
diff --git a/mail/mew2/pkg-comment b/mail/mew2/pkg-comment
index 716e8e2868af..a31b49d89530 100644
--- a/mail/mew2/pkg-comment
+++ b/mail/mew2/pkg-comment
@@ -1 +1 @@
-Message interface to Emacs Window (version 2) for emacs20
+Message interface to Emacs Window (version 2) for emacs21
diff --git a/mail/mew2/pkg-descr b/mail/mew2/pkg-descr
index eb6791574b91..a1ee92480f9b 100644
--- a/mail/mew2/pkg-descr
+++ b/mail/mew2/pkg-descr
@@ -8,12 +8,12 @@ and to make it easy to view and compose them. With Mew you can send a
 picture of a birthday cake with the song "Happy Birthday to you" to your
 friend, which is encrypted by strong cryptograph.
 
-This port is the Mew2(Mew with version 2) for emacs-20.7(editors/emacs20). 
+This port is the Mew2(Mew with version 2) for emacs-21.x (editors/emacs21). 
 The Mew2 port and corresponding Emacs port are listed bellow and elisp
 `site-lisp' directory(elisp load path), info path and etc directory(only
 effective for xemacs ports) are shown as well. 
 
-mail/mew2-emacs20(mew-emacs20-2.0) ===> editors/emacs20(emacs-20.7) 
+mail/mew2 (mew-emacs21-2.x) ===> editors/emacs21 (emacs-21.x) 
 	Lisp directory : /usr/local/share/emacs/site-lisp/mew
 	Info directory : /usr/local/info
 	ETC directory  : /usr/local/share/emacs/etc/mew
diff --git a/mail/mew3-emacs20/Makefile b/mail/mew3-emacs20/Makefile
index b4a133c20a63..8f361c433798 100644
--- a/mail/mew3-emacs20/Makefile
+++ b/mail/mew3-emacs20/Makefile
@@ -1,108 +1,22 @@
-# New ports collection makefile for: Mew
+# New ports collection makefile for: Mew (for xemacs21)
 # Date created:		21 November 1997
 # Whom:			Kiriyama Kazuhiko <kiri@kiri.toba-cmt.ac.jp>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	mew
-PORTVERSION=	${MEW_VER}
-CATEGORIES=	mail elisp
-MASTER_SITES=	ftp://ftp.mew.org/pub/Mew/ \
-		ftp://ftp.kyushu-u.ac.jp/pub/Misc/mew/ \
-		${MASTER_SITE_PORTS_JP}
-PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
-
 MAINTAINER?=	kiri@FreeBSD.org
 
 # Mew major version
 MEW_MAJOR_VER?=	2
 
-# distfile version
-MEW_VER=	${MEW_MAJOR_VER}.1
-
-# document install directory by install-doc target
-MEW_DOCDIR?=	share/doc/${PORTNAME}${MEW_MAJOR_VER}
-
-# emacs port setup
-EMACS_PORT_NAME?=	emacs20
-
-# target name for make build and install
-ALL_TARGET?=	all info jinfo
-INSTALL_TARGET?=	install install-info install-jinfo install-etc
-
-# environments
-MAKE_ENV+=	EMACS_LIBDIR=${EMACS_LIBDIR} MEW_MAJOR_VER=${MEW_MAJOR_VER}
-PLIST_SUB+=	MEW_MAJOR_VER=${MEW_MAJOR_VER}
+# This is a slave port.
+MASTERDIR=	${.CURDIR}/../mew${MEW_MAJOR_VER}
 
-# manuals
-MAN1=		mewcat.1 mewdecode.1 mewencode.1 mewls.1
+# use pkg-* files in ${.CURDIR}
+PKGDIR=		${.CURDIR}
 
-post-patch:
-	for f in mew-key.el info/mew.texi; do \
-		${PERL} -i -pe 's,%%MEW_MAJOR_VER%%,${MEW_MAJOR_VER},g' ${WRKSRC}/$${f}; \
-	done
-
-post-install:
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/${MEW_DOCDIR}
-	(cd ${WRKSRC} ; \
-		${INSTALL_DATA} 00* ${PREFIX}/${MEW_DOCDIR}/ ; \
-		for dir in contrib; do \
-			${CP} -R $${dir} ${PREFIX}/${MEW_DOCDIR}/ ; \
-		done)
-	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/${MEW_DOCDIR}
-.endif
-
-############################################################
-## Make DESCR,COMMENT and PLIST (only for MAINTAINER use)
-############################################################
-#COMMENT_TEXT=	'Message interface to Emacs Window (version ${MEW_MAJOR_VER}) for ${EMACS_PORT_NAME}'
-#.if ${EMACS_PORT_NAME} == "xemacs21" || ${EMACS_PORT_NAME} == "xemacs21-mule"
-#ELISPDIR=	${PREFIX}/${EMACS_PACKAGESDIR}/lisp/${PORTNAME}${MEW_MAJOR_VER}
-#INFODIR=	${PREFIX}/${EMACS_PACKAGESDIR}/info
-#ETCDIR=		${PREFIX}/${EMACS_PACKAGESDIR}/etc/${PORTNAME}${MEW_MAJOR_VER}
-#.else
-#ELISPDIR=	${PREFIX}/${EMACS_SITE_LISPDIR}/${PORTNAME}${MEW_MAJOR_VER}
-#INFODIR=	${PREFIX}/info
-#ETCDIR=		${PREFIX}/${EMACS_LIBDIR}/etc/${PORTNAME}${MEW_MAJOR_VER}
-#.endif
-#SCRIPTS_ENV+=	EMACS_PORTSDIR=${EMACS_PORTSDIR:S,^${PORTSDIR}/,,} \
-#		PKGNAME=${PKGNAME} ELISPDIR=${ELISPDIR} INFODIR=${INFODIR} \
-#		ETCDIR=${ETCDIR} EMACS_CMD=${EMACS_CMD:S,${PREFIX}/bin/,,} \
-#		PORTNAME=${PORTNAME} EMACS_PORT_NAME=${EMACS_PORT_NAME}
-#
-#pre-plist:
-#	mkdir -p ${ELISPDIR} ${INFODIR} ${ETCDIR} \
-#		${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp
-#
-#pre-arrange:
-#	${ECHO} ${COMMENT_TEXT} > ${PKGDIR}/pkg-comment
-#	${SETENV} ${SCRIPTS_ENV} WRKTMPDIR=${PKGDIR} TMPL_FILES=pkg-descr \
-#		MEW_MAJOR_VER=${MEW_MAJOR_VER} \
-#		${SH} ${FILESDIR}/tmpl2file.sh
-#	${SETENV} EMACS_PORT_NAME=${EMACS_PORT_NAME} WRKTMPDIR=${PKGDIR} \
-#		${SH} ${FILESDIR}/message.sh
-#	${CHOWN} kiri:staff ${PKGDIR}/pkg-comment ${PKGDIR}/pkg-descr ${PKGDIR}/pkg-message
-#
-#arrange:
-#.if ${EMACS_PORT_NAME} == "xemacs21" || ${EMACS_PORT_NAME} == "xemacs21-mule"
-#	${MAKE} PLIST_SUB_EXCLS="${PLIST_SUB_EXCLS}" \
-#		DIRRM2RMDIRS="${ETCDIR:S,^${PREFIX}/,,:S,/${PORTNAME}${MEW_MAJOR_VER}$,,} \
-#			${ELISPDIR:S,^${PREFIX}/,,:S,/${PORTNAME}${MEW_MAJOR_VER}$,,} \
-#			${EMACS_PACKAGESDIR} ${EMACS_PACKAGESDIR}/lisp \
-#			${EMACS_PACKAGESDIR}/info ${EMACS_PACKAGESDIR}/etc \
-#			${EMACS_PACKAGESDIR}/man ${EMACS_PACKAGESDIR}/pkginfo" \
-#		DIRRMDEPTH=2 plist
-#.else
-#	${MAKE} PLIST_SUB_EXCLS="${PLIST_SUB_EXCLS}" \
-#		DIRRM2RMDIRS="${ETCDIR:S,^${PREFIX}/,,:S,/${PORTNAME}${MEW_MAJOR_VER}$,,} \
-#			${ELISPDIR:S,^${PREFIX}/,,:S,/${PORTNAME}${MEW_MAJOR_VER}$,,} \
-#			${EMACS_LIBDIR}/${EMACS_VER}/site-lisp \
-#			${EMACS_LIBDIR}/${EMACS_VER}" \
-#		INFOFILES="mew.info mew.jis.info" DIRRMDEPTH=2 plist
-#.endif
-#	${INSTALL} -c -m 644 -o kiri -g staff ${WRKPLIST} ${PLIST}
-#	${PERL} -i -pe 's@((?!mew)...|^.{0,2})%%MEW_MAJOR_VER%%@$$1\x32@g' ${PLIST}
+# set emacs port
+EMACS_PORT_NAME=	emacs20
 
-.include <bsd.port.mk>
+.include "${MASTERDIR}/Makefile"
diff --git a/mail/mew3-emacs20/distinfo b/mail/mew3-emacs20/distinfo
deleted file mode 100644
index 232144109fa2..000000000000
--- a/mail/mew3-emacs20/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (mew-2.1.tar.gz) = db70bd87397f31ad10d97d62ecc5f427
diff --git a/mail/mew3-emacs20/files/Addrbook b/mail/mew3-emacs20/files/Addrbook
deleted file mode 100644
index 45ad31e9223c..000000000000
--- a/mail/mew3-emacs20/files/Addrbook
+++ /dev/null
@@ -1,25 +0,0 @@
-; See comments at end of this file
-; This file is almost empty as MH now supports personal aliases.
-
-;everyone: *
-
-; Blank lines and lines beginning with a ; are ignored.
-; < file	-> read more aliases from "file"
-; foo: fum      -> simple replacement
-; foo: fum, fie -> list replacement
-; foo: < file   -> list replacement from "file"
-; foo: = group  -> list replacement from UNIX group
-; foo: + group  -> list replacement by ALL users in /etc/passwd
-;		      with gid == group
-; foo: *        -> list replacement by ALL users in /etc/passwd
-;                     with uid >= 200
-; foo*: fum     -> matches foo<string> (including the empty string)
-;
-; using a ';' instead of a ':' indicates that the alias should be displayed
-; along with the addresses used (normally, the addresses replace the alias
-; completely)
-ML-FreeBSD: FreeBSD-users-jp@jp.freebsd.org
-ML-fvwm:    fvwm-users-jp@skylark.ics.es.osaka-u.ac.jp
-ML-SKK:     skk@sato.kuis.kyoto-u.ac.jp
-ML-infotalk:infotalk-request@square.brl.ntt.jp
-ML-skkfep:  skkfep@chanchan.suri.co.jp
diff --git a/mail/mew3-emacs20/files/dot.emacs.el.in b/mail/mew3-emacs20/files/dot.emacs.el.in
deleted file mode 100644
index 8cfe348595fa..000000000000
--- a/mail/mew3-emacs20/files/dot.emacs.el.in
+++ /dev/null
@@ -1,95 +0,0 @@
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; Mew ;;;;;;;;;
-;;;       Mew (Ver.%%version%%)                                             ;;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;;
-;;; Site configuration
-;;;
-%%REQUIRE%%
-(autoload 'mew "mew" nil t)
-(autoload 'mew-send "mew" nil t)
-(setq mew-mail-domain-list '("%%nameserver%%"))
-(setq mew-icon-directory "%%emacsdir%%/etc/mew")
-;;;
-;;; Window tips
-;;;
-;; If you use XEmacs and your video chip provides only limited
-;; color map(e.g. 256), put the following line to avoid exhaustion
-;; of colors.
-;(setq mew-demo-picture nil)
-(cond
- ((string-match "XEmacs" emacs-version)
-;  (setq url-be-asynchronous t)
-;  (setq-default buffer-file-coding-system 'iso-2022-jp)
-;  (setq keyboard-coding-system    'iso-2022-jp)
-;  (setq terminal-coding-system    'iso-2022-jp)
-  (add-menu-item '("Apps") "Read Mail (Mew)" 'mew t "Read Mail (VM)...")
-  (add-menu-item '("Apps") "Send Mail (Mew)" 'mew-send t "Read Mail (VM)...")
-;  (delete-menu-item '("Apps" "Read Mail (VM)..."))
-;  (delete-menu-item '("Apps" "Read Mail (MH)..."))
-;  (delete-menu-item '("Apps" "Send mail..."))
-  (setq toolbar-mail-reader 'Mew)
-  (setq toolbar-mail-commands-alist
-	(cons '(Mew . mew) toolbar-mail-commands-alist))
-  )
- ((string< "20" emacs-version)
-;  (setq standard-fontset-spec14
-;	"-*-fixed-medium-r-normal-*-14-*-*-*-*-*-fontset-standard")
-;  (create-fontset-from-fontset-spec standard-fontset-spec14 nil 'noerror)
-;  (set-default-font standard-fontset-spec14)
-  (setup-japanese-environment)
-  )
- (t ;; Mule 2.3 or Emacs 19
-  )
- )
-;;;
-;;; Citation tip
-;;;
-(setq mew-cite-fields '("From:" "Subject:" "Date:" "Message-ID:"))
-(setq mew-cite-format "From: %s\nSubject: %s\nDate: %s\nMessage-ID: %s\n\n")
-(setq mew-cite-prefix-function 'mew-cite-prefix-username)
-;(setq mew-cite-fields '("Message-ID:" "From:"))
-;(setq mew-cite-format "Message-ID: %s の記事にて\n%s さんは書かれました :\n\n")
-;; Change citation according to the message body language.
-;(setq mew-cite-fields '("Message-ID:" "From:"))
-;(defadvice mew-draft-cite (before my-add activate)
-;  (save-excursion
-;    (set-buffer (or mew-message-citation-buffer (mew-buffer-message)))
-;    (if (string= (mew-charset-guess-region (point-min) (point-max))
-;                 "us-ascii" )
-;        ;; us-ascii
-;        (setq mew-cite-format "In Message-ID: %s\n%s wrote  :\n\n")
-;      ;; others
-;      (setq mew-cite-format "Message-ID: %s の記事にて\n%s さんは書かれました :\n\n") )))
-;;;
-;;; Signature tip
-;;;
-;; Change signature according to the message body language.
-;(setq mew-signature-file "~/.signature")
-;(make-local-variable 'mew-signature-file)
-;(defadvice mew-draft-insert-signature (before my-add activate)
-;  ;; 本文が英語なら mew-signature-file に ~/.signature.eng を代入する。
-;  ;; 本文が英語以外なら mew-signature-file に ~/.signature を代入する。
-;  ;; ~/.signature.eng に英語用の署名を書いておくこと。
-;  (save-match-data
-;    (let ((eng (string-match "\\.eng$" mew-signature-file)))
-;      (if (string= (mew-charset-guess-region (point-min) (point-max))
-;                   "us-ascii" )
-;          (if (not eng)
-;              (setq mew-signature-file (concat mew-signature-file ".eng")) )
-;        (if eng
-;            (setq mew-signature-file (substring mew-signature-file 0 -4)) )))))
-;
-(setq mew-signature-insert-last t)
-(add-hook 'mew-send-hook 'mew-draft-insert-signature)
-;;;
-;;; Thread tip
-;;;
-;; Now threading is insufficient,but partially makes enough by comment out following line.
-;(setq mew-prog-imls-arg-list '("--thread=yes" "--indent=2"))
-;;;
-;;; Miscellaneous
-;;;
-(setq mew-underline-lines-use t)
-(setq mew-use-highlight-body t)
-;; If you use Wnn4/6,sj3 or Canna, comment out following line.
-;(setq mew-use-overlay-keymap nil)
diff --git a/mail/mew3-emacs20/files/message.sh b/mail/mew3-emacs20/files/message.sh
deleted file mode 100644
index c4941cbfed1b..000000000000
--- a/mail/mew3-emacs20/files/message.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
- 
-case ${EMACS_PORT_NAME} in
-    emacs20)
-	cat <<EOF > ${WRKTMPDIR}/pkg-message
-*************************************************************************
-* You must set at least following elisps to your own dot.emacs file:    *
-*                                                                       *
-*       (autoload 'mew "mew" nil t)                                     *
-*       (autoload 'mew-send "mew" nil t)                                *
-*       (setq mew-mail-domain "domain of e-mail address")               *
-*       (setq mew-pop-server "your POP server")    ;; if not localhost  *
-*       (setq mew-smtp-server "your SMTP server")  ;; if not localhost  *
-*       (setq mew-prog-pgpkey      "fetch")         ;; for PGP use      *
-*       (setq mew-prog-pgpkey-arg  '("-q" "-o" "-"));; for PGP use      *
-*                                                                       *
-*************************************************************************
-EOF
-	;;
-    xemacs21*)
-	cat <<EOF > ${WRKTMPDIR}/pkg-message
-*************************************************************************
-* You must set at least following elisps to your own dot.emacs file:    *
-*                                                                       *
-*       (autoload 'mew "mew" nil t)                                     *
-*       (autoload 'mew-send "mew" nil t)                                *
-*       (setq mew-mail-domain "domain of e-mail address")               *
-*       (setq mew-pop-server "your POP server")    ;; if not localhost  *
-*       (setq mew-smtp-server "your SMTP server")  ;; if not localhost  *
-*       (setq mew-icon-directory "icon directory") ;; if using XEmacs   *
-*       (setq mew-prog-pgpkey      "fetch")         ;; for PGP use      *
-*       (setq mew-prog-pgpkey-arg  '("-q" "-o" "-"));; for PGP use      *
-*                                                                       *
-*************************************************************************
-EOF
-	;;
-esac
diff --git a/mail/mew3-emacs20/files/patch-aa b/mail/mew3-emacs20/files/patch-aa
deleted file mode 100644
index ba398cffa9ea..000000000000
--- a/mail/mew3-emacs20/files/patch-aa
+++ /dev/null
@@ -1,171 +0,0 @@
---- Makefile.orig	Wed Jul 18 08:20:40 2001
-+++ Makefile	Fri Aug  3 22:18:35 2001
-@@ -19,14 +19,14 @@
- ## EDIT THE FOLLOWINGS
- ##
- 
--prefix=/usr/local
-+prefix=${PREFIX}
- infodir=$(prefix)/info
- 
- ##
- ## Compile engines
- ##
- 
--EMACS = emacs
-+EMACS = ${EMACS_CMD}
- #EMACS = xemacs
- #EMACS = mule
- 
-@@ -34,7 +34,7 @@
- ## A directory where mew*.el[c] will be installed.
- ##
- 
--elispdir = $(prefix)/share/emacs/site-lisp/mew
-+elispdir = $(prefix)/${EMACS_LIBDIR}/site-lisp/mew${MEW_MAJOR_VER}
- #elispdir  = $(prefix)/lib/$(EMACS)/site-lisp
- #elispdir = $(prefix)/lib/emacs
- 
-@@ -42,7 +42,10 @@
- ## A directory where etc file will be installed.
- ##
- 
--etcdir = $(prefix)/lib/$(EMACS)/etc/Mew
-+etcdir = $(prefix)/${EMACS_LIBDIR}/etc/mew${MEW_MAJOR_VER}
-+
-+# For XEmacs packages
-+XPKGDIR=	$(prefix)/${EMACS_PACKAGESDIR}
- 
- ################################################################
- ##
-@@ -67,6 +70,8 @@
- 	mew-key.elc     mew-thread.elc  mew-smime.elc	\
- 	mew-theme.elc	mew.elc
- 
-+OBJS_PKG=	 auto-autoloads.elc custom-load.elc
-+
- SRCS =	mew-addrbook.el	mew-attach.el	mew-blvs.el	\
- 	mew-bq.el	mew-cache.el	mew-complete.el	\
- 	mew-config.el	mew-const.el	mew-decode.el	\
-@@ -87,6 +92,8 @@
- 	mew-thread.el	mew-smime.el	mew-theme.el	\
- 	mew.el
- 
-+SRCS_PKG=	auto-autoloads.el custom-load.el
-+
- TEMPFILE = temp.el
- 
- CP = cp
-@@ -103,7 +110,9 @@
- 
- ################################################################
- 
--el: $(TEMPFILE) mew.el
-+el: $(OBJS)
-+
-+$(OBJS): $(TEMPFILE) mew.el
- 	@echo 'Compiling EL files of Mew ... '
- 	@echo 'PLEASE IGNORE WARNINGS IF DISPLAYED. TAKE IT EASY!'
- 	$(EMACS) -batch -q -no-site-file -l ./$(TEMPFILE) -f mew-compile
-@@ -116,11 +125,11 @@
- 	@echo ')))' >> $(TEMPFILE)
- 
- install-el: $(OBJS)
--	-@if [ ! -d $(elispdir) ]; then \
-+	if [ ! -d $(elispdir) ]; then \
- 		$(MKDIR) $(elispdir); \
- 	fi
--	$(CP) $(SRCS) $(elispdir)
--	$(CP) $(OBJS) $(elispdir)
-+	${BSD_INSTALL_DATA} $(SRCS) $(elispdir)
-+	${BSD_INSTALL_DATA} $(OBJS) $(elispdir)
- 
- ################################################################
- 
-@@ -136,7 +145,9 @@
- 	cd info; $(MAKE) info EMACS=$(EMACS)
- 
- install-info:
--	cd info; $(MAKE) install-info infodir=$(infodir)
-+	${MKDIR} $(infodir)
-+	cd info; $(MAKE) install-info infodir=$(infodir) \
-+		XEMACS_VER_OVER20="${XEMACS_VER_OVER20}"
- 
- ################################################################
- 
-@@ -144,15 +155,72 @@
- 	cd info; $(MAKE) jinfo EMACS=$(EMACS)
- 
- install-jinfo:
--	cd info; $(MAKE) install-jinfo infodir=$(infodir)
-+	${MKDIR} $(infodir)
-+	cd info; $(MAKE) install-jinfo infodir=$(infodir) \
-+		XEMACS_VER_OVER20="${XEMACS_VER_OVER20}"
-+
-+install-man:
-+	${MKDIR} ${MANDIR}
-+	cd info; $(MAKE) install-man MANDIR=$(MANDIR)
- 
- ################################################################
- 
- install-etc:
--	-@if [ ! -d $(etcdir) ]; then \
-+	if [ ! -d $(etcdir) ]; then \
- 		$(MKDIR) $(etcdir); \
- 	fi
--	cd etc; $(CP) -r * $(etcdir)/
-+	cd etc; $(CP) -R * $(etcdir)/
-+
-+################################################################
-+
-+package: ${OBJS} ${OBJS_PKG} bin
-+
-+${OBJS_PKG}: ${SRCS_PKG}
-+	${EMACS} -vanilla -batch -eval "(push \"./\" load-path)" -l bytecomp \
-+		-f batch-byte-compile ${.ALLSRC}
-+
-+auto-autoloads.el : ${OBJS} _pkg.el
-+	${EMACS} -vanilla -batch \
-+		-eval "(setq autoload-package-name \"${XEMACS_PKGNAME}\")" \
-+		-l autoload -f batch-update-directory .
-+	${RM} -f auto-autoloads.el~
-+
-+custom-load.el : ${OBJS}
-+	${EMACS} -vanilla -batch -l cus-dep -f Custom-make-dependencies .
-+	if [ ! -f ${.TARGET} ]; then \
-+		touch ${.TARGET}; \
-+	fi
-+
-+_pkg.el:
-+	@echo Creating _pkg.el
-+	@echo ";;;###autoload" 				>  _pkg.el
-+	@echo "(package-provide '${XEMACS_PKGNAME}" 	>> _pkg.el
-+	@echo "		 :version $(XEMACS_PKGVER)"	>> _pkg.el
-+	@echo "		 :type 'regular)" 		>> _pkg.el
-+
-+install-mule-package: install-package
-+	${MAKE} infodir=${XPKGDIR}/info XEMACS_VER_OVER20="yes" install-jinfo
-+	${MAKE} manifest
-+
-+install-package:
-+	${MKDIR} ${XPKGDIR}/pkginfo
-+	${MAKE} install-bin
-+	${MAKE} elispdir=${XPKGDIR}/lisp/mew${MEW_MAJOR_VER} install-el
-+	${BSD_INSTALL_DATA} _pkg.el ${OBJS_PKG} ${SRCS_PKG} \
-+		${XPKGDIR}/lisp/mew${MEW_MAJOR_VER}
-+	${MAKE} infodir=${XPKGDIR}/info XEMACS_VER_OVER20="yes" \
-+						install-info
-+	${MAKE} MANDIR=${XPKGDIR}/man/mew${MEW_MAJOR_VER} install-man
-+	${MAKE} etcdir=${XPKGDIR}/etc/mew${MEW_MAJOR_VER} install-etc
-+	${MAKE} manifest
-+
-+manifest:
-+	(cd ${XPKGDIR}; \
-+		ls -d1 lisp/mew${MEW_MAJOR_VER}/* info/mew${MEW_MAJOR_VER}.* \
-+			man/mew${MEW_MAJOR_VER}/* etc/mew${MEW_MAJOR_VER}/* \
-+			> ${XPKGDIR}/pkginfo/MANIFEST.mew${MEW_MAJOR_VER})
-+	${ECHO} "pkginfo/MANIFEST.mew${MEW_MAJOR_VER}" \
-+		>> ${XPKGDIR}/pkginfo/MANIFEST.mew${MEW_MAJOR_VER}
- 
- ################################################################
- 
diff --git a/mail/mew3-emacs20/files/patch-ab b/mail/mew3-emacs20/files/patch-ab
deleted file mode 100644
index cde8b6340a44..000000000000
--- a/mail/mew3-emacs20/files/patch-ab
+++ /dev/null
@@ -1,28 +0,0 @@
---- bin/Makefile.in.orig	Mon Sep 24 21:40:37 2001
-+++ bin/Makefile.in	Tue Nov 20 10:10:42 2001
-@@ -65,7 +65,7 @@
- 	$(CC) $(COFLAG) $(OBJ1) $(LIBS)
- 	$(RM) $(ALT)
- 	for f in $(ALT); do \
--	  $(LN) $(PRG1) $${f}; done
-+	  $(LN) -sf $(PRG1) $${f}; done
- 
- $(PRG2): $(OBJ2)
- 	$(CC) $(COFLAG) $(CFLAGS) $(OBJ2)
-@@ -88,14 +88,14 @@
- 	fi
- 	$(INSTALL) -m 555 $(PRG1) $(bindir)
- 	for f in $(ALT); do \
--	  $(RM) $(bindir)/$${f}; $(LN) $(bindir)/$(PRG1) $(bindir)/$${f}; done
-+ 	  $(RM) $(bindir)/$${f}; $(LN) -sf $(bindir)/$(PRG1) $(bindir)/$${f}; done
- 	$(INSTALL) -m 555 $(PRG2) $(bindir)
- 	-@if [ ! -d $(mandir) ]; then \
- 		$(MKDIR) $(mandir); \
- 	fi
- 	$(INSTALL) -m 444 $(MAN1) $(mandir)
- 	for f in $(MALT); do \
--	  $(RM) $(mandir)/$${f}; $(LN) $(mandir)/$(MAN1) $(mandir)/$${f}; done
-+ 	  $(RM) $(mandir)/$${f}; $(LN) -sf $(mandir)/$(MAN1) $(mandir)/$${f}; done
- 	$(INSTALL) -m 444 $(MAN2) $(mandir)
- 
- ##
diff --git a/mail/mew3-emacs20/files/patch-ac b/mail/mew3-emacs20/files/patch-ac
deleted file mode 100644
index 1b3351685988..000000000000
--- a/mail/mew3-emacs20/files/patch-ac
+++ /dev/null
@@ -1,95 +0,0 @@
---- info/Makefile.orig	Fri Aug 17 21:26:00 2001
-+++ info/Makefile	Tue Nov 20 10:18:58 2001
-@@ -28,9 +28,9 @@
- #INSTALLINFO_OPTIONS = --section Emacs Emacs
- #INSTALLINFO_JOPTIONS =
- #infodir = 
--INSTALLINFO_ARGS  = mew.info $(infodir)/dir
-+INSTALLINFO_ARGS  = mew${MEW_MAJOR_VER}.info $(infodir)/dir
- #INSTALLINFO_ARGS  = mew.info 
--INSTALLINFO_JARGS = mew.jis.info $(infodir)/dir
-+INSTALLINFO_JARGS = mew${MEW_MAJOR_VER}.jis.info $(infodir)/dir
- 
- 
- RM = rm -f
-@@ -44,50 +44,60 @@
- ## DO NOT EDIT THE FOLLOWINGS
- ##
- 
--INFO  = mew.info mew.info-1 mew.info-2 mew.info-3
--JINFO = mew.jis.info mew.jis.info-1 mew.jis.info-2 mew.jis.info-3
-+INFO  = mew${MEW_MAJOR_VER}.info mew${MEW_MAJOR_VER}.info-1 mew${MEW_MAJOR_VER}.info-2 mew${MEW_MAJOR_VER}.info-3
-+JINFO = mew${MEW_MAJOR_VER}.jis.info mew${MEW_MAJOR_VER}.jis.info-1 mew${MEW_MAJOR_VER}.jis.info-2
-+MANUALS= 00readme mew.texi
- 
- all: info
- info:
--	sed -e 's/@setfilename mew.jis.info/@setfilename mew.info/' \
-+	sed -e "s/@setfilename mew${MEW_MAJOR_VER}\.jis\.info/@setfilename mew${MEW_MAJOR_VER}\.info/" \
- 	    -e 's/@set jp/@set us/' mew.texi > tmp.texi
- 	mv tmp.texi mew.texi
--	$(RM) mew.info*
--	$(TOUCH) mew.info
-+	$(RM) mew${MEW_MAJOR_VER}.info*
-+	$(TOUCH) mew${MEW_MAJOR_VER}.info
- 	$(EMACS) -batch -q -no-site-file -l texinfmt \
- 		-f batch-texinfo-format mew.texi
- 
- jinfo:
--	sed -e 's/@setfilename mew.info/@setfilename mew.jis.info/' \
-+	sed -e "s/@setfilename mew${MEW_MAJOR_VER}\.info/@setfilename mew${MEW_MAJOR_VER}\.jis.info/" \
- 	    -e 's/@set us/@set jp/' mew.texi > tmp.texi
- 	mv tmp.texi mew.texi
--	$(RM) mew.jis.info*
--	$(TOUCH) mew.jis.info
-+	$(RM) mew${MEW_MAJOR_VER}.jis.info*
-+	$(TOUCH) mew${MEW_MAJOR_VER}.jis.info
- 	$(EMACS) -batch -q -no-site-file -l texinfmt \
- 		-f batch-texinfo-format mew.texi
- 
- install: install-info
- install-info:
--	-@if [ ! -d $(infodir) ]; then \
-+	-if [ ! -d $(infodir) ]; then \
- 		$(MKDIR) $(infodir); \
- 	fi; \
--	cp $(INFO) $(infodir)
--	-@if [ -x "$(INSTALLINFO)" ]; then \
--		$(INSTALLINFO) $(INSTALLINFO_OPTIONS) $(INSTALLINFO_ARGS); \
--	else \
--		echo "Don't forget to edit $(infodir)/dir for Mew."; \
-+	${BSD_INSTALL_DATA} $(INFO) $(infodir)/
-+	-if [ -z "${XEMACS_VER_OVER20}" ]; then \
-+		if [ -x "$(INSTALLINFO)" ]; then \
-+			$(INSTALLINFO) $(INSTALLINFO_OPTIONS) $(INSTALLINFO_ARGS); \
-+		else \
-+			echo "Don't forget to edit $(infodir)/dir for Mew."; \
-+		fi; \
- 	fi
- 
- install-jinfo:
--	-@if [ ! -d $(infodir) ]; then \
-+	-if [ ! -d $(infodir) ]; then \
- 		$(MKDIR) $(infodir); \
- 	fi; \
--	cp $(JINFO) $(infodir)
--	-@if [ -x "$(INSTALLINFO)" ]; then \
--		$(INSTALLINFO) $(INSTALLINFO_JOPTIONS) $(INSTALLINFO_JARGS); \
--	else \
--		echo "Don't forget to edit $(infodir)/dir for Mew."; \
-+	${BSD_INSTALL_DATA} $(JINFO) $(infodir)/
-+	-if [ -z "${XEMACS_VER_OVER20}" ]; then \
-+		if [ -x "$(INSTALLINFO)" ]; then \
-+			$(INSTALLINFO) $(INSTALLINFO_JOPTIONS) $(INSTALLINFO_JARGS); \
-+		else \
-+			echo "Don't forget to edit $(infodir)/dir for Mew."; \
-+		fi; \
- 	fi
-+
-+install-man:
-+	${MKDIR} ${MANDIR}
-+	${BSD_INSTALL_DATA} ${MANUALS} ${MANDIR}
-+
- ##
- ## End of Makefile
- ##
diff --git a/mail/mew3-emacs20/files/patch-ad b/mail/mew3-emacs20/files/patch-ad
deleted file mode 100644
index 933ef45d9e73..000000000000
--- a/mail/mew3-emacs20/files/patch-ad
+++ /dev/null
@@ -1,27 +0,0 @@
---- info/mew.texi~	Thu Aug  2 22:31:28 2001
-+++ info/mew.texi	Fri Aug  3 11:01:40 2001
-@@ -1,6 +1,6 @@
- \input texinfo  @c -*-texinfo-*-
- @c %**start of header
--@setfilename mew.jis.info
-+@setfilename mew%%MEW_MAJOR_VER%%.jis.info
- @settitle Mew (Messaging in the Emacs World)
- @c %**end of header
- 
-@@ -41,14 +41,14 @@
- @ifset jp
- @dircategory Message User Agent
- @direntry
--* Mew-J: (mew.jis.info).     Messaging in the Emacs World.
-+* Mew-J: (mew%%MEW_MAJOR_VER%%.jis.info).     Messaging in the Emacs World.
- @end direntry
- @end ifset
- 
- @ifset us
- @dircategory Message User Agent
- @direntry
--* Mew: (mew.info).           Messaging in the Emacs World.
-+* Mew: (mew%%MEW_MAJOR_VER%%.info).           Messaging in the Emacs World.
- @end direntry
- @end ifset
- 
diff --git a/mail/mew3-emacs20/files/patch-ae b/mail/mew3-emacs20/files/patch-ae
deleted file mode 100644
index d1647a30fb9c..000000000000
--- a/mail/mew3-emacs20/files/patch-ae
+++ /dev/null
@@ -1,11 +0,0 @@
---- mew-key.el~	Wed Jul 18 08:19:11 2001
-+++ mew-key.el	Fri Aug  3 11:30:10 2001
-@@ -507,7 +507,7 @@
- ;;;
- 
- (defvar mew-icon-directory (if (fboundp 'locate-data-directory)
--			       (locate-data-directory "mew") nil))
-+			       (locate-data-directory "mew%%MEW_MAJOR_VER%%") nil))
- 
- (defvar mew-icon-separate nil)
- (defvar mew-icon-blank nil)
diff --git a/mail/mew3-emacs20/files/patch-af b/mail/mew3-emacs20/files/patch-af
deleted file mode 100644
index 7bb77f4ae56e..000000000000
--- a/mail/mew3-emacs20/files/patch-af
+++ /dev/null
@@ -1,55 +0,0 @@
---- bin/mewls.c.orig	Sat Sep  8 11:07:12 2001
-+++ bin/mewls.c	Tue Nov 20 10:26:04 2001
-@@ -124,8 +124,8 @@
- private void init_fields(char *);
- private void print_field(char *, int, char *, char *);
- private void init_search(char *, int);
--private char *strcasechr(char *, int);
--private char *strcasestr(char *, char *);
-+private char *mystrcasechr(char *, int);
-+private char *mystrcasestr(char *, char *);
- private int  print_for_scan(FILE *, char *, char *);
- private int  print_for_sort(FILE *, char *, char *);
- private int  print_for_pick(FILE *, char *, char *);
-@@ -473,7 +473,7 @@
- }
- 
- private char *
--strcasechr(char *s, int c)
-+mystrcasechr(char *s, int c)
- {
- 	int lc = tolower(c);
- 	int uc = toupper(c);
-@@ -486,12 +486,12 @@
- }
- 
- private char *
--strcasestr(char *s1, char *s2)
-+mystrcasestr(char *s1, char *s2)
- {
- 	char *p;
- 	unsigned int len = strlen(s2);
- 
--	for (p = s1; (p = strcasechr(p, *s2)) != NULL; p++)
-+	for (p = s1; (p = mystrcasechr(p, *s2)) != NULL; p++)
- 		if (strncasecmp(p, s2, len) == 0)
- 			return p;
- 	return NULL;
-@@ -513,7 +513,7 @@
- 				return TRUE;
- 			}
- 		} else {
--			if (strcasestr(p, value) != NULL) {
-+			if (mystrcasestr(p, value) != NULL) {
- 				*end = tmp;
- 				return TRUE;
- 			}
-@@ -540,7 +540,7 @@
- 					return TRUE;
- 				}
- 			} else {
--				if (strcasestr(beg, value) != NULL) {
-+				if (mystrcasestr(beg, value) != NULL) {
- 					*end = tmp;
- 					return TRUE;
- 				}
diff --git a/mail/mew3-emacs20/files/pkg-descr.tmpl b/mail/mew3-emacs20/files/pkg-descr.tmpl
deleted file mode 100644
index 60fa7d3f4f6e..000000000000
--- a/mail/mew3-emacs20/files/pkg-descr.tmpl
+++ /dev/null
@@ -1,19 +0,0 @@
-Mew is a "Message interface to Emacs Window" to integrate
-
-   - Email
-   - MIME(Multipurpose Internet Mail Extensions)
-   - PGP(Pretty Good Privacy)
-
-and to make it easy to view and compose them. With Mew you can send a
-picture of a birthday cake with the song "Happy Birthday to you" to your
-friend, which is encrypted by strong cryptograph.
-
-This port is the Mew%%MEW_MAJOR_VER%%(Mew with version %%MEW_MAJOR_VER%%) for %%EMACS_CMD%%(%%EMACS_PORTSDIR%%). 
-The Mew%%MEW_MAJOR_VER%% port and corresponding Emacs port are listed bellow and elisp
-`site-lisp' directory(elisp load path), info path and etc directory(only
-effective for xemacs ports) are shown as well. 
-
-mail/%%PORTNAME%%%%MEW_MAJOR_VER%%-%%EMACS_PORT_NAME%%(%%PKGNAME%%) ===> %%EMACS_PORTSDIR%%(%%EMACS_CMD%%) 
-	Lisp directory : %%ELISPDIR%%
-	Info directory : %%INFODIR%%
-	ETC directory  : %%ETCDIR%%
diff --git a/mail/mew3-emacs20/files/tmpl2file.sh b/mail/mew3-emacs20/files/tmpl2file.sh
deleted file mode 100644
index d8e1a662ca53..000000000000
--- a/mail/mew3-emacs20/files/tmpl2file.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-for f in ${TMPL_FILES}; do
-	sed \
-		-e "s,%%EMACS_CMD%%,${EMACS_CMD},g" \
-		-e "s,%%EMACS_PORTSDIR%%,${EMACS_PORTSDIR},g" \
-		-e "s,%%PKGNAME%%,${PKGNAME},g" \
-		-e "s,%%EMACS_PORT_NAME%%,${EMACS_PORT_NAME},g" \
-		-e "s,%%MEW_MAJOR_VER%%,${MEW_MAJOR_VER},g" \
-		-e "s,%%PORTNAME%%,${PORTNAME},g" \
-		-e "s,%%ELISPDIR%%,${ELISPDIR},g" \
-		-e "s,%%INFODIR%%,${INFODIR},g" \
-		-e "s,%%ETCDIR%%,${ETCDIR},g" \
-		< ${FILESDIR}/${f}.tmpl > ${WRKTMPDIR}/${f}
-done
diff --git a/mail/mew3-emacs20/files/user-install.in b/mail/mew3-emacs20/files/user-install.in
deleted file mode 100644
index ee1a7ad4d9f4..000000000000
--- a/mail/mew3-emacs20/files/user-install.in
+++ /dev/null
@@ -1,374 +0,0 @@
-#!/bin/sh
-
-PREFIX=%%PREFIX%%
-EMACSDIR=%%EMACSDIR%%
-ELISPDIR=%%ELISPDIR%%
-SAMPLEDIR=%%SAMPLEDIR%%
-
-AWK=%%AWK%%
-CAT=%%CAT%%
-CP=%%CP%%
-ECHO=%%ECHO%%
-MKDIR="%%MKDIR%%"
-RM=%%RM%%
-SED=%%SED%%
-TOUCH=%%TOUCH%%
-DIALOG=/usr/bin/dialog
-
-select()
-{
-	local Language key
-	Language="\
-Choose a language when you write mails.\n\
-    (Now is \"${language}\" selected.)"
-	${DIALOG} --title "Choose the Language" \
-	--hline "Select Items and Quit when finished" \
-	--menu "${Language}" -1 -1 2 \
-	English		"English" \
-	Japanese	"japanese" \
-		2>	/tmp/menu.$$
-	retval=$?
-	key=`${CAT} /tmp/menu.$$|${SED} -e 's/\"//g'`
-	${RM} -f /tmp/menu.$$
-	case $retval in
-		0) if [ -z ${key} ]; then return; fi ;;
-		1) return ;;
-		255) return ;;
-	esac
-	language=${key}
-#	echo citation:key=${key},dot_emacs=${dot_emacs}>>/tmp/temp
-}
-
-input_data()
-# argument No.1 ($1) : Key words (string)
-# argument No.2 ($2) : Variable for the Key words (string)
-# argument No.3 ($3) : unit for the variable (string)
-{
-	local key
-#	echo '$1='$1
-#	echo '$2='$2
-#	echo '$3='$3
-#	exit 1
-#	echo '${nameserver}='${mail_address}
-#	eval echo '${'$2'}'
-	eval key='${'$2'}'
-#	echo key=${key}
-#	exit 1
-	if [ ! -z ${key} ]; then
-		${DIALOG} --title "Confirm $1" \
-		--hline "Press Yes/No" \
-		--yesno "$1 $3 has set \"${key}\". Is this OK?" -1 -1
-		retval=$?
-		if [ X"${retval}" = "X0" -o X"${retval}" = "X255" ]; then  return; fi
-	fi
-	${DIALOG} --title "Set $1 $3" \
-	--hline "Write $1 $3" \
-	--inputbox "Specify $1 $3" -1 -1 \
-		2>  /tmp/input.$$
-	eval $2=`${CAT} /tmp/input.$$`
-	${RM} -f /tmp/input.$$
-}
-
-options()
-{
-	local Options keys del_keys
-	Options="\
-Please select Mew functions that you want to. To select a function, \n\
-use the arrow keys to move to it and press [SPACE]. To de-select it, \n\
-press [SPACE] again.  Select OK or Cancel to leave this menu."
-	del_keys="Highlight Citation Cite_Change Sign_Change"
-	${DIALOG} --title "Select Mew functions" \
-	--hline "" \
-	--checklist "${Options}" -1 -1 4 \
-	Highlight	"highlight body for Mew(Japanese)" ${options_Highlight} \
-	Citation	"Citation with the mail." ${options_Citation} \
-	Cite_Change	"Change citation English <--> Japanese." ${options_Cite_Change} \
-	Sign_Change	"Change signature English <--> Japanese." ${options_Sign_Change} \
-		2> /tmp/checklist.$$
-	retval=$?
-	keys=`${CAT} /tmp/checklist.$$|${SED} -e 's/\"//g'`
-	${RM} -f /tmp/checklist.$$
-	case $retval in
-		1)   return ;;
-		255) return ;;
-	esac
-	dot_emacs=""
-#	echo keys=$keys
-	for k in ${keys}; do
-		del_keys=`${ECHO} ${del_keys}|${SED} -e "s/ *${k}//g"`
-#		echo del_keys=${del_keys}
-#		echo k=$k
-		case ${k} in
-		Highlight)
-			dot_emacs="${dot_emacs} dot.emacs-highlight-body.el"
-			options_Highlight=ON
-			;;
-		Citation)
-			citation
-#			echo options:key=${k},dot_emacs=${dot_emacs}>>/tmp/temp
-			options_Citation=ON
-			;;
-		Cite_Change)
-			dot_emacs="${dot_emacs} dot.emacs-cite-change.el"
-			options_Cite_Change=ON
-			;;
-		Sign_Change)
-			dot_emacs="${dot_emacs} dot.emacs-signature-change.el"
-			options_Sign_Change=ON
-			;;
-		esac
-	done
-#	exit 1
-	for k in ${del_keys}; do
-#		echo k=$k
-		case ${k} in
-		Highlight)
-			dot_emacs=`${ECHO} ${dot_emacs}|${SED} -e "s/ *dot\.emacs-highlight-body\.el//"`
-			options_Highlight=OFF
-			;;
-		Citation)
-			options_Citation=OFF
-			;;
-		Cite_Change)
-			dot_emacs=`${ECHO} ${dot_emacs}|${SED} -e "s/ *dot\.emacs-cite-change\.el//"`
-			options_Cite_Change=OFF
-			;;
-		Sign_Change)
-			dot_emacs=`${ECHO} ${dot_emacs}|${SED} -e "s/ *dot\.emacs-signature-change\.el//"`
-			options_Sign_Change=OFF
-			;;
-		esac
-	done
-#	echo dot_emacs=${dot_emacs}
-#	echo del_keys=${del_keys}
-#	exit 1
-}
-
-citation()
-{
-	dot_emacs=`${ECHO} ${dot_emacs}|${SED} -e "s/ *dot\.emacs-cite.[a-z]*//g"`
-	case ${language} in
-	English)
-		dot_emacs="${dot_emacs} dot.emacs-cite.el"
-		;;
-	Japanese)
-		dot_emacs="${dot_emacs} dot.emacs-cite.ja.el"
-		;;
-	esac
-#	echo citation:key=${key},dot_emacs=${dot_emacs}>>/tmp/temp
-}
-
-case ${TERM} in
-emacs)
-	${ECHO} "Here is \"Emacs\" shell. Try on other terminal."
-	exit 1
-	;;
-esac
-
-version="%%VERSION%%"
-#version="1.92"
-
-SEDCMD='${SED}
-	-e "s,%%prefix%%,${PREFIX},g"
-	-e "s,%%emacsdir%%,${EMACSDIR},g"
-	-e "s,%%elispdir%%,${ELISPDIR},g"
-	-e "s,%%version%%,${version},g"
-	-e "s,%%nameserver%%,${nameserver},g"
-	-e "s,%%mail_address%%,${mail_address},g"
-	-e "s,%%domain_name%%,${domain_name},g"
-	-e "s,%%default_domain_name%%,${default_domain_name},g"
-	-e "s,%%signature%%,${signature},g"'
-
-###
-# Check ~/.backup directory exist.
-#
-${MKDIR} ${HOME}/.backup
-
-###
-# Backup all files.
-#
-${CP} ${HOME}/${dot_emacs_file} ${HOME}/.backup/${dot_emacs_file}.$$
-${CP} ${HOME}/.im/Config ${HOME}/.backup/Config.$$
-
-###
-# Check ~/.im/Config file exist.
-#
-if [ ! -f ${HOME}/.im/Config ]; then
-	${ECHO} "${HOME}/.im/Config: Not found. Do imsetup first."
-	exit 1
-else
-	mail_address=`${AWK} '/^Address=/{sub(/^Address=/,"");print}' ${HOME}/.im/Config`
-	domain_name=`${AWK} '/^FromDomain=/{sub(/^FromDomain=/,"");print}' ${HOME}/.im/Config`
-	default_domain_name=`${AWK} '/^ToDomain=/{sub(/^ToDomain=/,"");print}' ${HOME}/.im/Config`
-	if [ X"${mail_address}" = "X%%mail_address%%" ]; then
-		mail_address=""
-	else
-		${CP} ${HOME}/.im/Config ${HOME}/.backup/Config
-		${SED} -e 's/^\(Address=\).*$/\1%%mail_address%%/' \
-			< ${HOME}/.backup/Config > ${HOME}/.im/Config
-	fi
-	if [ X"${domain_name}" = "X%%domain_name%%" ]; then
-		domain_name=""
-	else
-		${CP} ${HOME}/.im/Config ${HOME}/.backup/Config
-		${SED} -e 's/^\(FromDomain=\).*$/\1%%domain_name%%/' \
-			< ${HOME}/.backup/Config > ${HOME}/.im/Config
-	fi
-	if [ X"${default_domain_name}" = "X%%default_domain_name%%" ]; then
-		default_domain_name=""
-	else
-		${CP} ${HOME}/.im/Config ${HOME}/.backup/Config
-		${SED} -e 's/^\(ToDomain=\).*$/\1%%default_domain_name%%/' \
-			< ${HOME}/.backup/Config > ${HOME}/.im/Config
-	fi
-fi
-
-###
-# Copy "aliases" if none
-#
-if [ ! -f ${HOME}/.im/Aliases ]; then	
-	${CP} ${SAMPLEDIR}/Aliases ${HOME}/.im
-fi
-
-###
-# Set user environment : nameserver, signature
-#
-options_Highlight=OFF
-options_Citation=OFF
-options_Cite_Change=OFF
-options_Sign_Change=OFF
-language=English
-dot_emacs_file=.emacs
-
-PreSet="\
-This is the main menu of the Mew configuration pre-settings. Please \n\
-select one of the options below by using the arrow keys or typing the \n\
-first character of the option name you intend to set. Invoke an option \n\
-by pressing [ENTER] or [TAB-ENTER] to exit the settings."
-
-answer=None
-while [ ! X"${answer}" = "XQuit" ]; do
-	${DIALOG} --title "Pre-set Mew configurations" \
-	--hline "To select an item press [Enter] on the item" \
-	--menu "${PreSet}" -1 -1 3 \
-	Language	"Determine language in use on Mew" \
-	DotEmacs	"Choose dot.emacs files being to use" \
-	Quit		"Quit this menu" \
-		2>	/tmp/menu.$$
-	retval=$?
-	answer=`${CAT} /tmp/menu.$$|${SED} -e 's/\"//g'`
-	${RM} -f /tmp/menu.$$
-	case $retval in
-		0) if [ -z ${answer} ]; then ${ECHO} "Nothing selected"; contiue; fi ;;
-		1) break ;;
-		255) break ;;
-	esac
-	case ${answer} in
-		Language)
-			select
-			;;
-		DotEmacs)
-			input_data "Emacs dot.emacs file name" "dot_emacs_file" ""
-			;;
-		Quit)
-			answer=Quit
-			;;
-	esac
-done
-
-#echo language=${language}
-#echo dot_emacs_file=${dot_emacs_file}
-#exit 1
-
-MainMenu="\
-This is the main menu of the Mew configuration settings. Please select \n\
-one of the options below by using the arrow keys or typing the first \n\
-character of the option name you intend to set. Invoke an option by \n\
-pressing [ENTER] or [TAB-ENTER] to exit the settings."
-
-answer=None
-while [ ! X"${answer}" = "XQuit" ]; do
-	${DIALOG} --title "Set Mew configurations" \
-	--hline "Select Items and Quit when finished" \
-	--menu "${MainMenu}" -1 -1 6 \
-	NameServer	"Name server Domain name" \
-	MailAddress	"Your mail address (with FQDN)" \
-	DomainName	"Your domain name" \
-	DefaultDomain	"Default domain name in abbrivation" \
-	Options		"Various options on using Mew" \
-	Quit		"Quit this menu" \
-		2>	/tmp/menu.$$
-	retval=$?
-	answer=`${CAT} /tmp/menu.$$`
-	${RM} -f /tmp/menu.$$
-	case $retval in
-		0)	if [ -z ${answer} ]; then
-				${ECHO} "Nothing selected"
-				exit 1
-			fi
-			;;
-		1)	${ECHO} "Cancel pressed."
-			exit 1
-			;;
-		255)	${ECHO} "ESC pressed."
-			exit 1
-			;;
-	esac
-	case ${answer} in
-		NameServer)
-			input_data "Name Server" "nameserver" ""
-			;;
-		MailAddress)
-			input_data "Mail Address" "mail_address" ""
-			;;
-		DomainName)
-			input_data "Domain Name" "domain_name" ""
-			;;
-		DefaultDomain)
-			input_data "Default Domain Name" "default_domain_name" ""
-			;;
-		Options)
-#			options
-			;;
-		Quit)
-			answer=Quit
-			;;
-	esac
-done
-
-#echo 'nameserver='${nameserver}
-#echo 'mail_address='${mail_address}
-#echo 'domain_name='${domain_name}
-#echo 'defaut_domain_name='${default_domain_name}
-
-#exit 1
-
-###
-# Custumize startup files with selected options.
-#
-dot_emacs="dot.emacs.el ${dot_emacs}"
-eval ${SEDCMD} < ${HOME}/.im/Config > ${HOME}/.backup/Config
-
-###
-# Add Mew startup setting to ~/.emacs
-#
-if [ -f ${dot_emacs_file} ]; then
-    ${SED} -e '/^;;;* Mew ;*$/,/^;;; *Mew end$/d' < ${HOME}/${dot_emacs_file} \
-	> ${HOME}/.backup/${dot_emacs_file}
-else
-    ${ECHO} "Create new \"dot.emacs\" file: ${dot_emacs_file}"
-fi
-
-#echo 'dot_emacs='${dot_emacs}
-for f in ${dot_emacs}; do
-	${CAT} ${SAMPLEDIR}/dot.emacs/${f} |\
-		eval ${SEDCMD} >> ${HOME}/.backup/${dot_emacs_file}
-done
-${ECHO} ";;;                                                       Mew end" \
-	>> ${HOME}/.backup/${dot_emacs_file}
-${CP} ${HOME}/.backup/${dot_emacs_file} ${HOME}/${dot_emacs_file}
-
-###
-# Copy im Config file  to ~/.im
-#
-${CP} ${HOME}/.backup/Config ${HOME}/.im/Config
diff --git a/mail/mew3-xemacs21-mule/Makefile b/mail/mew3-xemacs21-mule/Makefile
index 7a5016ca440b..4ef2c12d9af9 100644
--- a/mail/mew3-xemacs21-mule/Makefile
+++ b/mail/mew3-xemacs21-mule/Makefile
@@ -11,7 +11,7 @@ MAINTAINER=	kiri@FreeBSD.org
 MEW_MAJOR_VER=	2
 
 # This is a slave port.
-MASTERDIR=	${.CURDIR}/../mew${MEW_MAJOR_VER}-emacs20
+MASTERDIR=	${.CURDIR}/../mew${MEW_MAJOR_VER}
 
 # Set emacs port
 EMACS_PORT_NAME=	xemacs21-mule
diff --git a/mail/mew3-xemacs21/Makefile b/mail/mew3-xemacs21/Makefile
index f66b28d4668e..2b4d0461f36a 100644
--- a/mail/mew3-xemacs21/Makefile
+++ b/mail/mew3-xemacs21/Makefile
@@ -11,7 +11,7 @@ MAINTAINER=	kiri@FreeBSD.org
 MEW_MAJOR_VER=	2
 
 # This is a slave port.
-MASTERDIR=	${.CURDIR}/../mew${MEW_MAJOR_VER}-emacs20
+MASTERDIR=	${.CURDIR}/../mew${MEW_MAJOR_VER}
 
 # set emacs port
 EMACS_PORT_NAME=	xemacs21
diff --git a/mail/mew3/Makefile b/mail/mew3/Makefile
index b4a133c20a63..bd2ca7ea3946 100644
--- a/mail/mew3/Makefile
+++ b/mail/mew3/Makefile
@@ -25,7 +25,7 @@ MEW_VER=	${MEW_MAJOR_VER}.1
 MEW_DOCDIR?=	share/doc/${PORTNAME}${MEW_MAJOR_VER}
 
 # emacs port setup
-EMACS_PORT_NAME?=	emacs20
+EMACS_PORT_NAME?=	emacs21
 
 # target name for make build and install
 ALL_TARGET?=	all info jinfo
diff --git a/mail/mew3/pkg-comment b/mail/mew3/pkg-comment
index 716e8e2868af..a31b49d89530 100644
--- a/mail/mew3/pkg-comment
+++ b/mail/mew3/pkg-comment
@@ -1 +1 @@
-Message interface to Emacs Window (version 2) for emacs20
+Message interface to Emacs Window (version 2) for emacs21
diff --git a/mail/mew3/pkg-descr b/mail/mew3/pkg-descr
index eb6791574b91..a1ee92480f9b 100644
--- a/mail/mew3/pkg-descr
+++ b/mail/mew3/pkg-descr
@@ -8,12 +8,12 @@ and to make it easy to view and compose them. With Mew you can send a
 picture of a birthday cake with the song "Happy Birthday to you" to your
 friend, which is encrypted by strong cryptograph.
 
-This port is the Mew2(Mew with version 2) for emacs-20.7(editors/emacs20). 
+This port is the Mew2(Mew with version 2) for emacs-21.x (editors/emacs21). 
 The Mew2 port and corresponding Emacs port are listed bellow and elisp
 `site-lisp' directory(elisp load path), info path and etc directory(only
 effective for xemacs ports) are shown as well. 
 
-mail/mew2-emacs20(mew-emacs20-2.0) ===> editors/emacs20(emacs-20.7) 
+mail/mew2 (mew-emacs21-2.x) ===> editors/emacs21 (emacs-21.x) 
 	Lisp directory : /usr/local/share/emacs/site-lisp/mew
 	Info directory : /usr/local/info
 	ETC directory  : /usr/local/share/emacs/etc/mew