diff -ruN deskutils.old/mhc-emacs20/Makefile deskutils/mhc-emacs20/Makefile
--- deskutils.old/mhc-emacs20/Makefile	Thu Aug  2 18:43:11 2001
+++ deskutils/mhc-emacs20/Makefile	Mon Oct 29 09:36:31 2001
@@ -19,23 +19,45 @@
 
 .include <bsd.port.pre.mk>
 
-.if (${EMACS_PORT_NAME} == "emacs20")
-ALL_TARGET=	elc
-.endif
 .if (${EMACS_PORT_NAME} == "xemacs21-mule")
 ALL_TARGET=	package
 INSTALL_TARGET=	install-package
-PLIST=	${PKGDIR}/pkg-plist.xemacs21-mule
+LISPDIR=	${EMACS_LIBDIR}/site-packages/lisp/${PORTNAME}
+ICONDIR=	${EMACS_LIBDIR}/site-packages/etc/${PORTNAME}
+IMG_SUFFIX=	xpm
+XEMACS_ONLY=	""
+EMACS_ONLY=	"@comment "
+EMACS21_ONLY=	"@comment "
+.else
+ALL_TARGET=	elc
+MAKE_ARGS+=	INST_OPTS="--with-lispdir=${PREFIX}/${LISPDIR}"
+LISPDIR=	${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
+ICONDIR=	${EMACS_LIBDIR}/etc/${PORTNAME}/icons
+XEMACS_ONLY=	"@comment "
+EMACS_ONLY=	""
+.if (${EMACS_PORT_NAME} == "emacs21")
+IMG_SUFFIX=	xpm
+EMACS21_ONLY=	""
+.else
+IMG_SUFFIX=	xbm
+EMACS21_ONLY=	"@comment "
 .endif
+.endif
+
+PLIST_SUB+=	LISPDIR=${LISPDIR} \
+		ICONDIR=${ICONDIR} IMG_SUFFIX=${IMG_SUFFIX} \
+		XEMACS_ONLY=${XEMACS_ONLY} \
+		EMACS_ONLY=${EMACS_ONLY} \
+		EMACS21_ONLY=${EMACS21_ONLY}
 
 DOCS=	00copyright 00readme 00readme.jis emacs/00usage.jis
 
 DOCSDIR=	${PREFIX}/share/doc/mhc
 
 post-install:
-.if (${EMACS_PORT_NAME} == "emacs20")
-	${MKDIR} ${PREFIX}/${EMACS_LIBDIR}/site-lisp/mhc/icons
-	${INSTALL_DATA} ${WRKSRC}/../icons/*.xbm ${PREFIX}/${EMACS_LIBDIR}/site-lisp/mhc/icons
+.if (${EMACS_PORT_NAME} == "emacs20") || (${EMACS_PORT_NAME} == "emacs21")
+	${MKDIR} ${PREFIX}/${ICONDIR}
+	${INSTALL_DATA} ${WRKSRC}/../icons/*.${IMG_SUFFIX} ${PREFIX}/${ICONDIR}
 .endif
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
diff -ruN deskutils.old/mhc-emacs20/pkg-descr deskutils/mhc-emacs20/pkg-descr
--- deskutils.old/mhc-emacs20/pkg-descr	Mon Apr  9 00:33:08 2001
+++ deskutils/mhc-emacs20/pkg-descr	Mon Oct 29 09:41:00 2001
@@ -5,18 +5,18 @@
 The supported MUA are Mew, Wanderlust and Gnus.
 Minimum setup:
 
-for Mew user:
-  (autoload 'mhc-mew-setup "mhc-mew")
-  (add-hook 'mew-init-hook 'mhc-mew-setup)
- optional setting for Mew-1.94 (Raw JIS header decoding)
- (add-hook 'mew-message-hook 'mhc-mew-decode-header)
-
-for Wanderlust user:
-  (autoload 'mhc-wl-setup "mhc-wl")
-  (add-hook 'wl-init-hook 'mhc-wl-setup)
-
-for Gnus user:
-  (autoload 'mhc-gnus-setup "mhc-gnus")
-  (add-hook 'gnus-startup-hook 'mhc-gnus-setup)
+;;; for Mew user:
+(autoload 'mhc-mew-setup "mhc-mew")
+(add-hook 'mew-init-hook 'mhc-mew-setup)
+;; optional setting for Mew-1.94 (Raw JIS header decoding)
+;(add-hook 'mew-message-hook 'mhc-mew-decode-header)
+;;; for Wanderlust user:
+(autoload 'mhc-wl-setup "mhc-wl")
+(add-hook 'wl-init-hook 'mhc-wl-setup)
+;;; for Gnus user:
+(autoload 'mhc-gnus-setup "mhc-gnus")
+(add-hook 'gnus-startup-hook 'mhc-gnus-setup)
+;; icon setting for emacs20 (with bitmap-mule) or emacs21
+;(setq mhc-icon-path "/usr/local/share/emacs/etc/mhc/icons")
 
 WWW: http://www.quickhack.net/mhc/
diff -ruN deskutils.old/mhc-emacs20/pkg-plist deskutils/mhc-emacs20/pkg-plist
--- deskutils.old/mhc-emacs20/pkg-plist	Thu Aug  2 18:43:11 2001
+++ deskutils/mhc-emacs20/pkg-plist	Mon Oct 29 09:36:31 2001
@@ -1,73 +1,80 @@
-%%EMACS_LIBDIR%%/site-lisp/mhc/mhc-bm.el
-@unexec rm -f %D/%%EMACS_LIBDIR%%/site-lisp/mhc/mhc-bm.elc
-%%EMACS_LIBDIR%%/site-lisp/mhc/mhc-calendar.el
-%%EMACS_LIBDIR%%/site-lisp/mhc/mhc-calendar.elc
-%%EMACS_LIBDIR%%/site-lisp/mhc/mhc-compat.el
-%%EMACS_LIBDIR%%/site-lisp/mhc/mhc-compat.elc
-%%EMACS_LIBDIR%%/site-lisp/mhc/mhc-cvs.el
-%%EMACS_LIBDIR%%/site-lisp/mhc/mhc-cvs.elc
-%%EMACS_LIBDIR%%/site-lisp/mhc/mhc-date.el
-%%EMACS_LIBDIR%%/site-lisp/mhc/mhc-date.elc
-%%EMACS_LIBDIR%%/site-lisp/mhc/mhc-day.el
-%%EMACS_LIBDIR%%/site-lisp/mhc/mhc-day.elc
-%%EMACS_LIBDIR%%/site-lisp/mhc/mhc-db.el
-%%EMACS_LIBDIR%%/site-lisp/mhc/mhc-db.elc
-%%EMACS_LIBDIR%%/site-lisp/mhc/mhc-draft.el
-%%EMACS_LIBDIR%%/site-lisp/mhc/mhc-draft.elc
-%%EMACS_LIBDIR%%/site-lisp/mhc/mhc-e21.el
-%%EMACS_LIBDIR%%/site-lisp/mhc/mhc-face.el
-%%EMACS_LIBDIR%%/site-lisp/mhc/mhc-face.elc
-%%EMACS_LIBDIR%%/site-lisp/mhc/mhc-file.el
-%%EMACS_LIBDIR%%/site-lisp/mhc/mhc-file.elc
-%%EMACS_LIBDIR%%/site-lisp/mhc/mhc-gnus.el
-%%EMACS_LIBDIR%%/site-lisp/mhc/mhc-guess.el
-%%EMACS_LIBDIR%%/site-lisp/mhc/mhc-guess.elc
-%%EMACS_LIBDIR%%/site-lisp/mhc/mhc-header.el
-%%EMACS_LIBDIR%%/site-lisp/mhc/mhc-header.elc
-%%EMACS_LIBDIR%%/site-lisp/mhc/mhc-logic.el
-%%EMACS_LIBDIR%%/site-lisp/mhc/mhc-logic.elc
-%%EMACS_LIBDIR%%/site-lisp/mhc/mhc-mew.el
-%%EMACS_LIBDIR%%/site-lisp/mhc/mhc-mime.el
-%%EMACS_LIBDIR%%/site-lisp/mhc/mhc-minibuf.el
-%%EMACS_LIBDIR%%/site-lisp/mhc/mhc-minibuf.elc
-%%EMACS_LIBDIR%%/site-lisp/mhc/mhc-misc.el
-%%EMACS_LIBDIR%%/site-lisp/mhc/mhc-misc.elc
-%%EMACS_LIBDIR%%/site-lisp/mhc/mhc-parse.el
-%%EMACS_LIBDIR%%/site-lisp/mhc/mhc-parse.elc
-%%EMACS_LIBDIR%%/site-lisp/mhc/mhc-ps.el
-%%EMACS_LIBDIR%%/site-lisp/mhc/mhc-ps.elc
-%%EMACS_LIBDIR%%/site-lisp/mhc/mhc-record.el
-%%EMACS_LIBDIR%%/site-lisp/mhc/mhc-record.elc
-%%EMACS_LIBDIR%%/site-lisp/mhc/mhc-schedule.el
-%%EMACS_LIBDIR%%/site-lisp/mhc/mhc-schedule.elc
-%%EMACS_LIBDIR%%/site-lisp/mhc/mhc-slot.el
-%%EMACS_LIBDIR%%/site-lisp/mhc/mhc-slot.elc
-%%EMACS_LIBDIR%%/site-lisp/mhc/mhc-summary.el
-%%EMACS_LIBDIR%%/site-lisp/mhc/mhc-summary.elc
-%%EMACS_LIBDIR%%/site-lisp/mhc/mhc-sync.el
-%%EMACS_LIBDIR%%/site-lisp/mhc/mhc-sync.elc
-%%EMACS_LIBDIR%%/site-lisp/mhc/mhc-vars.el
-%%EMACS_LIBDIR%%/site-lisp/mhc/mhc-vars.elc
-%%EMACS_LIBDIR%%/site-lisp/mhc/mhc-wl.el
-%%EMACS_LIBDIR%%/site-lisp/mhc/mhc-xmas.el
-%%EMACS_LIBDIR%%/site-lisp/mhc/mhc.el
-%%EMACS_LIBDIR%%/site-lisp/mhc/mhc.elc
-%%EMACS_LIBDIR%%/site-lisp/mhc/nnmhc.el
-%%EMACS_LIBDIR%%/site-lisp/mhc/icons/Anniversary.xbm
-%%EMACS_LIBDIR%%/site-lisp/mhc/icons/Birthday.xbm
-%%EMACS_LIBDIR%%/site-lisp/mhc/icons/Business.xbm
-%%EMACS_LIBDIR%%/site-lisp/mhc/icons/CheckBox.xbm
-%%EMACS_LIBDIR%%/site-lisp/mhc/icons/CheckedBox.xbm
-%%EMACS_LIBDIR%%/site-lisp/mhc/icons/Conflict.xbm
-%%EMACS_LIBDIR%%/site-lisp/mhc/icons/Date.xbm
-%%EMACS_LIBDIR%%/site-lisp/mhc/icons/Holiday.xbm
-%%EMACS_LIBDIR%%/site-lisp/mhc/icons/Link.xbm
-%%EMACS_LIBDIR%%/site-lisp/mhc/icons/Other.xbm
-%%EMACS_LIBDIR%%/site-lisp/mhc/icons/Party.xbm
-%%EMACS_LIBDIR%%/site-lisp/mhc/icons/Private.xbm
-%%EMACS_LIBDIR%%/site-lisp/mhc/icons/Vacation.xbm
-@dirrm %%EMACS_LIBDIR%%/site-lisp/mhc/icons
-@dirrm %%EMACS_LIBDIR%%/site-lisp/mhc
+%%XEMACS_ONLY%%%%LISPDIR%%/auto-autoloads.el
+%%XEMACS_ONLY%%%%LISPDIR%%/auto-autoloads.elc
+%%XEMACS_ONLY%%%%LISPDIR%%/custom-load.el
+%%XEMACS_ONLY%%%%LISPDIR%%/custom-load.elc
+%%LISPDIR%%/mhc-bm.el
+%%EMACS_ONLY%%@unexec rm -f %D/%%LISPDIR%%/mhc-bm.elc
+%%LISPDIR%%/mhc-calendar.el
+%%LISPDIR%%/mhc-calendar.elc
+%%LISPDIR%%/mhc-compat.el
+%%LISPDIR%%/mhc-compat.elc
+%%LISPDIR%%/mhc-cvs.el
+%%LISPDIR%%/mhc-cvs.elc
+%%LISPDIR%%/mhc-date.el
+%%LISPDIR%%/mhc-date.elc
+%%LISPDIR%%/mhc-day.el
+%%LISPDIR%%/mhc-day.elc
+%%LISPDIR%%/mhc-db.el
+%%LISPDIR%%/mhc-db.elc
+%%LISPDIR%%/mhc-draft.el
+%%LISPDIR%%/mhc-draft.elc
+%%LISPDIR%%/mhc-e21.el
+%%EMACS21_ONLY%%%%LISPDIR%%/mhc-e21.elc
+%%LISPDIR%%/mhc-face.el
+%%LISPDIR%%/mhc-face.elc
+%%LISPDIR%%/mhc-file.el
+%%LISPDIR%%/mhc-file.elc
+%%LISPDIR%%/mhc-gnus.el
+%%LISPDIR%%/mhc-guess.el
+%%LISPDIR%%/mhc-guess.elc
+%%LISPDIR%%/mhc-header.el
+%%LISPDIR%%/mhc-header.elc
+%%LISPDIR%%/mhc-logic.el
+%%LISPDIR%%/mhc-logic.elc
+%%LISPDIR%%/mhc-mew.el
+%%LISPDIR%%/mhc-mime.el
+%%LISPDIR%%/mhc-minibuf.el
+%%LISPDIR%%/mhc-minibuf.elc
+%%LISPDIR%%/mhc-misc.el
+%%LISPDIR%%/mhc-misc.elc
+%%LISPDIR%%/mhc-parse.el
+%%LISPDIR%%/mhc-parse.elc
+%%LISPDIR%%/mhc-ps.el
+%%LISPDIR%%/mhc-ps.elc
+%%LISPDIR%%/mhc-record.el
+%%LISPDIR%%/mhc-record.elc
+%%LISPDIR%%/mhc-schedule.el
+%%LISPDIR%%/mhc-schedule.elc
+%%LISPDIR%%/mhc-slot.el
+%%LISPDIR%%/mhc-slot.elc
+%%LISPDIR%%/mhc-summary.el
+%%LISPDIR%%/mhc-summary.elc
+%%LISPDIR%%/mhc-sync.el
+%%LISPDIR%%/mhc-sync.elc
+%%LISPDIR%%/mhc-vars.el
+%%LISPDIR%%/mhc-vars.elc
+%%LISPDIR%%/mhc-wl.el
+%%LISPDIR%%/mhc-xmas.el
+%%XEMACS_ONLY%%%%LISPDIR%%/mhc-xmas.elc
+%%LISPDIR%%/mhc.el
+%%LISPDIR%%/mhc.elc
+%%LISPDIR%%/nnmhc.el
+%%ICONDIR%%/Anniversary.%%IMG_SUFFIX%%
+%%ICONDIR%%/Birthday.%%IMG_SUFFIX%%
+%%ICONDIR%%/Business.%%IMG_SUFFIX%%
+%%ICONDIR%%/CheckBox.%%IMG_SUFFIX%%
+%%ICONDIR%%/CheckedBox.%%IMG_SUFFIX%%
+%%ICONDIR%%/Conflict.%%IMG_SUFFIX%%
+%%ICONDIR%%/Date.%%IMG_SUFFIX%%
+%%ICONDIR%%/Holiday.%%IMG_SUFFIX%%
+%%ICONDIR%%/Link.%%IMG_SUFFIX%%
+%%ICONDIR%%/Other.%%IMG_SUFFIX%%
+%%ICONDIR%%/Party.%%IMG_SUFFIX%%
+%%ICONDIR%%/Private.%%IMG_SUFFIX%%
+%%ICONDIR%%/Vacation.%%IMG_SUFFIX%%
+@dirrm %%ICONDIR%%
+%%EMACS_ONLY%%@dirrm %%EMACS_LIBDIR%%/etc/mhc
+@dirrm %%LISPDIR%%
 %%PORTDOCS%%share/doc/mhc/DOT.schedule.sample.jp
 %%PORTDOCS%%share/doc/mhc/00copyright
 %%PORTDOCS%%share/doc/mhc/00readme
diff -ruN deskutils.old/mhc-emacs21/Makefile deskutils/mhc-emacs21/Makefile
--- deskutils.old/mhc-emacs21/Makefile	Thu Jan  1 09:00:00 1970
+++ deskutils/mhc-emacs21/Makefile	Mon Oct 29 09:46:34 2001
@@ -0,0 +1,13 @@
+# New ports collection makefile for:	mhc (for emacs21)
+# Date created:		29 Oct 2001
+# Whom:			Yoichi NAKAYAMA <yoichi@eken.phys.nagoya-u.ac.jp>
+#
+# $FreeBSD$
+#
+
+MASTERDIR=	${.CURDIR}/../../deskutils/mhc-emacs20
+MAINTAINER=	yoichi@eken.phys.nagoya-u.ac.jp
+
+EMACS_PORT_NAME=	emacs21
+
+.include <${MASTERDIR}/Makefile>