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.

3 files changed, 20 insertions, 15 deletions

diff --git a/devel/semantic/Makefile b/devel/semantic/Makefile
index 622c710e82c..5065e57f0ca 100644
--- a/devel/semantic/Makefile
+++ b/devel/semantic/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2005/06/16 06:57:48 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2005/08/28 04:25:29 uebayasi Exp $
 #
 
 DISTNAME=	semantic-1.4.2
+PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=cedet/}
 
@@ -9,18 +10,12 @@ MAINTAINER=	cjones@NetBSD.org
 HOMEPAGE=	http://cedet.sourceforge.net/semantic.shtml
 COMMENT=	Lexer, parser-generator, and parser written for Emacs
 
-DEPENDS+=	speedbar>=0.13:../../editors/speedbar
-DEPENDS+=	eieio>=0.17:../../lang/eieio
+DEPENDS+=	${EMACS_PKGNAME_PREFIX}speedbar>=0.13:../../editors/speedbar
+DEPENDS+=	${EMACS_PKGNAME_PREFIX}eieio>=0.17:../../lang/eieio
 
 .include "../../mk/emacs.mk"
 
-.if ${EMACS_FLAVOR} == "emacs"
-EMACS=			emacs
-.else
-EMACS=			xemacs
-.endif
-
-BUILD_ENV+=	EMACS=${EMACS}
+BUILD_ENV+=	EMACS=${EMACS_FLAVOR}
 
 NO_CONFIGURE=	# set
 USE_TOOLS+=	gmake
@@ -28,6 +23,8 @@ USE_TOOLS+=	gmake
 INFO_FILES=	semantic.info
 OTHER_INFO=	semantic.info-1 semantic.info-2
 
+MAKE_ENV+=	EMACS=${EMACS_FLAVOR}
+
 # XXX cd ${WRKSRC}; ${MAKE} -V semantic_LISP
 SRCS=	semantic.el semantic-util.el semantic-bnf.el semantic-ctxt.el
 # XXX cd ${WRKSRC}; ${MAKE} -V Languages_LISP
diff --git a/devel/semantic/distinfo b/devel/semantic/distinfo
index dc859ac7160..9d594eb91db 100644
--- a/devel/semantic/distinfo
+++ b/devel/semantic/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2005/02/23 22:24:33 agc Exp $
+$NetBSD: distinfo,v 1.6 2005/08/28 04:25:29 uebayasi Exp $
 
 SHA1 (semantic-1.4.2.tar.gz) = a8898745055319de676c61a5d529d4dfb6eb2878
 RMD160 (semantic-1.4.2.tar.gz) = 38243d5b84443430565100d2cfb1add45383e92f
 Size (semantic-1.4.2.tar.gz) = 313881 bytes
-SHA1 (patch-aa) = 7747913d4db505d1bc287b1d9bd986cbfaf53c7a
+SHA1 (patch-aa) = 28b97231dadb920be67d853de531f0b273e1b870
diff --git a/devel/semantic/patches/patch-aa b/devel/semantic/patches/patch-aa
index b9b02377764..5973f57b931 100644
--- a/devel/semantic/patches/patch-aa
+++ b/devel/semantic/patches/patch-aa
@@ -1,8 +1,16 @@
-$NetBSD: patch-aa,v 1.2 2003/01/11 08:56:33 uebayasi Exp $
+$NetBSD: patch-aa,v 1.3 2005/08/28 04:25:29 uebayasi Exp $
 
---- Makefile.orig	Tue Dec 31 19:17:40 2002
+--- Makefile.orig	2002-12-31 19:17:40.000000000 +0900
 +++ Makefile
-@@ -19,7 +19,6 @@
+@@ -11,7 +11,6 @@ ede_FILES=Project.ede Makefile
+ 
+ example_MISC=semantic-skel.el skeleton.bnf semantic-example.el
+ init_LISP=semantic-load.el
+-EMACS=emacs
+ LOADPATH=../speedbar/ ../eieio/ 
+ semantic_LISP=semantic.el semantic-util.el semantic-bnf.el semantic-ctxt.el
+ Languages_LISP=semantic-c.el semantic-el.el semantic-java.el semantic-make.el semantic-scm.el semantic-texi.el
+@@ -19,7 +18,6 @@ tools_LISP=semantic-imenu.el semantic-sb
  senator_LISP=senator.el
  misc_AUX=INSTALL NEWS ChangeLog
  info_TEXINFOS=semantic.texi