Use a common PLIST by taking advantage of the variables exported by

emacs.mk.

4 files changed, 190 insertions, 369 deletions

diff --git a/mail/vm/Makefile b/mail/vm/Makefile
index 2b4a170a8c1..cc440221ade 100644
--- a/mail/vm/Makefile
+++ b/mail/vm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2006/03/05 16:27:26 jlam Exp $
+# $NetBSD: Makefile,v 1.30 2006/04/05 15:50:27 jlam Exp $
 
 DISTNAME=	vm-7.19
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
@@ -24,34 +24,32 @@ COMMENT=	VM (View Mail) is an advanced mail user agent for Emacs
 .include "../../mk/emacs.mk"
 
 USE_TOOLS+=	makeinfo
+INFO_FILES=	# PLIST
 
 .if ${EMACS_FLAVOR} == "xemacs"
-INFODIR=	${PREFIX}/lib/xemacs/site-packages/info
-PIXMAPDIR=	${PREFIX}/lib/xemacs/site-packages/etc/vm
-BINDIR=		${PREFIX}/bin
-PLIST_SRC=	${PKGDIR}/PLIST.xemacs
+PIXMAPDIR=	${EMACS_LISPPREFIX:H}/etc/vm
 .elif ${EMACS_FLAVOR} == "emacs"
-INFODIR=	${PREFIX}/info
-PIXMAPDIR=	${PREFIX}/share/emacs/site-lisp/vm/pixmaps
-BINDIR=		${PREFIX}/bin
-INFO_FILES=	vm.info
-PLIST_SRC=	${PKGDIR}/PLIST.emacs
+PIXMAPDIR=	${EMACS_LISPPREFIX}/vm/pixmaps
 .endif
-MAKEFLAGS+=	EMACS=${EMACS_BIN:Q}
 
+MAKEFLAGS+=	EMACS=${EMACS_BIN:Q}
 MAKE_ENV+=	LISPDIR=${EMACS_LISPPREFIX}/vm
 MAKE_ENV+=	INFODIR=${INFODIR:Q}
 MAKE_ENV+=	PIXMAPDIR=${PIXMAPDIR:Q}
