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.

4 files changed, 13 insertions, 13 deletions

diff --git a/inputmethod/anthy-elisp/Makefile b/inputmethod/anthy-elisp/Makefile
index 376d413ff9d..380b3b55473 100644
--- a/inputmethod/anthy-elisp/Makefile
+++ b/inputmethod/anthy-elisp/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/12/28 05:38:47 taya Exp $
+# $NetBSD: Makefile,v 1.2 2005/08/28 04:25:29 uebayasi Exp $
 
 .include	"../../inputmethod/anthy/Makefile.common"
-PKGNAME=	anthy-elisp-${ANTHY_VERSION}
+PKGNAME=	${EMACS_PKGNAME_PREFIX}anthy-elisp-${ANTHY_VERSION}
 CATEGORIES=	inputmethod editor
 
 MAINTAINER=	taya@NetBSD.org
@@ -15,8 +15,7 @@ EMACS_USE_LEIM=	# defined (for emacs21/emacs20)
 
 .include "../../mk/emacs.mk"
 .if ${EMACS_FLAVOR} == "xemacs"
-PKGNAME=	${PKGNAME_PREFIX}anthy-elisp-${ANTHY_VERSION}
-DEPENDS+=	xemacs-packages:../../editors/xemacs-packages
+DEPENDS+=	xemacs-packages-[0-9]*:../../editors/xemacs-packages
 .endif
 
 do-build:
diff --git a/inputmethod/iiimecf/Makefile b/inputmethod/iiimecf/Makefile
index 3c0ddbd496b..f27cfaf37ab 100644
--- a/inputmethod/iiimecf/Makefile
+++ b/inputmethod/iiimecf/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2003/07/17 21:43:35 grant Exp $
+# $NetBSD: Makefile,v 1.6 2005/08/28 04:25:29 uebayasi Exp $
 #
 
 DISTNAME=	IIIMECF-0.6
-PKGNAME=	iiimecf-0.6
+PKGNAME=	${EMACS_PKGNAME_PREFIX}iiimecf-0.6
 CATEGORIES=	japanese inputmethod
 MASTER_SITES=	ftp://ftp.m17n.org/pub/mule/IIIM/
 
@@ -10,7 +10,7 @@ MAINTAINER=	uebayasi@NetBSD.org
 #HOMEPAGE=
 COMMENT=	Emacs Lisp library for IIIM Protocol
 
-DEPENDS+=	Mule-UCS>=0.82:../../editors/mule-ucs
+DEPENDS+=	${EMACS_PKGNAME_PREFIX}Mule-UCS>=0.82:../../editors/mule-ucs
 
 do-build:
 	@cd ${WRKSRC} && \
diff --git a/inputmethod/skk/Makefile b/inputmethod/skk/Makefile
index b47dff8608d..91f33161869 100644
--- a/inputmethod/skk/Makefile
+++ b/inputmethod/skk/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2005/03/05 11:26:48 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2005/08/28 04:25:30 uebayasi Exp $
 #
 
 DISTNAME=	ddskk-12.2.0
-PKGNAME=	skk-12.2.0
+PKGNAME=	${EMACS_PKGNAME_PREFIX}skk-12.2.0
 PKGREVISION=	1
 CATEGORIES=	japanese inputmethod
 MASTER_SITES=	http://openlab.ring.gr.jp/skk/maintrunk/
@@ -19,12 +19,12 @@ EMACS_VERSIONS_ACCEPTED=	emacs21 emacs21nox xemacs214 emacs20 xemacs215
 .include "../../mk/emacs.mk"
 .include "options.mk"
 
-DEPENDS=	${PKGNAME_PREFIX}apel>=10.6:../../devel/apel
+DEPENDS=	${EMACS_PKGNAME_PREFIX}apel>=10.6:../../devel/apel
 .if ${EMACS_FLAVOR} == "emacs"
 EMACS_USE_LEIM=	# defined
-BUILD_DEPENDS+=	${PKGNAME_PREFIX}Mule-UCS-[0-9]*:../../editors/mule-ucs
+BUILD_DEPENDS+=	${EMACS_PKGNAME_PREFIX}Mule-UCS-[0-9]*:../../editors/mule-ucs
 .else
-BUILD_DEPENDS+= ${PKGNAME_PREFIX}xemacs-packages>=1.10:../../editors/xemacs-packages
+BUILD_DEPENDS+= xemacs-packages>=1.10:../../editors/xemacs-packages
 .endif
 
 MAKEFLAGS=	EMACS=${EMACS_BIN}
diff --git a/inputmethod/tc/Makefile b/inputmethod/tc/Makefile
index eebb3ba5168..c2d5f052423 100644
--- a/inputmethod/tc/Makefile
+++ b/inputmethod/tc/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2005/05/22 20:08:08 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2005/08/28 04:25:30 uebayasi Exp $
 #
 
 DISTNAME=	tc-2.3.1
+PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
 CATEGORIES=	japanese inputmethod
 MASTER_SITES=	http://openlab.ring.gr.jp/tcode/resources/soft/