NetBSD Problem Report #42763

From ryo_on@yk.rim.or.jp  Sun Feb  7 07:13:24 2010
Return-Path: <ryo_on@yk.rim.or.jp>
Received: from mail.netbsd.org (mail.netbsd.org [204.152.190.11])
	by www.NetBSD.org (Postfix) with ESMTP id A48BB63B886
	for <gnats-bugs@gnats.netbsd.org>; Sun,  7 Feb 2010 07:13:24 +0000 (UTC)
Message-Id: <20100207071324.3C3D963B148@mail.netbsd.org>
Date: Sun,  7 Feb 2010 07:13:24 +0000 (UTC)
From: ryo_on@yk.rim.or.jp
Reply-To: ryo_on@yk.rim.or.jp
To: gnats-bugs@gnats.NetBSD.org
Subject: inputmethod/skk lacks support for editors/emacs-nox11 (emacs-nox11-23.1nb1)
X-Send-Pr-Version: 3.95

>Number:         42763
>Category:       pkg
>Synopsis:       inputmethod/skk lacks support for editors/emacs-nox11 (emacs-nox11-23.1nb1)
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    uebayasi
>State:          closed
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sun Feb 07 07:15:00 +0000 2010
>Closed-Date:    Wed Feb 09 12:58:33 +0000 2011
>Last-Modified:  Wed Feb 09 12:58:33 +0000 2011
>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:/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


>Release-Note:

>Audit-Trail:

Responsible-Changed-From-To: pkg-manager->uebayasi
Responsible-Changed-By: obache@NetBSD.org
Responsible-Changed-When: Wed, 03 Mar 2010 07:37:16 +0000
Responsible-Changed-Why:
Over to maintainer.


From: "Hiramatsu Yoshifumi" <hiramatsu@netbsd.org>
To: gnats-bugs@gnats.NetBSD.org
Cc: 
Subject: PR/42763 CVS commit: pkgsrc/editors
Date: Tue, 8 Feb 2011 13:20:14 +0000

 Module Name:	pkgsrc
 Committed By:	hiramatsu
 Date:		Tue Feb  8 13:20:14 UTC 2011

 Modified Files:
 	pkgsrc/editors/emacs: modules.mk version.mk
 	pkgsrc/editors/emacs-nox11: version.mk
 	pkgsrc/editors/emacs21: version.mk
 	pkgsrc/editors/emacs21-nox11: version.mk
 	pkgsrc/editors/emacs22: version.mk
 	pkgsrc/editors/emacs22-nox11: version.mk

 Log Message:
 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.


 To generate a diff of this commit:
 cvs rdiff -u -r1.13 -r1.14 pkgsrc/editors/emacs/modules.mk
 cvs rdiff -u -r1.5 -r1.6 pkgsrc/editors/emacs/version.mk
 cvs rdiff -u -r1.4 -r1.5 pkgsrc/editors/emacs-nox11/version.mk
 cvs rdiff -u -r1.1 -r1.2 pkgsrc/editors/emacs21/version.mk
 cvs rdiff -u -r1.1 -r1.2 pkgsrc/editors/emacs21-nox11/version.mk
 cvs rdiff -u -r1.2 -r1.3 pkgsrc/editors/emacs22/version.mk
 cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/editors/emacs22-nox11/version.mk

 Please note that diffs are not public domain; they are subject to the
 copyright notices on the relevant files.

State-Changed-From-To: open->feedback
State-Changed-By: dholland@NetBSD.org
State-Changed-When: Wed, 09 Feb 2011 05:53:02 +0000
State-Changed-Why:
Did the commit fix it?


From: Ryo ONODERA <ryo_on@yk.rim.or.jp>
To: gnats-bugs@NetBSD.org
Cc: 
Subject: Re: pkg/42763 (inputmethod/skk lacks support for
 editors/emacs-nox11 (emacs-nox11-23.1nb1))
Date: Wed, 09 Feb 2011 21:19:13 +0900 (JST)

 not fixed yet.
 My 1st patch is needed.
 I will commit later and close this PR.

From: "Ryo ONODERA" <ryoon@netbsd.org>
To: pkgsrc-changes@NetBSD.org
Date: Wed, 9 Feb 2011 12:44:21 +0000

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Wed Feb  9 12:44:21 UTC 2011

Modified Files:
        pkgsrc/inputmethod/skk: Makefile

	Log Message:
	Add emacs23nox to EMACS_VERSIONS_ACCEPTED.


	To generate a diff of this commit:
	cvs rdiff -u -r1.22 -r1.23 pkgsrc/inputmethod/skk/Makefile

	Please note that diffs are not public domain; they are subject to the
	copyright notices on the relevant files.


State-Changed-From-To: feedback->closed
State-Changed-By: ryoon@NetBSD.org
State-Changed-When: Wed, 09 Feb 2011 12:58:33 +0000
State-Changed-Why:
Patch applied.


>Unformatted:

Home	PR Database Search