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.

25 files changed, 103 insertions, 56 deletions

diff --git a/devel/apel/Makefile b/devel/apel/Makefile
index ddded744cbf..14eb6ff1fe9 100644
--- a/devel/apel/Makefile
+++ b/devel/apel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2007/10/29 12:53:51 uebayasi Exp $
+# $NetBSD: Makefile,v 1.20 2008/10/11 09:31:55 uebayasi Exp $
 
 DISTNAME=	apel-10.7
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
@@ -10,6 +10,11 @@ MAINTAINER=	uebayasi@NetBSD.org
 HOMEPAGE=	http://www.kanji.zinbun.kyoto-u.ac.jp/~tomo/elisp/APEL/
 COMMENT=	Portable Emacs library
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+INSTALLATION_DIRS+=	${DOCDIR} \
+			${EMACS_LISPPREFIX:C|^${PREFIX}/||}/apel \
+			${EMACS_LISPPREFIX:C|^${PREFIX}/||}/emu
+
 PLIST_SRC=	${PKGDIR}/PLIST.${EMACS_FLAVOR}
 BUILD_TARGET=	${BUILD_TARGET.${EMACS_FLAVOR}}
 INSTALL_TARGET=	${INSTALL_TARGET.${EMACS_FLAVOR}}
@@ -17,7 +22,6 @@ MAKE_FLAGS+=	EMACS=${EMACS_FLAVOR:Q}
 MAKE_FLAGS+=	LISPDIR=${EMACS_LISPPREFIX:Q}
 MAKE_FLAGS+=	VERSION_SPECIFIC_LISPDIR=${EMACS_LISPPREFIX:Q}
 MAKE_FLAGS+=	${MAKE_FLAGS.${EMACS_FLAVOR}}
-INSTALLATION_DIRS+=	${DOCDIR}
 
 # apel is included in xemacs-packages
 EMACS_VERSIONS_ACCEPTED=emacs22 emacs22nox emacs21 emacs21nox emacs20
@@ -29,5 +33,18 @@ INSTALL_TARGET.xemacs=	install-package
 MAKE_FLAGS.emacs=
 MAKE_FLAGS.xemacs=	PACKAGEDIR=${EMACS_LISPPREFIX:C|/lisp$||}
 
-.include "../../mk/emacs.mk"
+# Pkgsrc developers should run "install" without this and check if PLIST is
+# correct.  Users just need to install files.
+do-install: plist
+	cd ${WRKSRC};							\
+	for subdir in emu apel; do					\
+		grep -v '^@' ${PLIST} | grep "/site-lisp/$$subdir/" |	\
+		while read file; do					\
+			file=$$( basename $$file );			\
+			${INSTALL_DATA} $$file				\
+			    ${DESTDIR}${EMACS_LISPPREFIX}/$$subdir/$$file; \
+		done							\
+	done
+
+.include "../../editors/emacs/modules.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/apel/buildlink3.mk b/devel/apel/buildlink3.mk
index 37b3585a523..e55330412dd 100644
--- a/devel/apel/buildlink3.mk
+++ b/devel/apel/buildlink3.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.1 2007/10/29 12:41:16 uebayasi Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2008/10/11 09:31:55 uebayasi Exp $
 #
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 APEL_BUILDLINK3_MK:=	${APEL_BUILDLINK3_MK}+
 
-.include "../../mk/emacs.mk"
+.include "../../editors/emacs/modules.mk"
 .if ${EMACS_FLAVOR} == "emacs"
 
 .if ${BUILDLINK_DEPTH} == "+"
diff --git a/devel/cflow-mode/Makefile b/devel/cflow-mode/Makefile
index f3988632941..38536be0f64 100644
--- a/devel/cflow-mode/Makefile
+++ b/devel/cflow-mode/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2008/03/03 17:45:34 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2008/10/11 09:31:55 uebayasi Exp $
 
 DISTNAME=	cflow-1.1
 PKGNAME=	cflow-mode-1.1
