Instead of extracting version string from PKGNAME, use

${_EMACS_VERSION_MAJOR} and ${_EMACS_VERSION_MINOR} to determine installed
version of emacs.

Also, set minimum version of _EMACS_REQD to the same as
${_EMACS_VERSION_MAJOR}.${_EMACS_VERSION_MINOR}. Otherwise, buildlink
does not work for emacs lisp libraries.

Should fix PR/42763.

7 files changed, 15 insertions, 20 deletions

diff --git a/editors/emacs-nox11/version.mk b/editors/emacs-nox11/version.mk
index c259cc47184..286e66e3ae6 100644
--- a/editors/emacs-nox11/version.mk
+++ b/editors/emacs-nox11/version.mk
@@ -1,7 +1,7 @@
-# $NetBSD: version.mk,v 1.4 2010/10/12 13:22:46 joerg Exp $
+# $NetBSD: version.mk,v 1.5 2011/02/08 13:20:13 hiramatsu Exp $
 
 _EMACS_FLAVOR=	emacs
-_EMACS_REQD=	emacs-nox11>=23<24
+_EMACS_REQD=	emacs-nox11>=23.2<24
 
 _EMACS_VERSION_MAJOR=	23
-_EMACS_VERSION_MINOR=	1
+_EMACS_VERSION_MINOR=	2
diff --git a/editors/emacs/modules.mk b/editors/emacs/modules.mk
index d6a2eeecc55..9b4ddb773a7 100644
--- a/editors/emacs/modules.mk
+++ b/editors/emacs/modules.mk
@@ -1,4 +1,4 @@
-# $NetBSD: modules.mk,v 1.13 2010/10/25 00:03:03 minskim Exp $
+# $NetBSD: modules.mk,v 1.14 2011/02/08 13:20:13 hiramatsu Exp $
 #
 # This Makefile fragment handles Emacs Lisp Packages (== ELPs).
 #
@@ -343,12 +343,7 @@ PRINT_PLIST_AWK+=	{ gsub(/${EMACS_LISPPREFIX:S|${PREFIX}/||:S|/|\\/|g}/, \
 
 .if defined(EMACS_BUILDLINK)
 _EMACS_DIR=	${BUILDLINK_DIR}/share/emacs
-_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
+ALL_ENV+=	EMACSLOADPATH=${_EMACS_DIR}/${_EMACS_VERSION_MAJOR}.${_EMACS_VERSION_MINOR}/lisp:${_EMACS_DIR}/site-lisp
 .include	"${_EMACS_PKGDIR}/buildlink3.mk"
 .endif
 
diff --git a/editors/emacs/version.mk b/editors/emacs/version.mk
index c6d7492caef..ad7e53aa78c 100644
--- a/editors/emacs/version.mk
+++ b/editors/emacs/version.mk
@@ -1,7 +1,7 @@
-# $NetBSD: version.mk,v 1.5 2010/10/12 13:22:45 joerg Exp $
+# $NetBSD: version.mk,v 1.6 2011/02/08 13:20:13 hiramatsu Exp $
 
 _EMACS_FLAVOR=	emacs
-_EMACS_REQD=	emacs>=23<24
+_EMACS_REQD=	emacs>=23.2<24
 
 _EMACS_VERSION_MAJOR=	23
 _EMACS_VERSION_MINOR=	2
diff --git a/editors/emacs21-nox11/version.mk b/editors/emacs21-nox11/version.mk
index b76c9cd20b6..2f1dda236a2 100644
--- a/editors/emacs21-nox11/version.mk
+++ b/editors/emacs21-nox11/version.mk
@@ -1,7 +1,7 @@
-# $NetBSD: version.mk,v 1.1 2008/10/11 09:31:56 uebayasi Exp $
+# $NetBSD: version.mk,v 1.2 2011/02/08 13:20:14 hiramatsu Exp $
 
 _EMACS_FLAVOR=	emacs
-_EMACS_REQD=	emacs-nox11>=21.2<22
+_EMACS_REQD=	emacs-nox11>=21.4<22
 _EMACS_PKGDEP.base=
 _EMACS_PKGDEP.leim=	leim>=21.${EMACS_VERSION_MINOR}<22:../../editors/leim21
 
diff --git a/editors/emacs21/version.mk b/editors/emacs21/version.mk
index 5ffee21196e..02e363d2a12 100644
--- a/editors/emacs21/version.mk
+++ b/editors/emacs21/version.mk
@@ -1,7 +1,7 @@
-# $NetBSD: version.mk,v 1.1 2008/10/11 09:31:56 uebayasi Exp $
+# $NetBSD: version.mk,v 1.2 2011/02/08 13:20:14 hiramatsu Exp $
 
 _EMACS_FLAVOR=	emacs
-_EMACS_REQD=	emacs>=21<22
+_EMACS_REQD=	emacs>=21.4<22
 _EMACS_PKGDEP.base=
 _EMACS_PKGDEP.leim=	leim>=21.${EMACS_VERSION_MINOR}<22:../../editors/leim21
 
diff --git a/editors/emacs22-nox11/version.mk b/editors/emacs22-nox11/version.mk
index 051dd0ccb5d..cc138ec0793 100644
--- a/editors/emacs22-nox11/version.mk
+++ b/editors/emacs22-nox11/version.mk
@@ -1,7 +1,7 @@
-# $NetBSD: version.mk,v 1.1.1.1 2009/08/05 10:32:54 minskim Exp $
+# $NetBSD: version.mk,v 1.2 2011/02/08 13:20:14 hiramatsu Exp $
 
 _EMACS_FLAVOR=	emacs
-_EMACS_REQD=	emacs-nox11>=22<23
+_EMACS_REQD=	emacs-nox11>=22.3<23
 _EMACS_PKGDEP.base=
 _EMACS_PKGDEP.leim=
 
diff --git a/editors/emacs22/version.mk b/editors/emacs22/version.mk
index 4d5f0db0de4..53b363dbcf4 100644
--- a/editors/emacs22/version.mk
+++ b/editors/emacs22/version.mk
@@ -1,7 +1,7 @@
-# $NetBSD: version.mk,v 1.2 2010/10/12 13:22:46 joerg Exp $
+# $NetBSD: version.mk,v 1.3 2011/02/08 13:20:14 hiramatsu Exp $
 
 _EMACS_FLAVOR=	emacs
-_EMACS_REQD=	emacs>=22<23
+_EMACS_REQD=	emacs>=22.3<23
 _EMACS_PKGDEP.base=
 _EMACS_PKGDEP.leim=