diff options
| author | uebayasi <uebayasi> | 2008-10-11 09:31:54 +0000 |
|---|---|---|
| committer | uebayasi <uebayasi> | 2008-10-11 09:31:54 +0000 |
| commit | c4b82a5cd529780fd545357545325d304952e605 (patch) | |
| tree | 28f89f081daec07805c1f982f0bc63a420c005ba | |
| parent | a7300be85c95b1f5616bddb1498456305605775e (diff) | |
| download | pkgsrc-c4b82a5cd529780fd545357545325d304952e605.tar.gz | |
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.
101 files changed, 758 insertions, 657 deletions
diff --git a/cad/dinotrace-mode/Makefile b/cad/dinotrace-mode/Makefile index 65e2d125b41..97cfc2f71cb 100644 --- a/cad/dinotrace-mode/Makefile +++ b/cad/dinotrace-mode/Makefile @@ -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 @@ DEPENDS+= ${EMACS_PKGNAME_PREFIX}verilog-mode>=3.13:../../cad/verilog-mode 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 --git a/cad/verilog-mode/Makefile b/cad/verilog-mode/Makefile index 6ca305e9974..54230362e17 100644 --- a/cad/verilog-mode/Makefile +++ b/cad/verilog-mode/Makefile @@ -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 @@ PKG_DESTDIR_SUPPORT= user-destdir WRKSRC= ${WRKDIR} -.include "../../mk/emacs.mk" +.include "../../editors/emacs/modules.mk" .if ${EMACS_FLAVOR} == "emacs" EMACS= emacs diff --git a/chat/irchat-pj/Makefile b/chat/irchat-pj/Makefile index 960c9e04f3a..7f6c4d60d00 100644 --- a/chat/irchat-pj/Makefile +++ b/chat/irchat-pj/Makefile @@ -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 @@ MAINTAINER= tech-pkg-ja@jp.NetBSD.org 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 @@ PKG_FAIL_REASON+= "Unknown Emacs flavor" 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 --git a/chat/navi2ch/Makefile b/chat/navi2ch/Makefile index ab9db7502e4..da57fabd9f8 100644 --- a/chat/navi2ch/Makefile +++ b/chat/navi2ch/Makefile @@ -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+=${CONFIGURE_ARGS.${EMACS_FLAVOR}} 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 --git a/chat/riece/Makefile b/chat/riece/Makefile index 8eb78a0f038..21cd4a0853f 100644 --- a/chat/riece/Makefile +++ b/chat/riece/Makefile @@ -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 @@ MAINTAINER= uebayasi@NetBSD.org 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+= ${CONFIGURE_ARGS.${EMACS_FLAVOR}} 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 --git a/chat/zenicb/Makefile b/chat/zenicb/Makefile index 219bcb349df..3b466791cae 100644 --- a/chat/zenicb/Makefile +++ b/chat/zenicb/Makefile @@ -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 @@ MAINTAINER= pkgsrc-users@NetBSD.org 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 @@ EMACS_VERSIONS_ACCEPTED= emacs21 emacs21nox emacs20 xemacs214 xemacs215 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 --git a/chat/zenirc/Makefile b/chat/zenirc/Makefile index 5e9def1e28b..9a2194705aa 100644 --- a/chat/zenirc/Makefile +++ b/chat/zenirc/Makefile @@ -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 @@ MAINTAINER= thorpej@NetBSD.org 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 --git a/chat/zephyr-mode/Makefile b/chat/zephyr-mode/Makefile index 7385db11f87..cb645985972 100644 --- a/chat/zephyr-mode/Makefile +++ b/chat/zephyr-mode/Makefile @@ -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 @@ PKG_DESTDIR_SUPPORT= user-destdir NO_BUILD= yes -.include "../../mk/emacs.mk" +.include "../../editors/emacs/modules.mk" do-install: @${INSTALL_DATA_DIR} ${DESTDIR}${EMACS_LISPPREFIX}/zephyr-mode diff --git a/devel/apel/Makefile b/devel/apel/Makefile index ddded744cbf..14eb6ff1fe9 100644 --- a/devel/apel/Makefile +++ b/devel/apel/Makefile @@ -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 @@ MAINTAINER= uebayasi@NetBSD.org 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+= EMACS=${EMACS_FLAVOR:Q} 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 @@ INSTALL_TARGET.xemacs= install-package 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 --git a/devel/apel/buildlink3.mk b/devel/apel/buildlink3.mk index 37b3585a523..e55330412dd 100644 --- a/devel/apel/buildlink3.mk +++ b/devel/apel/buildlink3.mk @@ -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 --git a/devel/cflow-mode/Makefile b/devel/cflow-mode/Makefile index f3988632941..38536be0f64 100644 --- a/devel/cflow-mode/Makefile +++ b/devel/cflow-mode/Makefile @@ -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 @@ COMMENT= Emacs mode for GNU cflow output 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 --git a/devel/cmake-mode/Makefile b/devel/cmake-mode/Makefile index db71b1c5ae5..046117f88a3 100644 --- a/devel/cmake-mode/Makefile +++ b/devel/cmake-mode/Makefile @@ -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 @@ -25,5 +25,5 @@ do-install: ${INSTALL_DATA_DIR} ${DESTDIR}${EMACS_LISPPREFIX} ${INSTALL_DATA} ${WRKSRC}/cmake-mode.* ${DESTDIR}${EMACS_LISPPREFIX} -.include "../../mk/emacs.mk" +.include "../../editors/emacs/modules.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/cqual/Makefile b/devel/cqual/Makefile index dcf57dd2eae..12e0625b524 100644 --- a/devel/cqual/Makefile +++ b/devel/cqual/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2008/02/04 20:10:35 tnn Exp $ +# $NetBSD: Makefile,v 1.16 2008/10/11 09:31:55 uebayasi Exp $ # DISTNAME= cqual-0.991 @@ -32,5 +32,5 @@ post-install: ${INSTALL_DATA} ${WRKSRC:Q}/doc/user-guide.pdf ${PREFIX:Q}/share/doc/cqual/ ${INSTALL_DATA} ${WRKSRC:Q}/examples/* ${PREFIX:Q}/share/examples/cqual/ -.include "../../mk/emacs.mk" +.include "../../editors/emacs/modules.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/doxymacs/Makefile b/devel/doxymacs/Makefile index 5cf9f49f5b8..b54d09e7647 100644 --- a/devel/doxymacs/Makefile +++ b/devel/doxymacs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2008/08/11 08:51:05 dsainty Exp $ +# $NetBSD: Makefile,v 1.6 2008/10/11 09:31:55 uebayasi Exp $ # DISTNAME= doxymacs-1.8.0 @@ -10,7 +10,9 @@ MAINTAINER= dsainty@NetBSD.org HOMEPAGE= http://doxymacs.sourceforge.net/ COMMENT= Doxygen editing support for Emacs -.include "../../mk/emacs.mk" +PKG_DESTDIR_SUPPORT= user-destdir + +.include "../../editors/emacs/modules.mk" # # "www/w3" (Emacs/W3) currently does not work with Emacs 22. Emacs/W3 diff --git a/devel/elib/Makefile.common b/devel/elib/Makefile.common index 5fd9f4e9e76..fc79482c476 100644 --- a/devel/elib/Makefile.common +++ b/devel/elib/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.5 2008/03/03 17:45:35 jlam Exp $ +# $NetBSD: Makefile.common,v 1.6 2008/10/11 09:31:55 uebayasi Exp $ # DISTNAME= elib-1.0 @@ -10,7 +10,7 @@ COMMENT= Library of utility functions for Emacs PKG_DESTDIR_SUPPORT= user-destdir -.include "../../mk/emacs.mk" +.include "../../editors/emacs/modules.mk" PKGSRC_MAKE_ENV+= EMACS=${EMACS_FLAVOR:Q} MAKEFLAGS+= EMACS=${EMACS_FLAVOR:Q} diff --git a/devel/emacs-ilisp/Makefile b/devel/emacs-ilisp/Makefile index 696cf2e048a..eeff523236d 100644 --- a/devel/emacs-ilisp/Makefile +++ b/devel/emacs-ilisp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2008/05/25 13:16:10 dillo Exp $ +# $NetBSD: Makefile,v 1.14 2008/10/11 09:31:55 uebayasi Exp $ # DISTNAME= ilisp-20021222 @@ -36,5 +36,5 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/extra/*.el ${DESTDIR}${SITELISP}/extra ${INSTALL_DATA} ${WRKSRC}/extra/*.elc ${DESTDIR}${SITELISP}/extra -.include "../../mk/emacs.mk" +.include "../../editors/emacs/modules.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/flim/Makefile b/devel/flim/Makefile index 35c5e4874eb..ec1c8897e58 100644 --- a/devel/flim/Makefile +++ b/devel/flim/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2007/11/12 05:34:10 uebayasi Exp $ +# $NetBSD: Makefile,v 1.28 2008/10/11 09:31:55 uebayasi Exp $ DISTNAME= flim-1.14.7 PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME} @@ -12,6 +12,10 @@ COMMENT= Emacs lisp library for message representation/encoding BUILD_DEPENDS+= qkc-[0-9]*:../../converters/qkc +PKG_DESTDIR_SUPPORT= user-destdir +INSTALLATION_DIRS+= ${EMACS_LISPPREFIX:C|^${PREFIX}/||}/flim \ + ${EMACS_INFOPREFIX:C|^${PREFIX}/||} + BUILD_TARGET= ${BUILD_TARGET.${EMACS_FLAVOR}} INSTALL_TARGET= ${INSTALL_TARGET.${EMACS_FLAVOR}} MAKEFLAGS= ${MAKEFLAGS.${EMACS_FLAVOR}} @@ -38,13 +42,22 @@ post-build: makeinfo --force --no-validate $${i}.texi; \ done +do-install: plist + cd ${WRKSRC}; \ + grep -v '^@' ${PLIST} | grep '/site-lisp/flim/' | \ + while read file; do \ + file=$$( basename $$file ); \ + ${INSTALL_DATA} $$file \ + ${DESTDIR}${EMACS_LISPPREFIX}/flim/$$file; \ + done + post-install: cd ${WRKSRC}; for f in mime-*.info mime-*.info-[0-9]*; do \ ${TEST} ! -f "$$f" || \ - ${INSTALL_DATA} "$$f" ${EMACS_INFOPREFIX}; \ + ${INSTALL_DATA} "$$f" ${DESTDIR}${EMACS_INFOPREFIX}; \ done -.include "../../mk/emacs.mk" +.include "../../editors/emacs/modules.mk" .include "../../devel/apel/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/haskell-mode/Makefile b/devel/haskell-mode/Makefile index adaa8ce6589..78b3ef65bac 100644 --- a/devel/haskell-mode/Makefile +++ b/devel/haskell-mode/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2008/03/03 17:45:35 jlam Exp $ +# $NetBSD: Makefile,v 1.18 2008/10/11 09:31:55 uebayasi Exp $ DISTNAME= haskell-mode-1.44 PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME} @@ -11,6 +11,8 @@ HOMEPAGE= http://www.haskell.org/haskell-mode/ COMMENT= Haskell mode for Emacs PKG_DESTDIR_SUPPORT= user-destdir +INSTALLATION_DIRS= ${EMACS_LISPPREFIX:C|^${PREFIX}/||}/haskell-mode \ + share/doc/html/haskell-mode HTML= .emacs fontlock.hs indent.hs index.html installation-guide.html SRCS= haskell-decl-scan.el haskell-doc.el haskell-font-lock.el \ @@ -24,12 +26,10 @@ do-build: done do-install: - ${INSTALL_DATA_DIR} ${DESTDIR}${EMACS_LISPPREFIX}/haskell-mode cd ${WRKSRC} && ${INSTALL_DATA} ${SRCS} ${SRCS:.el=.elc} \ ${DESTDIR}${EMACS_LISPPREFIX}/haskell-mode - ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/html/haskell-mode cd ${WRKSRC} && ${INSTALL_DATA} ${HTML} \ ${DESTDIR}${PREFIX}/share/doc/html/haskell-mode -.include "../../mk/emacs.mk" +.include "../../editors/emacs/modules.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/js2-mode/Makefile b/devel/js2-mode/Makefile index e1fd16b25c4..4587cd41061 100644 --- a/devel/js2-mode/Makefile +++ b/devel/js2-mode/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2008/04/12 13:57:19 wiz Exp $ +# $NetBSD: Makefile,v 1.2 2008/10/11 09:31:55 uebayasi Exp $ # DISTNAME= js2-20080406 @@ -27,5 +27,5 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/${DISTNAME}.el ${DESTDIR}${EMACS_LISPPREFIX}/js2.el ${INSTALL_DATA} ${WRKSRC}/${DISTNAME}.elc ${DESTDIR}${EMACS_LISPPREFIX}/js2.elc -.include "../../mk/emacs.mk" +.include "../../editors/emacs/modules.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/mell/Makefile b/devel/mell/Makefile index 1c00f4fd1dc..bf7ac4df80c 100644 --- a/devel/mell/Makefile +++ b/devel/mell/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2008/03/02 12:26:08 obache Exp $ +# $NetBSD: Makefile,v 1.2 2008/10/11 09:31:55 uebayasi Exp $ # DISTNAME= mell-1.0.0 @@ -17,5 +17,5 @@ USE_LANGUAGES= # none CONFIGURE_ARGS+= --with-emacs-sitelispdir=${EMACS_LISPPREFIX} -.include "../../mk/emacs.mk" +.include "../../editors/emacs/modules.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/mell/buildlink3.mk b/devel/mell/buildlink3.mk index ca52f73d76c..69ef11beb9b 100644 --- a/devel/mell/buildlink3.mk +++ b/devel/mell/buildlink3.mk @@ -1,9 +1,9 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/03/02 12:26:08 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2008/10/11 09:31:55 uebayasi Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ MELL_BUILDLINK3_MK:= ${MELL_BUILDLINK3_MK}+ -.include "../../mk/emacs.mk" +.include "../../editors/emacs/modules.mk" .if ${BUILDLINK_DEPTH} == "+" BUILDLINK_DEPENDS+= mell diff --git a/devel/pcl-cvs/Makefile b/devel/pcl-cvs/Makefile index 0b9bf905bc0..518aaa0031c 100644 --- a/devel/pcl-cvs/Makefile +++ b/devel/pcl-cvs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2007/02/22 19:26:23 wiz Exp $ +# $NetBSD: Makefile,v 1.21 2008/10/11 09:31:55 uebayasi Exp $ # DISTNAME= pcl-cvs-2.9.9 @@ -11,6 +11,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org #HOMEPAGE= COMMENT= Front-end to CVS for emacs +PKG_DESTDIR_SUPPORT= user-destdir + BROKEN_IN= pkgsrc-2006Q1 DEPENDS+= emacs20-elib>=1.0:../../devel/emacs20-elib @@ -20,13 +22,13 @@ CONFLICTS+= emacs21 EMACS_VERSIONS_ACCEPTED= emacs20 -.include "../../mk/emacs.mk" +.include "../../editors/emacs/modules.mk" .if !((${EMACS_FLAVOR} == "emacs") && (${EMACS_VERSION_MAJOR} == "20")) PKG_SKIP_REASON+= "${PKGNAME} is only for emacs20" .endif -MAKE_ENV+= PREFIX=${PREFIX:Q} +MAKE_ENV+= PREFIX=${DESTDIR:Q}${PREFIX:Q} BUILD_TARGET= default INFO_FILES= # PLIST MESSAGE_SUBST+= EMACS_LISPPREFIX=${EMACS_LISPPREFIX:Q} diff --git a/devel/php-mode/Makefile b/devel/php-mode/Makefile index 20d3c69519e..aa345a700b8 100644 --- a/devel/php-mode/Makefile +++ b/devel/php-mode/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2008/08/12 10:12:36 dsainty Exp $ +# $NetBSD: Makefile,v 1.2 2008/10/11 09:31:55 uebayasi Exp $ # DISTNAME= php-mode-1.4.0 @@ -22,5 +22,5 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/php-mode.e* \ ${DESTDIR}${EMACS_LISPPREFIX}/php-mode -.include "../../mk/emacs.mk" +.include "../../editors/emacs/modules.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/psvn/Makefile b/devel/psvn/Makefile index 30f5be2d806..d9c9a355224 100644 --- a/devel/psvn/Makefile +++ b/devel/psvn/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2008/03/03 17:45:36 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2008/10/11 09:31:55 uebayasi Exp $ # DISTNAME= psvn.el @@ -18,7 +18,7 @@ PKG_DESTDIR_SUPPORT= user-destdir VER= 25241 WRKSRC= ${WRKDIR} -.include "../../mk/emacs.mk" +.include "../../editors/emacs/modules.mk" INSTALLATION_DIRS= ${EMACS_LISPPREFIX:S/^${PREFIX}\///} diff --git a/devel/pvs/Makefile b/devel/pvs/Makefile index aebc778136f..fd8e780c24e 100644 --- a/devel/pvs/Makefile +++ b/devel/pvs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2008/05/26 02:13:18 joerg Exp $ +# $NetBSD: Makefile,v 1.35 2008/10/11 09:31:55 uebayasi Exp $ # DISTNAME= pvs-${VERSION} @@ -56,5 +56,5 @@ do-install: ${CHMOD} 755 ${DESTDIR}${PREFIX}/pvs/pvs .include "../../mk/tex.buildlink3.mk" -.include "../../mk/emacs.mk" +.include "../../editors/emacs/modules.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/python-mode/Makefile b/devel/python-mode/Makefile index f4c0a5ae0b0..e67473d3043 100644 --- a/devel/python-mode/Makefile +++ b/devel/python-mode/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2008/04/13 22:12:56 wiz Exp $ +# $NetBSD: Makefile,v 1.21 2008/10/11 09:31:55 uebayasi Exp $ # DISTNAME= python-mode-1.0 @@ -20,7 +20,7 @@ ELISP_FILES= python-mode.el # package. Also, python-mode does not appear to work as is with XEmacs 21.1 EMACS_VERSIONS_ACCEPTED= emacs22 emacs22nox emacs21 emacs21nox emacs20 -.include "../../mk/emacs.mk" +.include "../../editors/emacs/modules.mk" INSTALLATION_DIRS= ${EMACS_LISPPREFIX:S/^${PREFIX}\///} diff --git a/devel/rsltc/Makefile b/devel/rsltc/Makefile index 719014a7c2e..68fb248e221 100644 --- a/devel/rsltc/Makefile +++ b/devel/rsltc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2008/03/03 17:45:37 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2008/10/11 09:31:55 uebayasi Exp $ # DISTNAME= rsltcsrc @@ -31,5 +31,5 @@ do-install: ${INSTALL_DATA} $${i}c ${DESTDIR}${PREFIX}/share/emacs/site-lisp/rsl ;\ done) -.include "../../mk/emacs.mk" +.include "../../editors/emacs/modules.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/ruby-mode/Makefile b/devel/ruby-mode/Makefile index 71770764395..5c63666d14b 100644 --- a/devel/ruby-mode/Makefile +++ b/devel/ruby-mode/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2008/06/20 15:50:25 taca Exp $ +# $NetBSD: Makefile,v 1.20 2008/10/11 09:31:55 uebayasi Exp $ # DISTNAME= ${RUBY_DISTNAME} @@ -38,5 +38,5 @@ do-install: .include "../../lang/ruby/rubyversion.mk" .include "../../lang/ruby/Makefile.common" -.include "../../mk/emacs.mk" +.include "../../editors/emacs/modules.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/ruby-rd-mode/Makefile b/devel/ruby-rd-mode/Makefile index d27f75fd026..4ab0462a12a 100644 --- a/devel/ruby-rd-mode/Makefile +++ b/devel/ruby-rd-mode/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2008/09/15 08:36:24 taca Exp $ +# $NetBSD: Makefile,v 1.23 2008/10/11 09:31:55 uebayasi Exp $ # DISTNAME= rdtool-${RUBY_RD_VERSION} @@ -30,5 +30,5 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/rd-mode.elc ${DESTDIR}${EMACS_LISPPREFIX}/rd-mode .include "../../lang/ruby/rubyversion.mk" -.include "../../mk/emacs.mk" +.include "../../editors/emacs/modules.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/scmgit-base/Makefile b/devel/scmgit-base/Makefile index cc0cf5aaa3a..9643d4f2e04 100644 --- a/devel/scmgit-base/Makefile +++ b/devel/scmgit-base/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2008/09/21 02:00:37 minskim Exp $ +# $NetBSD: Makefile,v 1.13 2008/10/11 09:31:55 uebayasi Exp $ # .include "../../devel/scmgit/Makefile.common" @@ -80,7 +80,7 @@ SUBST_MESSAGE.fix-paths=Fixing hard-coded pathnames SUBST_STAGE.fix-paths= pre-build SUBST_VARS.fix-paths= PREFIX -#.include "../../mk/emacs.mk" # XXX TODO (see patch-ad) +#.include "../../editors/emacs/modules.mk" # XXX TODO (see patch-ad) .include "options.mk" .include "../../lang/perl5/module.mk" diff --git a/devel/semantic/Makefile b/devel/semantic/Makefile index d438536ce15..e27e4e39444 100644 --- a/devel/semantic/Makefile +++ b/devel/semantic/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2008/03/03 17:45:37 jlam Exp $ +# $NetBSD: Makefile,v 1.25 2008/10/11 09:31:55 uebayasi Exp $ # DISTNAME= semantic-1.4.4 @@ -51,7 +51,7 @@ do-install: ${INSTALL_DATA} "$$f" ${DESTDIR}${EMACS_INFOPREFIX}; \ done -.include "../../mk/emacs.mk" +.include "../../editors/emacs/modules.mk" .include "../../editors/speedbar/buildlink3.mk" .include "../../lang/eieio/buildlink3.mk" diff --git a/devel/semi/Makefile b/devel/semi/Makefile index 0f0f6be6903..265747ff708 100644 --- a/devel/semi/Makefile +++ b/devel/semi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2007/11/12 05:34:10 uebayasi Exp $ +# $NetBSD: Makefile,v 1.27 2008/10/11 09:31:55 uebayasi Exp $ # DISTNAME= semi-1.14.6 @@ -18,6 +18,10 @@ COMMENT= Emacs lisp library to provide MIME feature BUILD_DEPENDS+= qkc-[0-9]*:../../converters/qkc +PKG_DESTDIR_SUPPORT= user-destdir +INSTALLATION_DIRS+= ${EMACS_LISPPREFIX:C|^${PREFIX}/||}/semi \ + ${EMACS_INFOPREFIX:C|^${PREFIX}/||} + BUILD_TARGET= ${BUILD_TARGET.${EMACS_FLAVOR}} INSTALL_TARGET= ${INSTALL_TARGET.${EMACS_FLAVOR}} MAKEFLAGS= ${MAKEFLAGS.${EMACS_FLAVOR}} @@ -43,15 +47,24 @@ post-build: makeinfo --force --no-validate $${i}.texi; \ done +do-install: plist + cd ${WRKSRC}; \ + grep -v '^@' ${PLIST} | grep '/site-lisp/semi/' | \ + while read file; do \ + file=$$( basename $$file ); \ + ${INSTALL_DATA} $$file \ + ${DESTDIR}${EMACS_LISPPREFIX}/semi/$$file; \ + done + post-install: cd ${WRKSRC}; for f in mime-ui-*.info mime-*.info-[0-9]*; do \ ${TEST} ! -f "$$f" || \ - ${INSTALL_DATA} "$$f" ${EMACS_INFOPREFIX}; \ + ${INSTALL_DATA} "$$f" ${DESTDIR}${EMACS_INFOPREFIX}; \ done .include "options.mk" -.include "../../mk/emacs.mk" +.include "../../editors/emacs/modules.mk" .include "../../devel/apel/buildlink3.mk" .include "../../devel/flim/buildlink3.mk" diff --git a/devel/sml-mode/Makefile b/devel/sml-mode/Makefile index 3e7f685d294..39483c661c6 100644 --- a/devel/sml-mode/Makefile +++ b/devel/sml-mode/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2008/03/03 17:45:37 jlam Exp $ +# $NetBSD: Makefile,v 1.16 2008/10/11 09:31:55 uebayasi Exp $ DISTNAME= sml-mode-3.9.5 PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME} @@ -22,5 +22,5 @@ do-install: ChangeLog ${DESTDIR}${EMACS_LISPPREFIX}/sml-mode ${INSTALL_DATA} ${WRKSRC}/sml-mode.info ${DESTDIR}${EMACS_INFOPREFIX} -.include "../../mk/emacs.mk" +.include "../../editors/emacs/modules.mk" .include "../../mk/bsd.pkg.mk" diff --git a/editors/emacs-nox11/buildlink3.mk b/editors/emacs-nox11/buildlink3.mk index e167a89328c..4d203b93838 100644 --- a/editors/emacs-nox11/buildlink3.mk +++ b/editors/emacs-nox11/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2007/10/29 12:40:02 uebayasi Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2008/10/11 09:31:56 uebayasi Exp $ # BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ @@ -13,9 +13,9 @@ BUILDLINK_PACKAGES+= emacs-nox11 BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}emacs-nox11 .if ${EMACS_NOX11_BUILDLINK3_MK} == "+" -.include "../../mk/emacs.mk" -BUILDLINK_API_DEPENDS.emacs-nox11+= ${_EMACS_REQD.emacs22nox} -BUILDLINK_PKGSRCDIR.emacs-nox11?= ${_EMACS_DEP.emacs22nox} +.include "../../editors/emacs/modules.mk" +BUILDLINK_API_DEPENDS.emacs-nox11+= ${_EMACS_REQD} +BUILDLINK_PKGSRCDIR.emacs-nox11?= ${_EMACS_PKGDIR} .endif # EMACS_NOX11_BUILDLINK3_MK BUILDLINK_CONTENTS_FILTER.emacs-nox11= ${EGREP} '.*\.el$$|.*\.elc$$' diff --git a/editors/emacs-nox11/version.mk b/editors/emacs-nox11/version.mk new file mode 100644 index 00000000000..ed737417c68 --- /dev/null +++ b/editors/emacs-nox11/version.mk @@ -0,0 +1,9 @@ +# $NetBSD: version.mk,v 1.1 2008/10/11 09:31:56 uebayasi Exp $ + +_EMACS_FLAVOR= emacs +_EMACS_REQD= emacs-nox11>=22<23 +_EMACS_PKGDEP.base= +_EMACS_PKGDEP.leim= + +_EMACS_VERSION_MAJOR= 22 +_EMACS_VERSION_MINOR= 1 diff --git a/editors/emacs-packages/Makefile b/editors/emacs-packages/Makefile index 0d539aa7dbf..63d6db0e080 100644 --- a/editors/emacs-packages/Makefile +++ b/editors/emacs-packages/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2007/10/30 12:46:01 dsainty Exp $ +# $NetBSD: Makefile,v 1.24 2008/10/11 09:31:56 uebayasi Exp $ DISTNAME= emacs-packages-0.9 CATEGORIES= meta-pkgs editors @@ -9,7 +9,7 @@ MAINTAINER= uebayasi@NetBSD.org HOMEPAGE= # empty COMMENT= Meta-package for the GNU Emacs lisp packages -.include "../../mk/emacs.mk" +.include "../../editors/emacs/modules.mk" # XXX # Please update the version of this package (emacs-package) when you diff --git a/editors/emacs/buildlink3.mk b/editors/emacs/buildlink3.mk index 231eceaf891..02b5e681ab4 100644 --- a/editors/emacs/buildlink3.mk +++ b/editors/emacs/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2007/10/29 12:40:03 uebayasi Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2008/10/11 09:31:56 uebayasi Exp $ # BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ @@ -13,9 +13,9 @@ BUILDLINK_PACKAGES+= emacs BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}emacs .if ${EMACS_BUILDLINK3_MK} == "+" -.include "../../mk/emacs.mk" -BUILDLINK_API_DEPENDS.emacs+= ${_EMACS_REQD.emacs22} -BUILDLINK_PKGSRCDIR.emacs?= ${_EMACS_DEP.emacs22} +.include "../../editors/emacs/modules.mk" +BUILDLINK_API_DEPENDS.emacs+= ${_EMACS_REQD} +BUILDLINK_PKGSRCDIR.emacs?= ${_EMACS_PKGDIR} .endif # EMACS_BUILDLINK3_MK BUILDLINK_CONTENTS_FILTER.emacs= ${EGREP} '.*\.el$$|.*\.elc$$' diff --git a/editors/emacs/modules.mk b/editors/emacs/modules.mk new file mode 100644 index 00000000000..ef8acdebe5c --- /dev/null +++ b/editors/emacs/modules.mk @@ -0,0 +1,317 @@ +# $NetBSD: modules.mk,v 1.1 2008/10/11 09:31:56 uebayasi Exp $ +# +# This Makefile fragment handles Emacs Lisp Packages (== ELPs). +# +# Note to users: +# +# * Users choose one favourite Emacs version (default GNU Emacs 21). +# +# * Emacs Lisp files are installed... +# GNU emacs +# -> ${PREFIX}/share/emacs/site-lisp/foo/... +# XEmacs +# ->${PREFIX}/lib/xemacs/site-packages/lisp/foo/... +# +# * 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 favourite Emacs version. +# Possible values: +# emacs21, emacs21nox, emacs22, emacs22nox, emacs20, xemacs215, xemacs215nox, xemacs214, xemacs214nox +# Default value: +# emacs22 +# +# Variables ELPs can provide: +# +# EMACS_MODULES +# Description: +# List of Emacs LISP modules that the current ELP +# needs at run-time. +# Possible values: +# base, leim +# Default value: +# <undefined> +# +# EMACS_VERSIONS_ACCEPTED +# Description: +# Versions the ELP accepts (supports). +# Possible values: +# emacs21, emacs21nox, emacs22, emacs22nox, emacs20, xemacs215, xemacs215nox, xemacs214, xemacs214nox +# Default value: +# emacs21, emacs21nox, emacs22, emacs22nox, emacs20, xemacs215, xemacs215nox, xemacs214, xemacs214nox +# +# 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 +# +# 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}/${PKGINFODIR} +# ${PREFIX}/lib/xemacs/site-packages/info +# +# EMACS_LISPPREFIX +# Description: +# 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-" +# +# EMACS_VERSION_MAJOR +# Description: +# Emacs major version. +# Possible values: +# 20, 21, 22, <integers more than that in the future> +# +# EMACS_VERSION_MINOR +# Description: +# Emacs minor version. +# Possible values: +# <integer> +# +# 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: +# ${PKGINFODIR} +# 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_{emacs21,emacs21nox,emacs22,emacs22nox,emacs20,xemacs215,xemacs215nox,xemacs214,xemacs214nox} +# FOR_{emacs,xemacs} +# FOR_{emacs_x,emacs_nox} +# NOTFOR_{emacs21,emacs21nox,emacs22,emacs22nox,emacs20,xemacs215,xemacs215nox,xemacs214,xemacs214nox} +# NOTFOR_{emacs,xemacs} +# NOTFOR_{emacs_x,emacs_nox} +# 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"; this means that only the PLIST lines +# prefixed by ${FOR_emacs} and ${FOR_emacs21} are +# valid. +# +# NOTFOR_* is the opposite of FOR_*. +# Possible values: +# "", "@comment" +# + +.if !defined(EMACS_MK) +EMACS_MK= # defined + +_VARGROUPS+= emacs +_USER_VARS.emacs= EMACS_TYPE +_PKG_VARS.emacs= EMACS_MODULES EMACS_VERSIONS_ACCEPTED +_SYS_VARS.emacs= EMACS_BIN EMACS_ETCPREFIX EMACS_FLAVOR \ + EMACS_INFOPREFIX EMACS_LISPPREFIX \ + EMACS_PKGNAME_PREFIX \ + EMACS_VERSION_MAJOR EMACS_VERSION_MINOR +_DEF_VARS.emacs= _EMACS_TYPE _EMACS_PKGBASE +BUILD_DEFS+= ${_USER_VARS.emacs} +BUILD_DEFS_EFFECTS+= ${_SYS_VARS.emacs} + +.include "../../mk/bsd.prefs.mk" + +# +# Constants +# + +_EMACS_VERSIONS_ALL= \ + emacs20 emacs21 emacs21nox emacs22 emacs22nox \ + xemacs214 xemacs214nox xemacs215 xemacs215nox + +_EMACS_PKGDIR_MAP= \ + emacs20@../../editors/emacs20 \ + emacs21@../../editors/emacs21 \ + emacs21nox@../../editors/emacs21-nox11 \ + emacs22@../../editors/emacs \ + emacs22nox@../../editors/emacs-nox11 \ + xemacs214@../../editors/xemacs \ + xemacs214nox@../../editors/xemacs-nox11 \ + xemacs215@../../editors/xemacs-current \ + xemacs215nox@../../editors/xemacs-current-nox11 + +_EMACS_ETCDIR.emacs= share +_EMACS_INFODIR.emacs= ${PKGINFODIR} +_EMACS_LISPDIR.emacs= share/emacs/site-lisp +_EMACS_PKGNAME_PREFIX.emacs= +_EMACS_CONFLICTS.emacs= xemacs-${PKGBASE}-[0-9]* + +_EMACS_ETCDIR.xemacs= lib/xemacs/site-packages/etc +_EMACS_INFODIR.xemacs= lib/xemacs/site-packages/info +_EMACS_LISPDIR.xemacs= lib/xemacs/site-packages/lisp +_EMACS_PKGNAME_PREFIX.xemacs= xemacs- +_EMACS_CONFLICTS.xemacs= ${PKGBASE:C|^xemacs-||}-[0-9]* + +# +# Version decision +# +# 1. Pick up an emacs version. +# +# 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; +# + +_EMACS_TYPE= ${EMACS_TYPE} + +EMACS_VERSIONS_ACCEPTED?= ${_EMACS_VERSIONS_ALL} +.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 + +_EMACS_PKGDIR= ${_EMACS_PKGDIR_MAP:M${_EMACS_TYPE}@*:C|${_EMACS_TYPE}@||} + +.include "${_EMACS_PKGDIR}/version.mk" + +# +# Dependencies and conflicts +# + +DEPENDS+= ${_EMACS_REQD}:${_EMACS_PKGDIR} +CONFLICTS+= ${_EMACS_CONFLICTS.${_EMACS_FLAVOR}} + +EMACS_MODULES?= +.for _mod_ in ${EMACS_MODULES} +.if !empty(_EMACS_PKGDEP.${_mod_}) +DEPENDS+= ${_EMACS_PKGDEP.${_mod_}} +.endif +.endfor + +# +# Macros for packages +# + +EMACS_FLAVOR= ${_EMACS_FLAVOR} +EMACS_BIN= ${PREFIX}/bin/${_EMACS_FLAVOR} +EMACS_VERSION_MAJOR= ${_EMACS_VERSION_MAJOR} +EMACS_VERSION_MINOR= ${_EMACS_VERSION_MINOR} +EMACS_ETCPREFIX= ${PREFIX}/${_EMACS_ETCDIR.${_EMACS_FLAVOR}} +EMACS_INFOPREFIX= ${PREFIX}/${_EMACS_INFODIR.${_EMACS_FLAVOR}} +EMACS_LISPPREFIX= ${PREFIX}/${_EMACS_LISPDIR.${_EMACS_FLAVOR}} +EMACS_PKGNAME_PREFIX= ${_EMACS_PKGNAME_PREFIX.${_EMACS_FLAVOR}} + +GNU_CONFIGURE_INFODIR?= ${EMACS_INFOPREFIX} + +_EMACS_PLIST_SUBST= +.for e in ${_EMACS_VERSIONS_ALL} emacs xemacs +. if "${e}" == ${EMACS_FLAVOR} || "${e}" == ${_EMACS_TYPE} +_EMACS_PLIST_SUBST+= FOR_${e}="" NOTFOR_${e}="@comment " +. else +_EMACS_PLIST_SUBST+= FOR_${e}="@comment " NOTFOR_${e}="" +. endif +.endfor +.if empty(EMACS_TYPE:M*nox) +_EMACS_PLIST_SUBST+= FOR_emacs_x="" NOTFOR_emacs_x="@comment " +_EMACS_PLIST_SUBST+= FOR_emacs_nox="@comment " NOTFOR_emacs_nox="" +.else +_EMACS_PLIST_SUBST+= FOR_emacs_x="@comment " NOTFOR_emacs_x="" +_EMACS_PLIST_SUBST+= FOR_emacs_nox="" NOTFOR_emacs_nox="@comment " +.endif + +_EMACS_PLIST_SUBST+= EMACS_FLAVOR=${EMACS_FLAVOR:Q} +_EMACS_PLIST_SUBST+= EMACS_VERSION=${_EMACS_VERSION_MAJOR:Q}.${_EMACS_VERSION_MINOR:Q} +_EMACS_PLIST_SUBST+= EMACS_ETCPREFIX=${EMACS_ETCPREFIX:C|^${PREFIX}/||} +_EMACS_PLIST_SUBST+= EMACS_INFOPREFIX=${EMACS_INFOPREFIX:C|^${PREFIX}/||} +_EMACS_PLIST_SUBST+= EMACS_LISPPREFIX=${EMACS_LISPPREFIX:C|^${PREFIX}/||} + +PLIST_SUBST+= ${_EMACS_PLIST_SUBST} + +PRINT_PLIST_AWK+= { gsub(/${EMACS_LISPPREFIX:S|${PREFIX}/||:S|/|\\/|g}/, \ + "$${EMACS_LISPPREFIX}"); \ + print; next; } + +# +# Build environment (buildlink3) +# + +_EMACS_DIR= ${BUILDLINK_DIR}/share/emacs +ALL_ENV+= EMACSLOADPATH=${_EMACS_DIR}/${_EMACS_VERSION_MAJOR}.${_EMACS_VERSION_MINOR}/lisp:${_EMACS_DIR}/site-lisp + +.include "${_EMACS_PKGDIR}/buildlink3.mk" + +.endif # EMACS_MK diff --git a/editors/emacs/version.mk b/editors/emacs/version.mk new file mode 100644 index 00000000000..bf23fb598cb --- /dev/null +++ b/editors/emacs/version.mk @@ -0,0 +1,9 @@ +# $NetBSD: version.mk,v 1.1 2008/10/11 09:31:56 uebayasi Exp $ + +_EMACS_FLAVOR= emacs +_EMACS_REQD= emacs>=22 +_EMACS_PKGDEP.base= +_EMACS_PKGDEP.leim= + +_EMACS_VERSION_MAJOR= 22 +_EMACS_VERSION_MINOR= 1 diff --git a/editors/emacs20/buildlink3.mk b/editors/emacs20/buildlink3.mk index 7c553d71002..3537a0bc00f 100644 --- a/editors/emacs20/buildlink3.mk +++ b/editors/emacs20/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2007/10/29 12:40:03 uebayasi Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2008/10/11 09:31:56 uebayasi Exp $ # BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ @@ -13,9 +13,9 @@ BUILDLINK_PACKAGES+= emacs BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}emacs .if ${APEL_BUILDLINK3_MK} == "+" -.include "../../mk/emacs.mk" -BUILDLINK_API_DEPENDS.emacs+= ${_EMACS_REQD.emacs20} -BUILDLINK_PKGSRCDIR.emacs?= ${_EMACS_DEP.emacs20} +.include "../../editors/emacs/modules.mk" +BUILDLINK_API_DEPENDS.emacs+= ${_EMACS_REQD} +BUILDLINK_PKGSRCDIR.emacs?= ${_EMACS_PKGDIR} .endif # APEL_BUILDLINK3_MK BUILDLINK_CONTENTS_FILTER.emacs= ${EGREP} '.*\.el$$|.*\.elc$$' diff --git a/editors/emacs20/version.mk b/editors/emacs20/version.mk new file mode 100644 index 00000000000..3a1335b0962 --- /dev/null +++ b/editors/emacs20/version.mk @@ -0,0 +1,9 @@ +# $NetBSD: version.mk,v 1.1 2008/10/11 09:31:56 uebayasi Exp $ + +_EMACS_FLAVOR= emacs +_EMACS_REQD= emacs>=20.7<21 +_EMACS_PKGDEP.base= +_EMACS_PKGDEP.leim= leim>=20.${EMACS_VERSION_MINOR}<21:../../editors/leim20 + +_EMACS_VERSION_MAJOR= 20 +_EMACS_VERSION_MINOR= 7 diff --git a/editors/emacs21-nox11/buildlink3.mk b/editors/emacs21-nox11/buildlink3.mk index 19c38716291..4d203b93838 100644 --- a/editors/emacs21-nox11/buildlink3.mk +++ b/editors/emacs21-nox11/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2007/10/29 12:40:03 uebayasi Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2008/10/11 09:31:56 uebayasi Exp $ # BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ @@ -13,9 +13,9 @@ BUILDLINK_PACKAGES+= emacs-nox11 BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}emacs-nox11 .if ${EMACS_NOX11_BUILDLINK3_MK} == "+" -.include "../../mk/emacs.mk" -BUILDLINK_API_DEPENDS.emacs-nox11+= ${_EMACS_REQD.emacs21nox} -BUILDLINK_PKGSRCDIR.emacs-nox11?= ${_EMACS_DEP.emacs21nox} +.include "../../editors/emacs/modules.mk" +BUILDLINK_API_DEPENDS.emacs-nox11+= ${_EMACS_REQD} +BUILDLINK_PKGSRCDIR.emacs-nox11?= ${_EMACS_PKGDIR} .endif # EMACS_NOX11_BUILDLINK3_MK BUILDLINK_CONTENTS_FILTER.emacs-nox11= ${EGREP} '.*\.el$$|.*\.elc$$' diff --git a/editors/emacs21-nox11/version.mk b/editors/emacs21-nox11/version.mk new file mode 100644 index 00000000000..b76c9cd20b6 --- /dev/null +++ b/editors/emacs21-nox11/version.mk @@ -0,0 +1,9 @@ +# $NetBSD: version.mk,v 1.1 2008/10/11 09:31:56 uebayasi Exp $ + +_EMACS_FLAVOR= emacs +_EMACS_REQD= emacs-nox11>=21.2<22 +_EMACS_PKGDEP.base= +_EMACS_PKGDEP.leim= leim>=21.${EMACS_VERSION_MINOR}<22:../../editors/leim21 + +_EMACS_VERSION_MAJOR= 21 +_EMACS_VERSION_MINOR= 4 diff --git a/editors/emacs21/buildlink3.mk b/editors/emacs21/buildlink3.mk index 4b5a42b3d92..02b5e681ab4 100644 --- a/editors/emacs21/buildlink3.mk +++ b/editors/emacs21/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2007/10/29 12:40:03 uebayasi Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2008/10/11 09:31:56 uebayasi Exp $ # BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ @@ -13,9 +13,9 @@ BUILDLINK_PACKAGES+= emacs BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}emacs .if ${EMACS_BUILDLINK3_MK} == "+" -.include "../../mk/emacs.mk" -BUILDLINK_API_DEPENDS.emacs+= ${_EMACS_REQD.emacs21} -BUILDLINK_PKGSRCDIR.emacs?= ${_EMACS_DEP.emacs21} +.include "../../editors/emacs/modules.mk" +BUILDLINK_API_DEPENDS.emacs+= ${_EMACS_REQD} +BUILDLINK_PKGSRCDIR.emacs?= ${_EMACS_PKGDIR} .endif # EMACS_BUILDLINK3_MK BUILDLINK_CONTENTS_FILTER.emacs= ${EGREP} '.*\.el$$|.*\.elc$$' diff --git a/editors/emacs21/version.mk b/editors/emacs21/version.mk new file mode 100644 index 00000000000..5ffee21196e --- /dev/null +++ b/editors/emacs21/version.mk @@ -0,0 +1,9 @@ +# $NetBSD: version.mk,v 1.1 2008/10/11 09:31:56 uebayasi Exp $ + +_EMACS_FLAVOR= emacs +_EMACS_REQD= emacs>=21<22 +_EMACS_PKGDEP.base= +_EMACS_PKGDEP.leim= leim>=21.${EMACS_VERSION_MINOR}<22:../../editors/leim21 + +_EMACS_VERSION_MAJOR= 21 +_EMACS_VERSION_MINOR= 4 diff --git a/editors/gnuserv/Makefile b/editors/gnuserv/Makefile index 7af8caa902e..9c36af1543c 100644 --- a/editors/gnuserv/Makefile +++ b/editors/gnuserv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2008/08/18 00:55:48 epg Exp $ +# $NetBSD: Makefile,v 1.11 2008/10/11 09:31:56 uebayasi Exp $ DISTNAME= gnuserv-3.12.7 PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME} @@ -22,5 +22,5 @@ post-install: ${INSTALL_DATA} $${FILE} $${FILE}c ${EMACS_LISPPREFIX}; \ done -.include "../../mk/emacs.mk" +.include "../../editors/emacs/modules.mk" .include "../../mk/bsd.pkg.mk" diff --git a/editors/jde/Makefile b/editors/jde/Makefile index 06997387fd9..93e95c7226e 100644 --- a/editors/jde/Makefile +++ b/editors/jde/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2008/05/26 02:13:18 joerg Exp $ +# $NetBSD: Makefile,v 1.25 2008/10/11 09:31:56 uebayasi Exp $ # DISTNAME= jde-2.3.2 @@ -24,7 +24,7 @@ PKG_DESTDIR_SUPPORT= user-destdir WRKSRC= ${WRKDIR}/${DISTNAME}/lisp -.include "../../mk/emacs.mk" +.include "../../editors/emacs/modules.mk" # XEmacs has its own JDE package EMACS_VERSIONS_ACCEPTED=emacs21 # XXX Won't compile with emacs20... diff --git a/editors/leim21/Makefile b/editors/leim21/Makefile index 6cfa05d1d37..7e05c730143 100644 --- a/editors/leim21/Makefile +++ b/editors/leim21/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2007/10/29 13:41:29 uebayasi Exp $ +# $NetBSD: Makefile,v 1.7 2008/10/11 09:31:56 uebayasi Exp $ DISTNAME= leim-${VERSION} PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME} @@ -36,5 +36,5 @@ post-extract: post-install: @${CHOWN} -R ${ROOT_USER} ${PREFIX}/share/emacs/${VERSION}/leim -.include "../../mk/emacs.mk" +.include "../../editors/emacs/modules.mk" .include "../../mk/bsd.pkg.mk" diff --git a/editors/matlab-mode/Makefile b/editors/matlab-mode/Makefile index 725dc39718a..789c14ad947 100644 --- a/editors/matlab-mode/Makefile +++ b/editors/matlab-mode/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2008/03/03 18:25:52 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2008/10/11 09:31:56 uebayasi Exp $ # DISTNAME= matlab.el @@ -20,7 +20,7 @@ PKG_DESTDIR_SUPPORT= user-destdir WRKSRC= ${WRKDIR} DIST_SUBDIR= ${BASEPKGNAME} -.include "../../mk/emacs.mk" +.include "../../editors/emacs/modules.mk" .if ${EMACS_FLAVOR} == "emacs" EMACS= emacs diff --git a/editors/mule-ucs/Makefile b/editors/mule-ucs/Makefile index a11478b728b..714bc8aad5d 100644 --- a/editors/mule-ucs/Makefile +++ b/editors/mule-ucs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2008/03/03 18:25:52 jlam Exp $ +# $NetBSD: Makefile,v 1.18 2008/10/11 09:31:56 uebayasi Exp $ DISTNAME= Mule-UCS-0.84 PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME} @@ -11,6 +11,10 @@ MAINTAINER= uebayasi@NetBSD.org COMMENT= Another encoding conversion mechanism for Emacs PKG_DESTDIR_SUPPORT= user-destdir +INSTALLATION_DIRS= ${EMACS_LISPPREFIX:C|^${PREFIX}/||}/mule-ucs \ + ${EMACS_LISPPREFIX:C|^${PREFIX}/||}/mule-ucs/big5conv \ + ${EMACS_LISPPREFIX:C|^${PREFIX}/||}/mule-ucs/jisx0213 \ + ${EMACS_LISPPREFIX:C|^${PREFIX}/||}/mule-ucs/reldata # Mule 4.1 feature required by Mule-UCS was added to 20.7nb1. EMACS_VERSIONS_ACCEPTED= emacs21 emacs21nox emacs20 @@ -27,20 +31,16 @@ do-build: ${EMACS_BIN} -q --no-site-file -batch -l x0213-comp.el do-install: - ${INSTALL_DATA_DIR} ${DESTDIR}${EMACS_LISPPREFIX}/mule-ucs cd ${WRKSRC}/lisp && \ for f in ChangeLog README* *.txt *.el *.elc *.txt; do \ ${INSTALL_DATA} $$f ${DESTDIR}${EMACS_LISPPREFIX}/mule-ucs; \ done - ${INSTALL_DATA_DIR} ${DESTDIR}${EMACS_LISPPREFIX}/mule-ucs/big5conv ${INSTALL_DATA} ${WRKSRC}/lisp/big5conv/* \ ${DESTDIR}${EMACS_LISPPREFIX}/mule-ucs/big5conv; \ - ${INSTALL_DATA_DIR} ${DESTDIR}${EMACS_LISPPREFIX}/mule-ucs/jisx0213 ${INSTALL_DATA} ${WRKSRC}/lisp/jisx0213/* \ ${DESTDIR}${EMACS_LISPPREFIX}/mule-ucs/jisx0213; \ - ${INSTALL_DATA_DIR} ${DESTDIR}${EMACS_LISPPREFIX}/mule-ucs/reldata ${INSTALL_DATA} ${WRKSRC}/lisp/reldata/* \ ${DESTDIR}${EMACS_LISPPREFIX}/mule-ucs/reldata -.include "../../mk/emacs.mk" +.include "../../editors/emacs/modules.mk" .include "../../mk/bsd.pkg.mk" diff --git a/editors/mule-ucs/buildlink3.mk b/editors/mule-ucs/buildlink3.mk index 7c994a4bdb2..1fad14e30e7 100644 --- a/editors/mule-ucs/buildlink3.mk +++ b/editors/mule-ucs/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2007/10/29 12:41:17 uebayasi Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2008/10/11 09:31:56 uebayasi Exp $ # BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ @@ -9,7 +9,7 @@ MULE_UCS_BUILDLINK3_MK:= ${MULE_UCS_BUILDLINK3_MK}+ # incorporated Unicode support. # -.include "../../mk/emacs.mk" +.include "../../editors/emacs/modules.mk" .if ${EMACS_FLAVOR} == "emacs" && ${EMACS_VERSION_MAJOR} < 22 .if ${BUILDLINK_DEPTH} == "+" diff --git a/editors/speedbar/Makefile b/editors/speedbar/Makefile index 04b9c4ceaf4..a52521badf7 100644 --- a/editors/speedbar/Makefile +++ b/editors/speedbar/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2008/03/03 18:25:53 jlam Exp $ +# $NetBSD: Makefile,v 1.20 2008/10/11 09:31:56 uebayasi Exp $ # DISTNAME= speedbar-0.14beta4 @@ -13,7 +13,7 @@ COMMENT= Directory and code browser for emacs PKG_DESTDIR_SUPPORT= user-destdir -.include "../../mk/emacs.mk" +.include "../../editors/emacs/modules.mk" PKGSRC_MAKE_ENV+= EMACS=${EMACS} diff --git a/editors/tamago/Makefile b/editors/tamago/Makefile index 4beb2e9cb47..edb81e2a1f2 100644 --- a/editors/tamago/Makefile +++ b/editors/tamago/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2008/04/12 22:43:00 jlam Exp $ +# $NetBSD: Makefile,v 1.18 2008/10/11 09:31:56 uebayasi Exp $ DISTNAME= tamago-4.0.6 PKGNAME= ${EMACS_PKGNAME_PREFIX}tamago-20020909 @@ -10,12 +10,15 @@ MAINTAINER= tech-pkg-ja@jp.NetBSD.org HOMEPAGE= http://www.m17n.org/tamago/ COMMENT= CJK characters inputting system for emacs + leim +PKG_DESTDIR_SUPPORT= user-destdir + GNU_CONFIGURE= yes +MAKE_FLAGS+= prefix=${DESTDIR:Q}${PREFIX} # XXX please someone adjust paths and PLIST for XEmacs... EMACS_VERSIONS_ACCEPTED= emacs22 emacs22nox emacs21 emacs21nox emacs20 EMACS_MODULES+= leim -.include "../../mk/emacs.mk" +.include "../../editors/emacs/modules.mk" PLIST_VARS+= jisx0213 diff --git a/editors/xemacs-current-nox11/buildlink3.mk b/editors/xemacs-current-nox11/buildlink3.mk index cd67f26c2fc..45e76f5fc57 100644 --- a/editors/xemacs-current-nox11/buildlink3.mk +++ b/editors/xemacs-current-nox11/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2007/11/12 01:48:48 uebayasi Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2008/10/11 09:31:56 uebayasi Exp $ # BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ @@ -13,9 +13,9 @@ BUILDLINK_PACKAGES+= xemacs-nox11 BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xemacs-nox11 .if ${XEMACS_NOX11_BUILDLINK3_MK} == "+" -.include "../../mk/emacs.mk" -BUILDLINK_API_DEPENDS.xemacs-nox11+= ${_EMACS_REQD.xemacs215nox} -BUILDLINK_PKGSRCDIR.xemacs-nox11?= ${_EMACS_DEP.xemacs215nox} +.include "../../editors/emacs/modules.mk" +BUILDLINK_API_DEPENDS.xemacs-nox11+= ${_EMACS_REQD} +BUILDLINK_PKGSRCDIR.xemacs-nox11?= ${_EMACS_PKGDIR} .endif # XEMACS_NOX11_BUILDLINK3_MK BUILDLINK_CONTENTS_FILTER.xemacs-nox11= ${EGREP} '.*\.el$$|.*\.elc$$' diff --git a/editors/xemacs-current-nox11/version.mk b/editors/xemacs-current-nox11/version.mk new file mode 100644 index 00000000000..d04c4a73cf8 --- /dev/null +++ b/editors/xemacs-current-nox11/version.mk @@ -0,0 +1,9 @@ +# $NetBSD: version.mk,v 1.1 2008/10/11 09:31:56 uebayasi Exp $ + +_EMACS_FLAVOR= xemacs +_EMACS_REQD= xemacs-nox11>=21.5<21.6 +_EMACS_PKGDEP.base= xemacs-packages>=1.15:../../editors/xemacs-packages +_EMACS_PKGDEP.leim= + +_EMACS_VERSION_MAJOR= 21 +_EMACS_VERSION_MINOR= 5 diff --git a/editors/xemacs-current/buildlink3.mk b/editors/xemacs-current/buildlink3.mk index 1f9fc69dd84..86aa1539510 100644 --- a/editors/xemacs-current/buildlink3.mk +++ b/editors/xemacs-current/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2007/10/29 12:40:03 uebayasi Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2008/10/11 09:31:56 uebayasi Exp $ # BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ @@ -13,9 +13,9 @@ BUILDLINK_PACKAGES+= xemacs BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xemacs .if ${XEMACS_BUILDLINK3_MK} == "+" -.include "../../mk/emacs.mk" -BUILDLINK_API_DEPENDS.xemacs+= ${_EMACS_REQD.xemacs215} -BUILDLINK_PKGSRCDIR.xemacs?= ${_EMACS_DEP.xemacs215} +.include "../../editors/emacs/modules.mk" +BUILDLINK_API_DEPENDS.xemacs+= ${_EMACS_REQD} +BUILDLINK_PKGSRCDIR.xemacs?= ${_EMACS_PKGDIR} .endif # XEMACS_BUILDLINK3_MK BUILDLINK_CONTENTS_FILTER.xemacs= ${EGREP} '.*\.el$$|.*\.elc$$' diff --git a/editors/xemacs-current/version.mk b/editors/xemacs-current/version.mk new file mode 100644 index 00000000000..7cf4c17dd67 --- /dev/null +++ b/editors/xemacs-current/version.mk @@ -0,0 +1,9 @@ +# $NetBSD: version.mk,v 1.1 2008/10/11 09:31:56 uebayasi Exp $ + +_EMACS_FLAVOR= xemacs +_EMACS_REQD= xemacs>=21.5<21.6 +_EMACS_PKGDEP.base= xemacs-packages>=1.15:../../editors/xemacs-packages +_EMACS_PKGDEP.leim= + +_EMACS_VERSION_MAJOR= 21 +_EMACS_VERSION_MINOR= 5 diff --git a/editors/xemacs-nox11/buildlink3.mk b/editors/xemacs-nox11/buildlink3.mk index 43c189326cc..45e76f5fc57 100644 --- a/editors/xemacs-nox11/buildlink3.mk +++ b/editors/xemacs-nox11/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2007/10/29 12:40:04 uebayasi Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2008/10/11 09:31:56 uebayasi Exp $ # BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ @@ -13,9 +13,9 @@ BUILDLINK_PACKAGES+= xemacs-nox11 BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xemacs-nox11 .if ${XEMACS_NOX11_BUILDLINK3_MK} == "+" -.include "../../mk/emacs.mk" -BUILDLINK_API_DEPENDS.xemacs-nox11+= ${_EMACS_REQD.xemacs214nox} -BUILDLINK_PKGSRCDIR.xemacs-nox11?= ${_EMACS_DEP.xemacs214nox} +.include "../../editors/emacs/modules.mk" +BUILDLINK_API_DEPENDS.xemacs-nox11+= ${_EMACS_REQD} +BUILDLINK_PKGSRCDIR.xemacs-nox11?= ${_EMACS_PKGDIR} .endif # XEMACS_NOX11_BUILDLINK3_MK BUILDLINK_CONTENTS_FILTER.xemacs-nox11= ${EGREP} '.*\.el$$|.*\.elc$$' diff --git a/editors/xemacs-nox11/version.mk b/editors/xemacs-nox11/version.mk new file mode 100644 index 00000000000..a04844f5c74 --- /dev/null +++ b/editors/xemacs-nox11/version.mk @@ -0,0 +1,9 @@ +# $NetBSD: version.mk,v 1.1 2008/10/11 09:31:56 uebayasi Exp $ + +_EMACS_FLAVOR= xemacs +_EMACS_REQD= xemacs-nox11>=21.4<21.5 +_EMACS_PKGDEP.base= xemacs-packages>=1.15:../../editors/xemacs-packages +_EMACS_PKGDEP.leim= + +_EMACS_VERSION_MAJOR= 21 +_EMACS_VERSION_MINOR= 4 diff --git a/editors/xemacs/buildlink3.mk b/editors/xemacs/buildlink3.mk index cc22efb5845..86aa1539510 100644 --- a/editors/xemacs/buildlink3.mk +++ b/editors/xemacs/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2007/10/29 12:40:04 uebayasi Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2008/10/11 09:31:56 uebayasi Exp $ # BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ @@ -13,9 +13,9 @@ BUILDLINK_PACKAGES+= xemacs BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xemacs .if ${XEMACS_BUILDLINK3_MK} == "+" -.include "../../mk/emacs.mk" -BUILDLINK_API_DEPENDS.xemacs+= ${_EMACS_REQD.xemacs214} -BUILDLINK_PKGSRCDIR.xemacs?= ${_EMACS_DEP.xemacs214} +.include "../../editors/emacs/modules.mk" +BUILDLINK_API_DEPENDS.xemacs+= ${_EMACS_REQD} +BUILDLINK_PKGSRCDIR.xemacs?= ${_EMACS_PKGDIR} .endif # XEMACS_BUILDLINK3_MK BUILDLINK_CONTENTS_FILTER.xemacs= ${EGREP} '.*\.el$$|.*\.elc$$' diff --git a/editors/xemacs/version.mk b/editors/xemacs/version.mk new file mode 100644 index 00000000000..7538edd6862 --- /dev/null +++ b/editors/xemacs/version.mk @@ -0,0 +1,9 @@ +# $NetBSD: version.mk,v 1.1 2008/10/11 09:31:56 uebayasi Exp $ + +_EMACS_FLAVOR= xemacs +_EMACS_REQD= xemacs>=21.4<21.5 +_EMACS_PKGDEP.base= xemacs-packages>=1.15:../../editors/xemacs-packages +_EMACS_PKGDEP.leim= + +_EMACS_VERSION_MAJOR= 21 +_EMACS_VERSION_MINOR= 4 diff --git a/graphics/artist/Makefile b/graphics/artist/Makefile index 060f491d63a..786138ca199 100644 --- a/graphics/artist/Makefile +++ b/graphics/artist/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2006/03/04 21:29:46 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2008/10/11 09:31:56 uebayasi Exp $ DISTNAME= artist-1.2.6 PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME} @@ -10,20 +10,21 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.lysator.liu.se/~tab/artist/ COMMENT= Elisp drawing package with mouse and keyboard support +PKG_DESTDIR_SUPPORT= user-destdir +INSTALLATION_DIRS+= ${DOCDIR} \ + ${EMACS_LISPPREFIX:C|^${PREFIX}/||}/artist + GNU_CONFIGURE= yes -.include "../../mk/emacs.mk" +.include "../../editors/emacs/modules.mk" -.if ${EMACS_FLAVOR} == "xemacs" -MAKE_FLAGS+= EMACS=xemacs -MAKE_FLAGS+= lispdir=${EMACS_LISPPREFIX}/artist -.endif +MAKE_FLAGS+= EMACS=${EMACS_FLAVOR} \ + lispdir=${DESTDIR}${EMACS_LISPPREFIX}/artist DOCS= BUGS COPYING ChangeLog INSTALL README TODO -DOCDIR= ${PREFIX}/share/doc/artist +DOCDIR= share/doc/artist post-install: - ${INSTALL_DATA_DIR} ${DOCDIR} - cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCDIR} + cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DESTDIR}${PREFIX}/${DOCDIR} .include "../../mk/bsd.pkg.mk" diff --git a/inputmethod/anthy-elisp/Makefile b/inputmethod/anthy-elisp/Makefile index 8583b40c14c..ccbe28235cf 100644 --- a/inputmethod/anthy-elisp/Makefile +++ b/inputmethod/anthy-elisp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2008/03/04 15:55:13 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2008/10/11 09:31:57 uebayasi Exp $ .include "../../inputmethod/anthy/Makefile.common" PKGNAME= ${EMACS_PKGNAME_PREFIX}anthy-elisp-${ANTHY_VERSION} @@ -16,7 +16,7 @@ GNU_CONFIGURE= yes CONFIGURE_ENV+= EMACS=${EMACS_BIN:Q} EMACS_MODULES+= base leim -.include "../../mk/emacs.mk" +.include "../../editors/emacs/modules.mk" do-build: cd ${WRKSRC}/src-util && ${MAKE} elc-stamp diff --git a/inputmethod/iiimecf/Makefile b/inputmethod/iiimecf/Makefile index 65f06a76944..c9037f2ab11 100644 --- a/inputmethod/iiimecf/Makefile +++ b/inputmethod/iiimecf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2008/03/04 15:55:13 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2008/10/11 09:31:57 uebayasi Exp $ # DISTNAME= IIIMECF-0.6 @@ -23,7 +23,7 @@ do-install: ${INSTALL_DATA} $$f ${DESTDIR}${EMACS_LISPPREFIX}/iiimecf; \ done -.include "../../mk/emacs.mk" +.include "../../editors/emacs/modules.mk" .include "../../editors/mule-ucs/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/inputmethod/prime-el/Makefile b/inputmethod/prime-el/Makefile index 7782a773d7f..b3cc19a824f 100644 --- a/inputmethod/prime-el/Makefile +++ b/inputmethod/prime-el/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2008/03/02 02:51:51 obache Exp $ +# $NetBSD: Makefile,v 1.2 2008/10/11 09:31:57 uebayasi Exp $ # DISTNAME= prime-el-1.5.1.3 @@ -28,5 +28,5 @@ CONF_FILES+= ${PREFIX}/share/doc/prime/examples/Custom_prime-el.el \ .include "../../devel/apel/buildlink3.mk" .include "../../devel/mell/buildlink3.mk" .include "../../inputmethod/prime/buildlink3.mk" -.include "../../mk/emacs.mk" +.include "../../editors/emacs/modules.mk" .include "../../mk/bsd.pkg.mk" diff --git a/inputmethod/skk/Makefile b/inputmethod/skk/Makefile index b973eb52e02..89939c379c5 100644 --- a/inputmethod/skk/Makefile +++ b/inputmethod/skk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2008/05/30 16:03:17 brook Exp $ +# $NetBSD: Makefile,v 1.18 2008/10/11 09:31:57 uebayasi Exp $ # DISTNAME= ddskk-20080309 @@ -11,32 +11,29 @@ MAINTAINER= uebayasi@NetBSD.org HOMEPAGE= http://openlab.ring.gr.jp/skk/index.html COMMENT= Japanese input methods for Emacs +PKG_DESTDIR_SUPPORT= user-destdir + CONFLICTS= ddskk-[0-9]* EMACS_MODULES+= base leim MAKEFLAGS+= EMACS=${EMACS_BIN:Q} +MAKE_ENV= prefix=${DESTDIR:Q}${PREFIX:Q} \ + EMACS_INFOPREFIX=${DESTDIR:Q}${EMACS_INFOPREFIX:Q} \ + EMACS_LISPPREFIX=${DESTDIR:Q}${EMACS_LISPPREFIX:Q} BUILD_TARGET= elc INFO_FILES= # PLIST -# SKK-CFG was copied from ${FILESDIR} during post-extract. -SUBST_CLASSES+= cfg -SUBST_STAGE.cfg= do-configure -SUBST_FILES.cfg= SKK-CFG -SUBST_SED.cfg= -e 's|@PREFIX@|${PREFIX}|g' \ - -e 's|@EMACS_INFOPREFIX@|${EMACS_INFOPREFIX}|g' \ - -e 's|@EMACS_LISPPREFIX@|${EMACS_LISPPREFIX}|g' - # Substitute directory definitions during do-configure. post-extract: @${MV} ${WRKSRC}/SKK-CFG ${WRKSRC}/SKK-CFG.orig @${CP} ${FILESDIR}/SKK-CFG ${WRKSRC} - @${CHMOD} +w ${WRKSRC}/doc/skk.texi + @${CHMOD} +w ${WRKSRC}/skk-dic.* ${WRKSRC}/doc/skk.texi .include "options.mk" -.include "../../mk/emacs.mk" +.include "../../editors/emacs/modules.mk" .include "../../devel/apel/buildlink3.mk" .include "../../editors/mule-ucs/buildlink3.mk" diff --git a/inputmethod/skk/files/SKK-CFG b/inputmethod/skk/files/SKK-CFG index e483124818e..bb424a3d41c 100644 --- a/inputmethod/skk/files/SKK-CFG +++ b/inputmethod/skk/files/SKK-CFG @@ -1,12 +1,17 @@ -;;; $NetBSD: SKK-CFG,v 1.2 2006/04/08 19:29:52 jlam Exp $ +;;; $NetBSD: SKK-CFG,v 1.3 2008/10/11 09:31:57 uebayasi Exp $ ;;; from inputmethods/ddskk/files/SKK-CFG ;;; NetBSD: SKK-CFG,v 1.1.1.1 2002/09/16 13:20:44 uebayasi Exp ;;; -(setq APEL_SPECIFIC_LISPDIR "@EMACS_LISPPREFIX@/apel") -(setq LISPDIR "@EMACS_LISPPREFIX@") + +(setq pkgsrc-prefix (getenv "prefix")) +(setq pkgsrc-emacs-infoprefix (getenv "EMACS_INFOPREFIX")) +(setq pkgsrc-emacs-lispprefix (getenv "EMACS_LISPPREFIX")) + +(setq APEL_SPECIFIC_LISPDIR (concat pkgsrc-emacs-lispprefix "/apel")) +(setq LISPDIR pkgsrc-emacs-lispprefix) ;;; XXX We avoid *.{el,elc} files installed under .../emacs/2?.?/site-lisp/... -(setq VERSION_SPECIFIC_LISPDIR "@EMACS_LISPPREFIX@") +(setq VERSION_SPECIFIC_LISPDIR pkgsrc-emacs-lispprefix) (setq EMU_PREFIX "emu") -(setq SKK_DATADIR "@PREFIX@/share/skk") -(setq SKK_INFODIR "@EMACS_INFOPREFIX@") -(setq SKK_LISPDIR "@EMACS_LISPPREFIX@/skk") +(setq SKK_DATADIR (concat pkgsrc-prefix "/share/skk")) +(setq SKK_INFODIR pkgsrc-emacs-infoprefix) +(setq SKK_LISPDIR (concat pkgsrc-emacs-lispprefix "/skk")) diff --git a/inputmethod/tc/Makefile b/inputmethod/tc/Makefile index cbf571057ad..d1919ad6f3b 100644 --- a/inputmethod/tc/Makefile +++ b/inputmethod/tc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2008/06/20 01:09:23 joerg Exp $ +# $NetBSD: Makefile,v 1.14 2008/10/11 09:31:57 uebayasi Exp $ # DISTNAME= tc-2.3.1 @@ -13,7 +13,7 @@ COMMENT= T-Code driver for Emacs PKG_DESTDIR_SUPPORT= user-destdir -.include "../../mk/emacs.mk" +.include "../../editors/emacs/modules.mk" .if ${EMACS_FLAVOR} == "xemacs" CONFIGURE_ARGS+=--with-emacs=xemacs diff --git a/lang/eieio/Makefile b/lang/eieio/Makefile index 30d3e23f83b..b324f92de45 100644 --- a/lang/eieio/Makefile +++ b/lang/eieio/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2008/03/04 16:38:12 jlam Exp $ +# $NetBSD: Makefile,v 1.18 2008/10/11 09:31:57 uebayasi Exp $ # DISTNAME= eieio-0.17 @@ -37,5 +37,5 @@ do-install: ${INSTALL_DATA} "$$f" ${DESTDIR}${EMACS_INFOPREFIX}; \ done -.include "../../mk/emacs.mk" +.include "../../editors/emacs/modules.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/twelf/Makefile b/lang/twelf/Makefile index fb005da1f2b..f32ec34eaf3 100644 --- a/lang/twelf/Makefile +++ b/lang/twelf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2008/05/26 02:13:21 joerg Exp $ +# $NetBSD: Makefile,v 1.18 2008/10/11 09:31:57 uebayasi Exp $ # DISTNAME= twelf-1-4 @@ -76,5 +76,5 @@ do-install: cd ${WRKSRC}/examples && pax -rw -pam * ${TWELF_EXAMPLEDIR} ${LN} -sf ${TWELF_EXAMPLEDIR} ${TWELF_LIBDIR}/examples -.include "../../mk/emacs.mk" +.include "../../editors/emacs/modules.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mail/etach/Makefile b/mail/etach/Makefile index 0ad792006ee..65e7e7313c4 100644 --- a/mail/etach/Makefile +++ b/mail/etach/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2008/03/04 17:57:18 jlam Exp $ +# $NetBSD: Makefile,v 1.16 2008/10/11 09:31:57 uebayasi Exp $ DISTNAME= etach-1.2.9 PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME} @@ -22,5 +22,5 @@ do-install: cd ${WRKSRC} && ${INSTALL_DATA} README.txt FAQ.txt LICENSE.txt \ ${DESTDIR}${PREFIX}/share/doc/etach/ -.include "../../mk/emacs.mk" +.include "../../editors/emacs/modules.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mail/gnus/Makefile b/mail/gnus/Makefile index 88e182bb811..29d58d3221f 100644 --- a/mail/gnus/Makefile +++ b/mail/gnus/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2007/02/22 19:01:21 wiz Exp $ +# $NetBSD: Makefile,v 1.16 2008/10/11 09:31:57 uebayasi Exp $ DISTNAME= gnus-5.10.8 PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME} @@ -25,5 +25,5 @@ GNU_CONFIGURE_INFODIR= ${PREFIX}/share/doc/gnus/info USE_TOOLS+= makeinfo INFO_FILES= # PLIST -.include "../../mk/emacs.mk" +.include "../../editors/emacs/modules.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mail/mailcrypt/Makefile b/mail/mailcrypt/Makefile index 12c7a2d3701..9a698982617 100644 --- a/mail/mailcrypt/Makefile +++ b/mail/mailcrypt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2007/06/20 11:42:23 markd Exp $ +# $NetBSD: Makefile,v 1.15 2008/10/11 09:31:57 uebayasi Exp $ DISTNAME= mailcrypt-3.5.8 PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME} @@ -10,12 +10,16 @@ MAINTAINER= sommerfeld@NetBSD.org HOMEPAGE= http://mailcrypt.sourceforge.net/ COMMENT= Emacs frontend for PGP and GPG +PKG_DESTDIR_SUPPORT= user-destdir + # What we would like to say here is: "we want GNU emacs" EMACS_VERSIONS_ACCEPTED= emacs22 emacs22nox emacs21 emacs21nox emacs20 GNU_CONFIGURE= yes -MAKE_FLAGS+= lispdir=${EMACS_LISPPREFIX:Q} +MAKE_FLAGS+= prefix=${DESTDIR:Q}${PREFIX:Q} \ + lispdir=${DESTDIR:Q}${EMACS_LISPPREFIX:Q} \ + infodir=${DESTDIR:Q}${PREFIX:Q}/info INFO_FILES= # PLIST -.include "../../mk/emacs.mk" +.include "../../editors/emacs/modules.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mail/mew/Makefile b/mail/mew/Makefile index 2fdf404fc29..5637bc6bbe6 100644 --- a/mail/mew/Makefile +++ b/mail/mew/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.74 2007/12/30 16:24:54 cjep Exp $ +# $NetBSD: Makefile,v 1.75 2008/10/11 09:31:57 uebayasi Exp $ DISTNAME= mew-5.2 PKGREVISION= 1 @@ -10,6 +10,9 @@ MAINTAINER= uebayasi@NetBSD.org HOMEPAGE= http://www.mew.org/ COMMENT= Messaging in the Emacs World +PKG_DESTDIR_SUPPORT= user-destdir +INSTALLATION_DIRS= ${MEW_CONTRIB_DIR:C|^${PREFIX}/||} + CONFLICTS+= mew-xemacs-[0-9]* incm-[0-9]* INFO_FILES= yes @@ -21,11 +24,13 @@ EMACS_MODULES+= base MEW_CONTRIB_DIR=${EMACS_LISPPREFIX}/mew/contrib +MAKE_FLAGS+= DESTDIR=${DESTDIR:Q} MAKE_FLAGS+= prefix=${PREFIX:Q} +MAKE_FLAGS+= exec_prefix=${PREFIX:Q} MAKE_FLAGS+= EMACS=${EMACS_BIN:Q} -MAKE_FLAGS+= elispdir=${EMACS_LISPPREFIX}/mew -MAKE_FLAGS+= etcdir=${EMACS_ETCPREFIX}/mew -MAKE_FLAGS+= infodir=${EMACS_INFOPREFIX} +MAKE_FLAGS+= elispdir=${EMACS_LISPPREFIX:Q}/mew +MAKE_FLAGS+= etcdir=${EMACS_ETCPREFIX:Q}/mew +MAKE_FLAGS+= infodir=${EMACS_INFOPREFIX:Q} MAKE_FLAGS+= mandir=${PREFIX:Q}/${PKGMANDIR:Q}/man1 CONFIGURE_ARGS+= --with-etcdir=${EMACS_ETCPREFIX}/mew @@ -40,9 +45,8 @@ post-configure: ${WRKSRC}/mew-key.el.1 > ${WRKSRC}/mew-key.el post-install: - ${INSTALL_DATA_DIR} ${MEW_CONTRIB_DIR} - ${INSTALL_DATA} ${WRKSRC}/contrib/* ${MEW_CONTRIB_DIR} + ${INSTALL_DATA} ${WRKSRC}/contrib/* ${DESTDIR}${MEW_CONTRIB_DIR} .include "../../devel/zlib/buildlink3.mk" -.include "../../mk/emacs.mk" +.include "../../editors/emacs/modules.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mail/rmail-mime/Makefile b/mail/rmail-mime/Makefile index 3a008dc03b9..2ac7c3a25f5 100644 --- a/mail/rmail-mime/Makefile +++ b/mail/rmail-mime/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2008/03/04 17:57:19 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2008/10/11 09:31:57 uebayasi Exp $ # DISTNAME= rmail-mime-1.13.0 @@ -14,7 +14,7 @@ DEPENDS+= ${EMACS_PKGNAME_PREFIX}semi>=1.14.4:../../devel/semi PKG_DESTDIR_SUPPORT= user-destdir -.include "../../mk/emacs.mk" +.include "../../editors/emacs/modules.mk" SITE_LISP= ${EMACS_LISPPREFIX:C|^${PREFIX}/||} PLIST_SUBST+= SITE_LISP=${SITE_LISP:Q} diff --git a/mail/vm/Makefile b/mail/vm/Makefile index 4fb2f3420ae..4873f16769a 100644 --- a/mail/vm/Makefile +++ b/mail/vm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2008/03/04 17:57:20 jlam Exp $ +# $NetBSD: Makefile,v 1.34 2008/10/11 09:31:57 uebayasi Exp $ DISTNAME= vm-7.19 PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME} @@ -48,6 +48,6 @@ do-install: cd ${WRKSRC} && ${INSTALL_PROGRAM} qp-decode qp-encode \ base64-decode base64-encode ${DESTDIR}${PREFIX}/bin -.include "../../mk/emacs.mk" +.include "../../editors/emacs/modules.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mail/wl/Makefile b/mail/wl/Makefile index 2b8163306d2..15d9274ef95 100644 --- a/mail/wl/Makefile +++ b/mail/wl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2008/01/18 05:08:31 tnn Exp $ +# $NetBSD: Makefile,v 1.38 2008/10/11 09:31:57 uebayasi Exp $ DISTNAME= wl-2.14.0 PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME} @@ -10,32 +10,32 @@ MAINTAINER= tech-pkg-ja@jp.NetBSD.org HOMEPAGE= http://www.gohome.org/wl/ COMMENT= Mail/news management system with IMAP4rev1 support for Emacs +PKG_DESTDIR_SUPPORT= user-destdir + BUILD_TARGET= all info INSTALL_TARGET= install install-info -MAKE_FLAGS+= INFODIR=${EMACS_INFOPREFIX:Q} -MAKE_FLAGS+= LISPDIR=${EMACS_LISPPREFIX:Q} +MAKE_FLAGS+= INFODIR=${DESTDIR:Q}${EMACS_INFOPREFIX:Q} +MAKE_FLAGS+= LISPDIR=${DESTDIR:Q}${EMACS_LISPPREFIX:Q} MAKE_FLAGS+= EMACS=${EMACS_FLAVOR:Q} -MAKE_FLAGS+= PIXMAPDIR=${PREFIX:Q}/share/wl +MAKE_FLAGS+= PIXMAPDIR=${DESTDIR:Q}${PREFIX:Q}/share/wl INFO_FILES= # PLIST DOCDIR= ${PREFIX}/share/doc/wl EXAMPLESDIR= ${PREFIX}/share/examples/wl -INSTALLATION_DIRS= ${DOCDIR} ${EXAMPLESDIR} ${EMACS_INFOPREFIX} +INSTALLATION_DIRS= ${DOCDIR}/en ${DOCDIR}/ja \ + ${EXAMPLESDIR}/en ${EXAMPLESDIR}/ja \ + ${EMACS_INFOPREFIX} post-install: - ${INSTALL_DATA_DIR} ${DOCDIR:Q}/en - ${INSTALL_DATA_DIR} ${DOCDIR:Q}/ja @set -e; \ for f in BUGS NEWS README; do \ - ${INSTALL_DATA} ${WRKSRC:Q}/"$$f" ${DOCDIR:Q}/en; \ - ${INSTALL_DATA} ${WRKSRC:Q}/"$$f".ja ${DOCDIR:Q}/ja; \ + ${INSTALL_DATA} ${WRKSRC:Q}/"$$f" ${DESTDIR:Q}${DOCDIR:Q}/en; \ + ${INSTALL_DATA} ${WRKSRC:Q}/"$$f".ja ${DESTDIR:Q}${DOCDIR:Q}/ja; \ done - ${INSTALL_DATA_DIR} ${EXAMPLESDIR:Q}/en - ${INSTALL_DATA_DIR} ${EXAMPLESDIR:Q}/ja - ${INSTALL_DATA} ${WRKSRC:Q}/samples/en/dot.* ${EXAMPLESDIR:Q}/en - ${INSTALL_DATA} ${WRKSRC:Q}/samples/ja/dot.* ${EXAMPLESDIR:Q}/ja + ${INSTALL_DATA} ${WRKSRC:Q}/samples/en/dot.* ${DESTDIR:Q}${EXAMPLESDIR:Q}/en + ${INSTALL_DATA} ${WRKSRC:Q}/samples/ja/dot.* ${DESTDIR:Q}${EXAMPLESDIR:Q}/ja -.include "../../mk/emacs.mk" +.include "../../editors/emacs/modules.mk" .include "options.mk" diff --git a/math/calc/Makefile b/math/calc/Makefile index 351c5bda247..0a125663be4 100644 --- a/math/calc/Makefile +++ b/math/calc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2008/03/04 18:12:58 jlam Exp $ +# $NetBSD: Makefile,v 1.22 2008/10/11 09:31:57 uebayasi Exp $ DISTNAME= calc-2.02f PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME} @@ -12,7 +12,7 @@ COMMENT= Advanced Calculator for GNU Emacs PKG_DESTDIR_SUPPORT= user-destdir -.include "../../mk/emacs.mk" +.include "../../editors/emacs/modules.mk" MAKE_ENV+= EMACS=${EMACS_FLAVOR:Q} diff --git a/math/ess/Makefile b/math/ess/Makefile index 51f94a08bc2..1c0eea1ed3a 100644 --- a/math/ess/Makefile +++ b/math/ess/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2008/03/04 18:12:59 jlam Exp $ +# $NetBSD: Makefile,v 1.18 2008/10/11 09:31:57 uebayasi Exp $ DISTNAME= ess-5.3.4 PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME} @@ -45,5 +45,5 @@ do-install: cd ${WRKSRC}/etc && ${INSTALL_SCRIPT} ess-sas-sh-command \ ${DESTDIR}${EMACS_ETCPREFIX}/ess -.include "../../mk/emacs.mk" +.include "../../editors/emacs/modules.mk" .include "../../mk/bsd.pkg.mk" diff --git a/misc/bbdb/Makefile b/misc/bbdb/Makefile index a3cf129283e..3d0347bc261 100644 --- a/misc/bbdb/Makefile +++ b/misc/bbdb/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2008/03/04 19:21:11 jlam Exp $ +# $NetBSD: Makefile,v 1.19 2008/10/11 09:31:57 uebayasi Exp $ # DISTNAME= bbdb-2.34 @@ -25,7 +25,7 @@ INFO_FILES= # PLIST LISPDIR= ${EMACS_LISPPREFIX}/bbdb INSTALLATION_DIRS= ${EMACS_INFOPREFIX} -.include "../../mk/emacs.mk" +.include "../../editors/emacs/modules.mk" .if ${EMACS_FLAVOR} == "xemacs" CONFIGURE_ARGS+= --with-emacs=xemacs diff --git a/misc/bbdb/buildlink3.mk b/misc/bbdb/buildlink3.mk index 1472adc74ed..6ddb7de9f66 100644 --- a/misc/bbdb/buildlink3.mk +++ b/misc/bbdb/buildlink3.mk @@ -1,10 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.1 2007/10/29 12:41:18 uebayasi Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2008/10/11 09:31:57 uebayasi Exp $ # BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ BBDB_BUILDLINK3_MK:= ${BBDB_BUILDLINK3_MK}+ -.include "../../mk/emacs.mk" +.include "../../editors/emacs/modules.mk" .if ${EMACS_FLAVOR} == "emacs" .if ${BUILDLINK_DEPTH} == "+" diff --git a/misc/elscreen/Makefile b/misc/elscreen/Makefile index 1cb0fe9cd2c..d9a828b7ddc 100644 --- a/misc/elscreen/Makefile +++ b/misc/elscreen/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2008/03/04 19:21:11 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2008/10/11 09:31:57 uebayasi Exp $ # DISTNAME= elscreen-1.4.5 @@ -30,7 +30,7 @@ do-install: ${INSTALL_DATA} ${WRKDIR}/*/*.el ${DESTDIR}${EMACS_LISPPREFIX}/elscreen ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/elscreen -.include "../../mk/emacs.mk" +.include "../../editors/emacs/modules.mk" .include "../../devel/apel/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/misc/emacs-wiki/Makefile b/misc/emacs-wiki/Makefile index 15ba897657f..f82abc2571d 100644 --- a/misc/emacs-wiki/Makefile +++ b/misc/emacs-wiki/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2008/03/04 19:21:11 jlam Exp $ +# $NetBSD: Makefile,v 1.3 2008/10/11 09:31:57 uebayasi Exp $ # DISTNAME= ${EMACSWIKI}-${EMACSWIKIVERSION} @@ -19,7 +19,7 @@ PKG_DESTDIR_SUPPORT= user-destdir #WRKSRC= ${WRKDIR}/${EMACSWIKI} -.include "../../mk/emacs.mk" +.include "../../editors/emacs/modules.mk" LISPDIR= ${EMACS_LISPPREFIX}/emacs-wiki diff --git a/misc/lookup/Makefile b/misc/lookup/Makefile index 80f8d98be83..a783004f135 100644 --- a/misc/lookup/Makefile +++ b/misc/lookup/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2008/07/14 12:56:09 joerg Exp $ +# $NetBSD: Makefile,v 1.17 2008/10/11 09:31:57 uebayasi Exp $ # DISTNAME= lookup-1.4.1 @@ -22,7 +22,7 @@ INFO_FILES= # PLIST CONFIGURE_ARGS+=${EMACS_FLAVOR} -.include "../../mk/emacs.mk" +.include "../../editors/emacs/modules.mk" .include "../../devel/apel/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mk/emacs.mk b/mk/emacs.mk index 8010df14c60..f2789a4f7e9 100644 --- a/mk/emacs.mk +++ b/mk/emacs.mk @@ -1,400 +1,5 @@ -# $NetBSD: emacs.mk,v 1.49 2008/03/01 05:11:10 obache Exp $ -# -# This Makefile fragment handles Emacs Lisp Packages (== ELPs). -# -# Note to users: -# -# * Users choose one favourite Emacs version (default GNU Emacs 21). -# -# * Emacs Lisp files are installed... -# GNU emacs -# -> ${PREFIX}/share/emacs/site-lisp/foo/... -# XEmacs -# ->${PREFIX}/lib/xemacs/site-packages/lisp/foo/... -# -# * 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 favourite Emacs version. -# Possible values: -# emacs21, emacs21nox, emacs22, emacs22nox, emacs20, xemacs215, xemacs215nox, xemacs214, xemacs214nox -# Default value: -# emacs22 -# -# Variables ELPs can provide: -# -# EMACS_MODULES -# Description: -# List of Emacs LISP modules that the current ELP -# needs at run-time. -# Possible values: -# base, leim -# Default value: -# <undefined> -# -# EMACS_VERSIONS_ACCEPTED -# Description: -# Versions the ELP accepts (supports). -# Possible values: -# emacs21, emacs21nox, emacs22, emacs22nox, emacs20, xemacs215, xemacs215nox, xemacs214, xemacs214nox -# Default value: -# emacs21, emacs21nox, emacs22, emacs22nox, emacs20, xemacs215, xemacs215nox, xemacs214, xemacs214nox -# -# 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 -# -# 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}/${PKGINFODIR} -# ${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-" -# -# EMACS_VERSION_MAJOR -# Description: -# Emacs major version. -# Possible values: -# 20, 21, 22, <integers more than that in the future> -# -# EMACS_VERSION_MINOR -# Description: -# Emacs minor version. -# Possible values: -# <integer> -# -# 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: -# ${PKGINFODIR} -# 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,emacs22,emacs22nox,emacs20,xemacs,xemacs215,xemacs215nox,xemacs214,xemacs214nox} -# 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"; this means that only the PLIST lines -# prefixed by ${FOR_emacs} and ${FOR_emacs21} are -# valid. -# Possible values: -# "", "@comment" -# -# NOTFOR_{emacs,emacs21,emacs21nox,emacs22,emacs22nox,emacs20,xemacs,xemacs215,xemacs215nox,xemacs214,xemacs214nox} -# Description: -# The opposite of FOR_*. See above. -# Possible values: -# "", "@comment" -# -# FOR_emacs_{x,nox},NOTFOR_emacs_{x,nox} -# Description: -# PLIST switches for X11 / non-X11. -# Possible values: -# "", "@comment" -# +# $NetBSD: emacs.mk,v 1.50 2008/10/11 09:31:57 uebayasi Exp $ -.if !defined(EMACS_MK) -EMACS_MK= # defined +# Please use editors/emacs/modules.mk! -_VARGROUPS+= emacs -_USER_VARS.emacs= EMACS_TYPE -_PKG_VARS.emacs= EMACS_MODULES EMACS_VERSIONS_ACCEPTED -_SYS_VARS.emacs= EMACS_BIN EMACS_ETCPREFIX EMACS_FLAVOR \ - EMACS_INFOPREFIX EMACS_LISPPREFIX \ - EMACS_PKGNAME_PREFIX \ - EMACS_VERSION_MAJOR EMACS_VERSION_MINOR -_DEF_VARS.emacs= _EMACS_TYPE _EMACS_PKGBASE _EMACS_VERSION_FULL _EMACS_BLNK -BUILD_DEFS+= ${_USER_VARS.emacs} -BUILD_DEFS_EFFECTS+= ${_SYS_VARS.emacs} - -.include "../../mk/bsd.prefs.mk" - -# -# Constants -# - -_EMACS_VERSIONS_ALL= \ - emacs20 emacs21 emacs21nox emacs22 emacs22nox xemacs214 xemacs214nox xemacs215 xemacs215nox -_EMACS_VERSIONS_ACCEPTED_DEFAULT= ${_EMACS_VERSIONS_ALL} -_EMACS_VERSION_DEFAULT.emacs= emacs21 -_EMACS_VERSION_DEFAULT.xemacs= xemacs214 -_EMACS_REQD.emacs20= emacs>=20.7<21 -_EMACS_REQD.emacs21= emacs>=21.2<22 -_EMACS_REQD.emacs21nox= emacs-nox11>=21.2<22 -_EMACS_REQD.emacs22= emacs>=22 -_EMACS_REQD.emacs22nox= emacs-nox11>=22 -_EMACS_REQD.xemacs214= xemacs>=21.4<21.5 -_EMACS_REQD.xemacs214nox= xemacs-nox11>=21.4<21.5 -_EMACS_REQD.xemacs215= xemacs>=21.5<21.6 -_EMACS_REQD.xemacs215nox= xemacs-nox11>=21.5<21.6 -_LEIM_REQD.emacs20= leim>=20.${EMACS_VERSION_MINOR}<21 -_LEIM_REQD.emacs20nox= ${_LEIM_REQD.emacs20} -_LEIM_REQD.emacs21= leim>=21.${EMACS_VERSION_MINOR}<22 -_LEIM_REQD.emacs21nox= ${_LEIM_REQD.emacs21} -_LEIM_REQD.emacs22= # nothing -_LEIM_REQD.emacs22nox= ${_LEIM_REQD.emacs22} -_EMACS_DEP.emacs20= ../../editors/emacs20 -_EMACS_DEP.emacs21= ../../editors/emacs21 -_EMACS_DEP.emacs21nox= ../../editors/emacs21-nox11 -_EMACS_DEP.emacs22= ../../editors/emacs -_EMACS_DEP.emacs22nox= ../../editors/emacs-nox11 -_EMACS_DEP.xemacs214= ../../editors/xemacs -_EMACS_DEP.xemacs214nox=../../editors/xemacs-nox11 -_EMACS_DEP.xemacs215= ../../editors/xemacs-current -_EMACS_DEP.xemacs215nox=../../editors/xemacs-current-nox11 -_LEIM_DEP.emacs20= ../../editors/leim20 -_LEIM_DEP.emacs20nox= ${_LEIM_DEP.emacs20} -_LEIM_DEP.emacs21= ../../editors/leim21 -_LEIM_DEP.emacs21nox= ${_LEIM_DEP.emacs21} -_LEIM_DEP.emacs22= -_LEIM_DEP.emacs20nox= ${_LEIM_DEP.emacs22} - -_EMACS_BLNK.emacs20= ../../editors/emacs20/buildlink3.mk -_EMACS_BLNK.emacs21= ../../editors/emacs21/buildlink3.mk -_EMACS_BLNK.emacs21nox= ../../editors/emacs21-nox11/buildlink3.mk -_EMACS_BLNK.emacs22= ../../editors/emacs/buildlink3.mk -_EMACS_BLNK.emacs22nox= ../../editors/emacs-nox11/buildlink3.mk -_EMACS_BLNK.xemacs214= ../../editors/xemacs/buildlink3.mk -_EMACS_BLNK.xemacs214nox= ../../editors/xemacs-nox11/buildlink3.mk -_EMACS_BLNK.xemacs215= ../../editors/xemacs-current/buildlink3.mk -_EMACS_BLNK.xemacs215nox= ../../editors/xemacs-current-nox11/buildlink3.mk - -# -# 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; -# - -.if ${EMACS_TYPE} == "emacs" || ${EMACS_TYPE} == "xemacs" -_EMACS_TYPE= ${_EMACS_VERSION_DEFAULT.${EMACS_TYPE}} -.endif -_EMACS_TYPE?= ${EMACS_TYPE} - -.if !empty(_EMACS_TYPE:Nxemacs*) -. if !empty(_EMACS_TYPE:N*nox) -_EMACS_PKGBASE= emacs -. else -_EMACS_PKGBASE= emacs-nox11 -. endif -.else -. 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 - -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 - -# -# Dependencies and conflicts -# - -DEPENDS+= ${_EMACS_REQD.${_EMACS_TYPE}}:${_EMACS_DEP.${_EMACS_TYPE}} -.if !empty(_EMACS_TYPE:Nxemacs*) -CONFLICTS+= xemacs-${PKGBASE}-[0-9]* -.else -CONFLICTS+= ${PKGBASE:C|^xemacs-||}-[0-9]* -.endif - -# -# Macros for packages -# - -EMACS_FLAVOR= ${_EMACS_TYPE:C|nox||:C|[0-9].*||} -EMACS_BIN= ${PREFIX}/bin/${EMACS_FLAVOR} -EMACS_VERSION_MAJOR= ${_EMACS_VERSION_MAJOR} -EMACS_VERSION_MINOR= ${_EMACS_VERSION_MINOR} -.if ${EMACS_FLAVOR} == "emacs" -EMACS_ETCPREFIX= ${PREFIX}/share -EMACS_INFOPREFIX= ${PREFIX}/${PKGINFODIR} -EMACS_LISPPREFIX= ${PREFIX}/share/emacs/site-lisp -EMACS_PKGNAME_PREFIX= -.elif ${EMACS_FLAVOR} == "xemacs" -EMACS_ETCPREFIX= ${PREFIX}/lib/xemacs/site-packages/etc -EMACS_INFOPREFIX= ${PREFIX}/lib/xemacs/site-packages/info -EMACS_LISPPREFIX= ${PREFIX}/lib/xemacs/site-packages/lisp -EMACS_PKGNAME_PREFIX= xemacs- -.else -PKG_FAIL_REASON+= "\`\`${EMACS_FLAVOR}'' is not a valid EMACS_FLAVOR" -.endif -GNU_CONFIGURE_INFODIR?= ${EMACS_INFOPREFIX} - -.for e in ${_EMACS_VERSIONS_ALL} emacs xemacs -. if "${e}" == ${EMACS_FLAVOR} || "${e}" == ${_EMACS_TYPE} -PLIST_SUBST+= FOR_${e}="" NOTFOR_${e}="@comment " -. else -PLIST_SUBST+= FOR_${e}="@comment " NOTFOR_${e}="" -. endif -.endfor -.if empty(EMACS_TYPE:M*nox) -PLIST_SUBST+= FOR_emacs_x="" NOTFOR_emacs_nox="@comment " FOR_emacs_nox="@comment " NOTFOR_emacs_nox="" -.else -PLIST_SUBST+= FOR_emacs_x="@comment " NOTFOR_emacs_nox="" FOR_emacs_nox="" NOTFOR_emacs_nox="@comment " -.endif - -PLIST_SUBST+= EMACS_FLAVOR=${EMACS_FLAVOR:Q} -PLIST_SUBST+= EMACS_VERSION=${_EMACS_VERSION_NOREV:Q} -PLIST_SUBST+= EMACS_ETCPREFIX=${EMACS_ETCPREFIX:C|^${PREFIX}/||} -PLIST_SUBST+= EMACS_INFOPREFIX=${EMACS_INFOPREFIX:C|^${PREFIX}/||} -PLIST_SUBST+= EMACS_LISPPREFIX=${EMACS_LISPPREFIX:C|^${PREFIX}/||} - -PRINT_PLIST_AWK+= { gsub(/${EMACS_LISPPREFIX:S|${PREFIX}/||:S|/|\\/|g}/, \ - "$${EMACS_LISPPREFIX}"); \ - print; next; } - -# -# ELP dependencies -# - -EMACS_MODULES?= # none - -# "base" elisp modules -.if !empty(_EMACS_TYPE:Memacs*) -_EMACS_PKGDEP.${_EMACS_TYPE},base?= # empty -.elif !empty(_EMACS_TYPE:Mxemacs*) -_EMACS_PKGDEP.${_EMACS_TYPE},base?= \ - xemacs-packages>=1.15:../../editors/xemacs-packages -.endif - -# "leim" - input methods for international character sets -_EMACS_PKGDEP.${_EMACS_TYPE},leim= \ - ${_LEIM_REQD.${_EMACS_TYPE}}:${_LEIM_DEP.${_EMACS_TYPE}} - -.for _mod_ in ${EMACS_MODULES} -.if ${_EMACS_PKGDEP.${_EMACS_TYPE},${_mod_}} != ":" -DEPENDS+= ${_EMACS_PKGDEP.${_EMACS_TYPE},${_mod_}} -.endif -.endfor - -# -# Build environment (buildlink3) -# - -_EMACS_DIR= ${BUILDLINK_DIR}/share/emacs -ALL_ENV+= EMACSLOADPATH=${_EMACS_DIR}/${_EMACS_VERSION_NOREV}/lisp:${_EMACS_DIR}/site-lisp - -.include "${_EMACS_BLNK.${_EMACS_TYPE}}" - -.endif # EMACS_MK +.include "../../editors/emacs/modules.mk" diff --git a/print/auctex/Makefile b/print/auctex/Makefile index 34eb9bc38ee..7b36226bf3d 100644 --- a/print/auctex/Makefile +++ b/print/auctex/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2008/06/12 02:14:43 joerg Exp $ +# $NetBSD: Makefile,v 1.35 2008/10/11 09:31:58 uebayasi Exp $ DISTNAME= auctex-11.84 PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME} @@ -10,6 +10,8 @@ HOMEPAGE= http://www.gnu.org/software/auctex/ COMMENT= Enhanced LaTeX mode for Emacs PKG_DESTDIR_SUPPORT= user-destdir +INSTALLATION_DIRS= ${EMACS_INFOPREFIX} \ + ${EMACS_LISPPREFIX}/auctex EMACS_MODULES= base @@ -26,6 +28,6 @@ INFO_FILES= YES CONFIGURE_ARGS.emacs= --with-lispdir=${EMACS_LISPPREFIX} CONFIGURE_ARGS.xemacs= --with-packagedir=${EMACS_LISPPREFIX:C|/lisp||} -.include "../../mk/emacs.mk" +.include "../../editors/emacs/modules.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/EasyPG/Makefile b/security/EasyPG/Makefile index e4dbc7233a3..faa7e65d2d4 100644 --- a/security/EasyPG/Makefile +++ b/security/EasyPG/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2007/08/08 19:57:32 gdt Exp $ +# $NetBSD: Makefile,v 1.10 2008/10/11 09:31:58 uebayasi Exp $ DISTNAME= epg-0.0.14 PKGREVISION= 2 @@ -20,5 +20,5 @@ DEPENDS+= gnupg>=1.4.3:../../security/gnupg # per README: GNU Emacs 21.4, XEmacs 21.4, or later EMACS_VERSIONS_ACCEPTED= emacs21 emacs21nox emacs22 emacs22nox xemacs214 xemacs215 -.include "../../mk/emacs.mk" +.include "../../editors/emacs/modules.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/starttls/Makefile b/security/starttls/Makefile index 7317df2de7a..e88c1557439 100644 --- a/security/starttls/Makefile +++ b/security/starttls/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2008/06/20 01:09:35 joerg Exp $ +# $NetBSD: Makefile,v 1.4 2008/10/11 09:31:58 uebayasi Exp $ # DISTNAME= starttls-0.10 @@ -15,7 +15,7 @@ PKG_DESTDIR_SUPPORT= user-destdir USE_TOOLS+= gmake GNU_CONFIGURE= yes -.include "../../mk/emacs.mk" +.include "../../editors/emacs/modules.mk" .include "../../security/openssl/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/dictem/Makefile b/textproc/dictem/Makefile index d8a1e63aa96..847cc1ef4e4 100644 --- a/textproc/dictem/Makefile +++ b/textproc/dictem/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2008/04/05 04:45:22 obache Exp $ +# $NetBSD: Makefile,v 1.3 2008/10/11 09:31:58 uebayasi Exp $ DISTNAME= dictem-0.82 PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME} @@ -34,5 +34,5 @@ do-install: cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} \ ${DESTDIR}${PREFIX}/share/doc/${PKGBASE} -.include "../../mk/emacs.mk" +.include "../../editors/emacs/modules.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/emacs-dict-client/Makefile b/textproc/emacs-dict-client/Makefile index 052ebe7a0ed..1265f4c2c67 100644 --- a/textproc/emacs-dict-client/Makefile +++ b/textproc/emacs-dict-client/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2006/03/04 21:30:46 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2008/10/11 09:31:58 uebayasi Exp $ DISTNAME= dictionary-1.8.2 PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME:S/dictionary/emacs-dict-client/} @@ -10,12 +10,14 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://me.in-berlin.de/~myrkr/dictionary/ COMMENT= Emacs package for talking to a dictionary server +PKG_DESTDIR_SUPPORT= user-destdir +INSTALLATION_DIRS= ${EMACS_LISPPREFIX:C|^${PREFIX}/||}/dictionary + 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 + ${DESTDIR}${EMACS_LISPPREFIX}/dictionary -.include "../../mk/emacs.mk" +.include "../../editors/emacs/modules.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/emacs-muse/Makefile b/textproc/emacs-muse/Makefile index c061cb188ff..b9c6084960c 100644 --- a/textproc/emacs-muse/Makefile +++ b/textproc/emacs-muse/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2007/09/16 10:30:25 wiz Exp $ +# $NetBSD: Makefile,v 1.2 2008/10/11 09:31:58 uebayasi Exp $ # DISTNAME= muse-3.11 @@ -33,5 +33,5 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/examples/*.png \ ${PREFIX}/share/examples/emacs-muse -.include "../../mk/emacs.mk" +.include "../../editors/emacs/modules.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/flyspell/Makefile b/textproc/flyspell/Makefile index 1f6204b3a3e..5395fd062a4 100644 --- a/textproc/flyspell/Makefile +++ b/textproc/flyspell/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2007/01/15 23:49:46 wiz Exp $ +# $NetBSD: Makefile,v 1.18 2008/10/11 09:31:58 uebayasi Exp $ # DISTNAME= flyspell-1.7m.el @@ -11,6 +11,9 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www-sop.inria.fr/mimosa/personnel/Manuel.Serrano/flyspell/flyspell.html COMMENT= Emacs/Xemacs on-the-fly spell checker +PKG_DESTDIR_SUPPORT= user-destdir +INSTALLATION_DIRS= ${EMACS_LISPPREFIX:C|^${PREFIX}/||}/flyspell + DEPENDS+= ${EMACS_PKGNAME_PREFIX}ispell-emacs-[0-9]*:../../textproc/ispell-emacs EXTRACT_ONLY= # None @@ -24,8 +27,7 @@ do-extract: @${CP} ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES} ${WRKSRC} do-install: - ${INSTALL_DATA_DIR} ${EMACS_LISPPREFIX}/flyspell - ${INSTALL_DATA} ${WRKSRC}/${DISTNAME} ${EMACS_LISPPREFIX}/flyspell/flyspell.el + ${INSTALL_DATA} ${WRKSRC}/${DISTNAME} ${DESTDIR}${EMACS_LISPPREFIX}/flyspell/flyspell.el -.include "../../mk/emacs.mk" +.include "../../editors/emacs/modules.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/ispell-emacs/Makefile b/textproc/ispell-emacs/Makefile index 47041f09e03..47dcc3bfbb0 100644 --- a/textproc/ispell-emacs/Makefile +++ b/textproc/ispell-emacs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2006/10/04 22:01:00 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2008/10/11 09:31:58 uebayasi Exp $ # DISTNAME= ispell.el @@ -12,6 +12,9 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.eng.utah.edu/~kstevens/ispell-page.html COMMENT= Emacs interface for ispell spell checker +PKG_DESTDIR_SUPPORT= user-destdir +INSTALLATION_DIRS= ${EMACS_LISPPREFIX:C|^${PREFIX}/||}/ispell + DEPENDS+= ispell-base-[0-9]*:../../textproc/ispell-base DIST_SUBDIR= ${PKGNAME_NOREV:C|^xemacs-||} @@ -21,8 +24,7 @@ NO_CONFIGURE= yes NO_BUILD= yes do-install: - ${INSTALL_DATA_DIR} ${EMACS_LISPPREFIX}/ispell - ${INSTALL_DATA} ${WRKSRC}/ispell.el ${EMACS_LISPPREFIX}/ispell + ${INSTALL_DATA} ${WRKSRC}/ispell.el ${DESTDIR}${EMACS_LISPPREFIX}/ispell -.include "../../mk/emacs.mk" +.include "../../editors/emacs/modules.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/migemo-elisp/Makefile b/textproc/migemo-elisp/Makefile index 2800d833806..55a515b5ed3 100644 --- a/textproc/migemo-elisp/Makefile +++ b/textproc/migemo-elisp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2008/02/10 13:10:27 obache Exp $ +# $NetBSD: Makefile,v 1.2 2008/10/11 09:31:58 uebayasi Exp $ .include "../../textproc/migemo/Makefile.common" @@ -10,7 +10,7 @@ PKG_DESTDIR_SUPPORT= user-destdir DEPENDS+= ${RUBY_PKGPREFIX}-migemo>=${MIGEMO_VERSION}:../../textproc/migemo -.include "../../mk/emacs.mk" +.include "../../editors/emacs/modules.mk" .if defined(EMACS_FLAVOR) && ${EMACS_FLAVOR} == "xemacs" DEPENDS+= xemacs-packages-[0-9]*:../../editors/xemacs-packages .endif diff --git a/textproc/nxml-mode/Makefile b/textproc/nxml-mode/Makefile index e2834b119e3..ee12ebb76b8 100644 --- a/textproc/nxml-mode/Makefile +++ b/textproc/nxml-mode/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2007/01/30 23:44:23 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2008/10/11 09:31:58 uebayasi Exp $ DISTNAME= nxml-mode-20041004 PKGREVISION= 1 @@ -25,5 +25,5 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/char-name/unicode/*.el ${EMACS_LISPPREFIX:Q}/nxml-mode/char-name/unicode ${INSTALL_DATA} ${WRKSRC}/nxml-mode.info ${EMACS_INFOPREFIX:Q} -.include "../../mk/emacs.mk" +.include "../../editors/emacs/modules.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/psgml-mode/Makefile b/textproc/psgml-mode/Makefile index 22763865181..186cf83253b 100644 --- a/textproc/psgml-mode/Makefile +++ b/textproc/psgml-mode/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2008/06/12 02:14:52 joerg Exp $ +# $NetBSD: Makefile,v 1.19 2008/10/11 09:31:58 uebayasi Exp $ DISTNAME= psgml-1.3.2 PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME:S/-/-mode-/} @@ -14,7 +14,7 @@ PKG_DESTDIR_SUPPORT= user-destdir EMACS_MODULES+= base -.include "../../mk/emacs.mk" +.include "../../editors/emacs/modules.mk" .if ${EMACS_FLAVOR} != "emacs" BUILD_TARGET= xemacs diff --git a/textproc/suikyo-elisp/Makefile b/textproc/suikyo-elisp/Makefile index b4ba92ec41e..dcd3f709160 100644 --- a/textproc/suikyo-elisp/Makefile +++ b/textproc/suikyo-elisp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2008/03/02 02:41:26 obache Exp $ +# $NetBSD: Makefile,v 1.2 2008/10/11 09:31:58 uebayasi Exp $ # .include "../../textproc/suikyo/Makefile.common" @@ -18,5 +18,5 @@ BUILD_DIRS+= elisp CONFIGURE_ARGS+= --with-emacs-sitelispdir=${EMACS_LISPPREFIX} -.include "../../mk/emacs.mk" +.include "../../editors/emacs/modules.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/suikyo/Makefile b/textproc/suikyo/Makefile index 8ebd9766eee..fdede9f9986 100644 --- a/textproc/suikyo/Makefile +++ b/textproc/suikyo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2008/06/19 15:01:17 taca Exp $ +# $NetBSD: Makefile,v 1.3 2008/10/11 09:31:58 uebayasi Exp $ # .include "Makefile.common" @@ -20,6 +20,6 @@ CONFIGURE_ARGS+= --with-rubydir=${PREFIX}/${RUBY_VENDORLIB} INSTALL_TARGET= install-pkgconfigDATA -.include "../../mk/emacs.mk" +.include "../../editors/emacs/modules.mk" .include "../../lang/ruby/rubyversion.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/xslide/Makefile b/textproc/xslide/Makefile index 7aad780f092..eaa5c4b12fb 100644 --- a/textproc/xslide/Makefile +++ b/textproc/xslide/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2006/06/15 13:31:30 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2008/10/11 09:31:58 uebayasi Exp $ # DISTNAME= xslide-0.2.2 @@ -12,7 +12,7 @@ HOMEPAGE= http://xslide.sourceforge.net/ COMMENT= XSL major mode for emacs -.include "../../mk/emacs.mk" +.include "../../editors/emacs/modules.mk" .if ${EMACS_FLAVOR} == "emacs" EMACS= emacs diff --git a/www/emacs-w3m/Makefile b/www/emacs-w3m/Makefile index f7908b3e006..5309b91fd37 100644 --- a/www/emacs-w3m/Makefile +++ b/www/emacs-w3m/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2008/04/12 22:43:13 jlam Exp $ +# $NetBSD: Makefile,v 1.23 2008/10/11 09:31:58 uebayasi Exp $ DISTNAME= emacs-w3m-1.4.4 PKGREVISION= 1 @@ -9,6 +9,9 @@ MAINTAINER= uebayasi@NetBSD.org HOMEPAGE= http://emacs-w3m.namazu.org/ COMMENT= Simple w3m interface for Emacs +PKG_DESTDIR_SUPPORT= user-destdir +INSTALLATION_DIRS= ${ETCDIR} + USE_TOOLS+= makeinfo INFO_FILES= YES @@ -16,9 +19,10 @@ DEPENDS+= w3m>=0.5.1nb2:../../www/w3m HAS_CONFIGURE= yes CONFIGURE_ARGS+=--with-emacs=${EMACS_BIN:Q} -CONFIGURE_ARGS+=--with-icondir=${PREFIX}/${ETCDIR} +CONFIGURE_ARGS+=--with-icondir=${ICONDIR} BUILD_TARGET= default INSTALL_TARGET= ${INSTALL_TARGET.${EMACS_FLAVOR}} +MAKE_FLAGS= prefix=${DESTDIR}${PREFIX} ICONDIR=${DESTDIR}${ICONDIR} PLIST_SUBST+= ETCDIR=${ETCDIR:Q} SUBST_CLASSES+= fix-icondir @@ -27,7 +31,7 @@ SUBST_FILES.fix-icondir= Makefile.in w3m.el w3mhack.el SUBST_SED.fix-icondir= -e 's|etc/images/w3m|etc/w3m|g' \ -e 's|images/w3m|w3m|g' -.include "../../mk/emacs.mk" +.include "../../editors/emacs/modules.mk" # GNU Emacs 21 or later and XEmacs have GUI support PLIST_VARS+= gui @@ -38,6 +42,7 @@ PLIST.gui= yes DOCUMENTS= COPYING ChangeLog ChangeLog.1 README README.ja ETCDIR= ${ETCDIR.${EMACS_FLAVOR}} +ICONDIR= ${PREFIX}/${ETCDIR} INSTALL_TARGET.emacs= install install-icons INSTALL_TARGET.xemacs= install-package @@ -45,8 +50,7 @@ ETCDIR.emacs= share/emacs/${_EMACS_VERSION_NOREV}/etc/w3m ETCDIR.xemacs= lib/xemacs/site-packages/etc/w3m post-install: - @${INSTALL_DATA_DIR} ${PREFIX}/${ETCDIR} - for f in ${DOCUMENTS}; do ${INSTALL_DATA} ${WRKSRC}/$$f ${PREFIX}/${ETCDIR}; done + for f in ${DOCUMENTS}; do ${INSTALL_DATA} ${WRKSRC}/$$f ${DESTDIR}${PREFIX}/${ETCDIR}; done .include "options.mk" diff --git a/www/w3/Makefile b/www/w3/Makefile index 635bc624000..b24f6b6ce50 100644 --- a/www/w3/Makefile +++ b/www/w3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2007/10/29 04:57:17 uebayasi Exp $ +# $NetBSD: Makefile,v 1.25 2008/10/11 09:31:58 uebayasi Exp $ DISTNAME= w3-4.0pre.47 PKGNAME= ${EMACS_PKGNAME_PREFIX}w3-4.0b47 @@ -28,6 +28,6 @@ ETCDIR= ${ETCDIR.${EMACS_FLAVOR}} ETCDIR.emacs= ${PREFIX}/share/w3 ETCDIR.xemacs= ${EMACS_LISPPREFIX:H}/etc/w3 -.include "../../mk/emacs.mk" +.include "../../editors/emacs/modules.mk" .include "../../mk/bsd.pkg.mk" |