4 files changed, 38 insertions, 31 deletions

diff --git a/mail/vm/Makefile b/mail/vm/Makefile
index be30daa34ae4..b21994d44788 100644
--- a/mail/vm/Makefile
+++ b/mail/vm/Makefile
@@ -6,12 +6,10 @@
 #
 
 PORTNAME=	vm
-PORTVERSION=	8.0.14
-PORTREVISION=	2
+PORTVERSION=	8.1.0
 CATEGORIES=	mail elisp
-MASTER_SITES=	https://launchpad.net/${PORTNAME}/8.0.x/${PORTVERSION}/+download/
+MASTER_SITES=	https://launchpad.net/${PORTNAME}/8.1.x/${PORTVERSION}/+download/
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	jhein@symmetricom.com
diff --git a/mail/vm/distinfo b/mail/vm/distinfo
index b88f04c1f178..1b36c00b3956 100644
--- a/mail/vm/distinfo
+++ b/mail/vm/distinfo
@@ -1,3 +1,3 @@
-MD5 (vm-8.0.14.tgz) = 35657d3d3dec1dcce5b31ac155e0cc4f
-SHA256 (vm-8.0.14.tgz) = 33a26785ab87212c492c303cdd3cb543d44cc789072cc4709e206ac05356b9e5
-SIZE (vm-8.0.14.tgz) = 550490
+MD5 (vm-8.1.0.tgz) = 4fb0c1ea5186f0f4e9d8b25d21ef4e7d
+SHA256 (vm-8.1.0.tgz) = c9065188c476367f67a76d4441ea69372ab6e321c4fa673156838eebcbf68664
+SIZE (vm-8.1.0.tgz) = 689653
diff --git a/mail/vm/pkg-descr b/mail/vm/pkg-descr
index e9e4b14a7c33..2be0a677f097 100644
--- a/mail/vm/pkg-descr
+++ b/mail/vm/pkg-descr
@@ -19,3 +19,4 @@ Some other features:
  - gpg integration
 
 WWW: http://www.nongnu.org/viewmail/
+WWW: https://launchpad.net/vm/
diff --git a/mail/vm/pkg-plist b/mail/vm/pkg-plist
index fba7ed3cfd32..bc8e776d3da2 100644
--- a/mail/vm/pkg-plist
+++ b/mail/vm/pkg-plist
@@ -17,27 +17,6 @@ bin/qp-encode
 %%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.xpm
-%%EMACS_LIBDIR_WITH_VER%%/etc/vm/help-dn.xpm
-%%EMACS_LIBDIR_WITH_VER%%/etc/vm/help-up.xpm
-%%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.xpm
-%%EMACS_LIBDIR_WITH_VER%%/etc/vm/previous-dn.xpm
-%%EMACS_LIBDIR_WITH_VER%%/etc/vm/previous-up.xpm
-%%EMACS_LIBDIR_WITH_VER%%/etc/vm/print-dn.xpm
-%%EMACS_LIBDIR_WITH_VER%%/etc/vm/print-up.xpm
-%%EMACS_LIBDIR_WITH_VER%%/etc/vm/quit-dn.xpm
-%%EMACS_LIBDIR_WITH_VER%%/etc/vm/quit-up.xpm
-%%EMACS_LIBDIR_WITH_VER%%/etc/vm/recover-dn.xpm
-%%EMACS_LIBDIR_WITH_VER%%/etc/vm/recover-up.xpm
-%%EMACS_LIBDIR_WITH_VER%%/etc/vm/reply-dn.xpm
-%%EMACS_LIBDIR_WITH_VER%%/etc/vm/reply-up.xpm
-%%EMACS_LIBDIR_WITH_VER%%/etc/vm/undelete-dn.xpm
-%%EMACS_LIBDIR_WITH_VER%%/etc/vm/undelete-up.xpm
-%%EMACS_LIBDIR_WITH_VER%%/etc/vm/visit-dn.xpm
-%%EMACS_LIBDIR_WITH_VER%%/etc/vm/visit-up.xpm
 %%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
@@ -73,6 +52,11 @@ bin/qp-encode
 %%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/help-dn.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/vm/help-up.xpm
+%%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/mime/application.xpm
 %%EMACS_LIBDIR_WITH_VER%%/etc/vm/mime/audio.xpm
 %%EMACS_LIBDIR_WITH_VER%%/etc/vm/mime/image.xpm
@@ -80,10 +64,29 @@ bin/qp-encode
 %%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_LIBDIR_WITH_VER%%/etc/vm/next-dn.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/vm/next-up.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/vm/previous-dn.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/vm/previous-up.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/vm/print-dn.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/vm/print-up.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/vm/quit-dn.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/vm/quit-up.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/vm/recover-dn.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/vm/recover-up.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/vm/reply-dn.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/vm/reply-up.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/vm/undelete-dn.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/vm/undelete-up.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/vm/visit-dn.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/vm/visit-up.xpm
 %%EMACS_VERSION_SITE_LISPDIR%%/vm/tapestry.el
 %%EMACS_VERSION_SITE_LISPDIR%%/vm/tapestry.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/vm/u-vm-color.el
+%%EMACS_VERSION_SITE_LISPDIR%%/vm/u-vm-color.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/vm/vcard.el
 %%EMACS_VERSION_SITE_LISPDIR%%/vm/vcard.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/vm/version.txt
 %%EMACS_VERSION_SITE_LISPDIR%%/vm/vm-autoload.el
 %%EMACS_VERSION_SITE_LISPDIR%%/vm/vm-autoload.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/vm/vm-autoloads.el
@@ -142,8 +145,6 @@ bin/qp-encode
 %%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
@@ -176,11 +177,18 @@ bin/qp-encode
 %%EMACS_VERSION_SITE_LISPDIR%%/vm/vm-version.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/vm/vm-virtual.el
 %%EMACS_VERSION_SITE_LISPDIR%%/vm/vm-virtual.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/vm/vm-w3.el
+%%EMACS_VERSION_SITE_LISPDIR%%/vm/vm-w3.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/vm/vm-w3m.el
+%%EMACS_VERSION_SITE_LISPDIR%%/vm/vm-w3m.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/vm/vm-window.el
 %%EMACS_VERSION_SITE_LISPDIR%%/vm/vm-window.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/vm/vm.el
 %%EMACS_VERSION_SITE_LISPDIR%%/vm/vm.elc
-@dirrm %%EMACS_VERSION_SITE_LISPDIR%%/vm
+@dirrmtry %%EMACS_VERSION_SITE_LISPDIR%%/vm
+@dirrmtry %%EMACS_VERSION_SITE_LISPDIR%%
 @dirrm %%EMACS_LIBDIR_WITH_VER%%/etc/vm/mime
 @dirrm %%EMACS_LIBDIR_WITH_VER%%/etc/vm/gtk
 @dirrm %%EMACS_LIBDIR_WITH_VER%%/etc/vm
+@dirrmtry %%EMACS_LIBDIR_WITH_VER%%/etc
+@dirrmtry %%EMACS_LIBDIR_WITH_VER%%