@@ -11,7 +11,7 @@ COMMENT=	Emacs mode for GNU cflow output
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-.include "../../mk/emacs.mk"
+.include "../../editors/emacs/modules.mk"
 
 do-build:
 	${EMACS_BIN} --no-init-file -batch -f batch-byte-compile \
diff --git a/devel/cmake-mode/Makefile b/devel/cmake-mode/Makefile
index db71b1c5ae5..046117f88a3 100644
--- a/devel/cmake-mode/Makefile
+++ b/devel/cmake-mode/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/03/03 17:45:34 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2008/10/11 09:31:55 uebayasi Exp $
 #
 
 DISTNAME=	cmake-mode
@@ -25,5 +25,5 @@ do-install:
 	${INSTALL_DATA_DIR} ${DESTDIR}${EMACS_LISPPREFIX}
 	${INSTALL_DATA} ${WRKSRC}/cmake-mode.* ${DESTDIR}${EMACS_LISPPREFIX}
 
-.include "../../mk/emacs.mk"
+.include "../../editors/emacs/modules.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/cqual/Makefile b/devel/cqual/Makefile
index dcf57dd2eae..12e0625b524 100644
--- a/devel/cqual/Makefile
+++ b/devel/cqual/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2008/02/04 20:10:35 tnn Exp $
+# $NetBSD: Makefile,v 1.16 2008/10/11 09:31:55 uebayasi Exp $
 #
 
 DISTNAME=		cqual-0.991
