From 94e4fa69d6357e1a5cae535af27c4c9c24bdfe3c Mon Sep 17 00:00:00 2001 From: uebayasi 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. --- print/auctex/Makefile | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'print') diff --git a/print/auctex/Makefile b/print/auctex/Makefile index 62a79b9049d..fbe6af54ba8 100644 --- a/print/auctex/Makefile +++ b/print/auctex/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.20 2005/06/27 10:03:54 wiz Exp $ +# $NetBSD: Makefile,v 1.21 2005/08/28 04:25:30 uebayasi Exp $ DISTNAME= auctex-11.55 +PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME} CATEGORIES= print MASTER_SITES= http://ftp.gnu.org/pub/gnu/auctex/ @@ -8,6 +9,8 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://www.nongnu.org/auctex/ COMMENT= Enhanced LaTeX mode for Emacs +.include "../../mk/emacs.mk" + USE_TOOLS+= gmake USE_PKGINSTALL= yes GNU_CONFIGURE= YES @@ -15,6 +18,10 @@ GNU_CONFIGURE= YES TEX_PREFIX_DEFAULT= ${LOCALBASE} EVAL_PREFIX+= TEX_PREFIX=teTeX +.if ${EMACS_FLAVOR} == "xemacs" +CONFIGURE_ARGS+= --with-packagedir=${EMACS_LISPPREFIX:C|/lisp||} +.endif + MAKEFLAGS+= EMACS=${EMACS_BIN} LISPDIR= ${EMACS_LISPPREFIX} @@ -23,5 +30,4 @@ INFO_FILES= auctex.info PLIST_SUBST+= INFODIR=${INFODIR} MESSAGE_SUBST+= LISPDIR=${LISPDIR} -.include "../../mk/emacs.mk" .include "../../mk/bsd.pkg.mk" -- cgit v1.2.3