pkg/42763: inputmethod/skk lacks support for editors/emacs-nox11 (emacs-nox11-23.1nb1)

[ryo_on%yk.rim.or.jp@localhost]

>Number:         42763
>Category:       pkg
>Synopsis:       inputmethod/skk lacks support for editors/emacs-nox11 
>(emacs-nox11-23.1nb1)
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sun Feb 07 07:15:00 +0000 2010
>Originator:     Ryo ONODERA
>Release:        NetBSD 5.99.24
>Organization:
        
>Environment:
        
        
System: NetBSD hydrogen.elements.tetera.org 5.99.24 NetBSD 5.99.24 
(BRIGHTGIRL6) #2: Sun Feb 7 09:11:01 JST 2010 
root%hydrogen.elements.tetera.org@localhost:/usr/obj/sys/arch/i386/compile/BRIGHTGIRL6
 i386
Architecture: i386
Machine: i386
>Description:
        
In devel/apel/Makefile, emacs23nox is not accepted now, but apel works with 
emacs23nox for me.
Because inputmethod/skk depends on devel/apel, I cannot use inputmethod/skk on 
emacs23nox.
The 1st patch add emacs23nox to EMACS_VERSIONS_ACCEPTED.

The editors/emacs/modules.mk is included from inputmethod/skk/Makefile, but 
editors/emacs/modules.mk
lacks the support for emacs??nox. Then inputmethod/skk fails to build, because 
_EMACS_VERSION_DIR variable
in editors/emacs/modules.mk is empty for emacs??nox.
The 2nd patch add the support for _EMACS_VERSION_DIR for emacs??nox.

The inputmethod/skk also works fine on emacs23nox for me.
The 3rd patch add emacs23nox entry to PLIST.

>How-To-Repeat:
        
For example
Add "EMACS_TYPE=emacs23nox" to /etc/mk.conf.
% cd /usr/pkg

>Fix:
        
== The 1st patch
$NetBSD$

