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.

11 files changed, 34 insertions, 28 deletions

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