Index: editors/emacs/modules.mk
===================================================================
RCS file: /e/cvsync/cvsync/pkgsrc/editors/emacs/modules.mk,v
retrieving revision 1.15
diff -u -r1.15 modules.mk
--- editors/emacs/modules.mk	23 Mar 2011 15:15:20 -0000	1.15
+++ editors/emacs/modules.mk	11 May 2011 00:02:35 -0000
@@ -1,4 +1,4 @@
-# $NetBSD: modules.mk,v 1.15 2011/03/23 15:15:20 minskim Exp $
+# $NetBSD: modules.mk,v 1.13 2010/10/25 00:03:03 minskim Exp $
 #
 # This Makefile fragment handles Emacs Lisp Packages (== ELPs).
 #
@@ -343,11 +343,12 @@
 
 .if defined(EMACS_BUILDLINK)
 _EMACS_DIR=	${BUILDLINK_DIR}/share/emacs
-.  if empty(EMACS_TYPE:Memacs24)
-ALL_ENV+=	EMACSLOADPATH=${_EMACS_DIR}/${_EMACS_VERSION_MAJOR}.${_EMACS_VERSION_MINOR}/lisp:${_EMACS_DIR}/site-lisp
-.  else
-ALL_ENV+=	EMACSLOADPATH=${_EMACS_DIR}/${_EMACS_VERSION_MAJOR}.${_EMACS_VERSION_MINOR}.${_EMACS_VERSION_MICRO}/lisp:${_EMACS_DIR}/site-lisp
-.  endif
+_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