pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Move mk/emacs.mk to editors/emacs/modules.mk.
details: https://anonhg.NetBSD.org/pkgsrc/rev/a25dc97b8aef
branches: trunk
changeset: 548192:a25dc97b8aef
user: uebayasi <uebayasi%pkgsrc.org@localhost>
date: Sat Oct 11 09:31:54 2008 +0000
description:
Move mk/emacs.mk to editors/emacs/modules.mk.
Don't call pkg_info to get the installed Emacs version; always use the
version matching EMACS_TYPE set by users. Be DEPENDS to it. This should
address pkg/37146 by Aleksey Cheusov.
While here convert some emacs lisp packages to user-destdir.
diffstat:
cad/dinotrace-mode/Makefile | 4 +-
cad/verilog-mode/Makefile | 4 +-
chat/irchat-pj/Makefile | 14 +-
chat/navi2ch/Makefile | 4 +-
chat/riece/Makefile | 19 +-
chat/zenicb/Makefile | 6 +-
chat/zenirc/Makefile | 8 +-
chat/zephyr-mode/Makefile | 4 +-
devel/apel/Makefile | 23 +-
devel/apel/buildlink3.mk | 4 +-
devel/cflow-mode/Makefile | 4 +-
devel/cmake-mode/Makefile | 4 +-
devel/cqual/Makefile | 4 +-
devel/doxymacs/Makefile | 6 +-
devel/elib/Makefile.common | 4 +-
devel/emacs-ilisp/Makefile | 4 +-
devel/flim/Makefile | 19 +-
devel/haskell-mode/Makefile | 8 +-
devel/js2-mode/Makefile | 4 +-
devel/mell/Makefile | 4 +-
devel/mell/buildlink3.mk | 4 +-
devel/pcl-cvs/Makefile | 8 +-
devel/php-mode/Makefile | 4 +-
devel/psvn/Makefile | 4 +-
devel/pvs/Makefile | 4 +-
devel/python-mode/Makefile | 4 +-
devel/rsltc/Makefile | 4 +-
devel/ruby-mode/Makefile | 4 +-
devel/ruby-rd-mode/Makefile | 4 +-
devel/scmgit-base/Makefile | 4 +-
devel/semantic/Makefile | 4 +-
devel/semi/Makefile | 19 +-
devel/sml-mode/Makefile | 4 +-
editors/emacs-nox11/buildlink3.mk | 8 +-
editors/emacs-nox11/version.mk | 9 +
editors/emacs-packages/Makefile | 4 +-
editors/emacs/buildlink3.mk | 8 +-
editors/emacs/modules.mk | 317 ++++++++++++++++++++++
editors/emacs/version.mk | 9 +
editors/emacs20/buildlink3.mk | 8 +-
editors/emacs20/version.mk | 9 +
editors/emacs21-nox11/buildlink3.mk | 8 +-
editors/emacs21-nox11/version.mk | 9 +
editors/emacs21/buildlink3.mk | 8 +-
editors/emacs21/version.mk | 9 +
editors/gnuserv/Makefile | 4 +-
editors/jde/Makefile | 4 +-
editors/leim21/Makefile | 4 +-
editors/matlab-mode/Makefile | 4 +-
editors/mule-ucs/Makefile | 12 +-
editors/mule-ucs/buildlink3.mk | 4 +-
editors/speedbar/Makefile | 4 +-
editors/tamago/Makefile | 7 +-
editors/xemacs-current-nox11/buildlink3.mk | 8 +-
editors/xemacs-current-nox11/version.mk | 9 +
editors/xemacs-current/buildlink3.mk | 8 +-
editors/xemacs-current/version.mk | 9 +
editors/xemacs-nox11/buildlink3.mk | 8 +-
editors/xemacs-nox11/version.mk | 9 +
editors/xemacs/buildlink3.mk | 8 +-
editors/xemacs/version.mk | 9 +
graphics/artist/Makefile | 19 +-
inputmethod/anthy-elisp/Makefile | 4 +-
inputmethod/iiimecf/Makefile | 4 +-
inputmethod/prime-el/Makefile | 4 +-
inputmethod/skk/Makefile | 19 +-
inputmethod/skk/files/SKK-CFG | 19 +-
inputmethod/tc/Makefile | 4 +-
lang/eieio/Makefile | 4 +-
lang/twelf/Makefile | 4 +-
mail/etach/Makefile | 4 +-
mail/gnus/Makefile | 4 +-
mail/mailcrypt/Makefile | 10 +-
mail/mew/Makefile | 18 +-
mail/rmail-mime/Makefile | 4 +-
mail/vm/Makefile | 4 +-
mail/wl/Makefile | 28 +-
math/calc/Makefile | 4 +-
math/ess/Makefile | 4 +-
misc/bbdb/Makefile | 4 +-
misc/bbdb/buildlink3.mk | 4 +-
misc/elscreen/Makefile | 4 +-
misc/emacs-wiki/Makefile | 4 +-
misc/lookup/Makefile | 4 +-
mk/emacs.mk | 401 +----------------------------
print/auctex/Makefile | 6 +-
security/EasyPG/Makefile | 4 +-
security/starttls/Makefile | 4 +-
textproc/dictem/Makefile | 4 +-
textproc/emacs-dict-client/Makefile | 10 +-
textproc/emacs-muse/Makefile | 4 +-
textproc/flyspell/Makefile | 10 +-
textproc/ispell-emacs/Makefile | 10 +-
textproc/migemo-elisp/Makefile | 4 +-
textproc/nxml-mode/Makefile | 4 +-
textproc/psgml-mode/Makefile | 4 +-
textproc/suikyo-elisp/Makefile | 4 +-
textproc/suikyo/Makefile | 4 +-
textproc/xslide/Makefile | 4 +-
www/emacs-w3m/Makefile | 14 +-
www/w3/Makefile | 4 +-
101 files changed, 758 insertions(+), 657 deletions(-)
diffs (truncated from 2878 to 300 lines):
diff -r 160641627aa8 -r a25dc97b8aef cad/dinotrace-mode/Makefile
--- a/cad/dinotrace-mode/Makefile Sat Oct 11 08:59:48 2008 +0000
+++ b/cad/dinotrace-mode/Makefile Sat Oct 11 09:31:54 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2008/03/03 01:50:26 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2008/10/11 09:31:54 uebayasi Exp $
#
DISTNAME= dinotrace-9.3c
@@ -16,7 +16,7 @@
PKG_DESTDIR_SUPPORT= user-destdir
.include "../../mk/bsd.prefs.mk"
-.include "../../mk/emacs.mk"
+.include "../../editors/emacs/modules.mk"
.if ${EMACS_FLAVOR} == "emacs"
EMACS= emacs
diff -r 160641627aa8 -r a25dc97b8aef cad/verilog-mode/Makefile
--- a/cad/verilog-mode/Makefile Sat Oct 11 08:59:48 2008 +0000
+++ b/cad/verilog-mode/Makefile Sat Oct 11 09:31:54 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2008/03/03 01:50:27 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2008/10/11 09:31:54 uebayasi Exp $
#
DISTNAME= verilog-mode-3.60
@@ -17,7 +17,7 @@
WRKSRC= ${WRKDIR}
-.include "../../mk/emacs.mk"
+.include "../../editors/emacs/modules.mk"
.if ${EMACS_FLAVOR} == "emacs"
EMACS= emacs
diff -r 160641627aa8 -r a25dc97b8aef chat/irchat-pj/Makefile
--- a/chat/irchat-pj/Makefile Sat Oct 11 08:59:48 2008 +0000
+++ b/chat/irchat-pj/Makefile Sat Oct 11 09:31:54 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2008/01/19 08:52:10 obache Exp $
+# $NetBSD: Makefile,v 1.15 2008/10/11 09:31:54 uebayasi Exp $
DISTNAME= irchat-pj-2.4.24.22
PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME}
@@ -12,7 +12,10 @@
HOMEPAGE= http://gouketsu.net/irchat-pj/
COMMENT= Emacs lisp interface to Internet Relay Chat
-.include "../../mk/emacs.mk"
+INSTALLATION_DIRS= bin ${EMACS_LISPPREFIX:C|^${PREFIX}/||}/irchat-pj
+PKG_DESTDIR_SUPPORT= user-destdir
+
+.include "../../editors/emacs/modules.mk"
.if ${EMACS_FLAVOR} == "emacs"
INSTALL_TARGET= install
@@ -26,4 +29,11 @@
LIBS.SunOS+= -lnsl -lsocket
MAKE_ENV+= LIBS=${LIBS:M*:Q}
+do-install:
+ cd ${WRKSRC}; \
+ ${INSTALL_PROGRAM} dcc/dcc ${DESTDIR}${PREFIX}/bin; \
+ for f in irchat*.el*; do \
+ ${INSTALL_DATA} $$f ${DESTDIR}${EMACS_LISPPREFIX}/irchat-pj; \
+ done
+
.include "../../mk/bsd.pkg.mk"
diff -r 160641627aa8 -r a25dc97b8aef chat/navi2ch/Makefile
--- a/chat/navi2ch/Makefile Sat Oct 11 08:59:48 2008 +0000
+++ b/chat/navi2ch/Makefile Sat Oct 11 09:31:54 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2008/07/14 12:56:00 joerg Exp $
+# $NetBSD: Makefile,v 1.22 2008/10/11 09:31:54 uebayasi Exp $
DISTNAME= navi2ch-cvs_0.0.20070423-1
PKGNAME= ${EMACS_PKGNAME_PREFIX}navi2ch-1.7.5.99.20070423
@@ -26,6 +26,6 @@
CONFIGURE_ARGS.emacs= --with-lispdir=${EMACS_LISPPREFIX}/navi2ch
CONFIGURE_ARGS.xemacs= --with-packagedir=${EMACS_LISPPREFIX:C|/lisp$||}
-.include "../../mk/emacs.mk"
+.include "../../editors/emacs/modules.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 160641627aa8 -r a25dc97b8aef chat/riece/Makefile
--- a/chat/riece/Makefile Sat Oct 11 08:59:48 2008 +0000
+++ b/chat/riece/Makefile Sat Oct 11 09:31:54 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2008/10/06 07:24:31 uebayasi Exp $
+# $NetBSD: Makefile,v 1.16 2008/10/11 09:31:54 uebayasi Exp $
#
DISTNAME= riece-5.0.0
@@ -10,14 +10,18 @@
HOMEPAGE= http://www.nongnu.org/riece/
COMMENT= IRC client for Emacs
+PKG_DESTDIR_SUPPORT= user-destdir
+INSTALLATION_DIRS= ${EMACS_LISPPREFIX:C|^${PREFIX}/||}/riece \
+ ${EMACS_INFOPREFIX:C|^${PREFIX}/||}
+
EMACS_VERSIONS_ACCEPTED= \
emacs22 emacs22nox emacs21 emacs21nox xemacs215 xemacs215nox xemacs214 xemacs214nox
+EMACS_MODULES= base
WRKSRC= ${WRKDIR}/${DISTNAME:C|[^0-9]$||}
GNU_CONFIGURE= YES
INFO_FILES= # PLIST
-EMACS_MODULES= base
# --with-emacs=... or --with-xemacs=...
CONFIGURE_ARGS+= --with-${EMACS_FLAVOR}=${EMACS_BIN:Q}
@@ -27,6 +31,15 @@
CONFIGURE_ARGS.emacs= --with-lispdir=${EMACS_LISPPREFIX:Q}
CONFIGURE_ARGS.xemacs= --with-packagedir=${EMACS_LISPPREFIX:C|/lisp\$||}
-.include "../../mk/emacs.mk"
+do-install: plist
+ ${INSTALL_DATA} ${WRKSRC}/doc/*.info ${DESTDIR}${EMACS_INFOPREFIX}
+ cd ${WRKSRC}/lisp; \
+ grep -v '^@' ${PLIST} | grep '/site-lisp/riece/' | \
+ while read file; do \
+ file=$$( basename $$file ); \
+ ${INSTALL_DATA} $$file ${DESTDIR}${EMACS_LISPPREFIX}/riece; \
+ done
+
+.include "../../editors/emacs/modules.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 160641627aa8 -r a25dc97b8aef chat/zenicb/Makefile
--- a/chat/zenicb/Makefile Sat Oct 11 08:59:48 2008 +0000
+++ b/chat/zenicb/Makefile Sat Oct 11 09:31:54 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2008/03/03 02:19:52 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2008/10/11 09:31:54 uebayasi Exp $
DISTNAME= zenicb-19981202
PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME}
@@ -10,10 +10,11 @@
COMMENT= ICB client for Emacs
PKG_DESTDIR_SUPPORT= user-destdir
+INSTALLATION_DIRS= ${EMACS_LISPPREFIX:C|^${PREFIX}/||}/zenicb
NO_SRC_ON_FTP= Already in MASTER_SITE_LOCAL
-.include "../../mk/emacs.mk"
+.include "../../editors/emacs/modules.mk"
EMACS_VERSIONS_ACCEPTED= emacs21 emacs21nox emacs20 xemacs214 xemacs215
@@ -22,7 +23,6 @@
do-build:
do-install:
- @${INSTALL_DATA_DIR} ${DESTDIR}${EMACS_LISPPREFIX}/zenicb
@for file in ${WRKSRC}/src/*.el; do \
j="${INSTALL_DATA} $$file ${DESTDIR}${EMACS_LISPPREFIX}/zenicb"; \
${ECHO} $$j; $$j; \
diff -r 160641627aa8 -r a25dc97b8aef chat/zenirc/Makefile
--- a/chat/zenirc/Makefile Sat Oct 11 08:59:48 2008 +0000
+++ b/chat/zenirc/Makefile Sat Oct 11 09:31:54 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/02/05 23:08:26 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2008/10/11 09:31:54 uebayasi Exp $
#
DISTNAME= zenirc-2.112
@@ -11,14 +11,16 @@
HOMEPAGE= http://www.splode.com/~friedman/software/emacs-lisp/zenirc/
COMMENT= IRC client for Emacs
+PKG_DESTDIR_SUPPORT= user-destdir
+
GNU_CONFIGURE= YES
CONFIGURE_HAS_MANDIR= NO
-.include "../../mk/emacs.mk"
+.include "../../editors/emacs/modules.mk"
.if ${EMACS_FLAVOR} == "xemacs"
MAKE_FLAGS+= EMACS=xemacs
.endif
-MAKE_FLAGS+= elispdir=${EMACS_LISPPREFIX}/zenirc
+MAKE_FLAGS+= elispdir=${DESTDIR:Q}${EMACS_LISPPREFIX:Q}/zenirc
.include "../../mk/bsd.pkg.mk"
diff -r 160641627aa8 -r a25dc97b8aef chat/zephyr-mode/Makefile
--- a/chat/zephyr-mode/Makefile Sat Oct 11 08:59:48 2008 +0000
+++ b/chat/zephyr-mode/Makefile Sat Oct 11 09:31:54 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2008/03/03 02:19:52 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2008/10/11 09:31:55 uebayasi Exp $
#
DISTNAME= zephyr-mode-2.5.20
@@ -17,7 +17,7 @@
NO_BUILD= yes
-.include "../../mk/emacs.mk"
+.include "../../editors/emacs/modules.mk"
do-install:
@${INSTALL_DATA_DIR} ${DESTDIR}${EMACS_LISPPREFIX}/zephyr-mode
diff -r 160641627aa8 -r a25dc97b8aef devel/apel/Makefile
--- a/devel/apel/Makefile Sat Oct 11 08:59:48 2008 +0000
+++ b/devel/apel/Makefile Sat Oct 11 09:31:54 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2007/10/29 12:53:51 uebayasi Exp $
+# $NetBSD: Makefile,v 1.20 2008/10/11 09:31:55 uebayasi Exp $
DISTNAME= apel-10.7
PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME}
@@ -10,6 +10,11 @@
HOMEPAGE= http://www.kanji.zinbun.kyoto-u.ac.jp/~tomo/elisp/APEL/
COMMENT= Portable Emacs library
+PKG_DESTDIR_SUPPORT= user-destdir
+INSTALLATION_DIRS+= ${DOCDIR} \
+ ${EMACS_LISPPREFIX:C|^${PREFIX}/||}/apel \
+ ${EMACS_LISPPREFIX:C|^${PREFIX}/||}/emu
+
PLIST_SRC= ${PKGDIR}/PLIST.${EMACS_FLAVOR}
BUILD_TARGET= ${BUILD_TARGET.${EMACS_FLAVOR}}
INSTALL_TARGET= ${INSTALL_TARGET.${EMACS_FLAVOR}}
@@ -17,7 +22,6 @@
MAKE_FLAGS+= LISPDIR=${EMACS_LISPPREFIX:Q}
MAKE_FLAGS+= VERSION_SPECIFIC_LISPDIR=${EMACS_LISPPREFIX:Q}
MAKE_FLAGS+= ${MAKE_FLAGS.${EMACS_FLAVOR}}
-INSTALLATION_DIRS+= ${DOCDIR}
# apel is included in xemacs-packages
EMACS_VERSIONS_ACCEPTED=emacs22 emacs22nox emacs21 emacs21nox emacs20
@@ -29,5 +33,18 @@
MAKE_FLAGS.emacs=
MAKE_FLAGS.xemacs= PACKAGEDIR=${EMACS_LISPPREFIX:C|/lisp$||}
-.include "../../mk/emacs.mk"
+# Pkgsrc developers should run "install" without this and check if PLIST is
+# correct. Users just need to install files.
+do-install: plist
+ cd ${WRKSRC}; \
+ for subdir in emu apel; do \
+ grep -v '^@' ${PLIST} | grep "/site-lisp/$$subdir/" | \
+ while read file; do \
+ file=$$( basename $$file ); \
+ ${INSTALL_DATA} $$file \
+ ${DESTDIR}${EMACS_LISPPREFIX}/$$subdir/$$file; \
+ done \
+ done
+
+.include "../../editors/emacs/modules.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 160641627aa8 -r a25dc97b8aef devel/apel/buildlink3.mk
--- a/devel/apel/buildlink3.mk Sat Oct 11 08:59:48 2008 +0000
+++ b/devel/apel/buildlink3.mk Sat Oct 11 09:31:54 2008 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.1 2007/10/29 12:41:16 uebayasi Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2008/10/11 09:31:55 uebayasi Exp $
#
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
APEL_BUILDLINK3_MK:= ${APEL_BUILDLINK3_MK}+
-.include "../../mk/emacs.mk"
+.include "../../editors/emacs/modules.mk"
.if ${EMACS_FLAVOR} == "emacs"
.if ${BUILDLINK_DEPTH} == "+"
diff -r 160641627aa8 -r a25dc97b8aef devel/cflow-mode/Makefile
--- a/devel/cflow-mode/Makefile Sat Oct 11 08:59:48 2008 +0000
+++ b/devel/cflow-mode/Makefile Sat Oct 11 09:31:54 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2008/03/03 17:45:34 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2008/10/11 09:31:55 uebayasi Exp $
DISTNAME= cflow-1.1
PKGNAME= cflow-mode-1.1
@@ -11,7 +11,7 @@
PKG_DESTDIR_SUPPORT= user-destdir
-.include "../../mk/emacs.mk"
+.include "../../editors/emacs/modules.mk"
do-build:
${EMACS_BIN} --no-init-file -batch -f batch-byte-compile \
diff -r 160641627aa8 -r a25dc97b8aef devel/cmake-mode/Makefile
--- a/devel/cmake-mode/Makefile Sat Oct 11 08:59:48 2008 +0000
+++ b/devel/cmake-mode/Makefile Sat Oct 11 09:31:54 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/03/03 17:45:34 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2008/10/11 09:31:55 uebayasi Exp $
#
DISTNAME= cmake-mode
Home |
Main Index |
Thread Index |
Old Index