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, 68 insertions, 64 deletions

diff --git a/editors/emacs-packages/Makefile b/editors/emacs-packages/Makefile
index a858cb3db65..a35f8aa4544 100644
--- a/editors/emacs-packages/Makefile
+++ b/editors/emacs-packages/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2004/11/30 15:42:02 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2005/08/28 04:25:29 uebayasi Exp $
 
 DISTNAME=	emacs-packages-0.6
 CATEGORIES=	meta-pkgs editors
@@ -12,60 +12,60 @@ COMMENT=	Meta-package for the GNU Emacs lisp packages
 .include "../../mk/emacs.mk"
 
 # XXX
-# Please update the version of this package (emacs-package) when you #
-# add a new emacs lisp package below!				     #
-DEPENDS+=	apel-[0-9]*:../../devel/apel
-DEPENDS+=	artist-[0-9]*:../../graphics/artist
-DEPENDS+=	auctex-[0-9]*:../../print/auctex
-DEPENDS+=	bbdb-[0-9]*:../../misc/bbdb
+# Please update the version of this package (emacs-package) when you
+# add a new emacs lisp package below!
+DEPENDS+=	${EMACS_PKGNAME_PREFIX}apel-[0-9]*:../../devel/apel
+DEPENDS+=	${EMACS_PKGNAME_PREFIX}artist-[0-9]*:../../graphics/artist
+DEPENDS+=	${EMACS_PKGNAME_PREFIX}auctex-[0-9]*:../../print/auctex
+DEPENDS+=	${EMACS_PKGNAME_PREFIX}bbdb-[0-9]*:../../misc/bbdb
 .if defined(_EMACS_VERSION_EMACS_MAJOR) && ${_EMACS_VERSION_EMACS_MAJOR} == "20"
-DEPENDS+=	calc-[0-9]*:../../math/calc
+DEPENDS+=	${EMACS_PKGNAME_PREFIX}calc-[0-9]*:../../math/calc
 .endif
-DEPENDS+=	eieio-[0-9]*:../../lang/eieio
-DEPENDS+=	elib-[0-9]*:../../devel/elib
-DEPENDS+=	emacs-dict-client-[0-9]*:../../textproc/emacs-dict-client
-DEPENDS+=	emacs-ilisp-[0-9]*:../../devel/emacs-ilisp
-DEPENDS+=	emacs-w3m-[0-9]*:../../www/emacs-w3m
-DEPENDS+=	ess-[0-9]*:../../math/ess
-DEPENDS+=	etach-[0-9]*:../../mail/etach
-DEPENDS+=	flim-[0-9]*:../../devel/flim
-DEPENDS+=	flyspell-[0-9]*:../../textproc/flyspell
-DEPENDS+=	haskell-mode-[0-9]*:../../devel/haskell-mode
-DEPENDS+=	iiimecf-[0-9]*:../../inputmethod/iiimecf
-DEPENDS+=	irchat-pj-[0-9]*:../../chat/irchat-pj
-DEPENDS+=	ispell-emacs-[0-9]*:../../textproc/ispell-emacs
+DEPENDS+=	${EMACS_PKGNAME_PREFIX}eieio-[0-9]*:../../lang/eieio
+DEPENDS+=	${EMACS_PKGNAME_PREFIX}elib-[0-9]*:../../devel/elib
+DEPENDS+=	${EMACS_PKGNAME_PREFIX}emacs-dict-client-[0-9]*:../../textproc/emacs-dict-client
+DEPENDS+=	${EMACS_PKGNAME_PREFIX}emacs-ilisp-[0-9]*:../../devel/emacs-ilisp
+DEPENDS+=	${EMACS_PKGNAME_PREFIX}emacs-w3m-[0-9]*:../../www/emacs-w3m
+DEPENDS+=	${EMACS_PKGNAME_PREFIX}ess-[0-9]*:../../math/ess
+DEPENDS+=	${EMACS_PKGNAME_PREFIX}etach-[0-9]*:../../mail/etach
+DEPENDS+=	${EMACS_PKGNAME_PREFIX}flim-[0-9]*:../../devel/flim
+DEPENDS+=	${EMACS_PKGNAME_PREFIX}flyspell-[0-9]*:../../textproc/flyspell
+DEPENDS+=	${EMACS_PKGNAME_PREFIX}haskell-mode-[0-9]*:../../devel/haskell-mode
+DEPENDS+=	${EMACS_PKGNAME_PREFIX}iiimecf-[0-9]*:../../inputmethod/iiimecf
+DEPENDS+=	${EMACS_PKGNAME_PREFIX}irchat-pj-[0-9]*:../../chat/irchat-pj
+DEPENDS+=	${EMACS_PKGNAME_PREFIX}ispell-emacs-[0-9]*:../../textproc/ispell-emacs
 #.if defined(_EMACS_VERSION_EMACS_MAJOR) && ${_EMACS_VERSION_EMACS_MAJOR} == "21"
