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.

7 files changed, 40 insertions, 32 deletions

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"