summaryrefslogtreecommitdiff
path: root/mail/vm
diff options
context:
space:
mode:
Diffstat (limited to 'mail/vm')
-rw-r--r--mail/vm/Makefile51
-rw-r--r--mail/vm/files/md54
-rw-r--r--mail/vm/files/patch-sum4
-rw-r--r--mail/vm/patches/patch-aa36
-rw-r--r--mail/vm/pkg/PLIST.emacs (renamed from mail/vm/pkg/PLIST)3
-rw-r--r--mail/vm/pkg/PLIST.xemacs176
6 files changed, 242 insertions, 32 deletions
diff --git a/mail/vm/Makefile b/mail/vm/Makefile
index 0f9b1b6caa9..c282bbcae7c 100644
--- a/mail/vm/Makefile
+++ b/mail/vm/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/12/01 04:18:20 jtb Exp $
+# $NetBSD: Makefile,v 1.2 2001/01/28 03:16:54 jtb Exp $
-DISTNAME= vm-6.87
+DISTNAME= vm-6.90
CATEGORIES= mail
MASTER_SITES= ftp://ftp.uni-mainz.de/pub/gnu/vm/ \
ftp://tug.org/vm/ \
@@ -11,20 +11,45 @@ MASTER_SITES= ftp://ftp.uni-mainz.de/pub/gnu/vm/ \
MAINTAINER= jtb@netbsd.org
HOMEPAGE= http://www.wonderworks.com/vm/
-DEPENDS+= emacs-[0-9]*:../../editors/emacs
+.include "../../mk/bsd.prefs.mk"
-WRKSRC= ${WRKDIR}/${PKGNAME}
+.if defined(USE_XEMACS)
+DEPENDS+= xemacs>=19.14:../../editors/xemacs
+MAKE_ENV+= EMACS=xemacs
+MAKE_ENV+= LISPDIR="${PREFIX}/lib/xemacs/xemacs-packages/lisp/vm"
+MAKE_ENV+= INFODIR="${PREFIX}/lib/xemacs/xemacs-packages/info"
+MAKE_ENV+= PIXMAPDIR="${PREFIX}/lib/xemacs/xemacs-packages/etc/vm"
+MAKE_ENV+= BINDIR="${PREFIX}/bin"
+PLIST_SRC= ${PKGDIR}/PLIST.xemacs
+.else
+DEPENDS+= emacs>=19.34:../../editors/emacs
+MAKE_ENV+= EMACS=emacs
+MAKE_ENV+= LISPDIR="${PREFIX}/share/emacs/site-lisp/vm"
+MAKE_ENV+= INFODIR="${PREFIX}/info"
+MAKE_ENV+= PIXMAPDIR="${PREFIX}/share/emacs/site-lisp/vm/pixmaps"
+MAKE_ENV+= BINDIR="${PREFIX}/bin"
INFO_FILES= vm.info
+PLIST_SRC= ${PKGDIR}/PLIST.emacs
+.endif
do-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/emacs/site-lisp/vm
- ${INSTALL_DATA} ${WRKSRC}/*.el ${WRKSRC}/*.elc \
- ${PREFIX}/share/emacs/site-lisp/vm
- ${INSTALL_DATA} ${WRKSRC}/*.info* ${PREFIX}/info
- ${INSTALL_DATA_DIR} ${PREFIX}/share/emacs/site-lisp/vm/pixmaps
- ${INSTALL_DATA} ${WRKSRC}/pixmaps/*.x[pb]m \
- ${PREFIX}/share/emacs/site-lisp/vm/pixmaps
- @for p in qp-decode qp-encode base64-decode base64-encode ; do \
- ${INSTALL_PROGRAM} ${WRKSRC}/$$p ${PREFIX}/bin ; done
+ ${INSTALL_DATA_DIR} ${LISPDIR}
+ @for a in ${WRKSRC}/*.el ${WRKSRC}/*.elc; do \
+ a="${INSTALL_DATA} $$a ${LISPDIR}"; \
+ ${ECHO} $$a; $$a; \
+ done
+ @for b in ${WRKSRC}/*.info*; do \
+ b="${INSTALL_DATA} $$b ${INFODIR}"; \
+ ${ECHO} $$b; $$b; \
+ done
+ ${INSTALL_DATA_DIR} ${PIXMAPDIR}
+ @for c in ${WRKSRC}/pixmaps/*.x[pb]m; do \
+ c="${INSTALL_DATA} $$c ${PIXMAPDIR}"; \
+ ${ECHO} $$c; $$c; \
+ done
+ @for p in qp-decode qp-encode base64-decode base64-encode ; do \
+ d="${INSTALL_PROGRAM} ${WRKSRC}/$$p ${BINDIR}"; \
+ ${ECHO} $$d; $$d; \
+ done
.include "../../mk/bsd.pkg.mk"
diff --git a/mail/vm/files/md5 b/mail/vm/files/md5
index aadf8ab4fd9..f89e6e13029 100644
--- a/mail/vm/files/md5
+++ b/mail/vm/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1.1.1 2000/12/01 04:18:22 jtb Exp $
+$NetBSD: md5,v 1.2 2001/01/28 03:16:55 jtb Exp $
-MD5 (vm-6.87.tar.gz) = 0f5636a808374fe7a560950487de8c32
+MD5 (vm-6.90.tar.gz) = c0e75051201ab8264cb211548d8275ec
diff --git a/mail/vm/files/patch-sum b/mail/vm/files/patch-sum
index 7e22a9635c1..ea5c6d1d7fb 100644
--- a/mail/vm/files/patch-sum
+++ b/mail/vm/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.2 2000/12/13 23:14:07 jtb Exp $
+$NetBSD: patch-sum,v 1.3 2001/01/28 03:16:55 jtb Exp $
-MD5 (patch-aa) = c6db6ae32e55e5911e27f1607ea6f402
+MD5 (patch-aa) = b064f90e9420149b19c4ccc8c00edd1b
MD5 (patch-ab) = f179927403e5801b44a1fd21a50bfe01
diff --git a/mail/vm/patches/patch-aa b/mail/vm/patches/patch-aa
index 4a3be3eb735..c61f721654a 100644
--- a/mail/vm/patches/patch-aa
+++ b/mail/vm/patches/patch-aa
@@ -1,36 +1,44 @@
-$NetBSD: patch-aa,v 1.2 2000/12/13 23:14:07 jtb Exp $
+$NetBSD: patch-aa,v 1.3 2001/01/28 03:16:55 jtb Exp $
---- Makefile.orig Mon Nov 27 22:51:42 2000
+--- Makefile.orig Fri Dec 15 20:05:39 2000
+++ Makefile
-@@ -5,18 +5,18 @@
- EMACS = emacs
+@@ -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 = /usr/local/lib/emacs/info
-+INFODIR = ${PREFIX}/info
+-INFODIR = ${prefix}/lib/emacs/info
++#INFODIR = ${prefix}/lib/emacs/info
# where the vm.elc, tapestry.elc, etc. files should go
--LISPDIR = /usr/local/lib/emacs/site-lisp
-+LISPDIR = ${PREFIX}/share/emacs/site-lisp/vm
+-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 = /usr/local/lib/emacs/etc/vm
-+PIXMAPDIR = ${LISPDIR}/pixmaps
+-PIXMAPDIR = ${prefix}/lib/emacs/etc/vm
++#PIXMAPDIR = ${prefix}/lib/emacs/etc/vm
# where the binaries should be go.
--BINDIR = /usr/local/bin
-+BINDIR = ${PREFIX}/bin
+-BINDIR = ${prefix}/bin
++#BINDIR = ${prefix}/bin
############## no user servicable parts beyond this point ###################
-@@ -124,7 +124,7 @@
+@@ -131,7 +131,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
++ makeinfo vm.texinfo
vm-autoload.elc: $(SOURCES)
@echo scanning sources to build autoload definitions...
diff --git a/mail/vm/pkg/PLIST b/mail/vm/pkg/PLIST.emacs
index f428913cebe..4aef02744f0 100644
--- a/mail/vm/pkg/PLIST
+++ b/mail/vm/pkg/PLIST.emacs
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2000/12/28 03:33:30 wiz Exp $
+@comment $NetBSD: PLIST.emacs,v 1.1 2001/01/28 03:16:57 jtb Exp $
bin/base64-decode
bin/base64-encode
bin/qp-decode
@@ -176,3 +176,4 @@ 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/pkg/PLIST.xemacs b/mail/vm/pkg/PLIST.xemacs
new file mode 100644
index 00000000000..2eac42a9b1f
--- /dev/null
+++ b/mail/vm/pkg/PLIST.xemacs
@@ -0,0 +1,176 @@
+@comment $NetBSD: PLIST.xemacs,v 1.1 2001/01/28 03:16:58 jtb Exp $
+bin/base64-decode
+bin/base64-encode
+bin/qp-decode
+bin/qp-encode
+lib/xemacs/xemacs-packages/etc/vm/audio_stamp-colorful.xpm
+lib/xemacs/xemacs-packages/etc/vm/audio_stamp-simple.xpm
+lib/xemacs/xemacs-packages/etc/vm/autofile-dn.xbm
+lib/xemacs/xemacs-packages/etc/vm/autofile-dn.xpm
+lib/xemacs/xemacs-packages/etc/vm/autofile-up.xbm
+lib/xemacs/xemacs-packages/etc/vm/autofile-up.xpm
+lib/xemacs/xemacs-packages/etc/vm/autofile-xx.xbm
+lib/xemacs/xemacs-packages/etc/vm/compose-dn.xbm
+lib/xemacs/xemacs-packages/etc/vm/compose-dn.xpm
+lib/xemacs/xemacs-packages/etc/vm/compose-up.xbm
+lib/xemacs/xemacs-packages/etc/vm/compose-up.xpm
+lib/xemacs/xemacs-packages/etc/vm/compose-xx.xbm
+lib/xemacs/xemacs-packages/etc/vm/delete-dn.xbm
+lib/xemacs/xemacs-packages/etc/vm/delete-dn.xpm
+lib/xemacs/xemacs-packages/etc/vm/delete-up.xbm
+lib/xemacs/xemacs-packages/etc/vm/delete-up.xpm
+lib/xemacs/xemacs-packages/etc/vm/delete-xx.xbm
+lib/xemacs/xemacs-packages/etc/vm/document-colorful.xpm
+lib/xemacs/xemacs-packages/etc/vm/document-simple.xpm
+lib/xemacs/xemacs-packages/etc/vm/file-dn.xbm
+lib/xemacs/xemacs-packages/etc/vm/file-dn.xpm
+lib/xemacs/xemacs-packages/etc/vm/file-up.xbm
+lib/xemacs/xemacs-packages/etc/vm/file-up.xpm
+lib/xemacs/xemacs-packages/etc/vm/file-xx.xbm
+lib/xemacs/xemacs-packages/etc/vm/film-colorful.xpm
+lib/xemacs/xemacs-packages/etc/vm/film-simple.xpm
+lib/xemacs/xemacs-packages/etc/vm/gear-colorful.xpm
+lib/xemacs/xemacs-packages/etc/vm/gear-simple.xpm
+lib/xemacs/xemacs-packages/etc/vm/getmail-dn.xbm
+lib/xemacs/xemacs-packages/etc/vm/getmail-dn.xpm
+lib/xemacs/xemacs-packages/etc/vm/getmail-up.xbm
+lib/xemacs/xemacs-packages/etc/vm/getmail-up.xpm
+lib/xemacs/xemacs-packages/etc/vm/getmail-xx.xbm
+lib/xemacs/xemacs-packages/etc/vm/help-dn.xbm
+lib/xemacs/xemacs-packages/etc/vm/help-dn.xpm
+lib/xemacs/xemacs-packages/etc/vm/help-up.xbm
+lib/xemacs/xemacs-packages/etc/vm/help-up.xpm
+lib/xemacs/xemacs-packages/etc/vm/help-xx.xbm
+lib/xemacs/xemacs-packages/etc/vm/message-colorful.xpm
+lib/xemacs/xemacs-packages/etc/vm/message-simple.xpm
+lib/xemacs/xemacs-packages/etc/vm/mime-colorful-dn.xpm
+lib/xemacs/xemacs-packages/etc/vm/mime-colorful-up.xpm
+lib/xemacs/xemacs-packages/etc/vm/mime-colorful-xx.xpm
+lib/xemacs/xemacs-packages/etc/vm/mime-dn.xbm
+lib/xemacs/xemacs-packages/etc/vm/mime-simple-dn.xpm
+lib/xemacs/xemacs-packages/etc/vm/mime-simple-up.xpm
+lib/xemacs/xemacs-packages/etc/vm/mime-simple-xx.xpm
+lib/xemacs/xemacs-packages/etc/vm/mime-up.xbm
+lib/xemacs/xemacs-packages/etc/vm/mime-xx.xbm
+lib/xemacs/xemacs-packages/etc/vm/mona_stamp-colorful.xpm
+lib/xemacs/xemacs-packages/etc/vm/mona_stamp-simple.xpm
+lib/xemacs/xemacs-packages/etc/vm/next-dn.xbm
+lib/xemacs/xemacs-packages/etc/vm/next-dn.xpm
+lib/xemacs/xemacs-packages/etc/vm/next-up.xbm
+lib/xemacs/xemacs-packages/etc/vm/next-up.xpm
+lib/xemacs/xemacs-packages/etc/vm/next-xx.xbm
+lib/xemacs/xemacs-packages/etc/vm/previous-dn.xbm
+lib/xemacs/xemacs-packages/etc/vm/previous-dn.xpm
+lib/xemacs/xemacs-packages/etc/vm/previous-up.xbm
+lib/xemacs/xemacs-packages/etc/vm/previous-up.xpm
+lib/xemacs/xemacs-packages/etc/vm/previous-xx.xbm
+lib/xemacs/xemacs-packages/etc/vm/print-dn.xbm
+lib/xemacs/xemacs-packages/etc/vm/print-dn.xpm
+lib/xemacs/xemacs-packages/etc/vm/print-up.xbm
+lib/xemacs/xemacs-packages/etc/vm/print-up.xpm
+lib/xemacs/xemacs-packages/etc/vm/print-xx.xbm
+lib/xemacs/xemacs-packages/etc/vm/quit-dn.xbm
+lib/xemacs/xemacs-packages/etc/vm/quit-dn.xpm
+lib/xemacs/xemacs-packages/etc/vm/quit-up.xbm
+lib/xemacs/xemacs-packages/etc/vm/quit-up.xpm
+lib/xemacs/xemacs-packages/etc/vm/quit-xx.xbm
+lib/xemacs/xemacs-packages/etc/vm/recover-dn.xbm
+lib/xemacs/xemacs-packages/etc/vm/recover-dn.xpm
+lib/xemacs/xemacs-packages/etc/vm/recover-up.xbm
+lib/xemacs/xemacs-packages/etc/vm/recover-up.xpm
+lib/xemacs/xemacs-packages/etc/vm/recover-xx.xbm
+lib/xemacs/xemacs-packages/etc/vm/reply-dn.xbm
+lib/xemacs/xemacs-packages/etc/vm/reply-dn.xpm
+lib/xemacs/xemacs-packages/etc/vm/reply-up.xbm
+lib/xemacs/xemacs-packages/etc/vm/reply-up.xpm
+lib/xemacs/xemacs-packages/etc/vm/reply-xx.xbm
+lib/xemacs/xemacs-packages/etc/vm/stuffed_box-colorful.xpm
+lib/xemacs/xemacs-packages/etc/vm/stuffed_box-simple.xpm
+lib/xemacs/xemacs-packages/etc/vm/undelete-dn.xbm
+lib/xemacs/xemacs-packages/etc/vm/undelete-dn.xpm
+lib/xemacs/xemacs-packages/etc/vm/undelete-up.xbm
+lib/xemacs/xemacs-packages/etc/vm/undelete-up.xpm
+lib/xemacs/xemacs-packages/etc/vm/undelete-xx.xbm
+lib/xemacs/xemacs-packages/etc/vm/visit-dn.xbm
+lib/xemacs/xemacs-packages/etc/vm/visit-dn.xpm
+lib/xemacs/xemacs-packages/etc/vm/visit-up.xbm
+lib/xemacs/xemacs-packages/etc/vm/visit-up.xpm
+lib/xemacs/xemacs-packages/etc/vm/visit-xx.xbm
+lib/xemacs/xemacs-packages/info/vm.info
+lib/xemacs/xemacs-packages/info/vm.info-1
+lib/xemacs/xemacs-packages/info/vm.info-2
+lib/xemacs/xemacs-packages/info/vm.info-3
+lib/xemacs/xemacs-packages/info/vm.info-4
+lib/xemacs/xemacs-packages/lisp/vm/tapestry.el
+lib/xemacs/xemacs-packages/lisp/vm/tapestry.elc
+lib/xemacs/xemacs-packages/lisp/vm/vm-autoload.el
+lib/xemacs/xemacs-packages/lisp/vm/vm-autoload.elc
+lib/xemacs/xemacs-packages/lisp/vm/vm-byteopts.el
+lib/xemacs/xemacs-packages/lisp/vm/vm-delete.el
+lib/xemacs/xemacs-packages/lisp/vm/vm-delete.elc
+lib/xemacs/xemacs-packages/lisp/vm/vm-digest.el
+lib/xemacs/xemacs-packages/lisp/vm/vm-digest.elc
+lib/xemacs/xemacs-packages/lisp/vm/vm-easymenu.el
+lib/xemacs/xemacs-packages/lisp/vm/vm-easymenu.elc
+lib/xemacs/xemacs-packages/lisp/vm/vm-edit.el
+lib/xemacs/xemacs-packages/lisp/vm/vm-edit.elc
+lib/xemacs/xemacs-packages/lisp/vm/vm-folder.el
+lib/xemacs/xemacs-packages/lisp/vm/vm-folder.elc
+lib/xemacs/xemacs-packages/lisp/vm/vm-imap.el
+lib/xemacs/xemacs-packages/lisp/vm/vm-imap.elc
+lib/xemacs/xemacs-packages/lisp/vm/vm-license.el
+lib/xemacs/xemacs-packages/lisp/vm/vm-license.elc
+lib/xemacs/xemacs-packages/lisp/vm/vm-macro.el
+lib/xemacs/xemacs-packages/lisp/vm/vm-macro.elc
+lib/xemacs/xemacs-packages/lisp/vm/vm-mark.el
+lib/xemacs/xemacs-packages/lisp/vm/vm-mark.elc
+lib/xemacs/xemacs-packages/lisp/vm/vm-menu.el
+lib/xemacs/xemacs-packages/lisp/vm/vm-menu.elc
+lib/xemacs/xemacs-packages/lisp/vm/vm-message.el
+lib/xemacs/xemacs-packages/lisp/vm/vm-message.elc
+lib/xemacs/xemacs-packages/lisp/vm/vm-mime.el
+lib/xemacs/xemacs-packages/lisp/vm/vm-mime.elc
+lib/xemacs/xemacs-packages/lisp/vm/vm-minibuf.el
+lib/xemacs/xemacs-packages/lisp/vm/vm-minibuf.elc
+lib/xemacs/xemacs-packages/lisp/vm/vm-misc.el
+lib/xemacs/xemacs-packages/lisp/vm/vm-misc.elc
+lib/xemacs/xemacs-packages/lisp/vm/vm-motion.el
+lib/xemacs/xemacs-packages/lisp/vm/vm-motion.elc
+lib/xemacs/xemacs-packages/lisp/vm/vm-mouse.el
+lib/xemacs/xemacs-packages/lisp/vm/vm-mouse.elc
+lib/xemacs/xemacs-packages/lisp/vm/vm-page.el
+lib/xemacs/xemacs-packages/lisp/vm/vm-page.elc
+lib/xemacs/xemacs-packages/lisp/vm/vm-pop.el
+lib/xemacs/xemacs-packages/lisp/vm/vm-pop.elc
+lib/xemacs/xemacs-packages/lisp/vm/vm-reply.el
+lib/xemacs/xemacs-packages/lisp/vm/vm-reply.elc
+lib/xemacs/xemacs-packages/lisp/vm/vm-save.el
+lib/xemacs/xemacs-packages/lisp/vm/vm-save.elc
+lib/xemacs/xemacs-packages/lisp/vm/vm-search.el
+lib/xemacs/xemacs-packages/lisp/vm/vm-search.elc
+lib/xemacs/xemacs-packages/lisp/vm/vm-sort.el
+lib/xemacs/xemacs-packages/lisp/vm/vm-sort.elc
+lib/xemacs/xemacs-packages/lisp/vm/vm-startup.el
+lib/xemacs/xemacs-packages/lisp/vm/vm-startup.elc
+lib/xemacs/xemacs-packages/lisp/vm/vm-summary.el
+lib/xemacs/xemacs-packages/lisp/vm/vm-summary.elc
+lib/xemacs/xemacs-packages/lisp/vm/vm-thread.el
+lib/xemacs/xemacs-packages/lisp/vm/vm-thread.elc
+lib/xemacs/xemacs-packages/lisp/vm/vm-toolbar.el
+lib/xemacs/xemacs-packages/lisp/vm/vm-toolbar.elc
+lib/xemacs/xemacs-packages/lisp/vm/vm-undo.el
+lib/xemacs/xemacs-packages/lisp/vm/vm-undo.elc
+lib/xemacs/xemacs-packages/lisp/vm/vm-user.el
+lib/xemacs/xemacs-packages/lisp/vm/vm-user.elc
+lib/xemacs/xemacs-packages/lisp/vm/vm-vars.el
+lib/xemacs/xemacs-packages/lisp/vm/vm-vars.elc
+lib/xemacs/xemacs-packages/lisp/vm/vm-version.el
+lib/xemacs/xemacs-packages/lisp/vm/vm-version.elc
+lib/xemacs/xemacs-packages/lisp/vm/vm-virtual.el
+lib/xemacs/xemacs-packages/lisp/vm/vm-virtual.elc
+lib/xemacs/xemacs-packages/lisp/vm/vm-window.el
+lib/xemacs/xemacs-packages/lisp/vm/vm-window.elc
+lib/xemacs/xemacs-packages/lisp/vm/vm.el
+lib/xemacs/xemacs-packages/lisp/vm/vm.elc
+@dirrm lib/xemacs/xemacs-packages/lisp/vm
+@dirrm lib/xemacs/xemacs-packages/etc/vm