6 files changed, 135 insertions, 104 deletions

diff --git a/mail/vm/Makefile b/mail/vm/Makefile
index 0eff587f2393..0d23344c52e9 100644
--- a/mail/vm/Makefile
+++ b/mail/vm/Makefile
@@ -6,33 +6,25 @@
 #
 
 PORTNAME=	vm
-PORTVERSION=	7.19
-PORTREVISION=	2
+PORTVERSION=	8.0.12
 CATEGORIES=	mail elisp
-MASTER_SITES=	http://www.seanet.com/~kylemonger/vm/ \
-		ftp://ftp.uni-mainz.de/pub/software/gnu/vm/ \
-		ftp://tug.org/vm/ \
-		ftp://psg.com/pub/vm/ \
-		ftp://sunsite.cnlab-switch.ch/mirror/vm/ \
-		ftp://ftp.uu.net/networking/mail/vm/ \
-		http://www.interhack.net/projects/vm/ \
-		ftp://ftp.ccs.neu.edu/net/mirrors/VM/ \
-		http://ftp.lip6.fr/pub/unix/mail/vm/ \
-		ftp://ftp.surfnet.nl/pub/mail/vm/ \
-		http://ftp.gwdg.de/pub/gnu2/vm/ \
-		http://ftp.vim.org/pub/mail/vm/
+MASTER_SITES=	${MASTER_SITE_SAVANNAH}
+MASTER_SITE_SUBDIR=	viewmail
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
+DISTNAME=	${PORTNAME}-${PORTVERSION}
+EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	jhein@timing.com
 COMMENT=	A mail reader running inside Emacs or XEmacs
 
+GNU_CONFIGURE=	yes
 USE_EMACS=	yes
-EMACS_PORT_NAME?=	emacs21
+USE_GMAKE=	yes
+CONFIGURE_ARGS+=	--with-emacs=${EMACS_CMD}
 MAKE_ARGS=	prefix=${PREFIX} \
-		INFODIR=${PREFIX}/info \
-		LISPDIR=${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME} \
-		PIXMAPDIR=${PREFIX}/${EMACS_LIBDIR_WITH_VER}/etc/vm
+		lispdir=${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME} \
+		pixmapdir=${PREFIX}/${EMACS_LIBDIR_WITH_VER}/etc/vm
 
-INFO=		vm
+INFO=		vm vm-pcrisis
 
 .include <bsd.port.mk>
