vm: update to 8.2.0b

go from a 14 year old version to one that is a mere 6 years.

9 files changed, 307 insertions, 201 deletions

diff --git a/mail/vm/Makefile b/mail/vm/Makefile
index 4cae1a0e631..87f8a8dcaf0 100644
--- a/mail/vm/Makefile
+++ b/mail/vm/Makefile
@@ -1,23 +1,17 @@
-# $NetBSD: Makefile,v 1.43 2017/01/19 18:52:17 agc Exp $
+# $NetBSD: Makefile,v 1.44 2018/11/29 00:36:23 markd Exp $
 
-DISTNAME=	vm-7.19
+DISTNAME=	vm-8.2.0b
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
-PKGREVISION=	4
 CATEGORIES=	mail
-MASTER_SITES=	ftp://ftp.uni-mainz.de/pub/software/gnu/vm/
-MASTER_SITES+=	ftp://tug.org/vm/
-MASTER_SITES+=	ftp://psg.com/pub/vm/
-MASTER_SITES+=	ftp://sunsite.cnlab-switch.ch/mirror/vm/
-MASTER_SITES+=	http://www.interhack.net/projects/vm/
-MASTER_SITES+=	http://ftp.lip6.fr/pub/unix/mail/vm/
-MASTER_SITES+=	http://ftp.jussieu.fr/pub/unix/mail/vm/
-MASTER_SITES+=	ftp://ftp.surfnet.nl/pub/mail/vm/
+MASTER_SITES=	https://launchpad.net/vm/8.2.x/8.2.0b/+download/
+EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.wonderworks.com/vm/
+HOMEPAGE=	https://launchpad.net/vm
 COMMENT=	VM (View Mail) is an advanced mail user agent for Emacs
 
-USE_TOOLS+=	makeinfo
+USE_TOOLS+=	makeinfo gmake gtar
+GNU_CONFIGURE=	yes
 INFO_FILES=	yes
 
 MAKEFLAGS+=	EMACS=${EMACS_BIN:Q}
@@ -31,19 +25,10 @@ INSTALLATION_DIRS=	bin ${EMACS_INFOPREFIX} ${EMACS_LISPPREFIX}/vm	\
 			${PIXMAPDIR}
 
 PIXMAPDIR=		${PIXMAPDIR.${EMACS_FLAVOR}}
-PIXMAPDIR.emacs=	${EMACS_LISPPREFIX}/vm/pixmaps
+PIXMAPDIR.emacs=	${PREFIX:Q}/share/vm/pixmaps
 PIXMAPDIR.xemacs=	${EMACS_LISPPREFIX:H}/etc/vm
 
