pkg/51757: pkgsrc/editor/emacs doesn't handle emacs-25.1

[Izumi Tsutsui <tsutsui%ceres.dti.ne.jp@localhost>]

>Number:         51757
>Category:       pkg
>Synopsis:       pkgsrc/editor/emacs doesn't build default emacs-25.1
>Confidential:   no
>Severity:       critical
>Priority:       high
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sat Dec 31 13:15:00 +0000 2016
>Originator:     Izumi Tsutsui
>Release:        NetBSD 7.0.2
>Organization:
>Environment:
System: NetBSD 7.0.2 + pkgsrc-2016Q4
Architecture: i386
Machine: i386
>Description:
It looks pkgsrc/emacs/Makefile.common was not updated for 25.1:

 http://cvsweb.netbsd.org/bsdweb.cgi/pkgsrc/editors/emacs/Makefile.common?rev=1.40&content-type=text/x-cvsweb-markup
---
PKG_FAIL_REASON+=	"EMACS_TYPE is xemacs."
# (Set these to avoid crashing out below.)
EMACS_PKGDIR=		../../editors/xemacs
EMACS_PACKAGE=		xemacs
.elif ${MY_EMACS_TYPE} == "emacs25"
EMACS_PKGDIR=		../../editors/emacs-snapshot
EMACS_PACKAGE=		${EMACS_BASE_TYPE}
.elif !empty(MY_EMACS_TYPE:M*nox)
EMACS_PKGDIR=		../../editors/${EMACS_BASE_TYPE}-nox11
EMACS_PACKAGE=		${EMACS_BASE_TYPE}-nox11
.else
EMACS_PKGDIR=		../../editors/${EMACS_BASE_TYPE}
EMACS_PACKAGE=		${EMACS_BASE_TYPE}
.endif

 :

.if ${MY_EMACS_TYPE} == "emacs20"
VER=	20.7
REV=	16
.elif ${MY_EMACS_TYPE} == "emacs21"
VER=	21.4
REV=	26
.elif ${MY_EMACS_TYPE} == "emacs21nox"
VER=	21.4
REV=	13
.elif ${MY_EMACS_TYPE} == "emacs22"
VER=	22.3
REV=	26
.elif ${MY_EMACS_TYPE} == "emacs22nox"
VER=	22.3
REV=	3
.elif ${MY_EMACS_TYPE} == "emacs23"
VER=	23.4
REV=	12
.elif ${MY_EMACS_TYPE} == "emacs23nox"
VER=	23.4
REV=	1
.elif ${MY_EMACS_TYPE} == "emacs24"
VER=	24.2
REV=	6
.elif ${MY_EMACS_TYPE} == "emacs24nox"
VER=	24.2
REV=	0
.else
VER=	${_EMACS_VERSION_MAJOR}
REV=	0
.endif

---

Then "make package" in pkgsrc/editor/emacs builds
pkgsrc/editor/emacs-snapshot.

But all other packages that require emacs try to build
pkgsrc/editor/emacs25 as defined in pkgsrc/mk/defaults/mk.conf
> pkgsrc/mk/defaults/mk.conf:EMACS_TYPE?=    emacs25
and pkgsrc/editor/emacs/modules.mk.

>How-To-Repeat:
cd /usr/pkgsrc/editor/emacs && make package
cd /usr/pkgsrc/inputmethod/mozc-elisp && make package

---
# cd /usr/pkgsrc/editor/emacs && make
WARNING: [license.mk] Every package should define a LICENSE.
===> Installing dependencies for emacs-25.0.50
=> Build dependency cwrappers>=20150314: found cwrappers-20161125
=> Full dependency emacs25>=25: found emacs25-25.0.50.2015071614nb11
===> Invoking ``all'' after barrier for emacs-25.0.50
===> Overriding tools for emacs-25.0.50

 :

# cd /usr/pkgsrc/inputmethod/mozc-elisp && make package
=> Bootstrap dependency digest>=20010302: found digest-20160304
=> Checksum SHA1 OK for mozc-2.17.2313.102.tar.xz
=> Checksum RMD160 OK for mozc-2.17.2313.102.tar.xz
=> Checksum SHA512 OK for mozc-2.17.2313.102.tar.xz
=> Checksum SHA1 OK for uim-mozc-321.3ea28b1.tar.xz
=> Checksum RMD160 OK for uim-mozc-321.3ea28b1.tar.xz
=> Checksum SHA512 OK for uim-mozc-321.3ea28b1.tar.xz
===> Installing dependencies for mozc-elisp-2.17.2313.102nb2
=> Build dependency cwrappers>=20150314: found cwrappers-20161125
=> Full dependency emacs25>=25.1<26: NOT found
=> Verifying package-install for ../../editors/emacs25
=> Bootstrap dependency digest>=20010302: found digest-20160304

 :

===> Installing binary package of emacs25-25.1nb2
pkg_add: A different version of emacs25-25.1nb2 is already installed: emacs25-25.0.50.2015071614nb11
pkg_add: 1 package addition failed
*** Error code 1

Stop.

---

>Fix:
Update pkgsrc/editors/Makefile.common as designed?
Also remove (unmaintained?) editors/emacs-snapshot?

---
Izumi Tsutsui