-#DEPENDS+=	jde-[0-9]*:../../editors/jde
+#DEPENDS+=	${EMACS_PKGNAME_PREFIX}jde-[0-9]*:../../editors/jde
 #.endif
-DEPENDS+=	riece-[0-9]*:../../chat/riece
-#DEPENDS+=	lookup-[0-9]*:../../misc/lookup
-DEPENDS+=	mailcrypt-[0-9]*:../../mail/mailcrypt
-DEPENDS+=	matlab-mode-*:../../editors/matlab-mode
-#DEPENDS+=	mew-[0-9]*:../../mail/mew
-DEPENDS+=	mew-[0-9]*:../../mail/mew3
-DEPENDS+=	Mule-UCS-[0-9]*:../../editors/mule-ucs
-DEPENDS+=	navi2ch-[0-9]*:../../chat/navi2ch
+DEPENDS+=	${EMACS_PKGNAME_PREFIX}riece-[0-9]*:../../chat/riece
+#DEPENDS+=	${EMACS_PKGNAME_PREFIX}lookup-[0-9]*:../../misc/lookup
+DEPENDS+=	${EMACS_PKGNAME_PREFIX}mailcrypt-[0-9]*:../../mail/mailcrypt
+DEPENDS+=	${EMACS_PKGNAME_PREFIX}matlab-mode-*:../../editors/matlab-mode
+#DEPENDS+=	${EMACS_PKGNAME_PREFIX}mew-[0-9]*:../../mail/mew
+DEPENDS+=	${EMACS_PKGNAME_PREFIX}mew-[0-9]*:../../mail/mew3
+DEPENDS+=	${EMACS_PKGNAME_PREFIX}Mule-UCS-[0-9]*:../../editors/mule-ucs
+DEPENDS+=	${EMACS_PKGNAME_PREFIX}navi2ch-[0-9]*:../../chat/navi2ch
 .if defined(_EMACS_VERSION_EMACS_MAJOR) && ${_EMACS_VERSION_EMACS_MAJOR} == "20"
-DEPENDS+=	pcl-cvs-[0-9]*:../../devel/pcl-cvs
+DEPENDS+=	${EMACS_PKGNAME_PREFIX}pcl-cvs-[0-9]*:../../devel/pcl-cvs
 .endif
