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.

1 files changed, 49 insertions, 49 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