Rework emacs.mk:

1) Simplify the way how an emacs version is picked when no emacs
   is installed, but a user try to install an Emacs Lisp package.
   Just pick up the version set as EMACS_TYPE than searching for
   versions already installed etc.  If the EMACS_TYPE version is
   not supported by the Emacs Lisp Package, just fail.  EMACS_TYPE
   be default to GNU Emacs 21.

   (In other words, users should set EMACS_TYPE as they want.
   Otherwise GNU Emacs 21 is used.)

2) All Emacs Lisp Packages *must* prepend EMACS_PKGNAME_PREFIX to
   a) the PKGNAME itself, and b) PKGNAME in its dependency lines.
   EMACS_PKGNAME_PREFIX is expanded to "xemacs-" when XEmacs is
   used.  This keeps dependency graph of Emacs-Lisp-packages-
   installed-for-XEmacs consistent.

3) Document EMACS_* variables as much as possible.

4) Provide more cookies for PLIST.  Maybe utilized later.

Note that the 2) change doesn't affect the default, GNU Emacs 21
behaviour.  So no version / revision bumps in this commit.

8 files changed, 23 insertions, 16 deletions

diff --git a/mail/etach/Makefile b/mail/etach/Makefile
index 97391f76b9f..f0271ecd505 100644
--- a/mail/etach/Makefile
+++ b/mail/etach/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2004/05/08 15:11:28 uebayasi Exp $
+# $NetBSD: Makefile,v 1.10 2005/08/28 04:25:30 uebayasi Exp $
 
 DISTNAME=		etach-1.2.9
+PKGNAME=		${EMACS_PKGNAME_PREFIX}${DISTNAME}
 CATEGORIES=		mail
 MASTER_SITES=		http://rulnick.com/etach/download/
 
diff --git a/mail/gnus/Makefile b/mail/gnus/Makefile
index 4e9c0d33d7a..51257b948ab 100644
--- a/mail/gnus/Makefile
+++ b/mail/gnus/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2005/04/08 19:05:58 jwise Exp $
+# $NetBSD: Makefile,v 1.9 2005/08/28 04:25:30 uebayasi Exp $
 
 DISTNAME=	gnus-5.10.6
+PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
 CATEGORIES=	mail
 MASTER_SITES=	http://quimby.gnus.org/gnus/dist/
 
diff --git a/mail/mailcrypt/Makefile b/mail/mailcrypt/Makefile
index f261114beb5..0905b5cb0b2 100644
--- a/mail/mailcrypt/Makefile
+++ b/mail/mailcrypt/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2005/03/24 21:12:56 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2005/08/28 04:25:30 uebayasi Exp $
 
 DISTNAME=	mailcrypt-3.5.8
+PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
 CATEGORIES=	mail security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mailcrypt/}
 
diff --git a/mail/mew/Makefile b/mail/mew/Makefile
index 6cc842af68d..23995a811bc 100644
--- a/mail/mew/Makefile
+++ b/mail/mew/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.64 2005/04/11 21:46:20 tv Exp $
+# $NetBSD: Makefile,v 1.65 2005/08/28 04:25:30 uebayasi Exp $
 
 DISTNAME=	mew-4.2
+PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.mew.org/pub/Mew/release/
 
diff --git a/mail/mew3/Makefile b/mail/mew3/Makefile
index 2634bc24c8d..d486ac36e20 100644
--- a/mail/mew3/Makefile
+++ b/mail/mew3/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2005/04/11 21:46:20 tv Exp $
+# $NetBSD: Makefile,v 1.18 2005/08/28 04:25:30 uebayasi Exp $
 
 DISTNAME=	mew-3.3
+PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
 PKGREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.mew.org/pub/Mew/release/
diff --git a/mail/rmail-mime/Makefile b/mail/rmail-mime/Makefile
index 2715e190164..aceb7b880aa 100644
--- a/mail/rmail-mime/Makefile
+++ b/mail/rmail-mime/Makefile
@@ -1,14 +1,15 @@
-# $NetBSD: Makefile,v 1.4 2003/07/17 21:46:59 grant Exp $
+# $NetBSD: Makefile,v 1.5 2005/08/28 04:25:30 uebayasi Exp $
 #
 
 DISTNAME=	rmail-mime-1.13.0
+PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.m17n.org/pub/mule/semi/rmail-mime/
 
 MAINTAINER=	jschauma@NetBSD.org
 COMMENT=	MIME-capabilities for RMAIL in Emacs
 
-DEPENDS=	semi>=1.14.4:../../devel/semi
+DEPENDS=	${EMACS_PKGNAME_PREFIX}semi>=1.14.4:../../devel/semi
 
 .include "../../mk/emacs.mk"
 
diff --git a/mail/vm/distinfo b/mail/vm/distinfo
index f0fec4ac4b7..c0053e1a2d2 100644
--- a/mail/vm/distinfo
+++ b/mail/vm/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.14 2005/02/24 09:59:30 agc Exp $
+$NetBSD: distinfo,v 1.15 2005/08/28 04:25:30 uebayasi Exp $
 
-SHA1 (vm-7.17.tar.gz) = 18504d06ba448b8f580aa9d3c240e9d734f6d45c
-RMD160 (vm-7.17.tar.gz) = 593f4e3887457380c0cf6c59b7831bdca5de2404
-Size (vm-7.17.tar.gz) = 380404 bytes
+SHA1 (vm-7.19.tar.gz) = 0fe9012b8988ebdec7641f48aca0ef365549c590
+RMD160 (vm-7.19.tar.gz) = 7a28c0a096f1f8093cffb9fc621cd270dd67b432
+Size (vm-7.19.tar.gz) = 381658 bytes
 SHA1 (patch-aa) = 7b8e9b8bcc1c03604fc0d2a81683754b823dc7a6
 SHA1 (patch-ab) = 51ea93e4b4066fbab7e75d03bea2cffd20c85440
diff --git a/mail/wl/Makefile b/mail/wl/Makefile
index d6445919c09..c3c1e55a126 100644
--- a/mail/wl/Makefile
+++ b/mail/wl/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2005/04/11 21:46:28 tv Exp $
+# $NetBSD: Makefile,v 1.23 2005/08/28 04:25:30 uebayasi Exp $
 
 DISTNAME=	wl-2.14.0
+PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.gohome.org/wl/stable/
 
@@ -9,10 +10,10 @@ HOMEPAGE=	http://www.gohome.org/wl/
 COMMENT=	Mail/news management system with IMAP4rev1 support for Emacs
 
 
-DEPENDS+=	apel>=10.6:../../devel/apel
-DEPENDS+=	flim>=1.14.7:../../devel/flim
-DEPENDS+=	semi>=1.14.6:../../devel/semi
-DEPENDS+=	bbdb-[0-9]*:../../misc/bbdb
+DEPENDS+=	${EMACS_PKGNAME_PREFIX}apel>=10.6:../../devel/apel
+DEPENDS+=	${EMACS_PKGNAME_PREFIX}flim>=1.14.7:../../devel/flim
+DEPENDS+=	${EMACS_PKGNAME_PREFIX}semi>=1.14.6:../../devel/semi
+DEPENDS+=	${EMACS_PKGNAME_PREFIX}bbdb-[0-9]*:../../misc/bbdb
 # XXX please someone adjust paths and PLIST for XEmacs...
 EMACS_VERSIONS_ACCEPTED=	emacs21 emacs21nox emacs20