-MAKE_ENV+=	BINDIR=${BINDIR:Q}
+MAKE_ENV+=	BINDIR=${PREFIX:Q}/bin
+PLIST_SUBST+=	PIXMAPDIR=${PIXMAPDIR:S/^${PREFIX}\///:Q}
+
+INSTALLATION_DIRS=	bin ${EMACS_INFOPREFIX} ${EMACS_LISPPREFIX}/vm	\
+			${PIXMAPDIR}
 
 do-install:
-	${INSTALL_DATA_DIR} ${EMACS_LISPPREFIX}/vm
 	cd ${WRKSRC} && ${INSTALL_DATA} *.el* ${EMACS_LISPPREFIX}/vm
-	${INSTALL_DATA_DIR} ${INFODIR}
-	${INSTALL_DATA} ${WRKSRC}/*.info* ${INFODIR}
-	${INSTALL_DATA_DIR} ${PIXMAPDIR}
+	cd ${WRKSRC}; for f in *.info *.info-[0-9]*; do			\
+		${TEST} ! -f "$$f" ||					\
+		${INSTALL_DATA} "$$f" ${EMACS_INFOPREFIX};		\
+	done
 	${INSTALL_DATA} ${WRKSRC}/pixmaps/*.x[pb]m ${PIXMAPDIR}
 	cd ${WRKSRC} && ${INSTALL_PROGRAM} qp-decode qp-encode		\
-		base64-decode base64-encode ${BINDIR}
+		base64-decode base64-encode ${PREFIX}/bin
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/vm/PLIST b/mail/vm/PLIST
new file mode 100644
index 00000000000..ce0f549efaf
--- /dev/null
+++ b/mail/vm/PLIST
@@ -0,0 +1,175 @@
+@comment $NetBSD: PLIST,v 1.3 2006/04/05 15:50:27 jlam Exp $
+bin/base64-decode
+bin/base64-encode
+bin/qp-decode
+bin/qp-encode
+${PIXMAPDIR}/audio_stamp-colorful.xpm
+${PIXMAPDIR}/audio_stamp-simple.xpm
+${PIXMAPDIR}/autofile-dn.xbm
+${PIXMAPDIR}/autofile-dn.xpm
+${PIXMAPDIR}/autofile-up.xbm
+${PIXMAPDIR}/autofile-up.xpm
+${PIXMAPDIR}/autofile-xx.xbm
+${PIXMAPDIR}/compose-dn.xbm
+${PIXMAPDIR}/compose-dn.xpm
+${PIXMAPDIR}/compose-up.xbm
+${PIXMAPDIR}/compose-up.xpm
+${PIXMAPDIR}/compose-xx.xbm
+${PIXMAPDIR}/delete-dn.xbm
+${PIXMAPDIR}/delete-dn.xpm
+${PIXMAPDIR}/delete-up.xbm
+${PIXMAPDIR}/delete-up.xpm
+${PIXMAPDIR}/delete-xx.xbm
+${PIXMAPDIR}/document-colorful.xpm
+${PIXMAPDIR}/document-simple.xpm
+${PIXMAPDIR}/file-dn.xbm
+${PIXMAPDIR}/file-dn.xpm
+${PIXMAPDIR}/file-up.xbm
+${PIXMAPDIR}/file-up.xpm
+${PIXMAPDIR}/file-xx.xbm
+${PIXMAPDIR}/film-colorful.xpm
+${PIXMAPDIR}/film-simple.xpm
+${PIXMAPDIR}/gear-colorful.xpm
+${PIXMAPDIR}/gear-simple.xpm
+${PIXMAPDIR}/getmail-dn.xbm
+${PIXMAPDIR}/getmail-dn.xpm
+${PIXMAPDIR}/getmail-up.xbm
+${PIXMAPDIR}/getmail-up.xpm
+${PIXMAPDIR}/getmail-xx.xbm
+${PIXMAPDIR}/help-dn.xbm
+${PIXMAPDIR}/help-dn.xpm
+${PIXMAPDIR}/help-up.xbm
+${PIXMAPDIR}/help-up.xpm
+${PIXMAPDIR}/help-xx.xbm
+${PIXMAPDIR}/message-colorful.xpm
+${PIXMAPDIR}/message-simple.xpm
+${PIXMAPDIR}/mime-colorful-dn.xpm
+${PIXMAPDIR}/mime-colorful-up.xpm
+${PIXMAPDIR}/mime-colorful-xx.xpm
+${PIXMAPDIR}/mime-dn.xbm
+${PIXMAPDIR}/mime-simple-dn.xpm
+${PIXMAPDIR}/mime-simple-up.xpm
+${PIXMAPDIR}/mime-simple-xx.xpm
+${PIXMAPDIR}/mime-up.xbm
+${PIXMAPDIR}/mime-xx.xbm
+${PIXMAPDIR}/mona_stamp-colorful.xpm
+${PIXMAPDIR}/mona_stamp-simple.xpm
+${PIXMAPDIR}/next-dn.xbm
+${PIXMAPDIR}/next-dn.xpm
+${PIXMAPDIR}/next-up.xbm
+${PIXMAPDIR}/next-up.xpm
+${PIXMAPDIR}/next-xx.xbm
+${PIXMAPDIR}/previous-dn.xbm
+${PIXMAPDIR}/previous-dn.xpm
+${PIXMAPDIR}/previous-up.xbm
+${PIXMAPDIR}/previous-up.xpm
+${PIXMAPDIR}/previous-xx.xbm
+${PIXMAPDIR}/print-dn.xbm
+${PIXMAPDIR}/print-dn.xpm
+${PIXMAPDIR}/print-up.xbm
+${PIXMAPDIR}/print-up.xpm
+${PIXMAPDIR}/print-xx.xbm
+${PIXMAPDIR}/quit-dn.xbm
+${PIXMAPDIR}/quit-dn.xpm
+${PIXMAPDIR}/quit-up.xbm
+${PIXMAPDIR}/quit-up.xpm
+${PIXMAPDIR}/quit-xx.xbm
+${PIXMAPDIR}/recover-dn.xbm
+${PIXMAPDIR}/recover-dn.xpm
+${PIXMAPDIR}/recover-up.xbm
+${PIXMAPDIR}/recover-up.xpm
+${PIXMAPDIR}/recover-xx.xbm
+${PIXMAPDIR}/reply-dn.xbm
+${PIXMAPDIR}/reply-dn.xpm
+${PIXMAPDIR}/reply-up.xbm
+${PIXMAPDIR}/reply-up.xpm
+${PIXMAPDIR}/reply-xx.xbm
+${PIXMAPDIR}/stuffed_box-colorful.xpm
+${PIXMAPDIR}/stuffed_box-simple.xpm
+${PIXMAPDIR}/undelete-dn.xbm
+${PIXMAPDIR}/undelete-dn.xpm
+${PIXMAPDIR}/undelete-up.xbm
+${PIXMAPDIR}/undelete-up.xpm
+${PIXMAPDIR}/undelete-xx.xbm
+${PIXMAPDIR}/visit-dn.xbm
+${PIXMAPDIR}/visit-dn.xpm
+${PIXMAPDIR}/visit-up.xbm
+${PIXMAPDIR}/visit-up.xpm
+${PIXMAPDIR}/visit-xx.xbm
+${EMACS_INFOPREFIX}/vm.info
+${EMACS_LISPPREFIX}/vm/tapestry.el
+${EMACS_LISPPREFIX}/vm/tapestry.elc
+${EMACS_LISPPREFIX}/vm/vm-autoload.el
+${EMACS_LISPPREFIX}/vm/vm-autoload.elc
+${EMACS_LISPPREFIX}/vm/vm-byteopts.el
+${EMACS_LISPPREFIX}/vm/vm-crypto.el
+${EMACS_LISPPREFIX}/vm/vm-crypto.elc
+${EMACS_LISPPREFIX}/vm/vm-delete.el
+${EMACS_LISPPREFIX}/vm/vm-delete.elc
+${EMACS_LISPPREFIX}/vm/vm-digest.el
+${EMACS_LISPPREFIX}/vm/vm-digest.elc
+${EMACS_LISPPREFIX}/vm/vm-easymenu.el
+${EMACS_LISPPREFIX}/vm/vm-easymenu.elc
+${EMACS_LISPPREFIX}/vm/vm-edit.el
+${EMACS_LISPPREFIX}/vm/vm-edit.elc
+${EMACS_LISPPREFIX}/vm/vm-folder.el
+${EMACS_LISPPREFIX}/vm/vm-folder.elc
+${EMACS_LISPPREFIX}/vm/vm-imap.el
+${EMACS_LISPPREFIX}/vm/vm-imap.elc
+${EMACS_LISPPREFIX}/vm/vm-license.el
+${EMACS_LISPPREFIX}/vm/vm-license.elc
+${EMACS_LISPPREFIX}/vm/vm-macro.el
+${EMACS_LISPPREFIX}/vm/vm-macro.elc
+${EMACS_LISPPREFIX}/vm/vm-mark.el
+${EMACS_LISPPREFIX}/vm/vm-mark.elc
+${EMACS_LISPPREFIX}/vm/vm-menu.el
+${EMACS_LISPPREFIX}/vm/vm-menu.elc
+${EMACS_LISPPREFIX}/vm/vm-message.el
+${EMACS_LISPPREFIX}/vm/vm-message.elc
+${EMACS_LISPPREFIX}/vm/vm-mime.el
+${EMACS_LISPPREFIX}/vm/vm-mime.elc
+${EMACS_LISPPREFIX}/vm/vm-minibuf.el
+${EMACS_LISPPREFIX}/vm/vm-minibuf.elc
+${EMACS_LISPPREFIX}/vm/vm-misc.el
+${EMACS_LISPPREFIX}/vm/vm-misc.elc
+${EMACS_LISPPREFIX}/vm/vm-motion.el
+${EMACS_LISPPREFIX}/vm/vm-motion.elc
+${EMACS_LISPPREFIX}/vm/vm-mouse.el
+${EMACS_LISPPREFIX}/vm/vm-mouse.elc
+${EMACS_LISPPREFIX}/vm/vm-page.el
+${EMACS_LISPPREFIX}/vm/vm-page.elc
+${EMACS_LISPPREFIX}/vm/vm-pop.el
+${EMACS_LISPPREFIX}/vm/vm-pop.elc
+${EMACS_LISPPREFIX}/vm/vm-reply.el
+${EMACS_LISPPREFIX}/vm/vm-reply.elc
+${EMACS_LISPPREFIX}/vm/vm-save.el
+${EMACS_LISPPREFIX}/vm/vm-save.elc
+${EMACS_LISPPREFIX}/vm/vm-search.el
+${EMACS_LISPPREFIX}/vm/vm-search.elc
+${EMACS_LISPPREFIX}/vm/vm-sort.el
+${EMACS_LISPPREFIX}/vm/vm-sort.elc
+${EMACS_LISPPREFIX}/vm/vm-startup.el
+${EMACS_LISPPREFIX}/vm/vm-startup.elc
+${EMACS_LISPPREFIX}/vm/vm-summary.el
+${EMACS_LISPPREFIX}/vm/vm-summary.elc
+${EMACS_LISPPREFIX}/vm/vm-thread.el
+${EMACS_LISPPREFIX}/vm/vm-thread.elc
+${EMACS_LISPPREFIX}/vm/vm-toolbar.el
+${EMACS_LISPPREFIX}/vm/vm-toolbar.elc
+${EMACS_LISPPREFIX}/vm/vm-undo.el
+${EMACS_LISPPREFIX}/vm/vm-undo.elc
+${EMACS_LISPPREFIX}/vm/vm-user.el
+${EMACS_LISPPREFIX}/vm/vm-user.elc
+${EMACS_LISPPREFIX}/vm/vm-vars.el
+${EMACS_LISPPREFIX}/vm/vm-vars.elc
+${EMACS_LISPPREFIX}/vm/vm-version.el
+${EMACS_LISPPREFIX}/vm/vm-version.elc
+${EMACS_LISPPREFIX}/vm/vm-virtual.el
+${EMACS_LISPPREFIX}/vm/vm-virtual.elc
+${EMACS_LISPPREFIX}/vm/vm-window.el
+${EMACS_LISPPREFIX}/vm/vm-window.elc
+${EMACS_LISPPREFIX}/vm/vm.el
+${EMACS_LISPPREFIX}/vm/vm.elc
+@unexec ${RMDIR} -p %D/${PIXMAPDIR} 2>/dev/null || ${TRUE}
+@dirrm ${EMACS_LISPPREFIX}/vm
+@unexec ${RMDIR} -p %D/${EMACS_LISPPREFIX} 2>/dev/null || ${TRUE}
diff --git a/mail/vm/PLIST.emacs b/mail/vm/PLIST.emacs
deleted file mode 100644
index e11d953ad26..00000000000
--- a/mail/vm/PLIST.emacs
+++ /dev/null
@@ -1,174 +0,0 @@
-@comment $NetBSD: PLIST.emacs,v 1.7 2004/03/07 21:46:31 seb Exp $
-bin/base64-decode
-bin/base64-encode
-bin/qp-decode
-bin/qp-encode
-share/emacs/site-lisp/vm/pixmaps/audio_stamp-colorful.xpm
-share/emacs/site-lisp/vm/pixmaps/audio_stamp-simple.xpm
-share/emacs/site-lisp/vm/pixmaps/autofile-dn.xbm
-share/emacs/site-lisp/vm/pixmaps/autofile-dn.xpm
-share/emacs/site-lisp/vm/pixmaps/autofile-up.xbm
-share/emacs/site-lisp/vm/pixmaps/autofile-up.xpm
-share/emacs/site-lisp/vm/pixmaps/autofile-xx.xbm
-share/emacs/site-lisp/vm/pixmaps/compose-dn.xbm
-share/emacs/site-lisp/vm/pixmaps/compose-dn.xpm
-share/emacs/site-lisp/vm/pixmaps/compose-up.xbm
-share/emacs/site-lisp/vm/pixmaps/compose-up.xpm
-share/emacs/site-lisp/vm/pixmaps/compose-xx.xbm
-share/emacs/site-lisp/vm/pixmaps/delete-dn.xbm
-share/emacs/site-lisp/vm/pixmaps/delete-dn.xpm
-share/emacs/site-lisp/vm/pixmaps/delete-up.xbm
-share/emacs/site-lisp/vm/pixmaps/delete-up.xpm
-share/emacs/site-lisp/vm/pixmaps/delete-xx.xbm
-share/emacs/site-lisp/vm/pixmaps/document-colorful.xpm
-share/emacs/site-lisp/vm/pixmaps/document-simple.xpm
-share/emacs/site-lisp/vm/pixmaps/file-dn.xbm
-share/emacs/site-lisp/vm/pixmaps/file-dn.xpm
-share/emacs/site-lisp/vm/pixmaps/file-up.xbm
-share/emacs/site-lisp/vm/pixmaps/file-up.xpm
-share/emacs/site-lisp/vm/pixmaps/file-xx.xbm
-share/emacs/site-lisp/vm/pixmaps/film-colorful.xpm
-share/emacs/site-lisp/vm/pixmaps/film-simple.xpm
-share/emacs/site-lisp/vm/pixmaps/gear-colorful.xpm
-share/emacs/site-lisp/vm/pixmaps/gear-simple.xpm
-share/emacs/site-lisp/vm/pixmaps/getmail-dn.xbm
-share/emacs/site-lisp/vm/pixmaps/getmail-dn.xpm
-share/emacs/site-lisp/vm/pixmaps/getmail-up.xbm
-share/emacs/site-lisp/vm/pixmaps/getmail-up.xpm
-share/emacs/site-lisp/vm/pixmaps/getmail-xx.xbm
-share/emacs/site-lisp/vm/pixmaps/help-dn.xbm
-share/emacs/site-lisp/vm/pixmaps/help-dn.xpm
-share/emacs/site-lisp/vm/pixmaps/help-up.xbm
-share/emacs/site-lisp/vm/pixmaps/help-up.xpm
-share/emacs/site-lisp/vm/pixmaps/help-xx.xbm
-share/emacs/site-lisp/vm/pixmaps/message-colorful.xpm
-share/emacs/site-lisp/vm/pixmaps/message-simple.xpm
-share/emacs/site-lisp/vm/pixmaps/mime-colorful-dn.xpm
-share/emacs/site-lisp/vm/pixmaps/mime-colorful-up.xpm
-share/emacs/site-lisp/vm/pixmaps/mime-colorful-xx.xpm
-share/emacs/site-lisp/vm/pixmaps/mime-dn.xbm
-share/emacs/site-lisp/vm/pixmaps/mime-simple-dn.xpm
-share/emacs/site-lisp/vm/pixmaps/mime-simple-up.xpm
-share/emacs/site-lisp/vm/pixmaps/mime-simple-xx.xpm
-share/emacs/site-lisp/vm/pixmaps/mime-up.xbm
-share/emacs/site-lisp/vm/pixmaps/mime-xx.xbm
-share/emacs/site-lisp/vm/pixmaps/mona_stamp-colorful.xpm
-share/emacs/site-lisp/vm/pixmaps/mona_stamp-simple.xpm
-share/emacs/site-lisp/vm/pixmaps/next-dn.xbm
-share/emacs/site-lisp/vm/pixmaps/next-dn.xpm
-share/emacs/site-lisp/vm/pixmaps/next-up.xbm
-share/emacs/site-lisp/vm/pixmaps/next-up.xpm
-share/emacs/site-lisp/vm/pixmaps/next-xx.xbm
-share/emacs/site-lisp/vm/pixmaps/previous-dn.xbm
-share/emacs/site-lisp/vm/pixmaps/previous-dn.xpm
-share/emacs/site-lisp/vm/pixmaps/previous-up.xbm
-share/emacs/site-lisp/vm/pixmaps/previous-up.xpm
-share/emacs/site-lisp/vm/pixmaps/previous-xx.xbm
-share/emacs/site-lisp/vm/pixmaps/print-dn.xbm
-share/emacs/site-lisp/vm/pixmaps/print-dn.xpm
-share/emacs/site-lisp/vm/pixmaps/print-up.xbm
-share/emacs/site-lisp/vm/pixmaps/print-up.xpm
-share/emacs/site-lisp/vm/pixmaps/print-xx.xbm
-share/emacs/site-lisp/vm/pixmaps/quit-dn.xbm
-share/emacs/site-lisp/vm/pixmaps/quit-dn.xpm
-share/emacs/site-lisp/vm/pixmaps/quit-up.xbm
-share/emacs/site-lisp/vm/pixmaps/quit-up.xpm
-share/emacs/site-lisp/vm/pixmaps/quit-xx.xbm
-share/emacs/site-lisp/vm/pixmaps/recover-dn.xbm
-share/emacs/site-lisp/vm/pixmaps/recover-dn.xpm
-share/emacs/site-lisp/vm/pixmaps/recover-up.xbm
-share/emacs/site-lisp/vm/pixmaps/recover-up.xpm
-share/emacs/site-lisp/vm/pixmaps/recover-xx.xbm
-share/emacs/site-lisp/vm/pixmaps/reply-dn.xbm
-share/emacs/site-lisp/vm/pixmaps/reply-dn.xpm
-share/emacs/site-lisp/vm/pixmaps/reply-up.xbm
-share/emacs/site-lisp/vm/pixmaps/reply-up.xpm
-share/emacs/site-lisp/vm/pixmaps/reply-xx.xbm
-share/emacs/site-lisp/vm/pixmaps/stuffed_box-colorful.xpm
-share/emacs/site-lisp/vm/pixmaps/stuffed_box-simple.xpm
-share/emacs/site-lisp/vm/pixmaps/undelete-dn.xbm
-share/emacs/site-lisp/vm/pixmaps/undelete-dn.xpm
-share/emacs/site-lisp/vm/pixmaps/undelete-up.xbm
-share/emacs/site-lisp/vm/pixmaps/undelete-up.xpm
-share/emacs/site-lisp/vm/pixmaps/undelete-xx.xbm
-share/emacs/site-lisp/vm/pixmaps/visit-dn.xbm
-share/emacs/site-lisp/vm/pixmaps/visit-dn.xpm
-share/emacs/site-lisp/vm/pixmaps/visit-up.xbm
-share/emacs/site-lisp/vm/pixmaps/visit-up.xpm
-share/emacs/site-lisp/vm/pixmaps/visit-xx.xbm
-share/emacs/site-lisp/vm/tapestry.el
-share/emacs/site-lisp/vm/tapestry.elc
-share/emacs/site-lisp/vm/vm-autoload.el
-share/emacs/site-lisp/vm/vm-autoload.elc
-share/emacs/site-lisp/vm/vm-byteopts.el
-share/emacs/site-lisp/vm/vm-crypto.el
-share/emacs/site-lisp/vm/vm-crypto.elc
-share/emacs/site-lisp/vm/vm-delete.el
-share/emacs/site-lisp/vm/vm-delete.elc
-share/emacs/site-lisp/vm/vm-digest.el
-share/emacs/site-lisp/vm/vm-digest.elc
-share/emacs/site-lisp/vm/vm-easymenu.el
-share/emacs/site-lisp/vm/vm-easymenu.elc
-share/emacs/site-lisp/vm/vm-edit.el
-share/emacs/site-lisp/vm/vm-edit.elc
-share/emacs/site-lisp/vm/vm-folder.el
-share/emacs/site-lisp/vm/vm-folder.elc
-share/emacs/site-lisp/vm/vm-imap.el
-share/emacs/site-lisp/vm/vm-imap.elc
-share/emacs/site-lisp/vm/vm-license.el
-share/emacs/site-lisp/vm/vm-license.elc
-share/emacs/site-lisp/vm/vm-macro.el
-share/emacs/site-lisp/vm/vm-macro.elc
-share/emacs/site-lisp/vm/vm-mark.el
-share/emacs/site-lisp/vm/vm-mark.elc
-share/emacs/site-lisp/vm/vm-menu.el
-share/emacs/site-lisp/vm/vm-menu.elc
-share/emacs/site-lisp/vm/vm-message.el
-share/emacs/site-lisp/vm/vm-message.elc
-share/emacs/site-lisp/vm/vm-mime.el
-share/emacs/site-lisp/vm/vm-mime.elc
-share/emacs/site-lisp/vm/vm-minibuf.el
-share/emacs/site-lisp/vm/vm-minibuf.elc
-share/emacs/site-lisp/vm/vm-misc.el
-share/emacs/site-lisp/vm/vm-misc.elc
-share/emacs/site-lisp/vm/vm-motion.el
-share/emacs/site-lisp/vm/vm-motion.elc
-share/emacs/site-lisp/vm/vm-mouse.el
-share/emacs/site-lisp/vm/vm-mouse.elc
-share/emacs/site-lisp/vm/vm-page.el
-share/emacs/site-lisp/vm/vm-page.elc
-share/emacs/site-lisp/vm/vm-pop.el
-share/emacs/site-lisp/vm/vm-pop.elc
-share/emacs/site-lisp/vm/vm-reply.el
-share/emacs/site-lisp/vm/vm-reply.elc
-share/emacs/site-lisp/vm/vm-save.el
-share/emacs/site-lisp/vm/vm-save.elc
-share/emacs/site-lisp/vm/vm-search.el
-share/emacs/site-lisp/vm/vm-search.elc
-share/emacs/site-lisp/vm/vm-sort.el
-share/emacs/site-lisp/vm/vm-sort.elc
-share/emacs/site-lisp/vm/vm-startup.el
-share/emacs/site-lisp/vm/vm-startup.elc
-share/emacs/site-lisp/vm/vm-summary.el
-share/emacs/site-lisp/vm/vm-summary.elc
-share/emacs/site-lisp/vm/vm-thread.el
-share/emacs/site-lisp/vm/vm-thread.elc
-share/emacs/site-lisp/vm/vm-toolbar.el
-share/emacs/site-lisp/vm/vm-toolbar.elc
-share/emacs/site-lisp/vm/vm-undo.el
-share/emacs/site-lisp/vm/vm-undo.elc
-share/emacs/site-lisp/vm/vm-user.el
-share/emacs/site-lisp/vm/vm-user.elc
-share/emacs/site-lisp/vm/vm-vars.el
-share/emacs/site-lisp/vm/vm-vars.elc
-share/emacs/site-lisp/vm/vm-version.el
-share/emacs/site-lisp/vm/vm-version.elc
-share/emacs/site-lisp/vm/vm-virtual.el
-share/emacs/site-lisp/vm/vm-virtual.elc
-share/emacs/site-lisp/vm/vm-window.el
-share/emacs/site-lisp/vm/vm-window.elc
-share/emacs/site-lisp/vm/vm.el
-share/emacs/site-lisp/vm/vm.elc
-@dirrm share/emacs/site-lisp/vm/pixmaps
-@dirrm share/emacs/site-lisp/vm
-@unexec ${RMDIR} %D/share/emacs/site-lisp 2>/dev/null || ${TRUE}
diff --git a/mail/vm/PLIST.xemacs b/mail/vm/PLIST.xemacs
deleted file mode 100644
index 0c35997ecd8..00000000000
--- a/mail/vm/PLIST.xemacs
+++ /dev/null
@@ -1,178 +0,0 @@
-@comment $NetBSD: PLIST.xemacs,v 1.3 2003/01/11 15:25:38 uebayasi Exp $
-bin/base64-decode
-bin/base64-encode
-bin/qp-decode
-bin/qp-encode
-lib/xemacs/site-packages/etc/vm/audio_stamp-colorful.xpm
-lib/xemacs/site-packages/etc/vm/audio_stamp-simple.xpm
-lib/xemacs/site-packages/etc/vm/autofile-dn.xbm
-lib/xemacs/site-packages/etc/vm/autofile-dn.xpm
-lib/xemacs/site-packages/etc/vm/autofile-up.xbm
-lib/xemacs/site-packages/etc/vm/autofile-up.xpm
-lib/xemacs/site-packages/etc/vm/autofile-xx.xbm
-lib/xemacs/site-packages/etc/vm/compose-dn.xbm
-lib/xemacs/site-packages/etc/vm/compose-dn.xpm
-lib/xemacs/site-packages/etc/vm/compose-up.xbm
-lib/xemacs/site-packages/etc/vm/compose-up.xpm
-lib/xemacs/site-packages/etc/vm/compose-xx.xbm
-lib/xemacs/site-packages/etc/vm/delete-dn.xbm
-lib/xemacs/site-packages/etc/vm/delete-dn.xpm
-lib/xemacs/site-packages/etc/vm/delete-up.xbm
-lib/xemacs/site-packages/etc/vm/delete-up.xpm
-lib/xemacs/site-packages/etc/vm/delete-xx.xbm
-lib/xemacs/site-packages/etc/vm/document-colorful.xpm
-lib/xemacs/site-packages/etc/vm/document-simple.xpm
-lib/xemacs/site-packages/etc/vm/file-dn.xbm
-lib/xemacs/site-packages/etc/vm/file-dn.xpm
-lib/xemacs/site-packages/etc/vm/file-up.xbm
-lib/xemacs/site-packages/etc/vm/file-up.xpm
-lib/xemacs/site-packages/etc/vm/file-xx.xbm
-lib/xemacs/site-packages/etc/vm/film-colorful.xpm
-lib/xemacs/site-packages/etc/vm/film-simple.xpm
-lib/xemacs/site-packages/etc/vm/gear-colorful.xpm
-lib/xemacs/site-packages/etc/vm/gear-simple.xpm
-lib/xemacs/site-packages/etc/vm/getmail-dn.xbm
-lib/xemacs/site-packages/etc/vm/getmail-dn.xpm
-lib/xemacs/site-packages/etc/vm/getmail-up.xbm
-lib/xemacs/site-packages/etc/vm/getmail-up.xpm
-lib/xemacs/site-packages/etc/vm/getmail-xx.xbm
-lib/xemacs/site-packages/etc/vm/help-dn.xbm
-lib/xemacs/site-packages/etc/vm/help-dn.xpm
-lib/xemacs/site-packages/etc/vm/help-up.xbm
-lib/xemacs/site-packages/etc/vm/help-up.xpm
-lib/xemacs/site-packages/etc/vm/help-xx.xbm
-lib/xemacs/site-packages/etc/vm/message-colorful.xpm
-lib/xemacs/site-packages/etc/vm/message-simple.xpm
-lib/xemacs/site-packages/etc/vm/mime-colorful-dn.xpm
-lib/xemacs/site-packages/etc/vm/mime-colorful-up.xpm
-lib/xemacs/site-packages/etc/vm/mime-colorful-xx.xpm
-lib/xemacs/site-packages/etc/vm/mime-dn.xbm
-lib/xemacs/site-packages/etc/vm/mime-simple-dn.xpm
-lib/xemacs/site-packages/etc/vm/mime-simple-up.xpm
-lib/xemacs/site-packages/etc/vm/mime-simple-xx.xpm
-lib/xemacs/site-packages/etc/vm/mime-up.xbm
-lib/xemacs/site-packages/etc/vm/mime-xx.xbm
-lib/xemacs/site-packages/etc/vm/mona_stamp-colorful.xpm
-lib/xemacs/site-packages/etc/vm/mona_stamp-simple.xpm
-lib/xemacs/site-packages/etc/vm/next-dn.xbm
-lib/xemacs/site-packages/etc/vm/next-dn.xpm
-lib/xemacs/site-packages/etc/vm/next-up.xbm
-lib/xemacs/site-packages/etc/vm/next-up.xpm
-lib/xemacs/site-packages/etc/vm/next-xx.xbm
-lib/xemacs/site-packages/etc/vm/previous-dn.xbm
-lib/xemacs/site-packages/etc/vm/previous-dn.xpm
-lib/xemacs/site-packages/etc/vm/previous-up.xbm
-lib/xemacs/site-packages/etc/vm/previous-up.xpm
-lib/xemacs/site-packages/etc/vm/previous-xx.xbm
-lib/xemacs/site-packages/etc/vm/print-dn.xbm
-lib/xemacs/site-packages/etc/vm/print-dn.xpm
-lib/xemacs/site-packages/etc/vm/print-up.xbm
-lib/xemacs/site-packages/etc/vm/print-up.xpm
-lib/xemacs/site-packages/etc/vm/print-xx.xbm
-lib/xemacs/site-packages/etc/vm/quit-dn.xbm
-lib/xemacs/site-packages/etc/vm/quit-dn.xpm
-lib/xemacs/site-packages/etc/vm/quit-up.xbm
-lib/xemacs/site-packages/etc/vm/quit-up.xpm
-lib/xemacs/site-packages/etc/vm/quit-xx.xbm
-lib/xemacs/site-packages/etc/vm/recover-dn.xbm
-lib/xemacs/site-packages/etc/vm/recover-dn.xpm
-lib/xemacs/site-packages/etc/vm/recover-up.xbm
-lib/xemacs/site-packages/etc/vm/recover-up.xpm
-lib/xemacs/site-packages/etc/vm/recover-xx.xbm
-lib/xemacs/site-packages/etc/vm/reply-dn.xbm
-lib/xemacs/site-packages/etc/vm/reply-dn.xpm
-lib/xemacs/site-packages/etc/vm/reply-up.xbm
-lib/xemacs/site-packages/etc/vm/reply-up.xpm
-lib/xemacs/site-packages/etc/vm/reply-xx.xbm
-lib/xemacs/site-packages/etc/vm/stuffed_box-colorful.xpm
-lib/xemacs/site-packages/etc/vm/stuffed_box-simple.xpm
-lib/xemacs/site-packages/etc/vm/undelete-dn.xbm
-lib/xemacs/site-packages/etc/vm/undelete-dn.xpm
-lib/xemacs/site-packages/etc/vm/undelete-up.xbm
-lib/xemacs/site-packages/etc/vm/undelete-up.xpm
-lib/xemacs/site-packages/etc/vm/undelete-xx.xbm
-lib/xemacs/site-packages/etc/vm/visit-dn.xbm
-lib/xemacs/site-packages/etc/vm/visit-dn.xpm
-lib/xemacs/site-packages/etc/vm/visit-up.xbm
-lib/xemacs/site-packages/etc/vm/visit-up.xpm
-lib/xemacs/site-packages/etc/vm/visit-xx.xbm
-lib/xemacs/site-packages/info/vm.info
-lib/xemacs/site-packages/info/vm.info-1
-lib/xemacs/site-packages/info/vm.info-2
-lib/xemacs/site-packages/info/vm.info-3
-lib/xemacs/site-packages/info/vm.info-4
-lib/xemacs/site-packages/lisp/vm/tapestry.el
-lib/xemacs/site-packages/lisp/vm/tapestry.elc
-lib/xemacs/site-packages/lisp/vm/vm-autoload.el
-lib/xemacs/site-packages/lisp/vm/vm-autoload.elc
-lib/xemacs/site-packages/lisp/vm/vm-byteopts.el
-lib/xemacs/site-packages/lisp/vm/vm-crypto.el
-lib/xemacs/site-packages/lisp/vm/vm-crypto.elc
-lib/xemacs/site-packages/lisp/vm/vm-delete.el
-lib/xemacs/site-packages/lisp/vm/vm-delete.elc
-lib/xemacs/site-packages/lisp/vm/vm-digest.el
-lib/xemacs/site-packages/lisp/vm/vm-digest.elc
-lib/xemacs/site-packages/lisp/vm/vm-easymenu.el
-lib/xemacs/site-packages/lisp/vm/vm-easymenu.elc
-lib/xemacs/site-packages/lisp/vm/vm-edit.el
-lib/xemacs/site-packages/lisp/vm/vm-edit.elc
-lib/xemacs/site-packages/lisp/vm/vm-folder.el
-lib/xemacs/site-packages/lisp/vm/vm-folder.elc
-lib/xemacs/site-packages/lisp/vm/vm-imap.el
-lib/xemacs/site-packages/lisp/vm/vm-imap.elc
-lib/xemacs/site-packages/lisp/vm/vm-license.el
-lib/xemacs/site-packages/lisp/vm/vm-license.elc
-lib/xemacs/site-packages/lisp/vm/vm-macro.el
-lib/xemacs/site-packages/lisp/vm/vm-macro.elc
-lib/xemacs/site-packages/lisp/vm/vm-mark.el
-lib/xemacs/site-packages/lisp/vm/vm-mark.elc
-lib/xemacs/site-packages/lisp/vm/vm-menu.el
-lib/xemacs/site-packages/lisp/vm/vm-menu.elc
-lib/xemacs/site-packages/lisp/vm/vm-message.el
-lib/xemacs/site-packages/lisp/vm/vm-message.elc
-lib/xemacs/site-packages/lisp/vm/vm-mime.el
-lib/xemacs/site-packages/lisp/vm/vm-mime.elc
-lib/xemacs/site-packages/lisp/vm/vm-minibuf.el
-lib/xemacs/site-packages/lisp/vm/vm-minibuf.elc
-lib/xemacs/site-packages/lisp/vm/vm-misc.el
-lib/xemacs/site-packages/lisp/vm/vm-misc.elc
-lib/xemacs/site-packages/lisp/vm/vm-motion.el
-lib/xemacs/site-packages/lisp/vm/vm-motion.elc
-lib/xemacs/site-packages/lisp/vm/vm-mouse.el
-lib/xemacs/site-packages/lisp/vm/vm-mouse.elc
-lib/xemacs/site-packages/lisp/vm/vm-page.el
-lib/xemacs/site-packages/lisp/vm/vm-page.elc
-lib/xemacs/site-packages/lisp/vm/vm-pop.el
-lib/xemacs/site-packages/lisp/vm/vm-pop.elc
-lib/xemacs/site-packages/lisp/vm/vm-reply.el
-lib/xemacs/site-packages/lisp/vm/vm-reply.elc
-lib/xemacs/site-packages/lisp/vm/vm-save.el
-lib/xemacs/site-packages/lisp/vm/vm-save.elc
-lib/xemacs/site-packages/lisp/vm/vm-search.el
-lib/xemacs/site-packages/lisp/vm/vm-search.elc
-lib/xemacs/site-packages/lisp/vm/vm-sort.el
-lib/xemacs/site-packages/lisp/vm/vm-sort.elc
-lib/xemacs/site-packages/lisp/vm/vm-startup.el
-lib/xemacs/site-packages/lisp/vm/vm-startup.elc
-lib/xemacs/site-packages/lisp/vm/vm-summary.el
-lib/xemacs/site-packages/lisp/vm/vm-summary.elc
-lib/xemacs/site-packages/lisp/vm/vm-thread.el
-lib/xemacs/site-packages/lisp/vm/vm-thread.elc
-lib/xemacs/site-packages/lisp/vm/vm-toolbar.el
-lib/xemacs/site-packages/lisp/vm/vm-toolbar.elc
-lib/xemacs/site-packages/lisp/vm/vm-undo.el
-lib/xemacs/site-packages/lisp/vm/vm-undo.elc
-lib/xemacs/site-packages/lisp/vm/vm-user.el
-lib/xemacs/site-packages/lisp/vm/vm-user.elc
-lib/xemacs/site-packages/lisp/vm/vm-vars.el
-lib/xemacs/site-packages/lisp/vm/vm-vars.elc
-lib/xemacs/site-packages/lisp/vm/vm-version.el
-lib/xemacs/site-packages/lisp/vm/vm-version.elc
-lib/xemacs/site-packages/lisp/vm/vm-virtual.el
-lib/xemacs/site-packages/lisp/vm/vm-virtual.elc
-lib/xemacs/site-packages/lisp/vm/vm-window.el
-lib/xemacs/site-packages/lisp/vm/vm-window.elc
-lib/xemacs/site-packages/lisp/vm/vm.el
-lib/xemacs/site-packages/lisp/vm/vm.elc
-@dirrm lib/xemacs/site-packages/lisp/vm
-@dirrm lib/xemacs/site-packages/etc/vm