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 | |
| 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.
58 files changed, 504 insertions, 341 deletions
diff --git a/cad/dinotrace-mode/Makefile b/cad/dinotrace-mode/Makefile index 1bb64e3e1b1..cdbbfb952ad 100644 --- a/cad/dinotrace-mode/Makefile +++ b/cad/dinotrace-mode/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.2 2003/07/17 21:24:48 grant Exp $ +# $NetBSD: Makefile,v 1.3 2005/08/28 04:25:28 uebayasi Exp $ # DISTNAME= dinotrace-9.1i -PKGNAME= dinotrace-mode-9.1i +PKGNAME= ${EMACS_PKGNAME_PREFIX}dinotrace-mode-9.1i CATEGORIES= cad editors MASTER_SITES= http://www.veripool.com/ftp/ @@ -10,7 +10,7 @@ MAINTAINER= dmcmahill@NetBSD.org HOMEPAGE= http://www.veripool.com/dinotrace/ COMMENT= Emacs major mode for dinotrace -DEPENDS+= verilog-mode>=3.13:../../cad/verilog-mode +DEPENDS+= ${EMACS_PKGNAME_PREFIX}verilog-mode>=3.13:../../cad/verilog-mode .include "../../mk/bsd.prefs.mk" diff --git a/cad/verilog-mode/Makefile b/cad/verilog-mode/Makefile index be1588d93f6..5ab0daaf4ea 100644 --- a/cad/verilog-mode/Makefile +++ b/cad/verilog-mode/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.5 2004/01/20 12:09:10 agc Exp $ +# $NetBSD: Makefile,v 1.6 2005/08/28 04:25:28 uebayasi Exp $ # DISTNAME= verilog-mode-3.60 +PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME} CATEGORIES= cad editors MASTER_SITES= ${MASTER_SITE_LOCAL} # The latest can be fetched interactively from diff --git a/chat/irchat-pj/Makefile b/chat/irchat-pj/Makefile index 298a73701e6..2b400f45015 100644 --- a/chat/irchat-pj/Makefile +++ b/chat/irchat-pj/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.9 2005/05/24 13:59:13 rillig Exp $ +# $NetBSD: Makefile,v 1.10 2005/08/28 04:25:28 uebayasi Exp $ DISTNAME= irchat-pj-2.4.24.22 +PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME} CATEGORIES= chat MASTER_SITES= http://irc.fan.gr.jp/pj/src/ diff --git a/chat/navi2ch/Makefile b/chat/navi2ch/Makefile index 32d4e295a9f..9368dbb1f29 100644 --- a/chat/navi2ch/Makefile +++ b/chat/navi2ch/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.11 2005/05/22 20:07:43 jlam Exp $ +# $NetBSD: Makefile,v 1.12 2005/08/28 04:25:28 uebayasi Exp $ DISTNAME= navi2ch-1.7.5 +PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME} CATEGORIES= chat MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=navi2ch/} diff --git a/chat/riece/Makefile b/chat/riece/Makefile index 0e5956d0b54..9fa27f2c4cc 100644 --- a/chat/riece/Makefile +++ b/chat/riece/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.2 2005/03/05 09:14:11 uebayasi Exp $ +# $NetBSD: Makefile,v 1.3 2005/08/28 04:25:28 uebayasi Exp $ # DISTNAME= riece-1.0.7a +PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME} CATEGORIES= chat japanese MASTER_SITES= http://savannah.nongnu.org/download/riece/ diff --git a/chat/zenicb/Makefile b/chat/zenicb/Makefile index 635d67405b1..8ef71bd70df 100644 --- a/chat/zenicb/Makefile +++ b/chat/zenicb/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.15 2005/04/02 22:01:36 jwise Exp $ +# $NetBSD: Makefile,v 1.16 2005/08/28 04:25:28 uebayasi Exp $ DISTNAME= zenicb-19981202 -PKGNAME=${DISTNAME} +PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME} PKGREVISION= 2 CATEGORIES= chat MASTER_SITES= ${MASTER_SITE_LOCAL} diff --git a/chat/zenirc/Makefile b/chat/zenirc/Makefile index d3820df5935..08ab34c5b7c 100644 --- a/chat/zenirc/Makefile +++ b/chat/zenirc/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.7 2003/07/17 21:26:31 grant Exp $ +# $NetBSD: Makefile,v 1.8 2005/08/28 04:25:28 uebayasi Exp $ # DISTNAME= zenirc-2.112 +PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME} CATEGORIES= chat MASTER_SITES= ftp://ftp.splode.com/pub/zenirc/ diff --git a/chat/zephyr-mode/Makefile b/chat/zephyr-mode/Makefile index bce829890b0..a1984a3a222 100644 --- a/chat/zephyr-mode/Makefile +++ b/chat/zephyr-mode/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.8 2005/05/24 14:04:15 rillig Exp $ +# $NetBSD: Makefile,v 1.9 2005/08/28 04:25:28 uebayasi Exp $ # DISTNAME= zephyr-mode-2.5.20 +PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME} CATEGORIES= chat net MASTER_SITES= http://www-2.cs.cmu.edu/People/dkindred/zephyr-mode/ 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/ diff --git a/editors/emacs-packages/Makefile b/editors/emacs-packages/Makefile index a858cb3db65..a35f8aa4544 100644 --- a/editors/emacs-packages/Makefile +++ b/editors/emacs-packages/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2004/11/30 15:42:02 wiz Exp $ +# $NetBSD: Makefile,v 1.17 2005/08/28 04:25:29 uebayasi Exp $ DISTNAME= emacs-packages-0.6 CATEGORIES= meta-pkgs editors @@ -12,60 +12,60 @@ COMMENT= Meta-package for the GNU Emacs lisp packages .include "../../mk/emacs.mk" # XXX -# Please update the version of this package (emacs-package) when you # -# add a new emacs lisp package below! # -DEPENDS+= apel-[0-9]*:../../devel/apel -DEPENDS+= artist-[0-9]*:../../graphics/artist -DEPENDS+= auctex-[0-9]*:../../print/auctex -DEPENDS+= bbdb-[0-9]*:../../misc/bbdb +# Please update the version of this package (emacs-package) when you +# add a new emacs lisp package below! +DEPENDS+= ${EMACS_PKGNAME_PREFIX}apel-[0-9]*:../../devel/apel +DEPENDS+= ${EMACS_PKGNAME_PREFIX}artist-[0-9]*:../../graphics/artist +DEPENDS+= ${EMACS_PKGNAME_PREFIX}auctex-[0-9]*:../../print/auctex +DEPENDS+= ${EMACS_PKGNAME_PREFIX}bbdb-[0-9]*:../../misc/bbdb .if defined(_EMACS_VERSION_EMACS_MAJOR) && ${_EMACS_VERSION_EMACS_MAJOR} == "20" -DEPENDS+= calc-[0-9]*:../../math/calc +DEPENDS+= ${EMACS_PKGNAME_PREFIX}calc-[0-9]*:../../math/calc .endif -DEPENDS+= eieio-[0-9]*:../../lang/eieio -DEPENDS+= elib-[0-9]*:../../devel/elib -DEPENDS+= emacs-dict-client-[0-9]*:../../textproc/emacs-dict-client -DEPENDS+= emacs-ilisp-[0-9]*:../../devel/emacs-ilisp -DEPENDS+= emacs-w3m-[0-9]*:../../www/emacs-w3m -DEPENDS+= ess-[0-9]*:../../math/ess -DEPENDS+= etach-[0-9]*:../../mail/etach -DEPENDS+= flim-[0-9]*:../../devel/flim -DEPENDS+= flyspell-[0-9]*:../../textproc/flyspell -DEPENDS+= haskell-mode-[0-9]*:../../devel/haskell-mode -DEPENDS+= iiimecf-[0-9]*:../../inputmethod/iiimecf -DEPENDS+= irchat-pj-[0-9]*:../../chat/irchat-pj -DEPENDS+= ispell-emacs-[0-9]*:../../textproc/ispell-emacs +DEPENDS+= ${EMACS_PKGNAME_PREFIX}eieio-[0-9]*:../../lang/eieio +DEPENDS+= ${EMACS_PKGNAME_PREFIX}elib-[0-9]*:../../devel/elib +DEPENDS+= ${EMACS_PKGNAME_PREFIX}emacs-dict-client-[0-9]*:../../textproc/emacs-dict-client +DEPENDS+= ${EMACS_PKGNAME_PREFIX}emacs-ilisp-[0-9]*:../../devel/emacs-ilisp +DEPENDS+= ${EMACS_PKGNAME_PREFIX}emacs-w3m-[0-9]*:../../www/emacs-w3m +DEPENDS+= ${EMACS_PKGNAME_PREFIX}ess-[0-9]*:../../math/ess +DEPENDS+= ${EMACS_PKGNAME_PREFIX}etach-[0-9]*:../../mail/etach +DEPENDS+= ${EMACS_PKGNAME_PREFIX}flim-[0-9]*:../../devel/flim +DEPENDS+= ${EMACS_PKGNAME_PREFIX}flyspell-[0-9]*:../../textproc/flyspell +DEPENDS+= ${EMACS_PKGNAME_PREFIX}haskell-mode-[0-9]*:../../devel/haskell-mode +DEPENDS+= ${EMACS_PKGNAME_PREFIX}iiimecf-[0-9]*:../../inputmethod/iiimecf +DEPENDS+= ${EMACS_PKGNAME_PREFIX}irchat-pj-[0-9]*:../../chat/irchat-pj +DEPENDS+= ${EMACS_PKGNAME_PREFIX}ispell-emacs-[0-9]*:../../textproc/ispell-emacs #.if defined(_EMACS_VERSION_EMACS_MAJOR) && ${_EMACS_VERSION_EMACS_MAJOR} == "21" -#DEPENDS+= jde-[0-9]*:../../editors/jde +#DEPENDS+= ${EMACS_PKGNAME_PREFIX}jde-[0-9]*:../../editors/jde #.endif -DEPENDS+= riece-[0-9]*:../../chat/riece -#DEPENDS+= lookup-[0-9]*:../../misc/lookup -DEPENDS+= mailcrypt-[0-9]*:../../mail/mailcrypt -DEPENDS+= matlab-mode-*:../../editors/matlab-mode -#DEPENDS+= mew-[0-9]*:../../mail/mew -DEPENDS+= mew-[0-9]*:../../mail/mew3 -DEPENDS+= Mule-UCS-[0-9]*:../../editors/mule-ucs -DEPENDS+= navi2ch-[0-9]*:../../chat/navi2ch +DEPENDS+= ${EMACS_PKGNAME_PREFIX}riece-[0-9]*:../../chat/riece +#DEPENDS+= ${EMACS_PKGNAME_PREFIX}lookup-[0-9]*:../../misc/lookup +DEPENDS+= ${EMACS_PKGNAME_PREFIX}mailcrypt-[0-9]*:../../mail/mailcrypt +DEPENDS+= ${EMACS_PKGNAME_PREFIX}matlab-mode-*:../../editors/matlab-mode +#DEPENDS+= ${EMACS_PKGNAME_PREFIX}mew-[0-9]*:../../mail/mew +DEPENDS+= ${EMACS_PKGNAME_PREFIX}mew-[0-9]*:../../mail/mew3 +DEPENDS+= ${EMACS_PKGNAME_PREFIX}Mule-UCS-[0-9]*:../../editors/mule-ucs +DEPENDS+= ${EMACS_PKGNAME_PREFIX}navi2ch-[0-9]*:../../chat/navi2ch .if defined(_EMACS_VERSION_EMACS_MAJOR) && ${_EMACS_VERSION_EMACS_MAJOR} == "20" -DEPENDS+= pcl-cvs-[0-9]*:../../devel/pcl-cvs +DEPENDS+= ${EMACS_PKGNAME_PREFIX}pcl-cvs-[0-9]*:../../devel/pcl-cvs .endif -#DEPENDS+= pvs-[0-9]*:../../devel/pvs # XXX pvs-license -DEPENDS+= psgml-mode-[0-9]*:../../textproc/psgml-mode -DEPENDS+= python-mode-[0-9]*:../../devel/python-mode -DEPENDS+= ruby-mode-[0-9]*:../../devel/ruby-mode -DEPENDS+= ruby-rd-mode-[0-9]*:../../devel/ruby-rd-mode -DEPENDS+= semantic-[0-9]*:../../devel/semantic -DEPENDS+= semi-[0-9]*:../../devel/semi -DEPENDS+= skk-[0-9]*:../../inputmethod/skk -DEPENDS+= sml-mode-[0-9]*:../../devel/sml-mode -DEPENDS+= speedbar-[0-9]*:../../editors/speedbar -DEPENDS+= tamago-[0-9]*:../../editors/tamago -DEPENDS+= tc-[0-9]*:../../inputmethod/tc -DEPENDS+= verilog-mode-[0-9]*:../../cad/verilog-mode -DEPENDS+= vm-[0-9]*:../../mail/vm -DEPENDS+= w3-[0-9]*:../../www/w3 -DEPENDS+= wl-[0-9]*:../../mail/wl -DEPENDS+= zenicb-[0-9]*:../../chat/zenicb -DEPENDS+= zenirc-[0-9]*:../../chat/zenirc +#DEPENDS+= ${EMACS_PKGNAME_PREFIX}pvs-[0-9]*:../../devel/pvs # XXX pvs-license +DEPENDS+= ${EMACS_PKGNAME_PREFIX}psgml-mode-[0-9]*:../../textproc/psgml-mode +DEPENDS+= ${EMACS_PKGNAME_PREFIX}python-mode-[0-9]*:../../devel/python-mode +DEPENDS+= ${EMACS_PKGNAME_PREFIX}ruby-mode-[0-9]*:../../devel/ruby-mode +DEPENDS+= ${EMACS_PKGNAME_PREFIX}ruby-rd-mode-[0-9]*:../../devel/ruby-rd-mode +DEPENDS+= ${EMACS_PKGNAME_PREFIX}semantic-[0-9]*:../../devel/semantic +DEPENDS+= ${EMACS_PKGNAME_PREFIX}semi-[0-9]*:../../devel/semi +DEPENDS+= ${EMACS_PKGNAME_PREFIX}skk-[0-9]*:../../inputmethod/skk +DEPENDS+= ${EMACS_PKGNAME_PREFIX}sml-mode-[0-9]*:../../devel/sml-mode +DEPENDS+= ${EMACS_PKGNAME_PREFIX}speedbar-[0-9]*:../../editors/speedbar +DEPENDS+= ${EMACS_PKGNAME_PREFIX}tamago-[0-9]*:../../editors/tamago +DEPENDS+= ${EMACS_PKGNAME_PREFIX}tc-[0-9]*:../../inputmethod/tc +DEPENDS+= ${EMACS_PKGNAME_PREFIX}verilog-mode-[0-9]*:../../cad/verilog-mode +DEPENDS+= ${EMACS_PKGNAME_PREFIX}vm-[0-9]*:../../mail/vm +DEPENDS+= ${EMACS_PKGNAME_PREFIX}w3-[0-9]*:../../www/w3 +DEPENDS+= ${EMACS_PKGNAME_PREFIX}wl-[0-9]*:../../mail/wl +DEPENDS+= ${EMACS_PKGNAME_PREFIX}zenicb-[0-9]*:../../chat/zenicb +DEPENDS+= ${EMACS_PKGNAME_PREFIX}zenirc-[0-9]*:../../chat/zenirc EXTRACT_ONLY= # empty NO_CHECKSUM= yes diff --git a/editors/gnuserv/Makefile b/editors/gnuserv/Makefile index 58b417a2b9e..3996baf35a1 100644 --- a/editors/gnuserv/Makefile +++ b/editors/gnuserv/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.6 2005/06/01 18:02:45 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2005/08/28 04:25:29 uebayasi Exp $ DISTNAME= gnuserv-3.12.7 +PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME} PKGREVISION= 1 CATEGORIES= editors MASTER_SITES= ${HOMEPAGE}/src/ diff --git a/editors/jde/Makefile b/editors/jde/Makefile index 07b848f0895..8a61bd4b17c 100644 --- a/editors/jde/Makefile +++ b/editors/jde/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.14 2005/08/11 14:36:53 uebayasi Exp $ +# $NetBSD: Makefile,v 1.15 2005/08/28 04:25:29 uebayasi Exp $ # DISTNAME= jde-2.3.2 +PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME} CATEGORIES= devel editors java MASTER_SITES= ${MASTER_SITE_LOCAL} # The "real" site has silly naming conventions: @@ -11,10 +12,10 @@ MAINTAINER= cjones@NetBSD.org HOMEPAGE= http://jdee.sunsite.dk/ COMMENT= Full-featured Java editing mode for emacs -DEPENDS+= speedbar>=0.14rc2:../../editors/speedbar -DEPENDS+= eieio>=0.17:../../lang/eieio -DEPENDS+= semantic>=1.4rc13:../../devel/semantic -DEPENDS+= elib>=1.0:../../devel/elib +DEPENDS+= ${EMACS_PKGNAME_PREFIX}speedbar>=0.14rc2:../../editors/speedbar +DEPENDS+= ${EMACS_PKGNAME_PREFIX}eieio>=0.17:../../lang/eieio +DEPENDS+= ${EMACS_PKGNAME_PREFIX}semantic>=1.4rc13:../../devel/semantic +DEPENDS+= ${EMACS_PKGNAME_PREFIX}elib>=1.0:../../devel/elib WRKSRC= ${WRKDIR}/${DISTNAME}/lisp diff --git a/editors/leim/Makefile b/editors/leim/Makefile index a1674ab4a56..af1debd1737 100644 --- a/editors/leim/Makefile +++ b/editors/leim/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.18 2005/05/22 20:07:56 jlam Exp $ +# $NetBSD: Makefile,v 1.19 2005/08/28 04:25:29 uebayasi Exp $ DISTNAME= leim-${VERSION} +PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME} CATEGORIES= editors MASTER_SITES= ${MASTER_SITE_GNU:=emacs/} DISTFILES= emacs-${VERSION}a${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX} diff --git a/editors/matlab-mode/Makefile b/editors/matlab-mode/Makefile index 247e54a8ab4..343b453b782 100644 --- a/editors/matlab-mode/Makefile +++ b/editors/matlab-mode/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.6 2005/03/14 22:03:55 dmcmahill Exp $ +# $NetBSD: Makefile,v 1.7 2005/08/28 04:25:29 uebayasi Exp $ # DISTNAME= matlab.el # we do this because we want DIST_SUBDIR to not change based on # emacs vs xemacs BASEPKGNAME= matlab-mode-2.3.1 -PKGNAME= ${BASEPKGNAME} +PKGNAME= ${EMACS_PKGNAME_PREFIX}${BASEPKGNAME} CATEGORIES= editors math MASTER_SITES= http://www.mathworks.com/matlabcentral/files/104/ EXTRACT_SUFX= @@ -35,7 +35,7 @@ do-build: done do-install: - ${INSTALL_DATA_DIR} ${EMACS_LISPPREFIX}/${PKGBASE} + ${INSTALL_DATA_DIR} ${EMACS_LISPPREFIX}/${PKGBASE:C|^xemacs-||} cd ${WRKSRC} && ${INSTALL_DATA} ${SRCS} ${SRCS:.el=.elc} ${EMACS_LISPPREFIX}/${PKGBASE} .include "../../mk/bsd.pkg.mk" diff --git a/editors/mule-ucs/Makefile b/editors/mule-ucs/Makefile index 0ff07bc56f8..e2fd0b05754 100644 --- a/editors/mule-ucs/Makefile +++ b/editors/mule-ucs/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.10 2004/05/08 13:35:20 uebayasi Exp $ +# $NetBSD: Makefile,v 1.11 2005/08/28 04:25:29 uebayasi Exp $ DISTNAME= Mule-UCS-0.84 +PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME} PKGREVISION= 4 CATEGORIES= editors MASTER_SITES= ftp://ftp.m17n.org/pub/mule/Mule-UCS/ diff --git a/editors/speedbar/Makefile b/editors/speedbar/Makefile index 79c6c15cc75..853f40bf897 100644 --- a/editors/speedbar/Makefile +++ b/editors/speedbar/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.12 2005/06/16 06:57:49 jlam Exp $ +# $NetBSD: Makefile,v 1.13 2005/08/28 04:25:29 uebayasi Exp $ # DISTNAME= speedbar-0.14beta4 -PKGNAME= speedbar-0.14rc4 +PKGNAME= ${EMACS_PKGNAME_PREFIX}speedbar-0.14rc4 CATEGORIES= editors devel MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=cedet/} diff --git a/editors/tamago/Makefile b/editors/tamago/Makefile index 950139cc189..ffc631c51e3 100644 --- a/editors/tamago/Makefile +++ b/editors/tamago/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.9 2004/05/08 13:35:20 uebayasi Exp $ +# $NetBSD: Makefile,v 1.10 2005/08/28 04:25:29 uebayasi Exp $ DISTNAME= tamago-4.0.6 -PKGNAME= tamago-20020909 +PKGNAME= ${EMACS_PKGNAME_PREFIX}tamago-20020909 CATEGORIES= editors MASTER_SITES= ftp://www.m17n.org/pub/tamago/ diff --git a/graphics/artist/Makefile b/graphics/artist/Makefile index d978cd489dc..f3324ea9786 100644 --- a/graphics/artist/Makefile +++ b/graphics/artist/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.5 2005/01/19 14:53:44 adam Exp $ +# $NetBSD: Makefile,v 1.6 2005/08/28 04:25:29 uebayasi Exp $ DISTNAME= artist-1.2.6 +PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME} CATEGORIES= graphics MASTER_SITES= http://www.lysator.liu.se/~tab/artist/ diff --git a/inputmethod/anthy-elisp/Makefile b/inputmethod/anthy-elisp/Makefile index 376d413ff9d..380b3b55473 100644 --- a/inputmethod/anthy-elisp/Makefile +++ b/inputmethod/anthy-elisp/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.1.1.1 2004/12/28 05:38:47 taya Exp $ +# $NetBSD: Makefile,v 1.2 2005/08/28 04:25:29 uebayasi Exp $ .include "../../inputmethod/anthy/Makefile.common" -PKGNAME= anthy-elisp-${ANTHY_VERSION} +PKGNAME= ${EMACS_PKGNAME_PREFIX}anthy-elisp-${ANTHY_VERSION} CATEGORIES= inputmethod editor MAINTAINER= taya@NetBSD.org @@ -15,8 +15,7 @@ EMACS_USE_LEIM= # defined (for emacs21/emacs20) .include "../../mk/emacs.mk" .if ${EMACS_FLAVOR} == "xemacs" -PKGNAME= ${PKGNAME_PREFIX}anthy-elisp-${ANTHY_VERSION} -DEPENDS+= xemacs-packages:../../editors/xemacs-packages +DEPENDS+= xemacs-packages-[0-9]*:../../editors/xemacs-packages .endif do-build: diff --git a/inputmethod/iiimecf/Makefile b/inputmethod/iiimecf/Makefile index 3c0ddbd496b..f27cfaf37ab 100644 --- a/inputmethod/iiimecf/Makefile +++ b/inputmethod/iiimecf/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.5 2003/07/17 21:43:35 grant Exp $ +# $NetBSD: Makefile,v 1.6 2005/08/28 04:25:29 uebayasi Exp $ # DISTNAME= IIIMECF-0.6 -PKGNAME= iiimecf-0.6 +PKGNAME= ${EMACS_PKGNAME_PREFIX}iiimecf-0.6 CATEGORIES= japanese inputmethod MASTER_SITES= ftp://ftp.m17n.org/pub/mule/IIIM/ @@ -10,7 +10,7 @@ MAINTAINER= uebayasi@NetBSD.org #HOMEPAGE= COMMENT= Emacs Lisp library for IIIM Protocol -DEPENDS+= Mule-UCS>=0.82:../../editors/mule-ucs +DEPENDS+= ${EMACS_PKGNAME_PREFIX}Mule-UCS>=0.82:../../editors/mule-ucs do-build: @cd ${WRKSRC} && \ diff --git a/inputmethod/skk/Makefile b/inputmethod/skk/Makefile index b47dff8608d..91f33161869 100644 --- a/inputmethod/skk/Makefile +++ b/inputmethod/skk/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.8 2005/03/05 11:26:48 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2005/08/28 04:25:30 uebayasi Exp $ # DISTNAME= ddskk-12.2.0 -PKGNAME= skk-12.2.0 +PKGNAME= ${EMACS_PKGNAME_PREFIX}skk-12.2.0 PKGREVISION= 1 CATEGORIES= japanese inputmethod MASTER_SITES= http://openlab.ring.gr.jp/skk/maintrunk/ @@ -19,12 +19,12 @@ EMACS_VERSIONS_ACCEPTED= emacs21 emacs21nox xemacs214 emacs20 xemacs215 .include "../../mk/emacs.mk" .include "options.mk" -DEPENDS= ${PKGNAME_PREFIX}apel>=10.6:../../devel/apel +DEPENDS= ${EMACS_PKGNAME_PREFIX}apel>=10.6:../../devel/apel .if ${EMACS_FLAVOR} == "emacs" EMACS_USE_LEIM= # defined -BUILD_DEPENDS+= ${PKGNAME_PREFIX}Mule-UCS-[0-9]*:../../editors/mule-ucs +BUILD_DEPENDS+= ${EMACS_PKGNAME_PREFIX}Mule-UCS-[0-9]*:../../editors/mule-ucs .else -BUILD_DEPENDS+= ${PKGNAME_PREFIX}xemacs-packages>=1.10:../../editors/xemacs-packages +BUILD_DEPENDS+= xemacs-packages>=1.10:../../editors/xemacs-packages .endif MAKEFLAGS= EMACS=${EMACS_BIN} diff --git a/inputmethod/tc/Makefile b/inputmethod/tc/Makefile index eebb3ba5168..c2d5f052423 100644 --- a/inputmethod/tc/Makefile +++ b/inputmethod/tc/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.9 2005/05/22 20:08:08 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2005/08/28 04:25:30 uebayasi Exp $ # DISTNAME= tc-2.3.1 +PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME} CATEGORIES= japanese inputmethod MASTER_SITES= http://openlab.ring.gr.jp/tcode/resources/soft/ diff --git a/lang/eieio/Makefile b/lang/eieio/Makefile index 9c2293db89b..64dcc57435d 100644 --- a/lang/eieio/Makefile +++ b/lang/eieio/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.11 2005/06/16 06:58:00 jlam Exp $ +# $NetBSD: Makefile,v 1.12 2005/08/28 04:25:30 uebayasi Exp $ # DISTNAME= eieio-0.17 +PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME} CATEGORIES= lang editors MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=cedet/} @@ -11,9 +12,8 @@ COMMENT= Enhanced Integration of Emacs Interpreted Objects .include "../../mk/emacs.mk" -.if ${EMACS_FLAVOR} == "emacs" -.elif ${EMACS_FLAVOR} == "xemacs" -DEPENDS+= xemacs-packages:../../editors/xemacs-packages +.if ${EMACS_FLAVOR} == "xemacs" +DEPENDS+= xemacs-packages-[0-9]*:../../editors/xemacs-packages .endif MAKEFLAGS+= EMACS=${EMACS_BIN} diff --git a/lang/twelf/Makefile b/lang/twelf/Makefile index cadcee1c7f4..f7836226ee4 100644 --- a/lang/twelf/Makefile +++ b/lang/twelf/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.9 2005/06/16 06:58:01 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2005/08/28 04:25:30 uebayasi Exp $ # DISTNAME= twelf-1-4 -PKGNAME= twelf-1.4 +PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME} PKGREVISION= 1 CATEGORIES= lang MASTER_SITES= http://www.cs.cmu.edu/~twelf/dist/ diff --git a/mail/etach/Makefile b/mail/etach/Makefile index 97391f76b9f..f0271ecd505 100644 --- a/mail/etach/Makefile +++ b/mail/etach/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.9 2004/05/08 15:11:28 uebayasi Exp $ +# $NetBSD: Makefile,v 1.10 2005/08/28 04:25:30 uebayasi Exp $ DISTNAME= etach-1.2.9 +PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME} CATEGORIES= mail MASTER_SITES= http://rulnick.com/etach/download/ diff --git a/mail/gnus/Makefile b/mail/gnus/Makefile index 4e9c0d33d7a..51257b948ab 100644 --- a/mail/gnus/Makefile +++ b/mail/gnus/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.8 2005/04/08 19:05:58 jwise Exp $ +# $NetBSD: Makefile,v 1.9 2005/08/28 04:25:30 uebayasi Exp $ DISTNAME= gnus-5.10.6 +PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME} CATEGORIES= mail MASTER_SITES= http://quimby.gnus.org/gnus/dist/ diff --git a/mail/mailcrypt/Makefile b/mail/mailcrypt/Makefile index f261114beb5..0905b5cb0b2 100644 --- a/mail/mailcrypt/Makefile +++ b/mail/mailcrypt/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.9 2005/03/24 21:12:56 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2005/08/28 04:25:30 uebayasi Exp $ DISTNAME= mailcrypt-3.5.8 +PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME} CATEGORIES= mail security MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mailcrypt/} diff --git a/mail/mew/Makefile b/mail/mew/Makefile index 6cc842af68d..23995a811bc 100644 --- a/mail/mew/Makefile +++ b/mail/mew/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.64 2005/04/11 21:46:20 tv Exp $ +# $NetBSD: Makefile,v 1.65 2005/08/28 04:25:30 uebayasi Exp $ DISTNAME= mew-4.2 +PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME} CATEGORIES= mail MASTER_SITES= ftp://ftp.mew.org/pub/Mew/release/ diff --git a/mail/mew3/Makefile b/mail/mew3/Makefile index 2634bc24c8d..d486ac36e20 100644 --- a/mail/mew3/Makefile +++ b/mail/mew3/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.17 2005/04/11 21:46:20 tv Exp $ +# $NetBSD: Makefile,v 1.18 2005/08/28 04:25:30 uebayasi Exp $ DISTNAME= mew-3.3 +PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME} PKGREVISION= 1 CATEGORIES= mail MASTER_SITES= ftp://ftp.mew.org/pub/Mew/release/ diff --git a/mail/rmail-mime/Makefile b/mail/rmail-mime/Makefile index 2715e190164..aceb7b880aa 100644 --- a/mail/rmail-mime/Makefile +++ b/mail/rmail-mime/Makefile @@ -1,14 +1,15 @@ -# $NetBSD: Makefile,v 1.4 2003/07/17 21:46:59 grant Exp $ +# $NetBSD: Makefile,v 1.5 2005/08/28 04:25:30 uebayasi Exp $ # DISTNAME= rmail-mime-1.13.0 +PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME} CATEGORIES= mail MASTER_SITES= ftp://ftp.m17n.org/pub/mule/semi/rmail-mime/ MAINTAINER= jschauma@NetBSD.org COMMENT= MIME-capabilities for RMAIL in Emacs -DEPENDS= semi>=1.14.4:../../devel/semi +DEPENDS= ${EMACS_PKGNAME_PREFIX}semi>=1.14.4:../../devel/semi .include "../../mk/emacs.mk" diff --git a/mail/vm/distinfo b/mail/vm/distinfo index f0fec4ac4b7..c0053e1a2d2 100644 --- a/mail/vm/distinfo +++ b/mail/vm/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.14 2005/02/24 09:59:30 agc Exp $ +$NetBSD: distinfo,v 1.15 2005/08/28 04:25:30 uebayasi Exp $ -SHA1 (vm-7.17.tar.gz) = 18504d06ba448b8f580aa9d3c240e9d734f6d45c -RMD160 (vm-7.17.tar.gz) = 593f4e3887457380c0cf6c59b7831bdca5de2404 -Size (vm-7.17.tar.gz) = 380404 bytes +SHA1 (vm-7.19.tar.gz) = 0fe9012b8988ebdec7641f48aca0ef365549c590 +RMD160 (vm-7.19.tar.gz) = 7a28c0a096f1f8093cffb9fc621cd270dd67b432 +Size (vm-7.19.tar.gz) = 381658 bytes SHA1 (patch-aa) = 7b8e9b8bcc1c03604fc0d2a81683754b823dc7a6 SHA1 (patch-ab) = 51ea93e4b4066fbab7e75d03bea2cffd20c85440 diff --git a/mail/wl/Makefile b/mail/wl/Makefile index d6445919c09..c3c1e55a126 100644 --- a/mail/wl/Makefile +++ b/mail/wl/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.22 2005/04/11 21:46:28 tv Exp $ +# $NetBSD: Makefile,v 1.23 2005/08/28 04:25:30 uebayasi Exp $ DISTNAME= wl-2.14.0 +PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME} CATEGORIES= mail MASTER_SITES= ftp://ftp.gohome.org/wl/stable/ @@ -9,10 +10,10 @@ HOMEPAGE= http://www.gohome.org/wl/ COMMENT= Mail/news management system with IMAP4rev1 support for Emacs -DEPENDS+= apel>=10.6:../../devel/apel -DEPENDS+= flim>=1.14.7:../../devel/flim -DEPENDS+= semi>=1.14.6:../../devel/semi -DEPENDS+= bbdb-[0-9]*:../../misc/bbdb +DEPENDS+= ${EMACS_PKGNAME_PREFIX}apel>=10.6:../../devel/apel +DEPENDS+= ${EMACS_PKGNAME_PREFIX}flim>=1.14.7:../../devel/flim +DEPENDS+= ${EMACS_PKGNAME_PREFIX}semi>=1.14.6:../../devel/semi +DEPENDS+= ${EMACS_PKGNAME_PREFIX}bbdb-[0-9]*:../../misc/bbdb # XXX please someone adjust paths and PLIST for XEmacs... EMACS_VERSIONS_ACCEPTED= emacs21 emacs21nox emacs20 diff --git a/math/calc/Makefile b/math/calc/Makefile index 946c7c582bd..fcf2669c4ae 100644 --- a/math/calc/Makefile +++ b/math/calc/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.13 2005/06/17 03:50:19 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2005/08/28 04:25:30 uebayasi Exp $ DISTNAME= calc-2.02f +PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME} PKGREVISION= 1 CATEGORIES= math MASTER_SITES= ${MASTER_SITE_GNU:=calc/} diff --git a/math/ess/Makefile b/math/ess/Makefile index 22586bbfade..f4a07fe0a31 100644 --- a/math/ess/Makefile +++ b/math/ess/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.8 2005/07/16 01:19:13 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2005/08/28 04:25:30 uebayasi Exp $ DISTNAME= ess-5.1.24 +PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME} CATEGORIES= math MASTER_SITES= http://software.biostat.washington.edu/ess/ 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 diff --git a/mk/emacs.mk b/mk/emacs.mk index 273bdcea48c..d868d2d672f 100644 --- a/mk/emacs.mk +++ b/mk/emacs.mk @@ -1,8 +1,10 @@ -# $NetBSD: emacs.mk,v 1.19 2005/05/22 21:52:49 rillig Exp $ +# $NetBSD: emacs.mk,v 1.20 2005/08/28 04:25:30 uebayasi Exp $ # -# A Makefile fragment for Emacs Lisp packages. +# This Makefile fragment handles Emacs Lisp Packages (== ELPs). # -# * Determine the version of Emacs/XEmacs to be used. +# Note to users: +# +# * Users choose one favoriate Emacs version (default GNU Emacs 21). # # * Emacs Lisp files are installed... # GNU emacs @@ -10,13 +12,161 @@ # XEmacs # ->${PREFIX}/lib/xemacs/site-packages/lisp/foo/... # -# * XEmacs package's names are prefix'ed by "xemacs-", since Emacs -# {20,21} conflict, and XEmacs conflict. +# * You can't install an ELP for both Emacs and XEmacs +# simultaneously. +# +# * XEmacs package's names are prefix'ed by "xemacs-". +# +# Note to package developers: +# +# * XEmacs package's names are prefix'ed by "xemacs-". +# +# This is to make sure ELPs for XEmacs keep their own dependency +# tree (for example, if an ELP "bar" depends on another ELP "foo", +# "xemacs-bar" depends on "xemacs-foo". "foo" (installed for GNU +# Emacs) is useless for "xemacs-bar" in this case.). +# +# Make sure too that "foo" and "xemacs-foo" conflict each other, +# since they can share some files. (Making all ELPs separately +# installable for GNU Emacs/XEmacs might be possible.) +# +# * Assume each ELP supports all Emacs versions by default. If the +# ELP supports only certain Emacs versions, define EMACS_VERSIONS +# _ACCEPTED explicitly before including mk/emacs.mk. +# +# Variables for users: +# +# EMACS_TYPE +# Description: +# The user's favoriate Emacs version. +# Possible values: +# emacs21, emacs21nox, emacs20, xemacs215, xemacs214 +# Default value: +# emacs21 +# +# Variables ELPs can provide: +# +# EMACS_USE_LEIM +# Description: +# Set if the ELP wants LEIM support. +# Possible values: +# <undefined>, <defined> +# Default value: +# <undefined> +# +# EMACS_VERSIONS_ACCEPTED +# Description: +# Versions the ELP accepts (supports). +# Possible values: +# emacs21, emacs21nox, emacs20, xemacs215, xemacs214 +# Default value: +# emacs21, emacs21nox, emacs20, xemacs215, xemacs214 +# REPLACE_EMACS +# Description: +# If set, correct the #!/path/to/emacs line in the +# specified files. +# Possible values: +# <a list of files relative to ${WRKDIR}> +# Default value: +# <undefined> +# +# Variables provided for ELPs: +# +# EMACS_BIN +# Description: +# Path to Emacs executable. +# Possible values: +# ${PREFIX}/bin/emacs, ${PREFIX}/bin/xemacs +# +# EMACS_ETCPREFIX +# Description: +# Path to the directory misc. files should be +# installed into. ELPs should append a short +# name as a subdirectory. +# Possible values: +# ${PREFIX}/share +# ${PREFIX}/lib/xemacs/site-packages/etc +# +# EMACS_FLAVOR +# Description: +# GNU Emacs (emacs) or XEmacs (xemacs). +# Possible values: +# emacs, xemacs # -# * Assume each package supports GNU Emacs {20,21} by default. If the -# package supports XEmacsen too, define EMACS_VERSIONS_ACCEPTED -# explicitly before including mk/emacs.mk. Note that the order is -# important. +# EMACS_INFOPREFIX +# Description: +# Path to the directory Info files should be +# installed into. Unlike EMACS_ETCPREFIX or +# EMACS_LISPPREFIX, subdirectory is not needed. +# Possible values: +# ${PREFIX}/info +# ${PREFIX}/lib/xemacs/site-packages/info +# +# EMACS_LISPPREFIX +# Description: +# Path to the directory Emacs lisp files should be +# installed into. ELPs should append a short name +# as a subdirectory. +# Possible values: +# ${PREFIX}/share/emacs/site-lisp +# ${PREFIX}/lib/xemacs/site-packages/lisp +# +# EMACS_PKGNAME_PREFIX +# Description: +# The prefix of PKGNAME and DEPENDS lines. All ELPs +# must honour this! +# Possible values: +# "", "xemacs-" +# +# Variables provided in ELPs' PLIST: +# +# EMACS_ETCPREFIX +# Description: +# Same as the one in Makefile, except that +# ${PREFIX} is omitted in PLIST. +# Possible values: +# share +# lib/xemacs/site-packages/etc +# +# EMACS_INFOPREFIX +# Description: +# Same as the one in Makefile, except that +# ${PREFIX} is omitted in PLIST. +# Possible values: +# info +# lib/xemacs/site-packages/info +# +# EMACS_LISPPREFIX +# Description: +# Same as the one in Makefile, except that +# ${PREFIX} is omitted in PLIST. +# Possible values: +# share/emacs/site-lisp +# lib/xemacs/site-packages/lisp +# +# EMACS_VERSION +# Description: +# XXX +# Possible values: +# XXX +# +# FOR_{emacs,emacs21,emacs21nox,emacs20,xemacs,xemacs215,xemacs214} +# Description: +# These macros will become either an empty string or +# "@comment" depending on the Emacs version; when +# "emacs21" is used, ${FOR_emacs} and ${FOR_emacs21} +# become "" (empty), and other macros become +# "@comment"; thie means that only the PLIST lines +# prefixed by ${FOR_emacs} and ${FOR_emacs21} are +# valid. +# Possible values: +# "", "@comment" +# +# NOTFOR_{emacs,emacs21,emacs21nox,emacs20,xemacs,xemacs215,xemacs214} +# Description: +# The opposite of FOR_*. See above. +# Possible values: +# "", "@comment" # .if !defined(EMACS_MK) @@ -24,185 +174,161 @@ EMACS_MK= # defined .include "../../mk/bsd.prefs.mk" -# Assume only GNU emacsen are supported by default. # -EMACS_VERSION_DEFAULT?= emacs21 -.if !defined(USE_XEMACS) -EMACS_VERSIONS_ACCEPTED?= emacs21 emacs21nox emacs20 -#EMACS_VERSIONS_ACCEPTED?= emacs21 emacs21nox xemacs214 emacs20 xemacs215 -.else -EMACS_VERSIONS_ACCEPTED?= xemacs214 xemacs215 -.endif +# Constants +# -# Actually BUILDLINK_ means little here... -# -BUILDLINK_DEPENDS.emacs20?= emacs>=20.7 -BUILDLINK_DEPENDS.emacs21?= emacs>=21.2 -BUILDLINK_DEPENDS.emacs21nox?= emacs-nox11>=21.2 -BUILDLINK_DEPENDS.xemacs214?= xemacs>=21.4 -BUILDLINK_DEPENDS.xemacs215?= xemacs>=21.5 -BUILDLINK_DEPENDS.leim20?= leim>=20.7 -BUILDLINK_DEPENDS.leim21?= leim>=21.2 - -.for v in ${EMACS_VERSIONS_ACCEPTED} -_EMACS_VERSION_${v}_OK= yes -.endfor - -# Look for Emacs 21/Emacs 20 -# -_TMP!= ${PKG_INFO} -e emacs || ${ECHO} -.if ${_TMP} != "" -_EMACS_VERSION_EMACS_FULL:= ${_TMP} -_EMACS_VERSION_EMACS= ${_EMACS_VERSION_EMACS_FULL:C/^.*-//} -_EMACS_VERSION_EMACS_MAJOR= ${_EMACS_VERSION_EMACS:C/\..*//} -.if ${_EMACS_VERSION_EMACS_MAJOR} == "21" -_EMACS_VERSION_emacs21_INSTALLED= yes -.elif ${_EMACS_VERSION_EMACS_MAJOR} == "20" -_EMACS_VERSION_emacs20_INSTALLED= yes -.endif -.endif +_EMACS_VERSIONS_ALL= \ + emacs21 emacs21nox xemacs214 emacs20 xemacs215 +_EMACS_VERSIONS_ACCEPTED_DEFAULT= ${_EMACS_VERSIONS_ALL} +_EMACS_VERSION_DEFAULT.emacs= emacs21 +_EMACS_VERSION_DEFAULT.xemacs= xemacs214 +_EMACS_REQD.emacs20= emacs>=20.7 +_EMACS_REQD.emacs21= emacs>=21.2 +_EMACS_REQD.emacs21nox= emacs-nox11>=21.2 +_EMACS_REQD.xemacs214= xemacs>=21.4 +_EMACS_REQD.xemacs215= xemacs>=21.5 +_EMACS_REQD.leim20= leim>=20.7 +_EMACS_REQD.leim21= leim>=21.2 +_EMACS_DEP.emacs20= ../../editors/emacs20 +_EMACS_DEP.emacs21= ../../editors/emacs +_EMACS_DEP.emacs21nox= ../../editors/emacs-nox11 +_EMACS_DEP.xemacs214= ../../editors/xemacs +_EMACS_DEP.xemacs215= ../../editors/xemacs-current +_EMACS_DEP.leim20= ../../editors/leim20 +_EMACS_DEP.leim21= ../../editors/leim -# Look for Emacs21 without X11 # -_TMP!= ${PKG_INFO} -e emacs-nox11 || ${ECHO} -.if ${_TMP} != "" -_EMACS_VERSION_EMACS_FULL:= ${_TMP} -_EMACS_VERSION_EMACS= ${_EMACS_VERSION_EMACS_FULL:C/^.*-//} -_EMACS_VERSION_EMACS_MAJOR= ${_EMACS_VERSION_EMACS:C/\..*//} -_EMACS_VERSION_emacs21nox_INSTALLED= yes -.endif +# Version decision +# +# 1. Pick up an emacs version. +# +# if (user want a specific version) +# if (the specified version is "emacs" or "xemacs") +# fall into recommended versions (i.e. "emacs21" or +# "xemacs214"; +# use the specified version; +# else +# use "emacs21" by default; +# add a dependency to the version; +# +# 2. Check if a given package can be used for the emacs version. +# +# if (package accepts the emacs version) +# nothing to do; +# else +# abort; +# -# Look for XEmacs 21.5/XEmacs 21.1 -# -_TMP!= ${PKG_INFO} -e xemacs || ${ECHO} -.if ${_TMP} != "" -_EMACS_VERSION_XEMACS_FULL:= ${_TMP:C/^.*-//} -_EMACS_VERSION_XEMACS= ${_EMACS_VERSION_XEMACS_FULL:C/^.*-//} -_EMACS_VERSION_XEMACS_MAJOR= ${_EMACS_VERSION_XEMACS:C/\..*//} -_EMACS_VERSION_XEMACS_MINOR= ${_EMACS_VERSION_XEMACS:C/^[0-9]*\.//:C/[^0-9].*//} -.if ${_EMACS_VERSION_XEMACS_MAJOR} == "21" && \ - ${_EMACS_VERSION_XEMACS_MINOR} == "5" -_EMACS_VERSION_xemacs215_INSTALLED= yes -.elif ${_EMACS_VERSION_XEMACS_MAJOR} == "21" && \ - ${_EMACS_VERSION_XEMACS_MINOR} == "4" -_EMACS_VERSION_xemacs214_INSTALLED= yes -.endif +.if !empty(EMACS_TYPE:Memacs) || !empty(EMACS_TYPE:Mxemacs) +_EMACS_TYPE= ${_EMACS_VERSION_DEFAULT.${EMACS_TYPE}} .endif +_EMACS_TYPE?= ${EMACS_TYPE} -# Determine the Emacs version to be used. -# -.if defined(EMACS_VERSION_REQD) -_EMACS_VERSION= ${EMACS_VERSION_REQD} -.endif -.if !defined(_EMACS_VERSION) -.if defined(_EMACS_VERSION_${EMACS_VERSION_DEFAULT}_OK) -.if defined(_EMACS_VERSION_${EMACS_VERSION_DEFAULT}_INSTALLED) -_EMACS_VERSION= ${EMACS_VERSION_DEFAULT} -.endif -.endif -.endif -.if !defined(_EMACS_VERSION) -.for v in ${EMACS_VERSIONS_ACCEPTED} -.if defined(_EMACS_VERSION_${v}_INSTALLED) -_EMACS_VERSION?= ${v} +.if !empty(_EMACS_TYPE:Nxemacs*) +. if !empty(_EMACS_TYPE:N*nox) +_EMACS_PKGBASE= emacs +. else +_EMACS_PKGBASE= emacs-nox11 +. endif .else -_EMACS_VERSION_FIRSTACCEPTED?= ${v} -.endif -.endfor -.endif -.if !defined(_EMACS_VERSION) -.if defined(_EMACS_VERSION_${EMACS_VERSION_DEFAULT}_OK) -_EMACS_VERSION= ${EMACS_VERSION_DEFAULT} +. if !empty(_EMACS_TYPE:N*nox) +_EMACS_PKGBASE= xemacs +. else +_EMACS_PKGBASE= xemacs-nox11 +. endif .endif + +_EMACS_VERSION_CMD!= ${PKG_INFO} -e "${_EMACS_PKGBASE}" || ${ECHO} +.if "${_EMACS_VERSION_CMD}" != "" +_EMACS_VERSION_FULL= ${_EMACS_VERSION_CMD} +_EMACS_VERSION= ${_EMACS_VERSION_FULL:C/^${_EMACS_PKGBASE}-//} +_EMACS_VERSION_MAJOR= ${_EMACS_VERSION:C/\..*//} +_EMACS_VERSION_MINOR= ${_EMACS_VERSION:C/^[0-9]*\.//:C/[^0-9].*//} +_EMACS_VERSION_NOREV= ${_EMACS_VERSION:C/[a-z]*$//} +_EMACS_VERSION_ISMATCH!= \ + dep="${_EMACS_REQD.${_EMACS_TYPE}:Q}"; \ + ${PKG_ADMIN} pmatch "$$dep" "${_EMACS_PKGBASE}"; \ + if [ $$? = 0 ]; then ${ECHO} "yes"; else ${ECHO} "no"; fi .endif -.if !defined(_EMACS_VERSION) -_EMACS_VERSION= ${_EMACS_VERSION_FIRSTACCEPTED} + +EMACS_VERSIONS_ACCEPTED?= ${_EMACS_VERSIONS_ACCEPTED_DEFAULT} + +.if empty(EMACS_VERSIONS_ACCEPTED:M${_EMACS_TYPE}) +PKG_FAIL_REASON+= "Accepted versions are: ${EMACS_VERSIONS_ACCEPTED}" +PKG_FAIL_REASON+= "No valid Emacs version installed found" .endif -# Set version specifics. # -FOR.emacs21= "@comment " -FOR.emacs21nox= "@comment " -FOR.emacs20= "@comment " -FOR.xemacs215= "@comment " -FOR.xemacs214= "@comment " -.if ${_EMACS_VERSION} == "emacs21" -EMACS_DEPENDENCY= ${BUILDLINK_DEPENDS.emacs21}:../../editors/emacs -FOR.emacs21= "" -.if defined(EMACS_USE_LEIM) -DEPENDS+= ${BUILDLINK_DEPENDS.leim21}:../../editors/leim -.endif -.elif ${_EMACS_VERSION} == "emacs21nox" -EMACS_DEPENDENCY= ${BUILDLINK_DEPENDS.emacs21nox}:../../editors/emacs-nox11 -FOR.emacs21nox= "" -.if defined(EMACS_USE_LEIM) -DEPENDS+= ${BUILDLINK_DEPENDS.leim21}:../../editors/leim -.endif -.elif ${_EMACS_VERSION} == "emacs20" -EMACS_DEPENDENCY= ${BUILDLINK_DEPENDS.emacs20}:../../editors/emacs20 -FOR.emacs20= "" +# Dependencies and conflicts +# + +DEPENDS+= ${_EMACS_REQD.${_EMACS_TYPE}}:${_EMACS_DEP.${_EMACS_TYPE}} .if defined(EMACS_USE_LEIM) -DEPENDS+= ${BUILDLINK_DEPENDS.leim20}:../../editors/leim20 -.endif -.elif ${_EMACS_VERSION} == "xemacs215" -EMACS_DEPENDENCY= ${BUILDLINK_DEPENDS.xemacs215}:../../editors/xemacs-current -FOR.xemacs215= "" -.elif ${_EMACS_VERSION} == "xemacs214" -EMACS_DEPENDENCY= ${BUILDLINK_DEPENDS.xemacs214}:../../editors/xemacs -FOR.xemacs214= "" -.else -PKG_SKIP_REASON+= "Accepted versions are: ${EMACS_VERSIONS_ACCEPTED}" -PKG_SKIP_REASON+= "No valid Emacs version installed found" +. if !empty(_EMACS_TYPE:Nxemacs*:Nemacs20*) +DEPENDS+= ${_EMACS_REQD.leim21}:${_EMACS_DEP.leim21} +. else +DEPENDS+= ${_EMACS_REQD.leim20}:${_EMACS_DEP.leim20} +. endif .endif -.if defined(EMACS_FOR_BUILD_ONLY) -BUILD_DEPENDS+= ${EMACS_DEPENDENCY} +.if !empty(_EMACS_TYPE:Nxemacs*) +CONFLICTS+= xemacs-${PKGBASE}-[0-9]* .else -DEPENDS+= ${EMACS_DEPENDENCY} +CONFLICTS+= ${PKGBASE:C|^xemacs-||}-[0-9]* .endif -# Provide some macro definitions. # -.if ${_EMACS_VERSION:Memacs*} -EMACS_FLAVOR= emacs -EMACS_BIN= ${PREFIX}/bin/emacs -EMACS_PKG_VERSION= ${_EMACS_VERSION_EMACS_FULL:C|^.*-||} +# Macros for packages +# + +EMACS_FLAVOR= ${_EMACS_TYPE:C|nox||:C|[0-9].*||} +EMACS_BIN= ${PREFIX}/bin/${EMACS_FLAVOR} +.if ${EMACS_FLAVOR} == "emacs" +EMACS_ETCPREFIX= ${PREFIX}/share +EMACS_INFOPREFIX= ${PREFIX}/info EMACS_LISPPREFIX= ${PREFIX}/share/emacs/site-lisp -PKGNAME_PREFIX= -CONFLICTS+= xemacs-${PKGBASE}-[0-9]* +EMACS_PKGNAME_PREFIX= .else -EMACS_FLAVOR= xemacs -EMACS_BIN= ${PREFIX}/bin/xemacs -EMACS_PKG_VERSION= ${_EMACS_VERSION_XEMACS_FULL:C|^.*-||} +EMACS_ETCPREFIX= ${PREFIX}/lib/xemacs/site-packages/etc +EMACS_INFOPREFIX= ${PREFIX}/lib/xemacs/site-packages/info EMACS_LISPPREFIX= ${PREFIX}/lib/xemacs/site-packages/lisp -PKGNAME_PREFIX= xemacs- -.if defined(PKGNAME) -PKGNAME:= ${PKGNAME_PREFIX}${PKGNAME} -.else -PKGNAME:= ${PKGNAME_PREFIX}${DISTNAME}${PKGREVISION} -CONFLICTS+= ${PKGBASE:C|^xemacs-||}-[0-9]* -.endif +EMACS_PKGNAME_PREFIX= xemacs- .endif -# strip out nb? -EMACS_VERSION=${EMACS_PKG_VERSION:C|nb[0-9]*$||} -PLIST_SUBST+= EMACS_VERSION=${EMACS_VERSION} + +_EMACS_FOR.emacs= "@comment " +_EMACS_FOR.emacs21= "@comment " +_EMACS_FOR.emacs21nox= "@comment " +_EMACS_FOR.emacs20= "@comment " +_EMACS_FOR.xemacs= "@comment " +_EMACS_FOR.xemacs215= "@comment " +_EMACS_FOR.xemacs214= "@comment " +_EMACS_NOTFOR.emacs= "" +_EMACS_NOTFOR.emacs21= "" +_EMACS_NOTFOR.emacs21nox= "" +_EMACS_NOTFOR.emacs20= "" +_EMACS_NOTFOR.xemacs= "" +_EMACS_NOTFOR.xemacs215= "" +_EMACS_NOTFOR.xemacs214= "" +_EMACS_FOR.${EMACS_FLAVOR}= "" +_EMACS_FOR.${_EMACS_TYPE}= "" +_EMACS_NOTFOR.${EMACS_FLAVOR}= "@comment " +_EMACS_NOTFOR.${_EMACS_TYPE}= "@comment " + +PLIST_SUBST+= EMACS_VERSION=${_EMACS_VERSION_NOREV} PLIST_SUBST+= EMACS_LISPPREFIX=${EMACS_LISPPREFIX:C|^${PREFIX}/||} -PLIST_SUBST+= FOR_emacs21=${FOR.emacs21} -PLIST_SUBST+= FOR_emacs21nox=${FOR.emacs21nox} -PLIST_SUBST+= FOR_emacs20=${FOR.emacs20} -PLIST_SUBST+= FOR_xemacs215=${FOR.xemacs215} -PLIST_SUBST+= FOR_xemacs214=${FOR.xemacs214} - -_REPLACE_EMACS_SED= -e "1s;^\#!.*emacs;\#!${EMACS_BIN};" - -.if defined(REPLACE_EMACS) -emacs-patch-scripts: -.for s in ${REPLACE_EMACS} - ${CP} ${WRKSRC}/${s} ${WRKSRC}/${s}.tmp - ${CHMOD} +w ${WRKSRC}/${s} - ${SED} ${_REPLACE_EMACS_SED} <${WRKSRC}/${s}.tmp >${WRKSRC}/${s} -.endfor - -post-patch: emacs-patch-scripts -.endif +PLIST_SUBST+= FOR_emacs=${_EMACS_FOR.emacs} +PLIST_SUBST+= FOR_emacs21=${_EMACS_FOR.emacs21} +PLIST_SUBST+= FOR_emacs21nox=${_EMACS_FOR.emacs21nox} +PLIST_SUBST+= FOR_emacs20=${_EMACS_FOR.emacs20} +PLIST_SUBST+= FOR_xemacs=${_EMACS_FOR.xemacs} +PLIST_SUBST+= FOR_xemacs215=${_EMACS_FOR.xemacs215} +PLIST_SUBST+= FOR_xemacs214=${_EMACS_FOR.xemacs214} +PLIST_SUBST+= NOTFOR_emacs=${_EMACS_NOTFOR.emacs} +PLIST_SUBST+= NOTFOR_emacs21=${_EMACS_NOTFOR.emacs21} +PLIST_SUBST+= NOTFOR_emacs21nox=${_EMACS_NOTFOR.emacs21nox} +PLIST_SUBST+= NOTFOR_emacs20=${_EMACS_NOTFOR.emacs20} +PLIST_SUBST+= NOTFOR_xemacs=${_EMACS_NOTFOR.xemacs} +PLIST_SUBST+= NOTFOR_xemacs215=${_EMACS_NOTFOR.xemacs215} +PLIST_SUBST+= NOTFOR_xemacs214=${_EMACS_NOTFOR.xemacs214} .endif # EMACS_MK 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" 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/} diff --git a/www/emacs-w3m/Makefile b/www/emacs-w3m/Makefile index 3366cde33ab..357c98b5a7f 100644 --- a/www/emacs-w3m/Makefile +++ b/www/emacs-w3m/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.9 2005/03/02 20:43:19 minskim Exp $ +# $NetBSD: Makefile,v 1.10 2005/08/28 04:25:31 uebayasi Exp $ DISTNAME= emacs-w3m-1.3.3 +PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME} CATEGORIES= www MASTER_SITES= ${HOMEPAGE} @@ -8,8 +9,8 @@ MAINTAINER= uebayasi@NetBSD.org HOMEPAGE= http://emacs-w3m.namazu.org/ COMMENT= Simple w3m interface for Emacs -EMACS_DEPENDS+= {w3m,w3m-img}>=0.3.1:../../www/w3m -BUILD_DEPENDS+= ${PKGNAME_PREFIX}semi-*:../../devel/semi +DEPENDS+= {w3m,w3m-img}>=0.3.1:../../www/w3m +BUILD_DEPENDS+= ${EMACS_PKGNAME_PREFIX}semi-[0-9]*:../../devel/semi # Not tested with xemacs... EMACS_VERSIONS_ACCEPTED= emacs21 emacs21nox emacs20 xemacs214 xemacs215 @@ -17,15 +18,12 @@ EMACS_VERSIONS_ACCEPTED= emacs21 emacs21nox emacs20 xemacs214 xemacs215 .include "../../mk/emacs.mk" .if ${EMACS_FLAVOR} == "xemacs" -EMACS_DEPENDS+= apel>=10.3:../../devel/apel -BUILD_DEPENDS+= mew-xemacs-*:../../mail/mew-xemacs -.else -BUILD_DEPENDS+= mew-*:../../mail/mew +DEPENDS+= ${EMACS_PKGNAME_PREFIX}apel>=10.3:../../devel/apel .endif EMACS_MAJOR_VERSION= ${EMACS_VERSION:C/\..*//} .if ${EMACS_FLAVOR} == "emacs" && ${EMACS_MAJOR_VERSION} == 21 -BUILD_DEPENDS+= Mule-UCS>=0.84:../../editors/mule-ucs +BUILD_DEPENDS+= ${EMACS_PKGNAME_PREFIX}Mule-UCS>=0.84:../../editors/mule-ucs .endif HAS_CONFIGURE= # defined diff --git a/www/w3/Makefile b/www/w3/Makefile index a292e8442e6..62ab39bf31c 100644 --- a/www/w3/Makefile +++ b/www/w3/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.16 2003/08/18 13:23:13 minoura Exp $ +# $NetBSD: Makefile,v 1.17 2005/08/28 04:25:31 uebayasi Exp $ DISTNAME= w3-4.0pre.47 -PKGNAME= w3-4.0b47 +PKGNAME= ${EMACS_PKGNAME_PREFIX}w3-4.0b47 CATEGORIES= www MASTER_SITES= ftp://ftp.xemacs.org/pub/xemacs/emacs-w3/ \ ftp://ftp.mpi-sb.mpg.de/pub/gnu/mirror/ftp.xemacs.org/xemacs/emacs-w3/ \ |