pkg/44485: EMACSLOADPATH is not valid for editores/emacs21

[ryoon%NetBSD.org@localhost]

>Number:         44485
>Category:       pkg
>Synopsis:       EMACSLOADPATH is not valid for editores/emacs21
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sat Jan 29 17:15:00 +0000 2011
>Originator:     Ryo ONODERA
>Release:        NetBSD 5.99.44
>Organization:
        
>Environment:
        
        
System: NetBSD hydrogen.elements.tetera.org 5.99.44 NetBSD 5.99.44 (LEAFGIRL2) 
#0: Sat Jan 29 21:02:08 JST 2011 
root%hydrogen.elements.tetera.org@localhost:/usr/obj/sys/arch/i386/compile/LEAFGIRL2
 i386
Architecture: i386
Machine: i386
>Description:
editors/emacs/modules.mk has
EMACSLOADPATH=${_EMACS_DIR}/${_EMACS_VERSION_DIR}/lisp:${_EMACS_DIR}/site-lisp .
For editors/emacs21, _EMACS_VERSION_DIR is 21.4a.
But EMACSLOADPATH should be 21.4 instead of 21.4a.

Probably some elisp package will fail to build.

My upcoming package, inputmethod/skk 14.2, fails to build.
        
>How-To-Repeat:
        
>Fix:
        
Index: modules.mk
===================================================================
RCS file: /cvsroot/pkgsrc/editors/emacs/modules.mk,v
retrieving revision 1.13
diff -u -r1.13 modules.mk
--- modules.mk  25 Oct 2010 00:03:03 -0000      1.13
+++ modules.mk  29 Jan 2011 17:11:49 -0000
@@ -348,7 +348,7 @@
        ${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
 


>Unformatted: