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.

5 files changed, 14 insertions, 13 deletions

diff --git a/textproc/emacs-dict-client/Makefile b/textproc/emacs-dict-client/Makefile
index 3432e3fc881..b107ec23f3b 100644
--- a/textproc/emacs-dict-client/Makefile
+++ b/textproc/emacs-dict-client/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2003/09/09 23:51:21 jschauma Exp $
+# $NetBSD: Makefile,v 1.7 2005/08/28 04:25:31 uebayasi Exp $
 
 DISTNAME=	dictionary-1.8.2
-PKGNAME=	${DISTNAME:S/dictionary/emacs-dict-client/}
+PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME:S/dictionary/emacs-dict-client/}
 CATEGORIES=	textproc
 MASTER_SITES=	${HOMEPAGE}
 
@@ -13,8 +13,8 @@ do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/emacs/site-lisp/dictionary
 	cd ${WRKSRC}; \
 	${INSTALL_DATA} connection.elc connection.el dictionary.elc \
-	  dictionary.el link.elc link.el dictionary-init.el \
-	  ${PREFIX}/share/emacs/site-lisp/dictionary
+	    dictionary.el link.elc link.el dictionary-init.el \
+	    ${PREFIX}/share/emacs/site-lisp/dictionary
 
 .include "../../mk/emacs.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/flyspell/Makefile b/textproc/flyspell/Makefile
index 5fc3aa08cff..f0a829ff221 100644
--- a/textproc/flyspell/Makefile
+++ b/textproc/flyspell/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2005/07/05 15:19:26 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2005/08/28 04:25:31 uebayasi Exp $
 #
 
 DISTNAME=	flyspell-1.7i.el
-PKGNAME=	${DISTNAME:S/.el//}
+PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME:S/.el//}
 PKGREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://www-sop.inria.fr/mimosa/personnel/Manuel.Serrano/flyspell/
@@ -12,7 +12,7 @@ MAINTAINER=	wiz@NetBSD.org
 HOMEPAGE=	http://www-sop.inria.fr/mimosa/personnel/Manuel.Serrano/flyspell/flyspell.html
 COMMENT=	Emacs/Xemacs on-the-fly spell checker
 
-DEPENDS=	ispell-emacs-[0-9]*:../../textproc/ispell-emacs
+DEPENDS=	${EMACS_PKGNAME_PREFIX}ispell-emacs-[0-9]*:../../textproc/ispell-emacs
 
 DIST_SUBDIR=	flyspell-1.7iv2
 
diff --git a/textproc/ispell-emacs/Makefile b/textproc/ispell-emacs/Makefile
index aaf643933ec..f5c9feb800c 100644
--- a/textproc/ispell-emacs/Makefile
+++ b/textproc/ispell-emacs/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2004/01/20 12:26:50 agc Exp $
+# $NetBSD: Makefile,v 1.5 2005/08/28 04:25:31 uebayasi Exp $
 #
 
 DISTNAME=	ispell.el
-PKGNAME=	ispell-emacs-3.6
+PKGNAME=	${EMACS_PKGNAME_PREFIX}ispell-emacs-3.6
 CATEGORIES=	textproc
 MASTER_SITES=	ftp://kdstevens.com/pub/stevens/
 EXTRACT_SUFX=	.gz
@@ -13,7 +13,7 @@ COMMENT=	Emacs interface for ispell spell checker
 
 DEPENDS=	ispell-base-[0-9]*:../../textproc/ispell-base
 
-DIST_SUBDIR=	${PKGNAME_NOREV}
+DIST_SUBDIR=	${PKGNAME_NOREV:C|^xemacs-||}
 WRKSRC=		${WRKDIR}
 
 NO_CONFIGURE=	#
diff --git a/textproc/psgml-mode/Makefile b/textproc/psgml-mode/Makefile
index 4ec349565f5..c34d9a0c914 100644
--- a/textproc/psgml-mode/Makefile
+++ b/textproc/psgml-mode/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2005/06/17 03:50:37 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2005/08/28 04:25:31 uebayasi Exp $
 
 DISTNAME=		psgml-1.3.2
-PKGNAME=		${DISTNAME:S/-/-mode-/}
+PKGNAME=		${EMACS_PKGNAME_PREFIX}${DISTNAME:S/-/-mode-/}
 CATEGORIES=		textproc editors
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=psgml/}
 
diff --git a/textproc/xslide/Makefile b/textproc/xslide/Makefile
index e59eafc42c7..dd721e5a3fd 100644
--- a/textproc/xslide/Makefile
+++ b/textproc/xslide/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2005/04/11 21:47:43 tv Exp $
+# $NetBSD: Makefile,v 1.4 2005/08/28 04:25:31 uebayasi Exp $
 #
 
 DISTNAME=		xslide-0.2.2
+PKGNAME=		${EMACS_PKGNAME_PREFIX}${DISTNAME}
 CATEGORIES=		textproc
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=xslide/}