Index: ../../editors/emacs/modules.mk
===================================================================
RCS file: /e/cvsync/cvsync/pkgsrc/editors/emacs/modules.mk,v
retrieving revision 1.14
diff -u -u -r1.14 modules.mk
--- ../../editors/emacs/modules.mk	8 Feb 2011 13:20:13 -0000	1.14
+++ ../../editors/emacs/modules.mk	7 Dec 2010 07:49:35 -0000
@@ -1,4 +1,4 @@
-# $NetBSD: modules.mk,v 1.14 2011/02/08 13:20:13 hiramatsu Exp $
+# $NetBSD: modules.mk,v 1.13 2010/10/25 00:03:03 minskim Exp $
 #
 # This Makefile fragment handles Emacs Lisp Packages (== ELPs).
 #
@@ -343,7 +343,12 @@
 
 .if defined(EMACS_BUILDLINK)
 _EMACS_DIR=	${BUILDLINK_DIR}/share/emacs
-ALL_ENV+=	EMACSLOADPATH=${_EMACS_DIR}/${_EMACS_VERSION_MAJOR}.${_EMACS_VERSION_MINOR}/lisp:${_EMACS_DIR}/site-lisp
+_EMACS_VERSION_DIR!=	\
+	(${PKG_INFO} -e emacs || ${ECHO} "") |				\
+	${SED} -e 's/emacs-//' |					\
+	${SED} -e 's/\.[0-9]\{8,\}//' |					\
+	${SED} -e 's/nb.*//'
+ALL_ENV+=	EMACSLOADPATH=${_EMACS_DIR}/${_EMACS_VERSION_DIR}/lisp:${_EMACS_DIR}/site-lisp
 .include	"${_EMACS_PKGDIR}/buildlink3.mk"
 .endif