diff options
author | uebayasi <uebayasi> | 2005-08-28 04:25:28 +0000 |
---|---|---|
committer | uebayasi <uebayasi> | 2005-08-28 04:25:28 +0000 |
commit | 94e4fa69d6357e1a5cae535af27c4c9c24bdfe3c (patch) | |
tree | ccca2342ed9e54797d6faec6027bbd0e5c89cd07 /devel | |
parent | b7a1a03542680610d58269bfcd522517b8693a08 (diff) | |
download | pkgsrc-94e4fa69d6357e1a5cae535af27c4c9c24bdfe3c.tar.gz |
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.
Diffstat (limited to 'devel')
-rw-r--r-- | devel/apel/Makefile | 3 | ||||
-rw-r--r-- | devel/elib/Makefile | 3 | ||||
-rw-r--r-- | devel/emacs-ilisp/Makefile | 4 | ||||
-rw-r--r-- | devel/haskell-mode/Makefile | 3 | ||||
-rw-r--r-- | devel/pcl-cvs/Makefile | 3 | ||||
-rw-r--r-- | devel/pvs/Makefile | 3 | ||||
-rw-r--r-- | devel/python-mode/Makefile | 3 | ||||
-rw-r--r-- | devel/ruby-mode/Makefile | 4 | ||||
-rw-r--r-- | devel/ruby-rd-mode/Makefile | 4 | ||||
-rw-r--r-- | devel/semantic/Makefile | 17 | ||||
-rw-r--r-- | devel/semantic/distinfo | 4 | ||||
-rw-r--r-- | devel/semantic/patches/patch-aa | 14 | ||||
-rw-r--r-- | devel/sml-mode/Makefile | 3 |
13 files changed, 40 insertions, 28 deletions
diff --git a/devel/apel/Makefile b/devel/apel/Makefile index 1597163b10f..2f9edef8876 100644 --- a/devel/apel/Makefile +++ b/devel/apel/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.12 2005/03/05 16:33:07 minskim Exp $ +# $NetBSD: Makefile,v 1.13 2005/08/28 04:25:28 uebayasi Exp $ DISTNAME= apel-10.6 +PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME} CATEGORIES= devel MASTER_SITES= ftp://ftp.m17n.org/pub/mule/apel/ diff --git a/devel/elib/Makefile b/devel/elib/Makefile index f35c7bdf83e..d393f5e0a95 100644 --- a/devel/elib/Makefile +++ b/devel/elib/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.12 2005/05/22 20:07:50 jlam Exp $ +# $NetBSD: Makefile,v 1.13 2005/08/28 04:25:28 uebayasi Exp $ # DISTNAME= elib-1.0 +PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME} PKGREVISION?= 2 CATEGORIES= devel MASTER_SITES= http://jde.sunsite.dk/ diff --git a/devel/emacs-ilisp/Makefile b/devel/emacs-ilisp/Makefile index 9bcf17bb214..0ae3f959ddc 100644 --- a/devel/emacs-ilisp/Makefile +++ b/devel/emacs-ilisp/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.6 2004/12/03 15:14:54 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2005/08/28 04:25:28 uebayasi Exp $ # DISTNAME= ilisp-20021222 -PKGNAME= emacs-${DISTNAME} +PKGNAME= ${EMACS_PKGNAME_PREFIX}emacs-${DISTNAME} CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ilisp/} diff --git a/devel/haskell-mode/Makefile b/devel/haskell-mode/Makefile index 6d06cf32cf4..7a86725c8ab 100644 --- a/devel/haskell-mode/Makefile +++ b/devel/haskell-mode/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.13 2003/07/17 21:31:03 grant Exp $ +# $NetBSD: Makefile,v 1.14 2005/08/28 04:25:28 uebayasi Exp $ DISTNAME= haskell-mode-1.44 +PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME} CATEGORIES= devel editors MASTER_SITES= http://www.haskell.org/haskell-mode/ diff --git a/devel/pcl-cvs/Makefile b/devel/pcl-cvs/Makefile index 910e0c31829..69964fade2d 100644 --- a/devel/pcl-cvs/Makefile +++ b/devel/pcl-cvs/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.10 2004/12/03 15:14:55 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2005/08/28 04:25:29 uebayasi Exp $ # DISTNAME= pcl-cvs-2.9.9 +PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME} PKGREVISION= 1 CATEGORIES= devel MASTER_SITES= ftp://rum.cs.yale.edu/pub/monnier/pcl-cvs/ diff --git a/devel/pvs/Makefile b/devel/pvs/Makefile index 7014d84ef64..c02bc65a516 100644 --- a/devel/pvs/Makefile +++ b/devel/pvs/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.18 2005/06/16 06:57:47 jlam Exp $ +# $NetBSD: Makefile,v 1.19 2005/08/28 04:25:29 uebayasi Exp $ # DISTNAME= pvs-${VERSION} +PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME} PKGREVISION= 2 CATEGORIES= devel lang MASTER_SITES= ftp://pvs.csl.sri.com/pub/pvs/pvs${VERSION}/ \ diff --git a/devel/python-mode/Makefile b/devel/python-mode/Makefile index 691776c585e..4f01d43b755 100644 --- a/devel/python-mode/Makefile +++ b/devel/python-mode/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.12 2005/06/16 06:57:47 jlam Exp $ +# $NetBSD: Makefile,v 1.13 2005/08/28 04:25:29 uebayasi Exp $ # DISTNAME= python-mode-4.54 +PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME} CATEGORIES= devel python MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=python-mode/} DISTFILES= python-mode.el diff --git a/devel/ruby-mode/Makefile b/devel/ruby-mode/Makefile index ada46fc0146..198642f90f5 100644 --- a/devel/ruby-mode/Makefile +++ b/devel/ruby-mode/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.10 2005/08/08 14:30:32 taca Exp $ +# $NetBSD: Makefile,v 1.11 2005/08/28 04:25:29 uebayasi Exp $ # DISTNAME= ${RUBY_DISTNAME} -PKGNAME= ${RUBY_PKGPREFIX}-mode-${RUBY_VERSION} +PKGNAME= ${EMACS_PKGNAME_PREFIX}${RUBY_PKGPREFIX}-mode-${RUBY_VERSION} CATEGORIES= devel ruby MASTER_SITES= ${MASTER_SITE_RUBY} diff --git a/devel/ruby-rd-mode/Makefile b/devel/ruby-rd-mode/Makefile index eff2fd80566..e7d79478057 100644 --- a/devel/ruby-rd-mode/Makefile +++ b/devel/ruby-rd-mode/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.12 2005/08/08 14:30:32 taca Exp $ +# $NetBSD: Makefile,v 1.13 2005/08/28 04:25:29 uebayasi Exp $ # DISTNAME= rdtool-${RUBY_RD_VERSION} -PKGNAME= ${RUBY_PKGPREFIX}-rd-mode-${RUBY_RD_VERSION} +PKGNAME= ${EMACS_PKGNAME_PREFIX}${RUBY_PKGPREFIX}-rd-mode-${RUBY_RD_VERSION} CATEGORIES= devel ruby MASTER_SITES= http://www2.pos.to/~tosh/ruby/rdtool/archive/ 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 diff --git a/devel/sml-mode/Makefile b/devel/sml-mode/Makefile index 5e12940bbb6..e702f4911a3 100644 --- a/devel/sml-mode/Makefile +++ b/devel/sml-mode/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.10 2005/06/16 06:57:48 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2005/08/28 04:25:29 uebayasi Exp $ DISTNAME= sml-mode-3.9.5 +PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME} CATEGORIES= devel editors MASTER_SITES= ftp://flint.cs.yale.edu/pub/monnier/sml-mode/ |