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 /misc | |
| 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 'misc')
| -rw-r--r-- | misc/bbdb/Makefile | 4 | ||||
| -rw-r--r-- | misc/bbdb/buildlink3.mk | 4 | ||||
| -rw-r--r-- | misc/elscreen/Makefile | 4 | ||||
| -rw-r--r-- | misc/emacs-wiki/Makefile | 4 | ||||
| -rw-r--r-- | misc/lookup/Makefile | 4 |
5 files changed, 10 insertions, 10 deletions
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" |