-#DEPENDS+=	pvs-[0-9]*:../../devel/pvs	# XXX pvs-license
-DEPENDS+=	psgml-mode-[0-9]*:../../textproc/psgml-mode
-DEPENDS+=	python-mode-[0-9]*:../../devel/python-mode
-DEPENDS+=	ruby-mode-[0-9]*:../../devel/ruby-mode
-DEPENDS+=	ruby-rd-mode-[0-9]*:../../devel/ruby-rd-mode
-DEPENDS+=	semantic-[0-9]*:../../devel/semantic
-DEPENDS+=	semi-[0-9]*:../../devel/semi
-DEPENDS+=	skk-[0-9]*:../../inputmethod/skk
-DEPENDS+=	sml-mode-[0-9]*:../../devel/sml-mode
-DEPENDS+=	speedbar-[0-9]*:../../editors/speedbar
-DEPENDS+=	tamago-[0-9]*:../../editors/tamago
-DEPENDS+=	tc-[0-9]*:../../inputmethod/tc
-DEPENDS+=	verilog-mode-[0-9]*:../../cad/verilog-mode
-DEPENDS+=	vm-[0-9]*:../../mail/vm
-DEPENDS+=	w3-[0-9]*:../../www/w3
-DEPENDS+=	wl-[0-9]*:../../mail/wl
-DEPENDS+=	zenicb-[0-9]*:../../chat/zenicb
-DEPENDS+=	zenirc-[0-9]*:../../chat/zenirc
+#DEPENDS+=	${EMACS_PKGNAME_PREFIX}pvs-[0-9]*:../../devel/pvs	# XXX pvs-license
+DEPENDS+=	${EMACS_PKGNAME_PREFIX}psgml-mode-[0-9]*:../../textproc/psgml-mode
+DEPENDS+=	${EMACS_PKGNAME_PREFIX}python-mode-[0-9]*:../../devel/python-mode
+DEPENDS+=	${EMACS_PKGNAME_PREFIX}ruby-mode-[0-9]*:../../devel/ruby-mode
+DEPENDS+=	${EMACS_PKGNAME_PREFIX}ruby-rd-mode-[0-9]*:../../devel/ruby-rd-mode
+DEPENDS+=	${EMACS_PKGNAME_PREFIX}semantic-[0-9]*:../../devel/semantic
+DEPENDS+=	${EMACS_PKGNAME_PREFIX}semi-[0-9]*:../../devel/semi
+DEPENDS+=	${EMACS_PKGNAME_PREFIX}skk-[0-9]*:../../inputmethod/skk
+DEPENDS+=	${EMACS_PKGNAME_PREFIX}sml-mode-[0-9]*:../../devel/sml-mode
+DEPENDS+=	${EMACS_PKGNAME_PREFIX}speedbar-[0-9]*:../../editors/speedbar
+DEPENDS+=	${EMACS_PKGNAME_PREFIX}tamago-[0-9]*:../../editors/tamago
+DEPENDS+=	${EMACS_PKGNAME_PREFIX}tc-[0-9]*:../../inputmethod/tc
+DEPENDS+=	${EMACS_PKGNAME_PREFIX}verilog-mode-[0-9]*:../../cad/verilog-mode
+DEPENDS+=	${EMACS_PKGNAME_PREFIX}vm-[0-9]*:../../mail/vm
+DEPENDS+=	${EMACS_PKGNAME_PREFIX}w3-[0-9]*:../../www/w3
+DEPENDS+=	${EMACS_PKGNAME_PREFIX}wl-[0-9]*:../../mail/wl
+DEPENDS+=	${EMACS_PKGNAME_PREFIX}zenicb-[0-9]*:../../chat/zenicb
+DEPENDS+=	${EMACS_PKGNAME_PREFIX}zenirc-[0-9]*:../../chat/zenirc
 
 EXTRACT_ONLY=	# empty
 NO_CHECKSUM=	yes
diff --git a/editors/gnuserv/Makefile b/editors/gnuserv/Makefile
index 58b417a2b9e..3996baf35a1 100644
--- a/editors/gnuserv/Makefile
+++ b/editors/gnuserv/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2005/06/01 18:02:45 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2005/08/28 04:25:29 uebayasi Exp $
 
 DISTNAME=	gnuserv-3.12.7
+PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
 PKGREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	${HOMEPAGE}/src/
diff --git a/editors/jde/Makefile b/editors/jde/Makefile
index 07b848f0895..8a61bd4b17c 100644
--- a/editors/jde/Makefile
+++ b/editors/jde/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2005/08/11 14:36:53 uebayasi Exp $
+# $NetBSD: Makefile,v 1.15 2005/08/28 04:25:29 uebayasi Exp $
 #
 
 DISTNAME=	jde-2.3.2
+PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
 CATEGORIES=	devel editors java
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 # The "real" site has silly naming conventions:
@@ -11,10 +12,10 @@ MAINTAINER=	cjones@NetBSD.org
 HOMEPAGE=	http://jdee.sunsite.dk/
 COMMENT=	Full-featured Java editing mode for emacs
 