-do-install:
-	cd ${WRKSRC} && ${INSTALL_DATA} *.el *.elc ${DESTDIR}${EMACS_LISPPREFIX}/vm
-	cd ${WRKSRC}; for f in *.info *.info-[0-9]*; do			\
-		${TEST} ! -f "$$f" ||					\
-		${INSTALL_DATA} "$$f" ${DESTDIR}${EMACS_INFOPREFIX};	\
-	done
-	${INSTALL_DATA} ${WRKSRC}/pixmaps/*.x[pb]m ${DESTDIR}${PIXMAPDIR}
-	cd ${WRKSRC} && ${INSTALL_PROGRAM} qp-decode qp-encode		\
-		base64-decode base64-encode ${DESTDIR}${PREFIX}/bin
-
 .include "../../editors/emacs/modules.mk"
 
+.include "../../misc/bbdb/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/vm/PLIST b/mail/vm/PLIST
index d4757486890..6c3be182372 100644
--- a/mail/vm/PLIST
+++ b/mail/vm/PLIST
@@ -1,119 +1,44 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 20:45:12 joerg Exp $
+@comment $NetBSD: PLIST,v 1.6 2018/11/29 00:36:23 markd 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
+info/vm-pcrisis.info
+info/vm.info
+share/doc/vm/CHANGES
+share/doc/vm/COPYING
+share/doc/vm/NEWS
+share/doc/vm/README
+share/doc/vm/TODO
 ${EMACS_LISPPREFIX}/vm/tapestry.el
 ${EMACS_LISPPREFIX}/vm/tapestry.elc
+${EMACS_LISPPREFIX}/vm/u-vm-color.el
+${EMACS_LISPPREFIX}/vm/u-vm-color.elc
+${EMACS_LISPPREFIX}/vm/vcard.el
+${EMACS_LISPPREFIX}/vm/vcard.elc
+${EMACS_LISPPREFIX}/vm/version.txt
 ${EMACS_LISPPREFIX}/vm/vm-autoload.el
 ${EMACS_LISPPREFIX}/vm/vm-autoload.elc
-${EMACS_LISPPREFIX}/vm/vm-byteopts.el
+${EMACS_LISPPREFIX}/vm/vm-autoloads.el
+${EMACS_LISPPREFIX}/vm/vm-autoloads.elc
+${EMACS_LISPPREFIX}/vm/vm-avirtual.el
+${EMACS_LISPPREFIX}/vm/vm-avirtual.elc
+${EMACS_LISPPREFIX}/vm/vm-biff.el
+${EMACS_LISPPREFIX}/vm/vm-biff.elc
 ${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-dired.el
+${EMACS_LISPPREFIX}/vm/vm-dired.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-grepmail.el
+${EMACS_LISPPREFIX}/vm/vm-grepmail.elc
 ${EMACS_LISPPREFIX}/vm/vm-imap.el
 ${EMACS_LISPPREFIX}/vm/vm-imap.elc
 ${EMACS_LISPPREFIX}/vm/vm-license.el
@@ -124,6 +49,8 @@ ${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-history.el
+${EMACS_LISPPREFIX}/vm/vm-message-history.elc
 ${EMACS_LISPPREFIX}/vm/vm-message.el
 ${EMACS_LISPPREFIX}/vm/vm-message.elc
 ${EMACS_LISPPREFIX}/vm/vm-mime.el
@@ -138,18 +65,32 @@ ${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-pcrisis.el
+${EMACS_LISPPREFIX}/vm/vm-pcrisis.elc
+${EMACS_LISPPREFIX}/vm/vm-pgg.el
+${EMACS_LISPPREFIX}/vm/vm-pgg.elc
+${EMACS_LISPPREFIX}/vm/vm-pine.el
+${EMACS_LISPPREFIX}/vm/vm-pine.elc
 ${EMACS_LISPPREFIX}/vm/vm-pop.el
 ${EMACS_LISPPREFIX}/vm/vm-pop.elc
+${EMACS_LISPPREFIX}/vm/vm-ps-print.el
+${EMACS_LISPPREFIX}/vm/vm-ps-print.elc
 ${EMACS_LISPPREFIX}/vm/vm-reply.el
 ${EMACS_LISPPREFIX}/vm/vm-reply.elc
+${EMACS_LISPPREFIX}/vm/vm-rfaddons.el
+${EMACS_LISPPREFIX}/vm/vm-rfaddons.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-serial.el
+${EMACS_LISPPREFIX}/vm/vm-serial.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-faces.el
+${EMACS_LISPPREFIX}/vm/vm-summary-faces.elc
 ${EMACS_LISPPREFIX}/vm/vm-summary.el
 ${EMACS_LISPPREFIX}/vm/vm-summary.elc
 ${EMACS_LISPPREFIX}/vm/vm-thread.el
@@ -162,11 +103,99 @@ ${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-vcard.el
+${EMACS_LISPPREFIX}/vm/vm-vcard.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-w3.el
+${EMACS_LISPPREFIX}/vm/vm-w3.elc
+${EMACS_LISPPREFIX}/vm/vm-w3m.el
+${EMACS_LISPPREFIX}/vm/vm-w3m.elc
 ${EMACS_LISPPREFIX}/vm/vm-window.el
 ${EMACS_LISPPREFIX}/vm/vm-window.elc
 ${EMACS_LISPPREFIX}/vm/vm.el
 ${EMACS_LISPPREFIX}/vm/vm.elc
+share/vm/CHANGES
+share/vm/COPYING
+share/vm/NEWS
+share/vm/README
+share/vm/TODO
+${PIXMAPDIR}/autofile-dn.xpm
+${PIXMAPDIR}/autofile-up.xpm
+${PIXMAPDIR}/compose-dn.xpm
+${PIXMAPDIR}/compose-up.xpm
+${PIXMAPDIR}/delete-dn.xpm
+${PIXMAPDIR}/delete-up.xpm
+${PIXMAPDIR}/file-dn.xpm
+${PIXMAPDIR}/file-up.xpm
+${PIXMAPDIR}/followup-dn.xpm
+${PIXMAPDIR}/followup-up.xpm
+${PIXMAPDIR}/forward-dn.xpm
+${PIXMAPDIR}/forward-up.xpm
+${PIXMAPDIR}/getmail-dn.xpm
+${PIXMAPDIR}/getmail-up.xpm
+${PIXMAPDIR}/gtk/autofile-dn.xpm
+${PIXMAPDIR}/gtk/autofile-up.xpm
+${PIXMAPDIR}/gtk/compose-dn.xpm
+${PIXMAPDIR}/gtk/compose-up.xpm
+${PIXMAPDIR}/gtk/delete-dn.xpm
+${PIXMAPDIR}/gtk/delete-up.xpm
+${PIXMAPDIR}/gtk/file-dn.xpm
+${PIXMAPDIR}/gtk/file-up.xpm
+${PIXMAPDIR}/gtk/followup-dn.xpm
+${PIXMAPDIR}/gtk/followup-up.xpm
+${PIXMAPDIR}/gtk/forward-dn.xpm
+${PIXMAPDIR}/gtk/forward-up.xpm
+${PIXMAPDIR}/gtk/getmail-dn.xpm
+${PIXMAPDIR}/gtk/getmail-up.xpm
+${PIXMAPDIR}/gtk/help-dn.xpm
+${PIXMAPDIR}/gtk/help-up.xpm
+${PIXMAPDIR}/gtk/mime-dn.xpm
+${PIXMAPDIR}/gtk/mime-up.xpm
+${PIXMAPDIR}/gtk/mime-xx.xpm
+${PIXMAPDIR}/gtk/next-dn.xpm
+${PIXMAPDIR}/gtk/next-up.xpm
+${PIXMAPDIR}/gtk/previous-dn.xpm
+${PIXMAPDIR}/gtk/previous-up.xpm
+${PIXMAPDIR}/gtk/print-dn.xpm
+${PIXMAPDIR}/gtk/print-up.xpm
+${PIXMAPDIR}/gtk/quit-dn.xpm
+${PIXMAPDIR}/gtk/quit-up.xpm
+${PIXMAPDIR}/gtk/recover-dn.xpm
+${PIXMAPDIR}/gtk/recover-up.xpm
+${PIXMAPDIR}/gtk/reply-dn.xpm
+${PIXMAPDIR}/gtk/reply-up.xpm
+${PIXMAPDIR}/gtk/undelete-dn.xpm
+${PIXMAPDIR}/gtk/undelete-up.xpm
+${PIXMAPDIR}/gtk/visit-dn.xpm
+${PIXMAPDIR}/gtk/visit-up.xpm
+${PIXMAPDIR}/help-dn.xpm
+${PIXMAPDIR}/help-up.xpm
+${PIXMAPDIR}/mime-dn.xpm
+${PIXMAPDIR}/mime-up.xpm
+${PIXMAPDIR}/mime-xx.xpm
+${PIXMAPDIR}/mime/application.xpm
+${PIXMAPDIR}/mime/audio.xpm
+${PIXMAPDIR}/mime/image.xpm
+${PIXMAPDIR}/mime/message.xpm
+${PIXMAPDIR}/mime/multipart.xpm
+${PIXMAPDIR}/mime/text.xpm
+${PIXMAPDIR}/mime/video.xpm
+${PIXMAPDIR}/next-dn.xpm
+${PIXMAPDIR}/next-up.xpm
+${PIXMAPDIR}/previous-dn.xpm
+${PIXMAPDIR}/previous-up.xpm
+${PIXMAPDIR}/print-dn.xpm
+${PIXMAPDIR}/print-up.xpm
+${PIXMAPDIR}/quit-dn.xpm
+${PIXMAPDIR}/quit-up.xpm
+${PIXMAPDIR}/recover-dn.xpm
+${PIXMAPDIR}/recover-up.xpm
+${PIXMAPDIR}/reply-dn.xpm
+${PIXMAPDIR}/reply-up.xpm
+${PIXMAPDIR}/undelete-dn.xpm
+${PIXMAPDIR}/undelete-up.xpm
+${PIXMAPDIR}/visit-dn.xpm
+${PIXMAPDIR}/visit-up.xpm
diff --git a/mail/vm/distinfo b/mail/vm/distinfo
index dc40e27d6fe..173561c9a07 100644
--- a/mail/vm/distinfo
+++ b/mail/vm/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.17 2015/11/03 23:27:23 agc Exp $
+$NetBSD: distinfo,v 1.18 2018/11/29 00:36:23 markd Exp $
 
-SHA1 (vm-7.19.tar.gz) = 0fe9012b8988ebdec7641f48aca0ef365549c590
-RMD160 (vm-7.19.tar.gz) = 7a28c0a096f1f8093cffb9fc621cd270dd67b432
-SHA512 (vm-7.19.tar.gz) = 1faa19ea102dc730c147039e5eb1c5ad63ad1dc06ca5813710ed59f09d7731e9cc5724d3b48d28c1209ca0be75f62350f4de4e84df8faffee3fb4751767c106e
-Size (vm-7.19.tar.gz) = 381658 bytes
-SHA1 (patch-aa) = 7b8e9b8bcc1c03604fc0d2a81683754b823dc7a6
-SHA1 (patch-ab) = 51ea93e4b4066fbab7e75d03bea2cffd20c85440
-SHA1 (patch-vm-folder.el) = c496a4a3fe26568d86d2d4f47087f9d67fd583e9
+SHA1 (vm-8.2.0b.tgz) = cd7ba5ad202173a7d44d24f873f8e64811f8eea1
+RMD160 (vm-8.2.0b.tgz) = d94e96c430cfdd615a4e6afe1b70337a1aad8bb5
+SHA512 (vm-8.2.0b.tgz) = 37b642975e8fe7e350c0a648f83608b28d8616417d376d9888c89b37c90d8bdb3c91cdc4c91a0f5072d29ac81bfea3d88f9b36699379bf8a5bdd15dd5a70858d
+Size (vm-8.2.0b.tgz) = 839789 bytes
+SHA1 (patch-info_vm-pcrisis.texinfo) = 13369e08a17b392a3dd2259f8b5326f9286a4f7b
+SHA1 (patch-info_vm.texinfo) = 52debfbd4a73552e38e266579f82ea608e841702
+SHA1 (patch-lisp_vm-pcrisis.el) = e3214d8414434c981267aba2e8fc2401a4924a4b
diff --git a/mail/vm/patches/patch-aa b/mail/vm/patches/patch-aa
deleted file mode 100644
index 3c25fb303dc..00000000000
--- a/mail/vm/patches/patch-aa
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2002/05/04 02:32:07 jtb Exp $
-
---- Makefile.orig	Sat May  4 03:21:17 2002
-+++ Makefile	Sat May  4 03:22:54 2002
-@@ -2,24 +2,24 @@
- # prior to 19.14 for XEmacs are unsupported.
- 
- # what emacs is called on your system
--EMACS = emacs
-+#EMACS = emacs
- 
- # top of the installation
--prefix = /usr/local
-+prefix = ${PREFIX}
- 
- # where the Info file should go
--INFODIR = ${prefix}/lib/emacs/info
-+#INFODIR = ${prefix}/lib/emacs/info
- 
- # where the vm.elc, tapestry.elc, etc. files should go
--LISPDIR = ${prefix}/lib/emacs/site-lisp
-+#LISPDIR = ${prefix}/lib/emacs/site-lisp
- 
- # where the toolbar pixmaps should go.
- # vm-toolbar-pixmap-directory must point to the same place.
- # vm-image-directory must point to the same place.
--PIXMAPDIR = ${prefix}/lib/emacs/etc/vm
-+#PIXMAPDIR = ${prefix}/lib/emacs/etc/vm
- 
- # where the binaries should be go.
--BINDIR = ${prefix}/bin
-+#BINDIR = ${prefix}/bin
- 
- ############## no user servicable parts beyond this point ###################
- 
-@@ -134,7 +134,7 @@
- 
- vm.info:	vm.texinfo
- 	@echo "making vm.info..."
--	@$(EMACS) $(BATCHFLAGS) -insert vm.texinfo -l texinfmt -f texinfo-format-buffer -f save-buffer
-+	$(MAKEINFO) vm.texinfo
- 
- # We use tr -d because Emacs under Cygwin apparently outputs CRLF
- # under Windows.  We remove the CRs.
diff --git a/mail/vm/patches/patch-ab b/mail/vm/patches/patch-ab
deleted file mode 100644
index e7c53eb3801..00000000000
--- a/mail/vm/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2003/02/19 22:06:20 jtb Exp $
-
---- vm.texinfo.orig	Tue May 28 19:45:36 2002
-+++ vm.texinfo
-@@ -2,7 +2,7 @@
- @setfilename vm.info
- @settitle VM User's Manual
- @direntry
--* VM::			A mail reader.
-+* VM: (vm).		A mail reader.
- @end direntry
- @iftex
- @finalout
diff --git a/mail/vm/patches/patch-info_vm-pcrisis.texinfo b/mail/vm/patches/patch-info_vm-pcrisis.texinfo
new file mode 100644
index 00000000000..8d85e823e3a
--- /dev/null
+++ b/mail/vm/patches/patch-info_vm-pcrisis.texinfo
@@ -0,0 +1,15 @@
+$NetBSD: patch-info_vm-pcrisis.texinfo,v 1.1 2018/11/29 00:36:23 markd Exp $
+
+revision 1503. Adjusted the texinfo files for makeinfo version 5.2
+
+--- info/vm-pcrisis.texinfo.orig	2011-12-27 22:19:28.000000000 +0000
++++ info/vm-pcrisis.texinfo
+@@ -1179,7 +1179,7 @@ bear this in mind when you set up the pr
+ 
+ @c ***************************************************************************
+ 
+-@unnumberedsubsec vmpc-auto-profiles-file
++@unnumberedsec vmpc-auto-profiles-file
+ @vindex vmpc-auto-profiles-file
+ 
+ The variable @code{vmpc-auto-profiles-file} contains the name of the
diff --git a/mail/vm/patches/patch-info_vm.texinfo b/mail/vm/patches/patch-info_vm.texinfo
new file mode 100644
index 00000000000..10379f6d2f3
--- /dev/null
+++ b/mail/vm/patches/patch-info_vm.texinfo
@@ -0,0 +1,133 @@
+$NetBSD: patch-info_vm.texinfo,v 1.1 2018/11/29 00:36:23 markd Exp $
+
+revision 1503. Adjusted the texinfo files for makeinfo version 5.2 
+
+--- info/vm.texinfo.orig	2011-12-27 22:19:28.000000000 +0000
++++ info/vm.texinfo
+@@ -914,7 +914,8 @@ following formats:
+ 
+ @example
+ ``pop:@var{HOST}:@var{PORT}:@var{AUTH}:@var{USER}:@var{PASSWORD}''
+-``imap:@var{HOST}:@var{PORT}:@var{MAILBOX}:@var{AUTH}:@var{USER}:@var{PASSWORD}''@end example
++``imap:@var{HOST}:@var{PORT}:@var{MAILBOX}:@var{AUTH}:@var{USER}:@var{PASSWORD}''
++@end example
+ 
+ @noindent Remote mailboxes accessed by VM in this fashion are referred
+ to as @dfn{server folders} (and @dfn{@acronym{POP} folders} or @dfn{@acronym{IMAP}
+@@ -1208,7 +1209,7 @@ The variable's value should be an associ
+ @end example
+ 
+ @var{IMAPDROP} is an @acronym{IMAP} maildrop specification (@ref{maildrop
+-  specification}). 
++specification}). 
+ 
+ @var{NAME} is a string that should give a less cumbersome name that you
+ will use to refer to this maildrop when using @code{vm-visit-imap-folder}.
+@@ -2814,7 +2815,7 @@ composition and will analyze your messag
+ * @acronym{MIME} preview::        Previewing a @acronym{MIME} message before sending.
+ @end menu
+ 
+-@node @acronym{MIME} attachments, @acronym{MIME} characters, Sending @acronym{MIME} Messages, Sending @acronym{MIME} Messages, 
++@node @acronym{MIME} attachments, @acronym{MIME} characters, Sending @acronym{MIME} Messages, Sending @acronym{MIME} Messages 
+ @unnumberedsec @acronym{MIME} attachments
+ 
+ @kindex C-c C-a
+@@ -2868,7 +2869,7 @@ Alternatively, you can mark one or more
+ before invoking this command.  All the marked messages will be
+ attached as a digest in the outgoing message.
+ 
+-@unnumberedsubsubsec Point-to-point attachment operations
++@unnumberedsubsec Point-to-point attachment operations
+ 
+ @cindex point-to-point attachment operations
+ A number of @dfn{point-to-point operations} allow you to attach objects
+@@ -3425,7 +3426,7 @@ command.  There is a separate variable
+ works like @code{vm-delete-after-saving} but applies to the @kbd{A}
+ (@code{vm-auto-archive-messages}) command (see below).
+ 
+-@unnumberedsubsec vm-auto-folder-alist
++@unnumberedsec vm-auto-folder-alist
+ 
+ @vindex vm-auto-folder-alist
+ The variable @code{vm-auto-folder-alist} is used to specify
+@@ -3477,7 +3478,7 @@ matching is case-insensitive.  Note that
+ always case-insensitive because the Internet message standard RFC 822
+ specifies that header names are case indistinct.
+ 
+-@unnumberedsubsec Other commands
++@unnumberedsec Other commands
+ 
+ @table @kbd
+ @findex vm-save-message-sans-headers
+@@ -5174,7 +5175,7 @@ the offline operation.  Similarly, @emph
+ been expunged in the cache folder are expunged on the server.
+ 
+ @anchor{@acronym{UIDVALIDITY}}
+-@unnumberedsubsec @acronym{UIDVALIDITY}
++@unnumberedsec @acronym{UIDVALIDITY}
+ 
+ @cindex @acronym{UIDVALIDITY}
+ Messages on an @acronym{IMAP} server have unique id numbers called UID's.
+@@ -5198,7 +5199,7 @@ time, but note that it is not possible t
+ setting the @code{vm-enable-external-messages} flag to @code{(imap)} before
+ you refresh the cache so that it will be quicker. @pxref{External Messages}.
+ 
+-@unnumberedsubsec Operations for the IMAP server
++@unnumberedsec Operations for the IMAP server
+ 
+ @cindex vm-list-imap-folders
+ The command @code{vm-list-imap-folders} lists the folders available on the
+@@ -6021,7 +6022,7 @@ packages in your environment.
+ Useful ways to customize VM.
+ @section Reading messages
+ 
+-@unnumberedsubsubsec Shrunken headers
++@unnumberedsubsec Shrunken headers
+ 
+ @cindex headers, shrunken
+ @vindex vm-enable-addons
+@@ -6069,7 +6070,7 @@ part.  You can use the same function to
+ 
+ @section Saving messages and attachments
+ 
+-@unnumberedsubsubsec Auto saving attachments
++@unnumberedsubsec Auto saving attachments
+ 
+ Messages with attachments get bulky and increase the size of VM
+ folders, slowing down VM.  The functions
+@@ -6179,7 +6180,7 @@ The project code base is maintained at t
+ @uref{http://launchpad.net/vm}.  The ``VM Development Team'' can be
+ reached here using the email address @email{vm@@lists.launchpad.net}.
+ 
+-@unnumberedsubsec Savannah project site
++@unnumberedsec Savannah project site
+ 
+ The changes made in each of the releases is described in the @samp{NEWS}
+ file, which can be found in the source code repository.  The changes made
+@@ -6197,7 +6198,7 @@ the @code{Source Code} menu.  The @code{
+ takes you to a page that lists various version of VM source code, and
+ gives instructions for downloading it via @samp{Bazaar} (@code{bzr}).
+ 
+-@unnumberedsubsec Technical support
++@unnumberedsec Technical support
+ 
+ VM has a dedicated usenet newsgroup @code{gnu.emacs.vm.info} and a
+ gmane newsgroup @code{gmane.emacs.viewmail}, in which the developers
+@@ -6220,7 +6221,7 @@ alternative approaches to narrow down th
+ 
+ The best way to report bugs is via the Launchpad bug tacker.  See below.
+ 
+-@unnumberedsubsec Get Involved
++@unnumberedsec Get Involved
+ 
+ VM is now supported and maintained by the user community.  So, as an
+ active user, your participation is key to keep the project going.  
+@@ -6545,7 +6546,7 @@ server are listed.  In the normal cases,
+ @acronym{IMAP} folders.)
+ @end itemize
+ 
+-@unnumberedsubsubsec Folder variables
++@unnumberedsubsec Folder variables
+ 
+ Internal to Emacs, VM stores the folder as simply a text buffer.  However, it
+ remembers a variety of data about the message contents in the buffer
diff --git a/mail/vm/patches/patch-lisp_vm-pcrisis.el b/mail/vm/patches/patch-lisp_vm-pcrisis.el
new file mode 100644
index 00000000000..7a23801366c
--- /dev/null
+++ b/mail/vm/patches/patch-lisp_vm-pcrisis.el
@@ -0,0 +1,15 @@
+$NetBSD: patch-lisp_vm-pcrisis.el,v 1.1 2018/11/29 00:36:23 markd Exp $
+
+remove  spurious &optional
+
+--- lisp/vm-pcrisis.el.orig	2011-12-27 22:19:28.000000000 +0000
++++ lisp/vm-pcrisis.el
+@@ -1214,7 +1214,7 @@ PROMPT argument and call this function i
+ ;; Functions for vmpc-conditions:
+ ;; -------------------------------------------------------------------
+ 
+-(defun vmpc-none-true-yet (&optional &rest exceptions)
++(defun vmpc-none-true-yet (&rest exceptions)
+   "True if none of the previous evaluated conditions was true.
+ This is a condition that can appear in `vmpc-conditions'.  If EXCEPTIONS are
+ specified, it means none were true except those.  For example, if you wanted
diff --git a/mail/vm/patches/patch-vm-folder.el b/mail/vm/patches/patch-vm-folder.el
deleted file mode 100644
index 8c983039881..00000000000
--- a/mail/vm/patches/patch-vm-folder.el
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-vm-folder.el,v 1.1 2013/03/01 21:15:38 markd Exp $
-
---- vm-folder.el.orig	2003-05-30 19:53:21.000000000 +0000
-+++ vm-folder.el
-@@ -4049,7 +4049,8 @@ files."
-   (use-local-map vm-mode-map)
-   ;; if the user saves after M-x recover-file, let them get new
-   ;; mail again.
--  (make-local-hook 'after-save-hook)
-+  (if (fboundp 'make-local-hook)
-+      (make-local-hook 'after-save-hook))
-   (add-hook 'after-save-hook 'vm-unblock-new-mail)
-   (and (vm-menu-support-possible-p)
-        (vm-menu-install-menus))