1 files changed, 77 insertions, 70 deletions

diff --git a/deskutils/mhc/pkg-plist b/deskutils/mhc/pkg-plist
index f5364b9b2a11..18f42f9da4eb 100644
--- a/deskutils/mhc/pkg-plist
+++ b/deskutils/mhc/pkg-plist
@@ -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