From aa8e85bcfdcd55a551512b16afecdd5b35d952eb Mon Sep 17 00:00:00 2001
From: uebayasi <uebayasi@pkgsrc.org>
Date: Sun, 28 Aug 2005 04:25:28 +0000
Subject: 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.
---
 misc/bbdb/Makefile     |  3 ++-
 misc/elscreen/Makefile | 10 ++++------
 misc/lookup/Makefile   |  7 ++++---
 3 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'misc')

diff --git a/misc/bbdb/Makefile b/misc/bbdb/Makefile
index ab1409b9654..5eeebed8d08 100644
--- a/misc/bbdb/Makefile
+++ b/misc/bbdb/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2005/06/17 03:50:21 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2005/08/28 04:25:30 uebayasi Exp $
 #
 
 DISTNAME=		bbdb-2.34
+PKGNAME=		${EMACS_PKGNAME_PREFIX}${DISTNAME}
 CATEGORIES=		mail misc news
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=bbdb/}
 
diff --git a/misc/elscreen/Makefile b/misc/elscreen/Makefile
index dc8c0f29e60..5deb5b9a90c 100644
--- a/misc/elscreen/Makefile
+++ b/misc/elscreen/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/12/01 03:49:40 uebayasi Exp $
+# $NetBSD: Makefile,v 1.2 2005/08/28 04:25:30 uebayasi Exp $
 #
 
 DISTNAME=	elscreen-1.3.2
+PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
 CATEGORIES=	misc
 MASTER_SITES=	ftp://ftp.morishima.net/pub/morishima.net/naoto/ElScreen/
 
@@ -9,14 +10,11 @@ MAINTAINER=	uebayasi@NetBSD.org
 HOMEPAGE=	http://www.morishima.net/~naoto/j/software/elscreen/
 COMMENT=	Window manager within Emacs
 
-EMACS_VERSIONS_ACCEPTED=	\
-		emacs21 emacs21nox emacs20 xemacs214 xemacs215
-
 NO_BUILD=	# Defined
 
 do-install:
-		@${INSTALL_DATA_DIR} ${EMACS_LISPPREFIX}/elscreen
-		@${INSTALL_DATA} ${WRKSRC}/elscreen.el ${EMACS_LISPPREFIX}/elscreen
+	@${INSTALL_DATA_DIR} ${EMACS_LISPPREFIX}/elscreen
+	@${INSTALL_DATA} ${WRKSRC}/elscreen.el ${EMACS_LISPPREFIX}/elscreen
 
 .include "../../mk/emacs.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/lookup/Makefile b/misc/lookup/Makefile
index 1df5ddf0b7d..fde06075265 100644
--- a/misc/lookup/Makefile
+++ b/misc/lookup/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2004/05/08 13:35:20 uebayasi Exp $
+# $NetBSD: Makefile,v 1.11 2005/08/28 04:25:30 uebayasi Exp $
 #
 
 DISTNAME=	lookup-1.4
+PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
 CATEGORIES=	textproc
 MASTER_SITES=	http://openlab.jp/edict/lookup/dist/
 
@@ -9,8 +10,8 @@ MAINTAINER=	uebayasi@NetBSD.org
 HOMEPAGE=	http://openlab.jp/edict/lookup/index.html.ja
 COMMENT=	Electric dictionary agent for Emacs
 
-DEPENDS+=	apel>=10:../../devel/apel
-DEPENDS+=	eblook>=1.4:../../textproc/eblook
+DEPENDS+=	${EMACS_PKGNAME_PREFIX}apel>=10:../../devel/apel
+DEPENDS+=	${EMACS_PKGNAME_PREFIX}eblook>=1.4:../../textproc/eblook
 
 EMACS_VERSIONS_ACCEPTED=	emacs21 emacs21nox emacs20 xemacs214 xemacs215
 
-- 
cgit v1.2.3