diff options
author | uebayasi <uebayasi> | 2008-10-11 09:31:54 +0000 |
---|---|---|
committer | uebayasi <uebayasi> | 2008-10-11 09:31:54 +0000 |
commit | b96889b1354fc2db619e890c37d47726128607e1 (patch) | |
tree | 28f89f081daec07805c1f982f0bc63a420c005ba /chat | |
parent | 82bb21f245fe7a2dee3f10a3aec11ffd03c27e07 (diff) | |
download | pkgsrc-b96889b1354fc2db619e890c37d47726128607e1.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.
Diffstat (limited to 'chat')
-rw-r--r-- | chat/irchat-pj/Makefile | 14 | ||||
-rw-r--r-- | chat/navi2ch/Makefile | 4 | ||||
-rw-r--r-- | chat/riece/Makefile | 19 | ||||
-rw-r--r-- | chat/zenicb/Makefile | 6 | ||||
-rw-r--r-- | chat/zenirc/Makefile | 8 | ||||
-rw-r--r-- | chat/zephyr-mode/Makefile | 4 |
6 files changed, 40 insertions, 15 deletions
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 |