-DEPENDS+=	speedbar>=0.14rc2:../../editors/speedbar
-DEPENDS+=	eieio>=0.17:../../lang/eieio
-DEPENDS+=	semantic>=1.4rc13:../../devel/semantic
-DEPENDS+=	elib>=1.0:../../devel/elib
+DEPENDS+=	${EMACS_PKGNAME_PREFIX}speedbar>=0.14rc2:../../editors/speedbar
+DEPENDS+=	${EMACS_PKGNAME_PREFIX}eieio>=0.17:../../lang/eieio
+DEPENDS+=	${EMACS_PKGNAME_PREFIX}semantic>=1.4rc13:../../devel/semantic
+DEPENDS+=	${EMACS_PKGNAME_PREFIX}elib>=1.0:../../devel/elib
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/lisp
 
diff --git a/editors/leim/Makefile b/editors/leim/Makefile
index a1674ab4a56..af1debd1737 100644
--- a/editors/leim/Makefile
+++ b/editors/leim/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2005/05/22 20:07:56 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2005/08/28 04:25:29 uebayasi Exp $
 
 DISTNAME=	leim-${VERSION}
+PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_GNU:=emacs/}
 DISTFILES=	emacs-${VERSION}a${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}
diff --git a/editors/matlab-mode/Makefile b/editors/matlab-mode/Makefile
index 247e54a8ab4..343b453b782 100644
--- a/editors/matlab-mode/Makefile
+++ b/editors/matlab-mode/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.6 2005/03/14 22:03:55 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.7 2005/08/28 04:25:29 uebayasi Exp $
 #
 
 DISTNAME=		matlab.el
 # we do this because we want DIST_SUBDIR to not change based on
 # emacs vs xemacs
 BASEPKGNAME=		matlab-mode-2.3.1
-PKGNAME=		${BASEPKGNAME}
+PKGNAME=		${EMACS_PKGNAME_PREFIX}${BASEPKGNAME}
 CATEGORIES=		editors math
 MASTER_SITES=		http://www.mathworks.com/matlabcentral/files/104/
 EXTRACT_SUFX=
@@ -35,7 +35,7 @@ do-build:
 	done
 
 do-install:
-	${INSTALL_DATA_DIR} ${EMACS_LISPPREFIX}/${PKGBASE}
+	${INSTALL_DATA_DIR} ${EMACS_LISPPREFIX}/${PKGBASE:C|^xemacs-||}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${SRCS} ${SRCS:.el=.elc} ${EMACS_LISPPREFIX}/${PKGBASE}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/mule-ucs/Makefile b/editors/mule-ucs/Makefile
index 0ff07bc56f8..e2fd0b05754 100644
--- a/editors/mule-ucs/Makefile
+++ b/editors/mule-ucs/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2004/05/08 13:35:20 uebayasi Exp $
+# $NetBSD: Makefile,v 1.11 2005/08/28 04:25:29 uebayasi Exp $
 
 DISTNAME=	Mule-UCS-0.84
+PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
 PKGREVISION=	4
 CATEGORIES=	editors
 MASTER_SITES=	ftp://ftp.m17n.org/pub/mule/Mule-UCS/
diff --git a/editors/speedbar/Makefile b/editors/speedbar/Makefile
index 79c6c15cc75..853f40bf897 100644
--- a/editors/speedbar/Makefile
+++ b/editors/speedbar/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2005/06/16 06:57:49 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2005/08/28 04:25:29 uebayasi Exp $
 #
 
 DISTNAME=	speedbar-0.14beta4
-PKGNAME=	speedbar-0.14rc4
+PKGNAME=	${EMACS_PKGNAME_PREFIX}speedbar-0.14rc4
 CATEGORIES=	editors devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=cedet/}
 
diff --git a/editors/tamago/Makefile b/editors/tamago/Makefile
index 950139cc189..ffc631c51e3 100644
--- a/editors/tamago/Makefile
+++ b/editors/tamago/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2004/05/08 13:35:20 uebayasi Exp $
+# $NetBSD: Makefile,v 1.10 2005/08/28 04:25:29 uebayasi Exp $
 
 DISTNAME=	tamago-4.0.6
-PKGNAME=	tamago-20020909
+PKGNAME=	${EMACS_PKGNAME_PREFIX}tamago-20020909
 CATEGORIES=	editors
 MASTER_SITES=	ftp://www.m17n.org/pub/tamago/