@@ -32,5 +32,5 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC:Q}/doc/user-guide.pdf ${PREFIX:Q}/share/doc/cqual/
 	${INSTALL_DATA} ${WRKSRC:Q}/examples/* ${PREFIX:Q}/share/examples/cqual/
 
-.include "../../mk/emacs.mk"
+.include "../../editors/emacs/modules.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/doxymacs/Makefile b/devel/doxymacs/Makefile
index 5cf9f49f5b8..b54d09e7647 100644
--- a/devel/doxymacs/Makefile
+++ b/devel/doxymacs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2008/08/11 08:51:05 dsainty Exp $
+# $NetBSD: Makefile,v 1.6 2008/10/11 09:31:55 uebayasi Exp $
 #
 
 DISTNAME=	doxymacs-1.8.0
@@ -10,7 +10,9 @@ MAINTAINER=	dsainty@NetBSD.org
 HOMEPAGE=	http://doxymacs.sourceforge.net/
 COMMENT=	Doxygen editing support for Emacs
 
-.include "../../mk/emacs.mk"
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+.include "../../editors/emacs/modules.mk"
 
 #
 # "www/w3" (Emacs/W3) currently does not work with Emacs 22.  Emacs/W3
diff --git a/devel/elib/Makefile.common b/devel/elib/Makefile.common
index 5fd9f4e9e76..fc79482c476 100644
--- a/devel/elib/Makefile.common
+++ b/devel/elib/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.5 2008/03/03 17:45:35 jlam Exp $
+# $NetBSD: Makefile.common,v 1.6 2008/10/11 09:31:55 uebayasi Exp $
 #
 
 DISTNAME=	elib-1.0
@@ -10,7 +10,7 @@ COMMENT=	Library of utility functions for Emacs
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-.include "../../mk/emacs.mk"
+.include "../../editors/emacs/modules.mk"
 
 PKGSRC_MAKE_ENV+=	EMACS=${EMACS_FLAVOR:Q}
 MAKEFLAGS+=		EMACS=${EMACS_FLAVOR:Q}
diff --git a/devel/emacs-ilisp/Makefile b/devel/emacs-ilisp/Makefile
index 696cf2e048a..eeff523236d 100644
--- a/devel/emacs-ilisp/Makefile
+++ b/devel/emacs-ilisp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2008/05/25 13:16:10 dillo Exp $
+# $NetBSD: Makefile,v 1.14 2008/10/11 09:31:55 uebayasi Exp $
 #
 
 DISTNAME=	ilisp-20021222
@@ -36,5 +36,5 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/extra/*.el ${DESTDIR}${SITELISP}/extra
 	${INSTALL_DATA} ${WRKSRC}/extra/*.elc ${DESTDIR}${SITELISP}/extra
 
-.include "../../mk/emacs.mk"
+.include "../../editors/emacs/modules.mk"
 .include "../../mk/bsd.pkg.mk"
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"
diff --git a/devel/haskell-mode/Makefile b/devel/haskell-mode/Makefile
index adaa8ce6589..78b3ef65bac 100644
--- a/devel/haskell-mode/Makefile
+++ b/devel/haskell-mode/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2008/03/03 17:45:35 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2008/10/11 09:31:55 uebayasi Exp $
 
 DISTNAME=		haskell-mode-1.44
 PKGNAME=		${EMACS_PKGNAME_PREFIX}${DISTNAME}
@@ -11,6 +11,8 @@ HOMEPAGE=		http://www.haskell.org/haskell-mode/
 COMMENT=		Haskell mode for Emacs
 
 PKG_DESTDIR_SUPPORT=	user-destdir
+INSTALLATION_DIRS=	${EMACS_LISPPREFIX:C|^${PREFIX}/||}/haskell-mode \
+			share/doc/html/haskell-mode
 
 HTML=	.emacs fontlock.hs indent.hs index.html installation-guide.html
 SRCS=	haskell-decl-scan.el haskell-doc.el haskell-font-lock.el	\
@@ -24,12 +26,10 @@ do-build:
 	done
 
 do-install:
-	${INSTALL_DATA_DIR} ${DESTDIR}${EMACS_LISPPREFIX}/haskell-mode
 	cd ${WRKSRC} && ${INSTALL_DATA} ${SRCS} ${SRCS:.el=.elc} 	\
 			${DESTDIR}${EMACS_LISPPREFIX}/haskell-mode
-	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/html/haskell-mode
 	cd ${WRKSRC} && ${INSTALL_DATA} ${HTML}				\
 			${DESTDIR}${PREFIX}/share/doc/html/haskell-mode
 
-.include "../../mk/emacs.mk"
+.include "../../editors/emacs/modules.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/js2-mode/Makefile b/devel/js2-mode/Makefile
index e1fd16b25c4..4587cd41061 100644
--- a/devel/js2-mode/Makefile
+++ b/devel/js2-mode/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/04/12 13:57:19 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2008/10/11 09:31:55 uebayasi Exp $
 #
 
 DISTNAME=	js2-20080406
@@ -27,5 +27,5 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/${DISTNAME}.el ${DESTDIR}${EMACS_LISPPREFIX}/js2.el
 	${INSTALL_DATA} ${WRKSRC}/${DISTNAME}.elc ${DESTDIR}${EMACS_LISPPREFIX}/js2.elc
 
-.include "../../mk/emacs.mk"
+.include "../../editors/emacs/modules.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/mell/Makefile b/devel/mell/Makefile
index 1c00f4fd1dc..bf7ac4df80c 100644
--- a/devel/mell/Makefile
+++ b/devel/mell/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/03/02 12:26:08 obache Exp $
+# $NetBSD: Makefile,v 1.2 2008/10/11 09:31:55 uebayasi Exp $
 #
 
 DISTNAME=	mell-1.0.0
@@ -17,5 +17,5 @@ USE_LANGUAGES=	# none
 
 CONFIGURE_ARGS+=	--with-emacs-sitelispdir=${EMACS_LISPPREFIX}
 
-.include "../../mk/emacs.mk"
+.include "../../editors/emacs/modules.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/mell/buildlink3.mk b/devel/mell/buildlink3.mk
index ca52f73d76c..69ef11beb9b 100644
--- a/devel/mell/buildlink3.mk
+++ b/devel/mell/buildlink3.mk
@@ -1,9 +1,9 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/03/02 12:26:08 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2008/10/11 09:31:55 uebayasi Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 MELL_BUILDLINK3_MK:=	${MELL_BUILDLINK3_MK}+
 
-.include "../../mk/emacs.mk"
+.include "../../editors/emacs/modules.mk"
 
 .if ${BUILDLINK_DEPTH} == "+"
 BUILDLINK_DEPENDS+=	mell
diff --git a/devel/pcl-cvs/Makefile b/devel/pcl-cvs/Makefile
index 0b9bf905bc0..518aaa0031c 100644
--- a/devel/pcl-cvs/Makefile
+++ b/devel/pcl-cvs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2007/02/22 19:26:23 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2008/10/11 09:31:55 uebayasi Exp $
 #
 
 DISTNAME=	pcl-cvs-2.9.9
@@ -11,6 +11,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 #HOMEPAGE=
 COMMENT=	Front-end to CVS for emacs
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 BROKEN_IN=	pkgsrc-2006Q1
 
 DEPENDS+=	emacs20-elib>=1.0:../../devel/emacs20-elib
@@ -20,13 +22,13 @@ CONFLICTS+=	emacs21
 
 EMACS_VERSIONS_ACCEPTED=	emacs20
 
-.include "../../mk/emacs.mk"
+.include "../../editors/emacs/modules.mk"
 
 .if !((${EMACS_FLAVOR} == "emacs") && (${EMACS_VERSION_MAJOR} == "20"))
 PKG_SKIP_REASON+=	"${PKGNAME} is only for emacs20"
 .endif
 
-MAKE_ENV+=	PREFIX=${PREFIX:Q}
+MAKE_ENV+=	PREFIX=${DESTDIR:Q}${PREFIX:Q}
 BUILD_TARGET=	default
 INFO_FILES=	# PLIST
 MESSAGE_SUBST+=	EMACS_LISPPREFIX=${EMACS_LISPPREFIX:Q}
diff --git a/devel/php-mode/Makefile b/devel/php-mode/Makefile
index 20d3c69519e..aa345a700b8 100644
--- a/devel/php-mode/Makefile
+++ b/devel/php-mode/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/08/12 10:12:36 dsainty Exp $
+# $NetBSD: Makefile,v 1.2 2008/10/11 09:31:55 uebayasi Exp $
 #
 
 DISTNAME=	php-mode-1.4.0
@@ -22,5 +22,5 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/php-mode.e* \
 		${DESTDIR}${EMACS_LISPPREFIX}/php-mode
 
-.include "../../mk/emacs.mk"
+.include "../../editors/emacs/modules.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/psvn/Makefile b/devel/psvn/Makefile
index 30f5be2d806..d9c9a355224 100644
--- a/devel/psvn/Makefile
+++ b/devel/psvn/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2008/03/03 17:45:36 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2008/10/11 09:31:55 uebayasi Exp $
 #
 
 DISTNAME=	psvn.el
@@ -18,7 +18,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 VER=		25241
 WRKSRC=		${WRKDIR}
 
-.include "../../mk/emacs.mk"
+.include "../../editors/emacs/modules.mk"
 
 INSTALLATION_DIRS=	${EMACS_LISPPREFIX:S/^${PREFIX}\///}
 
diff --git a/devel/pvs/Makefile b/devel/pvs/Makefile
index aebc778136f..fd8e780c24e 100644
--- a/devel/pvs/Makefile
+++ b/devel/pvs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2008/05/26 02:13:18 joerg Exp $
+# $NetBSD: Makefile,v 1.35 2008/10/11 09:31:55 uebayasi Exp $
 #
 
 DISTNAME=		pvs-${VERSION}
@@ -56,5 +56,5 @@ do-install:
 	${CHMOD} 755 ${DESTDIR}${PREFIX}/pvs/pvs
 
 .include "../../mk/tex.buildlink3.mk"
-.include "../../mk/emacs.mk"
+.include "../../editors/emacs/modules.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/python-mode/Makefile b/devel/python-mode/Makefile
index f4c0a5ae0b0..e67473d3043 100644
--- a/devel/python-mode/Makefile
+++ b/devel/python-mode/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2008/04/13 22:12:56 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2008/10/11 09:31:55 uebayasi Exp $
 #
 
 DISTNAME=	python-mode-1.0
@@ -20,7 +20,7 @@ ELISP_FILES=	python-mode.el
 # package. Also, python-mode does not appear to work as is with XEmacs 21.1
 EMACS_VERSIONS_ACCEPTED= emacs22 emacs22nox emacs21 emacs21nox emacs20
 
-.include "../../mk/emacs.mk"
+.include "../../editors/emacs/modules.mk"
 
 INSTALLATION_DIRS=	${EMACS_LISPPREFIX:S/^${PREFIX}\///}
 
diff --git a/devel/rsltc/Makefile b/devel/rsltc/Makefile
index 719014a7c2e..68fb248e221 100644
--- a/devel/rsltc/Makefile
+++ b/devel/rsltc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2008/03/03 17:45:37 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2008/10/11 09:31:55 uebayasi Exp $
 #
 
 DISTNAME=		rsltcsrc
@@ -31,5 +31,5 @@ do-install:
 		${INSTALL_DATA} $${i}c ${DESTDIR}${PREFIX}/share/emacs/site-lisp/rsl ;\
 	done)
 
-.include "../../mk/emacs.mk"
+.include "../../editors/emacs/modules.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/ruby-mode/Makefile b/devel/ruby-mode/Makefile
index 71770764395..5c63666d14b 100644
--- a/devel/ruby-mode/Makefile
+++ b/devel/ruby-mode/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2008/06/20 15:50:25 taca Exp $
+# $NetBSD: Makefile,v 1.20 2008/10/11 09:31:55 uebayasi Exp $
 #
 
 DISTNAME=	${RUBY_DISTNAME}
@@ -38,5 +38,5 @@ do-install:
 
 .include "../../lang/ruby/rubyversion.mk"
 .include "../../lang/ruby/Makefile.common"
-.include "../../mk/emacs.mk"
+.include "../../editors/emacs/modules.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/ruby-rd-mode/Makefile b/devel/ruby-rd-mode/Makefile
index d27f75fd026..4ab0462a12a 100644
--- a/devel/ruby-rd-mode/Makefile
+++ b/devel/ruby-rd-mode/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2008/09/15 08:36:24 taca Exp $
+# $NetBSD: Makefile,v 1.23 2008/10/11 09:31:55 uebayasi Exp $
 #
 
 DISTNAME=	rdtool-${RUBY_RD_VERSION}
@@ -30,5 +30,5 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/rd-mode.elc ${DESTDIR}${EMACS_LISPPREFIX}/rd-mode
 
 .include "../../lang/ruby/rubyversion.mk"
-.include "../../mk/emacs.mk"
+.include "../../editors/emacs/modules.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/scmgit-base/Makefile b/devel/scmgit-base/Makefile
index cc0cf5aaa3a..9643d4f2e04 100644
--- a/devel/scmgit-base/Makefile
+++ b/devel/scmgit-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2008/09/21 02:00:37 minskim Exp $
+# $NetBSD: Makefile,v 1.13 2008/10/11 09:31:55 uebayasi Exp $
 #
 
 .include "../../devel/scmgit/Makefile.common"
@@ -80,7 +80,7 @@ SUBST_MESSAGE.fix-paths=Fixing hard-coded pathnames
 SUBST_STAGE.fix-paths=	pre-build
 SUBST_VARS.fix-paths=	PREFIX
 
-#.include "../../mk/emacs.mk" # XXX TODO (see patch-ad)
+#.include "../../editors/emacs/modules.mk" # XXX TODO (see patch-ad)
 
 .include "options.mk"
 .include "../../lang/perl5/module.mk"
diff --git a/devel/semantic/Makefile b/devel/semantic/Makefile
index d438536ce15..e27e4e39444 100644
--- a/devel/semantic/Makefile
+++ b/devel/semantic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2008/03/03 17:45:37 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2008/10/11 09:31:55 uebayasi Exp $
 #
 
 DISTNAME=	semantic-1.4.4
@@ -51,7 +51,7 @@ do-install:
 		${INSTALL_DATA} "$$f" ${DESTDIR}${EMACS_INFOPREFIX};	\
 	done
 
-.include "../../mk/emacs.mk"
+.include "../../editors/emacs/modules.mk"
 
 .include "../../editors/speedbar/buildlink3.mk"
 .include "../../lang/eieio/buildlink3.mk"
diff --git a/devel/semi/Makefile b/devel/semi/Makefile
index 0f0f6be6903..265747ff708 100644
--- a/devel/semi/Makefile
+++ b/devel/semi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2007/11/12 05:34:10 uebayasi Exp $
+# $NetBSD: Makefile,v 1.27 2008/10/11 09:31:55 uebayasi Exp $
 #
 
 DISTNAME=	semi-1.14.6
@@ -18,6 +18,10 @@ COMMENT=	Emacs lisp library to provide MIME feature
 
 BUILD_DEPENDS+=	qkc-[0-9]*:../../converters/qkc
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+INSTALLATION_DIRS+=	${EMACS_LISPPREFIX:C|^${PREFIX}/||}/semi \
+			${EMACS_INFOPREFIX:C|^${PREFIX}/||}
+
 BUILD_TARGET=	${BUILD_TARGET.${EMACS_FLAVOR}}
 INSTALL_TARGET=	${INSTALL_TARGET.${EMACS_FLAVOR}}
 MAKEFLAGS=	${MAKEFLAGS.${EMACS_FLAVOR}}
@@ -43,15 +47,24 @@ post-build:
 		makeinfo --force --no-validate $${i}.texi;		\
 	done
 
+do-install: plist
+	cd ${WRKSRC};							\
+	grep -v '^@' ${PLIST} | grep '/site-lisp/semi/' |		\
+	while read file; do						\
+		file=$$( basename $$file );				\
+		${INSTALL_DATA} $$file					\
+		    ${DESTDIR}${EMACS_LISPPREFIX}/semi/$$file;		\
+	done
+
 post-install:
 	cd ${WRKSRC}; for f in mime-ui-*.info mime-*.info-[0-9]*; do	\
 		${TEST} ! -f "$$f" ||					\
-		${INSTALL_DATA} "$$f" ${EMACS_INFOPREFIX};		\
+		${INSTALL_DATA} "$$f" ${DESTDIR}${EMACS_INFOPREFIX};	\
 	done
 
 .include "options.mk"
 
-.include "../../mk/emacs.mk"
+.include "../../editors/emacs/modules.mk"
 
 .include "../../devel/apel/buildlink3.mk"
 .include "../../devel/flim/buildlink3.mk"
diff --git a/devel/sml-mode/Makefile b/devel/sml-mode/Makefile
index 3e7f685d294..39483c661c6 100644
--- a/devel/sml-mode/Makefile
+++ b/devel/sml-mode/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2008/03/03 17:45:37 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2008/10/11 09:31:55 uebayasi Exp $
 
 DISTNAME=	sml-mode-3.9.5
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
@@ -22,5 +22,5 @@ do-install:
 		ChangeLog ${DESTDIR}${EMACS_LISPPREFIX}/sml-mode
 	${INSTALL_DATA} ${WRKSRC}/sml-mode.info ${DESTDIR}${EMACS_INFOPREFIX}
 
-.include "../../mk/emacs.mk"
+.include "../../editors/emacs/modules.mk"
 .include "../../mk/bsd.pkg.mk"