diff --git a/mail/vm/distinfo b/mail/vm/distinfo
index 2421aa125f75..804abf190f1b 100644
--- a/mail/vm/distinfo
+++ b/mail/vm/distinfo
@@ -1,3 +1,3 @@
-MD5 (vm-7.19.tar.gz) = 7866f6243e398d76ae32356a4af76fa3
-SHA256 (vm-7.19.tar.gz) = 54bdd076bb98cad57a71fb986d131963e97a13cc71f15819d32691e3c0c5bdb0
-SIZE (vm-7.19.tar.gz) = 381658
+MD5 (vm-8.0.12.tgz) = b761ef5d3125d36a44d37626764d8e70
+SHA256 (vm-8.0.12.tgz) = 1e7b6e3c7401a825d288420c5a7820a004eff4b0f8838018a5598c95a0d5de57
+SIZE (vm-8.0.12.tgz) = 547048
diff --git a/mail/vm/files/patch-aa b/mail/vm/files/patch-aa
deleted file mode 100644
index 2bbc1e489ff9..000000000000
--- a/mail/vm/files/patch-aa
+++ /dev/null
@@ -1,10 +0,0 @@
---- vm.texinfo.bak	Tue Jun  4 09:38:50 2002
-+++ vm.texinfo	Tue Jun  4 09:39:19 2002
-@@ -1,6 +1,7 @@
- \input texinfo  @comment -*-Text-*-
- @setfilename vm.info
- @settitle VM User's Manual
-+@dircategory The Emacs editor and associated tools
- @direntry
- * VM::			A mail reader.
- @end direntry
diff --git a/mail/vm/files/patch-lisp_vm-pine.el b/mail/vm/files/patch-lisp_vm-pine.el
new file mode 100644
index 000000000000..0ca11d91b8e8
--- /dev/null
+++ b/mail/vm/files/patch-lisp_vm-pine.el
@@ -0,0 +1,28 @@
+$FreeBSD$
+
+from http://groups.google.com/group/gnu.emacs.vm.bug/browse_thread/thread/ed559486d3438d6d/db0325050f401ad9?lnk=raot#db0325050f401ad9 ...
+
+Subject: Missing autoload for vm-decode-postponed-mime-message in vm-8.0.12
+
+In vm 8.0.12 it seems there's a missing autoload for the function vm-
+decode-postponed-mime-message in vm-pine.el. See:
+
+https://bugzilla.redhat.com/show_bug.cgi?id=474728
+https://bugs.launchpad.net/viewmail/+bug/300748
+
+The fix is trivial, patch below
+
+diff -up vm-8.0.12/lisp/vm-pine.el.fix-missing-autoload vm-8.0.12/lisp/vm-pine.el
+--- lisp/vm-pine.el.fix-missing-autoload      2008-12-05
+23:00:06.0000000
+00 +0000
++++ lisp/vm-pine.el   2008-12-05 23:00:43.000000000 +0000
+@@ -488,6 +488,7 @@ creation)."
+         (error "Folder buffer closed before deletion of source message."))))
+
+ ;;-----------------------------------------------------------------------------
++;;;###autoload
+ (defun vm-decode-postponed-mime-message ()
+   "Replace the mime buttons by attachment buttons."
+   (interactive)
+
diff --git a/mail/vm/pkg-descr b/mail/vm/pkg-descr
index b03788bd3189..e9e4b14a7c33 100644
--- a/mail/vm/pkg-descr
+++ b/mail/vm/pkg-descr
@@ -8,7 +8,14 @@ advanced commands that do tasks like bursting and creating digests,
 message forwarding, and organizing message presentation according to
 various criteria.
 
-WWW: http://www.wonderworks.com/vm/
+It was written as an alternative to the Emacs RMAIL mail reader.
+VM is highly configurable and easy to use. It supports POP and IMAP
+for mail retrieval, understands MIME, and reads both the standard
+UNIX mailbox format and the BABYL format used by the RMAIL mailer.
 
-- Olivier Tharan
-olive@oban.frmug.org
+Some other features:
+ - thread viewing
+ - virtual folders
+ - gpg integration
+
+WWW: http://www.nongnu.org/viewmail/
diff --git a/mail/vm/pkg-plist b/mail/vm/pkg-plist
index 49dc55d7cdaa..fba7ed3cfd32 100644
--- a/mail/vm/pkg-plist
+++ b/mail/vm/pkg-plist
@@ -1,117 +1,109 @@
+@comment $FreeBSD$
 bin/base64-decode
 bin/base64-encode
 bin/qp-decode
 bin/qp-encode
-%%EMACS_LIBDIR_WITH_VER%%/etc/vm/audio_stamp-colorful.xpm
-%%EMACS_LIBDIR_WITH_VER%%/etc/vm/audio_stamp-simple.xpm
-%%EMACS_LIBDIR_WITH_VER%%/etc/vm/autofile-dn.xbm
 %%EMACS_LIBDIR_WITH_VER%%/etc/vm/autofile-dn.xpm
-%%EMACS_LIBDIR_WITH_VER%%/etc/vm/autofile-up.xbm
 %%EMACS_LIBDIR_WITH_VER%%/etc/vm/autofile-up.xpm
-%%EMACS_LIBDIR_WITH_VER%%/etc/vm/autofile-xx.xbm
-%%EMACS_LIBDIR_WITH_VER%%/etc/vm/compose-dn.xbm
 %%EMACS_LIBDIR_WITH_VER%%/etc/vm/compose-dn.xpm
-%%EMACS_LIBDIR_WITH_VER%%/etc/vm/compose-up.xbm
 %%EMACS_LIBDIR_WITH_VER%%/etc/vm/compose-up.xpm
-%%EMACS_LIBDIR_WITH_VER%%/etc/vm/compose-xx.xbm
-%%EMACS_LIBDIR_WITH_VER%%/etc/vm/delete-dn.xbm
 %%EMACS_LIBDIR_WITH_VER%%/etc/vm/delete-dn.xpm
-%%EMACS_LIBDIR_WITH_VER%%/etc/vm/delete-up.xbm
 %%EMACS_LIBDIR_WITH_VER%%/etc/vm/delete-up.xpm
-%%EMACS_LIBDIR_WITH_VER%%/etc/vm/delete-xx.xbm
-%%EMACS_LIBDIR_WITH_VER%%/etc/vm/document-colorful.xpm
-%%EMACS_LIBDIR_WITH_VER%%/etc/vm/document-simple.xpm
-%%EMACS_LIBDIR_WITH_VER%%/etc/vm/file-dn.xbm
 %%EMACS_LIBDIR_WITH_VER%%/etc/vm/file-dn.xpm
-%%EMACS_LIBDIR_WITH_VER%%/etc/vm/file-up.xbm
 %%EMACS_LIBDIR_WITH_VER%%/etc/vm/file-up.xpm
-%%EMACS_LIBDIR_WITH_VER%%/etc/vm/file-xx.xbm
-%%EMACS_LIBDIR_WITH_VER%%/etc/vm/film-colorful.xpm
-%%EMACS_LIBDIR_WITH_VER%%/etc/vm/film-simple.xpm
-%%EMACS_LIBDIR_WITH_VER%%/etc/vm/gear-colorful.xpm
-%%EMACS_LIBDIR_WITH_VER%%/etc/vm/gear-simple.xpm
-%%EMACS_LIBDIR_WITH_VER%%/etc/vm/getmail-dn.xbm
+%%EMACS_LIBDIR_WITH_VER%%/etc/vm/followup-dn.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/vm/followup-up.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/vm/forward-dn.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/vm/forward-up.xpm
 %%EMACS_LIBDIR_WITH_VER%%/etc/vm/getmail-dn.xpm
-%%EMACS_LIBDIR_WITH_VER%%/etc/vm/getmail-up.xbm
 %%EMACS_LIBDIR_WITH_VER%%/etc/vm/getmail-up.xpm
-%%EMACS_LIBDIR_WITH_VER%%/etc/vm/getmail-xx.xbm
-%%EMACS_LIBDIR_WITH_VER%%/etc/vm/help-dn.xbm
 %%EMACS_LIBDIR_WITH_VER%%/etc/vm/help-dn.xpm
-%%EMACS_LIBDIR_WITH_VER%%/etc/vm/help-up.xbm
 %%EMACS_LIBDIR_WITH_VER%%/etc/vm/help-up.xpm
-%%EMACS_LIBDIR_WITH_VER%%/etc/vm/help-xx.xbm
-%%EMACS_LIBDIR_WITH_VER%%/etc/vm/message-colorful.xpm
-%%EMACS_LIBDIR_WITH_VER%%/etc/vm/message-simple.xpm
-%%EMACS_LIBDIR_WITH_VER%%/etc/vm/mime-colorful-dn.xpm
-%%EMACS_LIBDIR_WITH_VER%%/etc/vm/mime-colorful-up.xpm
-%%EMACS_LIBDIR_WITH_VER%%/etc/vm/mime-colorful-xx.xpm
-%%EMACS_LIBDIR_WITH_VER%%/etc/vm/mime-dn.xbm
-%%EMACS_LIBDIR_WITH_VER%%/etc/vm/mime-simple-dn.xpm
-%%EMACS_LIBDIR_WITH_VER%%/etc/vm/mime-simple-up.xpm
-%%EMACS_LIBDIR_WITH_VER%%/etc/vm/mime-simple-xx.xpm
-%%EMACS_LIBDIR_WITH_VER%%/etc/vm/mime-up.xbm
-%%EMACS_LIBDIR_WITH_VER%%/etc/vm/mime-xx.xbm
-%%EMACS_LIBDIR_WITH_VER%%/etc/vm/mona_stamp-colorful.xpm
-%%EMACS_LIBDIR_WITH_VER%%/etc/vm/mona_stamp-simple.xpm
-%%EMACS_LIBDIR_WITH_VER%%/etc/vm/next-dn.xbm
+%%EMACS_LIBDIR_WITH_VER%%/etc/vm/mime-dn.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/vm/mime-up.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/vm/mime-xx.xpm
 %%EMACS_LIBDIR_WITH_VER%%/etc/vm/next-dn.xpm
-%%EMACS_LIBDIR_WITH_VER%%/etc/vm/next-up.xbm
 %%EMACS_LIBDIR_WITH_VER%%/etc/vm/next-up.xpm
-%%EMACS_LIBDIR_WITH_VER%%/etc/vm/next-xx.xbm
-%%EMACS_LIBDIR_WITH_VER%%/etc/vm/previous-dn.xbm
 %%EMACS_LIBDIR_WITH_VER%%/etc/vm/previous-dn.xpm
-%%EMACS_LIBDIR_WITH_VER%%/etc/vm/previous-up.xbm
 %%EMACS_LIBDIR_WITH_VER%%/etc/vm/previous-up.xpm
-%%EMACS_LIBDIR_WITH_VER%%/etc/vm/previous-xx.xbm
-%%EMACS_LIBDIR_WITH_VER%%/etc/vm/print-dn.xbm
 %%EMACS_LIBDIR_WITH_VER%%/etc/vm/print-dn.xpm
-%%EMACS_LIBDIR_WITH_VER%%/etc/vm/print-up.xbm
 %%EMACS_LIBDIR_WITH_VER%%/etc/vm/print-up.xpm
-%%EMACS_LIBDIR_WITH_VER%%/etc/vm/print-xx.xbm
-%%EMACS_LIBDIR_WITH_VER%%/etc/vm/quit-dn.xbm
 %%EMACS_LIBDIR_WITH_VER%%/etc/vm/quit-dn.xpm
-%%EMACS_LIBDIR_WITH_VER%%/etc/vm/quit-up.xbm
 %%EMACS_LIBDIR_WITH_VER%%/etc/vm/quit-up.xpm
-%%EMACS_LIBDIR_WITH_VER%%/etc/vm/quit-xx.xbm
-%%EMACS_LIBDIR_WITH_VER%%/etc/vm/recover-dn.xbm
 %%EMACS_LIBDIR_WITH_VER%%/etc/vm/recover-dn.xpm
-%%EMACS_LIBDIR_WITH_VER%%/etc/vm/recover-up.xbm
 %%EMACS_LIBDIR_WITH_VER%%/etc/vm/recover-up.xpm
-%%EMACS_LIBDIR_WITH_VER%%/etc/vm/recover-xx.xbm
-%%EMACS_LIBDIR_WITH_VER%%/etc/vm/reply-dn.xbm
 %%EMACS_LIBDIR_WITH_VER%%/etc/vm/reply-dn.xpm
-%%EMACS_LIBDIR_WITH_VER%%/etc/vm/reply-up.xbm
 %%EMACS_LIBDIR_WITH_VER%%/etc/vm/reply-up.xpm
-%%EMACS_LIBDIR_WITH_VER%%/etc/vm/reply-xx.xbm
-%%EMACS_LIBDIR_WITH_VER%%/etc/vm/stuffed_box-colorful.xpm
-%%EMACS_LIBDIR_WITH_VER%%/etc/vm/stuffed_box-simple.xpm
-%%EMACS_LIBDIR_WITH_VER%%/etc/vm/undelete-dn.xbm
 %%EMACS_LIBDIR_WITH_VER%%/etc/vm/undelete-dn.xpm
-%%EMACS_LIBDIR_WITH_VER%%/etc/vm/undelete-up.xbm
 %%EMACS_LIBDIR_WITH_VER%%/etc/vm/undelete-up.xpm
-%%EMACS_LIBDIR_WITH_VER%%/etc/vm/undelete-xx.xbm
-%%EMACS_LIBDIR_WITH_VER%%/etc/vm/visit-dn.xbm
 %%EMACS_LIBDIR_WITH_VER%%/etc/vm/visit-dn.xpm
-%%EMACS_LIBDIR_WITH_VER%%/etc/vm/visit-up.xbm
 %%EMACS_LIBDIR_WITH_VER%%/etc/vm/visit-up.xpm
-%%EMACS_LIBDIR_WITH_VER%%/etc/vm/visit-xx.xbm
+%%EMACS_LIBDIR_WITH_VER%%/etc/vm/gtk/autofile-dn.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/vm/gtk/autofile-up.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/vm/gtk/compose-dn.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/vm/gtk/compose-up.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/vm/gtk/delete-dn.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/vm/gtk/delete-up.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/vm/gtk/file-dn.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/vm/gtk/file-up.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/vm/gtk/followup-dn.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/vm/gtk/followup-up.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/vm/gtk/forward-dn.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/vm/gtk/forward-up.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/vm/gtk/getmail-dn.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/vm/gtk/getmail-up.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/vm/gtk/help-dn.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/vm/gtk/help-up.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/vm/gtk/mime-dn.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/vm/gtk/mime-up.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/vm/gtk/mime-xx.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/vm/gtk/next-dn.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/vm/gtk/next-up.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/vm/gtk/previous-dn.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/vm/gtk/previous-up.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/vm/gtk/print-dn.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/vm/gtk/print-up.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/vm/gtk/quit-dn.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/vm/gtk/quit-up.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/vm/gtk/recover-dn.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/vm/gtk/recover-up.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/vm/gtk/reply-dn.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/vm/gtk/reply-up.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/vm/gtk/undelete-dn.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/vm/gtk/undelete-up.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/vm/gtk/visit-dn.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/vm/gtk/visit-up.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/vm/mime/application.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/vm/mime/audio.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/vm/mime/image.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/vm/mime/message.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/vm/mime/multipart.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/vm/mime/text.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/vm/mime/video.xpm
 %%EMACS_VERSION_SITE_LISPDIR%%/vm/tapestry.el
 %%EMACS_VERSION_SITE_LISPDIR%%/vm/tapestry.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/vm/vcard.el
+%%EMACS_VERSION_SITE_LISPDIR%%/vm/vcard.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/vm/vm-autoload.el
 %%EMACS_VERSION_SITE_LISPDIR%%/vm/vm-autoload.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/vm/vm-byteopts.el
+%%EMACS_VERSION_SITE_LISPDIR%%/vm/vm-autoloads.el
+%%EMACS_VERSION_SITE_LISPDIR%%/vm/vm-autoloads.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/vm/vm-avirtual.el
+%%EMACS_VERSION_SITE_LISPDIR%%/vm/vm-avirtual.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/vm/vm-biff.el
+%%EMACS_VERSION_SITE_LISPDIR%%/vm/vm-biff.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/vm/vm-crypto.el
 %%EMACS_VERSION_SITE_LISPDIR%%/vm/vm-crypto.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/vm/vm-delete.el
 %%EMACS_VERSION_SITE_LISPDIR%%/vm/vm-delete.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/vm/vm-digest.el
 %%EMACS_VERSION_SITE_LISPDIR%%/vm/vm-digest.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/vm/vm-easymenu.el
-%%EMACS_VERSION_SITE_LISPDIR%%/vm/vm-easymenu.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/vm/vm-edit.el
 %%EMACS_VERSION_SITE_LISPDIR%%/vm/vm-edit.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/vm/vm-folder.el
 %%EMACS_VERSION_SITE_LISPDIR%%/vm/vm-folder.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/vm/vm-grepmail.el
+%%EMACS_VERSION_SITE_LISPDIR%%/vm/vm-grepmail.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/vm/vm-imap.el
 %%EMACS_VERSION_SITE_LISPDIR%%/vm/vm-imap.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/vm/vm-license.el
@@ -122,6 +114,8 @@ bin/qp-encode
 %%EMACS_VERSION_SITE_LISPDIR%%/vm/vm-mark.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/vm/vm-menu.el
 %%EMACS_VERSION_SITE_LISPDIR%%/vm/vm-menu.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/vm/vm-message-history.el
+%%EMACS_VERSION_SITE_LISPDIR%%/vm/vm-message-history.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/vm/vm-message.el
 %%EMACS_VERSION_SITE_LISPDIR%%/vm/vm-message.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/vm/vm-mime.el
@@ -136,18 +130,34 @@ bin/qp-encode
 %%EMACS_VERSION_SITE_LISPDIR%%/vm/vm-mouse.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/vm/vm-page.el
 %%EMACS_VERSION_SITE_LISPDIR%%/vm/vm-page.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/vm/vm-pcrisis.el
+%%EMACS_VERSION_SITE_LISPDIR%%/vm/vm-pcrisis.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/vm/vm-pgg.el
+%%EMACS_VERSION_SITE_LISPDIR%%/vm/vm-pgg.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/vm/vm-pine.el
+%%EMACS_VERSION_SITE_LISPDIR%%/vm/vm-pine.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/vm/vm-pop.el
 %%EMACS_VERSION_SITE_LISPDIR%%/vm/vm-pop.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/vm/vm-ps-print.el
+%%EMACS_VERSION_SITE_LISPDIR%%/vm/vm-ps-print.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/vm/vm-reply.el
 %%EMACS_VERSION_SITE_LISPDIR%%/vm/vm-reply.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/vm/vm-revno.el
+%%EMACS_VERSION_SITE_LISPDIR%%/vm/vm-revno.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/vm/vm-rfaddons.el
+%%EMACS_VERSION_SITE_LISPDIR%%/vm/vm-rfaddons.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/vm/vm-save.el
 %%EMACS_VERSION_SITE_LISPDIR%%/vm/vm-save.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/vm/vm-search.el
 %%EMACS_VERSION_SITE_LISPDIR%%/vm/vm-search.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/vm/vm-serial.el
+%%EMACS_VERSION_SITE_LISPDIR%%/vm/vm-serial.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/vm/vm-sort.el
 %%EMACS_VERSION_SITE_LISPDIR%%/vm/vm-sort.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/vm/vm-startup.el
 %%EMACS_VERSION_SITE_LISPDIR%%/vm/vm-startup.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/vm/vm-summary-faces.el
+%%EMACS_VERSION_SITE_LISPDIR%%/vm/vm-summary-faces.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/vm/vm-summary.el
 %%EMACS_VERSION_SITE_LISPDIR%%/vm/vm-summary.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/vm/vm-thread.el
@@ -160,6 +170,8 @@ bin/qp-encode
 %%EMACS_VERSION_SITE_LISPDIR%%/vm/vm-user.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/vm/vm-vars.el
 %%EMACS_VERSION_SITE_LISPDIR%%/vm/vm-vars.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/vm/vm-vcard.el
+%%EMACS_VERSION_SITE_LISPDIR%%/vm/vm-vcard.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/vm/vm-version.el
 %%EMACS_VERSION_SITE_LISPDIR%%/vm/vm-version.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/vm/vm-virtual.el
@@ -169,4 +181,6 @@ bin/qp-encode
 %%EMACS_VERSION_SITE_LISPDIR%%/vm/vm.el
 %%EMACS_VERSION_SITE_LISPDIR%%/vm/vm.elc
 @dirrm %%EMACS_VERSION_SITE_LISPDIR%%/vm
+@dirrm %%EMACS_LIBDIR_WITH_VER%%/etc/vm/mime
+@dirrm %%EMACS_LIBDIR_WITH_VER%%/etc/vm/gtk
 @dirrm %%EMACS_LIBDIR_WITH_VER%%/etc/vm