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.

1 files changed, 16 insertions, 3 deletions

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"