pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Rework emacs.mk:
details: https://anonhg.NetBSD.org/pkgsrc/rev/7bf9a74e0644
branches: trunk
changeset: 498633:7bf9a74e0644
user: uebayasi <uebayasi%pkgsrc.org@localhost>
date: Sun Aug 28 04:25:28 2005 +0000
description:
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:
cad/dinotrace-mode/Makefile | 6 +-
cad/verilog-mode/Makefile | 3 +-
chat/irchat-pj/Makefile | 3 +-
chat/navi2ch/Makefile | 3 +-
chat/riece/Makefile | 3 +-
chat/zenicb/Makefile | 4 +-
chat/zenirc/Makefile | 3 +-
chat/zephyr-mode/Makefile | 3 +-
devel/apel/Makefile | 3 +-
devel/elib/Makefile | 3 +-
devel/emacs-ilisp/Makefile | 4 +-
devel/haskell-mode/Makefile | 3 +-
devel/pcl-cvs/Makefile | 3 +-
devel/pvs/Makefile | 3 +-
devel/python-mode/Makefile | 3 +-
devel/ruby-mode/Makefile | 4 +-
devel/ruby-rd-mode/Makefile | 4 +-
devel/semantic/Makefile | 17 +-
devel/semantic/distinfo | 4 +-
devel/semantic/patches/patch-aa | 14 +-
devel/sml-mode/Makefile | 3 +-
editors/emacs-packages/Makefile | 98 +++---
editors/gnuserv/Makefile | 3 +-
editors/jde/Makefile | 11 +-
editors/leim/Makefile | 3 +-
editors/matlab-mode/Makefile | 6 +-
editors/mule-ucs/Makefile | 3 +-
editors/speedbar/Makefile | 4 +-
editors/tamago/Makefile | 4 +-
graphics/artist/Makefile | 3 +-
inputmethod/anthy-elisp/Makefile | 7 +-
inputmethod/iiimecf/Makefile | 6 +-
inputmethod/skk/Makefile | 10 +-
inputmethod/tc/Makefile | 3 +-
lang/eieio/Makefile | 8 +-
lang/twelf/Makefile | 4 +-
mail/etach/Makefile | 3 +-
mail/gnus/Makefile | 3 +-
mail/mailcrypt/Makefile | 3 +-
mail/mew/Makefile | 3 +-
mail/mew3/Makefile | 3 +-
mail/rmail-mime/Makefile | 5 +-
mail/vm/distinfo | 8 +-
mail/wl/Makefile | 11 +-
math/calc/Makefile | 3 +-
math/ess/Makefile | 3 +-
misc/bbdb/Makefile | 3 +-
misc/elscreen/Makefile | 10 +-
misc/lookup/Makefile | 7 +-
mk/emacs.mk | 474 ++++++++++++++++++++++-------------
print/auctex/Makefile | 10 +-
textproc/emacs-dict-client/Makefile | 8 +-
textproc/flyspell/Makefile | 6 +-
textproc/ispell-emacs/Makefile | 6 +-
textproc/psgml-mode/Makefile | 4 +-
textproc/xslide/Makefile | 3 +-
www/emacs-w3m/Makefile | 14 +-
www/w3/Makefile | 4 +-
58 files changed, 513 insertions(+), 350 deletions(-)
diffs (truncated from 1610 to 300 lines):
diff -r 1c2f0fadb0dd -r 7bf9a74e0644 cad/dinotrace-mode/Makefile
--- a/cad/dinotrace-mode/Makefile Sun Aug 28 01:43:56 2005 +0000
+++ b/cad/dinotrace-mode/Makefile Sun Aug 28 04:25:28 2005 +0000
@@ -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 @@
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 -r 1c2f0fadb0dd -r 7bf9a74e0644 cad/verilog-mode/Makefile
--- a/cad/verilog-mode/Makefile Sun Aug 28 01:43:56 2005 +0000
+++ b/cad/verilog-mode/Makefile Sun Aug 28 04:25:28 2005 +0000
@@ -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 -r 1c2f0fadb0dd -r 7bf9a74e0644 chat/irchat-pj/Makefile
--- a/chat/irchat-pj/Makefile Sun Aug 28 01:43:56 2005 +0000
+++ b/chat/irchat-pj/Makefile Sun Aug 28 04:25:28 2005 +0000
@@ -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 -r 1c2f0fadb0dd -r 7bf9a74e0644 chat/navi2ch/Makefile
--- a/chat/navi2ch/Makefile Sun Aug 28 01:43:56 2005 +0000
+++ b/chat/navi2ch/Makefile Sun Aug 28 04:25:28 2005 +0000
@@ -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 -r 1c2f0fadb0dd -r 7bf9a74e0644 chat/riece/Makefile
--- a/chat/riece/Makefile Sun Aug 28 01:43:56 2005 +0000
+++ b/chat/riece/Makefile Sun Aug 28 04:25:28 2005 +0000
@@ -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 -r 1c2f0fadb0dd -r 7bf9a74e0644 chat/zenicb/Makefile
--- a/chat/zenicb/Makefile Sun Aug 28 01:43:56 2005 +0000
+++ b/chat/zenicb/Makefile Sun Aug 28 04:25:28 2005 +0000
@@ -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 -r 1c2f0fadb0dd -r 7bf9a74e0644 chat/zenirc/Makefile
--- a/chat/zenirc/Makefile Sun Aug 28 01:43:56 2005 +0000
+++ b/chat/zenirc/Makefile Sun Aug 28 04:25:28 2005 +0000
@@ -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 -r 1c2f0fadb0dd -r 7bf9a74e0644 chat/zephyr-mode/Makefile
--- a/chat/zephyr-mode/Makefile Sun Aug 28 01:43:56 2005 +0000
+++ b/chat/zephyr-mode/Makefile Sun Aug 28 04:25:28 2005 +0000
@@ -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 -r 1c2f0fadb0dd -r 7bf9a74e0644 devel/apel/Makefile
--- a/devel/apel/Makefile Sun Aug 28 01:43:56 2005 +0000
+++ b/devel/apel/Makefile Sun Aug 28 04:25:28 2005 +0000
@@ -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 -r 1c2f0fadb0dd -r 7bf9a74e0644 devel/elib/Makefile
--- a/devel/elib/Makefile Sun Aug 28 01:43:56 2005 +0000
+++ b/devel/elib/Makefile Sun Aug 28 04:25:28 2005 +0000
@@ -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 -r 1c2f0fadb0dd -r 7bf9a74e0644 devel/emacs-ilisp/Makefile
--- a/devel/emacs-ilisp/Makefile Sun Aug 28 01:43:56 2005 +0000
+++ b/devel/emacs-ilisp/Makefile Sun Aug 28 04:25:28 2005 +0000
@@ -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 -r 1c2f0fadb0dd -r 7bf9a74e0644 devel/haskell-mode/Makefile
--- a/devel/haskell-mode/Makefile Sun Aug 28 01:43:56 2005 +0000
+++ b/devel/haskell-mode/Makefile Sun Aug 28 04:25:28 2005 +0000
@@ -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 -r 1c2f0fadb0dd -r 7bf9a74e0644 devel/pcl-cvs/Makefile
--- a/devel/pcl-cvs/Makefile Sun Aug 28 01:43:56 2005 +0000
+++ b/devel/pcl-cvs/Makefile Sun Aug 28 04:25:28 2005 +0000
@@ -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 -r 1c2f0fadb0dd -r 7bf9a74e0644 devel/pvs/Makefile
--- a/devel/pvs/Makefile Sun Aug 28 01:43:56 2005 +0000
+++ b/devel/pvs/Makefile Sun Aug 28 04:25:28 2005 +0000
@@ -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 -r 1c2f0fadb0dd -r 7bf9a74e0644 devel/python-mode/Makefile
--- a/devel/python-mode/Makefile Sun Aug 28 01:43:56 2005 +0000
+++ b/devel/python-mode/Makefile Sun Aug 28 04:25:28 2005 +0000
@@ -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 -r 1c2f0fadb0dd -r 7bf9a74e0644 devel/ruby-mode/Makefile
--- a/devel/ruby-mode/Makefile Sun Aug 28 01:43:56 2005 +0000
+++ b/devel/ruby-mode/Makefile Sun Aug 28 04:25:28 2005 +0000
@@ -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 -r 1c2f0fadb0dd -r 7bf9a74e0644 devel/ruby-rd-mode/Makefile
--- a/devel/ruby-rd-mode/Makefile Sun Aug 28 01:43:56 2005 +0000
+++ b/devel/ruby-rd-mode/Makefile Sun Aug 28 04:25:28 2005 +0000
@@ -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 -r 1c2f0fadb0dd -r 7bf9a74e0644 devel/semantic/Makefile
--- a/devel/semantic/Makefile Sun Aug 28 01:43:56 2005 +0000
+++ b/devel/semantic/Makefile Sun Aug 28 04:25:28 2005 +0000
@@ -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 @@
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 @@
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 -r 1c2f0fadb0dd -r 7bf9a74e0644 devel/semantic/distinfo
--- a/devel/semantic/distinfo Sun Aug 28 01:43:56 2005 +0000
+++ b/devel/semantic/distinfo Sun Aug 28 04:25:28 2005 +0000
@@ -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 -r 1c2f0fadb0dd -r 7bf9a74e0644 devel/semantic/patches/patch-aa
--- a/devel/semantic/patches/patch-aa Sun Aug 28 01:43:56 2005 +0000
+++ b/devel/semantic/patches/patch-aa Sun Aug 28 04:25:28 2005 +0000
@@ -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
Home |
Main Index |
Thread Index |
Old Index