--- ./Makefile.orig     2010-02-06 14:00:36.000000000 +0000
+++ ./Makefile
@@ -24,7 +24,7 @@ MAKE_FLAGS+=  VERSION_SPECIFIC_LISPDIR=${
 MAKE_FLAGS+=   ${MAKE_FLAGS.${EMACS_FLAVOR}}
 
 # apel is included in xemacs-packages
-EMACS_VERSIONS_ACCEPTED=emacs23 emacs22 emacs22nox emacs21 emacs21nox emacs20
+EMACS_VERSIONS_ACCEPTED=emacs23nox emacs23 emacs22 emacs22nox emacs21 
emacs21nox emacs20
 
 BUILD_TARGET.emacs=    elc
 BUILD_TARGET.xemacs=   package


== The 2nd patch
$NetBSD$

--- ./modules.mk.orig   2010-02-06 15:14:33.000000000 +0000
+++ ./modules.mk
@@ -338,11 +338,20 @@ PRINT_PLIST_AWK+= { gsub(/${EMACS_LISPPR
 
 .if defined(EMACS_BUILDLINK)
 _EMACS_DIR=    ${BUILDLINK_DIR}/share/emacs
+.if !empty(EMACS_TYPE:M*nox)
+_EMACS_VERSION_DIR!=   \
+       (${PKG_INFO} -e emacs-nox11 || ${ECHO} "") |                    \
+       ${SED} -e 's/emacs-nox11-//' |                                  \
+       ${SED} -e 's/\.[0-9]\{8,\}//' |                                 \
+       ${SED} -e 's/nb.*//'
+.endif
+.if empty(EMACS_TYPE:M*nox)
 _EMACS_VERSION_DIR!=   \
        (${PKG_INFO} -e emacs || ${ECHO} "") |                          \
        ${SED} -e 's/emacs-//' |                                        \
        ${SED} -e 's/\.[0-9]\{8,\}//' |                                 \
        ${SED} -e 's/nb.*//'
+.endif
 ALL_ENV+=      
EMACSLOADPATH=${_EMACS_DIR}/${_EMACS_VERSION_DIR}/lisp:${_EMACS_DIR}/site-lisp
 .include       "${_EMACS_PKGDIR}/buildlink3.mk"
 .endif

== The 3rd patch
$NetBSD$

--- ./PLIST.orig        2010-02-06 22:26:18.000000000 +0000
+++ ./PLIST
@@ -6,12 +6,14 @@ ${FOR_emacs21nox}${EMACS_LISPPREFIX}/skk
 ${FOR_emacs22}${EMACS_LISPPREFIX}/skk/ccc.el
 ${FOR_emacs22nox}${EMACS_LISPPREFIX}/skk/ccc.el
 ${FOR_emacs23}${EMACS_LISPPREFIX}/skk/ccc.el
+${FOR_emacs23nox}${EMACS_LISPPREFIX}/skk/ccc.el
 ${FOR_emacs20}${EMACS_LISPPREFIX}/skk/ccc.elc
 ${FOR_emacs21}${EMACS_LISPPREFIX}/skk/ccc.elc
 ${FOR_emacs21nox}${EMACS_LISPPREFIX}/skk/ccc.elc
 ${FOR_emacs22}${EMACS_LISPPREFIX}/skk/ccc.elc
 ${FOR_emacs22nox}${EMACS_LISPPREFIX}/skk/ccc.elc
 ${FOR_emacs23}${EMACS_LISPPREFIX}/skk/ccc.elc
+${FOR_emacs23nox}${EMACS_LISPPREFIX}/skk/ccc.elc
 ${EMACS_LISPPREFIX}/skk/context-skk.el
 ${EMACS_LISPPREFIX}/skk/context-skk.elc
 ${FOR_emacs20}${EMACS_LISPPREFIX}/skk/leim-list.el
@@ -20,6 +22,7 @@ ${FOR_emacs21nox}${EMACS_LISPPREFIX}/skk
 ${FOR_emacs22}${EMACS_LISPPREFIX}/skk/leim-list.el
 ${FOR_emacs22nox}${EMACS_LISPPREFIX}/skk/leim-list.el
 ${FOR_emacs23}${EMACS_LISPPREFIX}/skk/leim-list.el
+${FOR_emacs23nox}${EMACS_LISPPREFIX}/skk/leim-list.el
 ${EMACS_LISPPREFIX}/skk/queue-m.el
 ${EMACS_LISPPREFIX}/skk/queue-m.elc
 ${EMACS_LISPPREFIX}/skk/skk-abbrev.el
@@ -51,11 +54,13 @@ ${FOR_emacs21nox}${EMACS_LISPPREFIX}/skk
 ${FOR_emacs22}${EMACS_LISPPREFIX}/skk/skk-e21.el
 ${FOR_emacs22nox}${EMACS_LISPPREFIX}/skk/skk-e21.el
 ${FOR_emacs23}${EMACS_LISPPREFIX}/skk/skk-e21.el
+${FOR_emacs23nox}${EMACS_LISPPREFIX}/skk/skk-e21.el
 ${FOR_emacs21}${EMACS_LISPPREFIX}/skk/skk-e21.elc
 ${FOR_emacs21nox}${EMACS_LISPPREFIX}/skk/skk-e21.elc
 ${FOR_emacs22}${EMACS_LISPPREFIX}/skk/skk-e21.elc
 ${FOR_emacs22nox}${EMACS_LISPPREFIX}/skk/skk-e21.elc
 ${FOR_emacs23}${EMACS_LISPPREFIX}/skk/skk-e21.elc
+${FOR_emacs23nox}${EMACS_LISPPREFIX}/skk/skk-e21.elc
 ${EMACS_LISPPREFIX}/skk/skk-gadget.el
 ${EMACS_LISPPREFIX}/skk/skk-gadget.elc
 ${EMACS_LISPPREFIX}/skk/skk-hint.el
@@ -71,7 +76,9 @@ ${FOR_emacs21}${EMACS_LISPPREFIX}/skk/sk
 ${FOR_emacs21nox}${EMACS_LISPPREFIX}/skk/skk-jisx0213.el
 ${FOR_emacs21nox}${EMACS_LISPPREFIX}/skk/skk-jisx0213.elc
 ${FOR_emacs23}${EMACS_LISPPREFIX}/skk/skk-jisx0213.el
+${FOR_emacs23nox}${EMACS_LISPPREFIX}/skk/skk-jisx0213.el
 ${FOR_emacs23}${EMACS_LISPPREFIX}/skk/skk-jisx0213.elc
+${FOR_emacs23nox}${EMACS_LISPPREFIX}/skk/skk-jisx0213.elc
 ${EMACS_LISPPREFIX}/skk/skk-jisyo-edit-mode.el
 ${EMACS_LISPPREFIX}/skk/skk-jisyo-edit-mode.elc
 ${EMACS_LISPPREFIX}/skk/skk-kakasi.el


>Unformatted: