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.

6 files changed, 12 insertions, 7 deletions

diff --git a/chat/irchat-pj/Makefile b/chat/irchat-pj/Makefile
index 298a73701e6..2b400f45015 100644
--- a/chat/irchat-pj/Makefile
+++ b/chat/irchat-pj/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2005/05/24 13:59:13 rillig Exp $
+# $NetBSD: Makefile,v 1.10 2005/08/28 04:25:28 uebayasi Exp $
 
 DISTNAME=	irchat-pj-2.4.24.22
+PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
 CATEGORIES=	chat
 MASTER_SITES=	http://irc.fan.gr.jp/pj/src/
 
diff --git a/chat/navi2ch/Makefile b/chat/navi2ch/Makefile
index 32d4e295a9f..9368dbb1f29 100644
--- a/chat/navi2ch/Makefile
+++ b/chat/navi2ch/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2005/05/22 20:07:43 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2005/08/28 04:25:28 uebayasi Exp $
 
 DISTNAME=	navi2ch-1.7.5
+PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
 CATEGORIES=	chat
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=navi2ch/}
 
diff --git a/chat/riece/Makefile b/chat/riece/Makefile
index 0e5956d0b54..9fa27f2c4cc 100644
--- a/chat/riece/Makefile
+++ b/chat/riece/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2005/03/05 09:14:11 uebayasi Exp $
+# $NetBSD: Makefile,v 1.3 2005/08/28 04:25:28 uebayasi Exp $
 #
 
 DISTNAME=	riece-1.0.7a
+PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
 CATEGORIES=	chat japanese
 MASTER_SITES=	http://savannah.nongnu.org/download/riece/
 
diff --git a/chat/zenicb/Makefile b/chat/zenicb/Makefile
index 635d67405b1..8ef71bd70df 100644
--- a/chat/zenicb/Makefile
+++ b/chat/zenicb/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2005/04/02 22:01:36 jwise Exp $
+# $NetBSD: Makefile,v 1.16 2005/08/28 04:25:28 uebayasi Exp $
 
 DISTNAME=		zenicb-19981202
-PKGNAME=${DISTNAME}
+PKGNAME=		${EMACS_PKGNAME_PREFIX}${DISTNAME}
 PKGREVISION=		2
 CATEGORIES=		chat
 MASTER_SITES=		${MASTER_SITE_LOCAL}
diff --git a/chat/zenirc/Makefile b/chat/zenirc/Makefile
index d3820df5935..08ab34c5b7c 100644
--- a/chat/zenirc/Makefile
+++ b/chat/zenirc/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2003/07/17 21:26:31 grant Exp $
+# $NetBSD: Makefile,v 1.8 2005/08/28 04:25:28 uebayasi Exp $
 #
 
 DISTNAME=	zenirc-2.112
+PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
 CATEGORIES=	chat
 MASTER_SITES=	ftp://ftp.splode.com/pub/zenirc/
 
diff --git a/chat/zephyr-mode/Makefile b/chat/zephyr-mode/Makefile
index bce829890b0..a1984a3a222 100644
--- a/chat/zephyr-mode/Makefile
+++ b/chat/zephyr-mode/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2005/05/24 14:04:15 rillig Exp $
+# $NetBSD: Makefile,v 1.9 2005/08/28 04:25:28 uebayasi Exp $
 #
 
 DISTNAME=	zephyr-mode-2.5.20
+PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
 CATEGORIES=	chat net
 MASTER_SITES=	http://www-2.cs.cmu.edu/People/dkindred/zephyr-mode/