Fri Sep 29 12:40:30 2017 UTC ()

emacs22*, emacs23*, emacs24*: remove unmaintained emacs versions

As announced in
https://mail-index.netbsd.org/pkgsrc-users/2017/09/11/msg025563.html

This still leaves emacs20, emacs21, and the current version, emacs25.


(wiz)

--- pkgsrc/chat/riece/Makefile 2014/11/23 06:13:37 1.25
+++ pkgsrc/chat/riece/Makefile 2017/09/29 12:40:26 1.26

 @@ -1,32 +1,32 @@
-# $NetBSD: Makefile,v 1.25 2014/11/23 06:13:37 mef Exp $
+# $NetBSD: Makefile,v 1.26 2017/09/29 12:40:26 wiz Exp $
+#
 DISTNAME=	riece-9.0.0
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
 PKGREVISION=	1
 CATEGORIES=	chat japanese
 MASTER_SITES=	http://download.savannah.gnu.org/releases/riece/
 LICENSE=	gnu-gpl-v3
 MAINTAINER=	makoto@ki.nu
 HOMEPAGE=	http://www.nongnu.org/riece/
 COMMENT=	IRC client for Emacs
 INSTALLATION_DIRS=	${EMACS_LISPPREFIX:C|^${PREFIX}/||}/riece \
 			${EMACS_INFOPREFIX:C|^${PREFIX}/||}
 EMACS_VERSIONS_ACCEPTED= \
-		emacs25 emacs24 emacs23 emacs23nox emacs22 emacs22nox emacs21 emacs21nox \
+		emacs25 emacs21 emacs21nox \
 		xemacs215 xemacs215nox xemacs214 xemacs214nox
 EMACS_MODULES=	base
 GNU_CONFIGURE=	YES
 INFO_FILES=	yes
 # --with-emacs=... or --with-xemacs=...
 CONFIGURE_ARGS+=	--with-${EMACS_FLAVOR}=${EMACS_BIN:Q}
 CONFIGURE_ARGS+=	${CONFIGURE_ARGS.${EMACS_FLAVOR}}
 # Riece digs sub directory.
 CONFIGURE_ARGS.emacs=	--with-lispdir=${EMACS_LISPPREFIX:Q}
 CONFIGURE_ARGS.xemacs=	--with-packagedir=${EMACS_LISPPREFIX:C|/lisp\$||}

--- pkgsrc/devel/apel/Makefile 2017/08/10 07:36:36 1.34
+++ pkgsrc/devel/apel/Makefile 2017/09/29 12:40:26 1.35

 @@ -1,40 +1,39 @@
-# $NetBSD: Makefile,v 1.34 2017/08/10 07:36:36 jperkin Exp $
+# $NetBSD: Makefile,v 1.35 2017/09/29 12:40:26 wiz Exp $
 DISTNAME=	apel-10.8
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
 PKGREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	http://kanji.zinbun.kyoto-u.ac.jp/~tomo/lemi/dist/apel/
 MAINTAINER=	uebayasi@NetBSD.org
 HOMEPAGE=	http://git.chise.org/elisp/apel/
 COMMENT=	Portable Emacs library
 LICENSE=	gnu-gpl-v2 OR gnu-gpl-v3
 INSTALLATION_DIRS+=	${EMACS_LISPPREFIX:C|^${PREFIX}/||}/apel
 INSTALLATION_DIRS+=	${EMACS_LISPPREFIX:C|^${PREFIX}/||}/emu
 PLIST_SRC=	${PKGDIR}/PLIST.${EMACS_FLAVOR}
 BUILD_TARGET=	${BUILD_TARGET.${EMACS_FLAVOR}}
 INSTALL_TARGET=	${INSTALL_TARGET.${EMACS_FLAVOR}}
 MAKE_FLAGS+=	EMACS=${EMACS_FLAVOR:Q}
 MAKE_FLAGS+=	LISPDIR=${EMACS_LISPPREFIX:Q}
 MAKE_FLAGS+=	VERSION_SPECIFIC_LISPDIR=${EMACS_LISPPREFIX:Q}
 MAKE_FLAGS+=	${MAKE_FLAGS.${EMACS_FLAVOR}}
 # apel is included in xemacs-packages
-EMACS_VERSIONS_ACCEPTED=	emacs25 emacs24 emacs24nox emacs23 emacs23nox
+EMACS_VERSIONS_ACCEPTED=	emacs25 emacs21 emacs21nox emacs20
 EMACS_VERSIONS_ACCEPTED+=	emacs22 emacs22nox emacs21 emacs21nox emacs20
 BUILD_TARGET.emacs=	elc
 BUILD_TARGET.xemacs=	package
 INSTALL_TARGET.emacs=	install
 INSTALL_TARGET.xemacs=	install-package
 MAKE_FLAGS.emacs=
 MAKE_FLAGS.xemacs=	PACKAGEDIR=${EMACS_LISPPREFIX:C|/lisp$||}
 .include "../../editors/emacs/modules.mk"
 PLIST_VARS+=	emacs23 emacs19
 .if empty(EMACS_TYPE:Mxemacs)
 .  if !empty(EMACS_TYPE:Memacs2[3-9]*)

--- pkgsrc/devel/emacs-ilisp/PLIST 2013/06/19 13:12:00 1.13
+++ pkgsrc/devel/emacs-ilisp/PLIST 2017/09/29 12:40:26 1.14

 @@ -1,14 +1,14 @@
-@comment $NetBSD: PLIST,v 1.13 2013/06/19 13:12:00 mef Exp $
+@comment $NetBSD: PLIST,v 1.14 2017/09/29 12:40:26 wiz Exp $
 share/doc/emacs-ilisp/INSTALLATION
 share/doc/emacs-ilisp/README
 ${EMACS_LISPPREFIX}/ilisp/allegro.lisp
 ${EMACS_LISPPREFIX}/ilisp/bridge.el
 ${EMACS_LISPPREFIX}/ilisp/bridge.elc
 ${EMACS_LISPPREFIX}/ilisp/cl-chs-init.lisp
 ${EMACS_LISPPREFIX}/ilisp/cl-ilisp.lisp
 ${EMACS_LISPPREFIX}/ilisp/cmulisp.lisp
 ${EMACS_LISPPREFIX}/ilisp/comint-ipc.el
 ${EMACS_LISPPREFIX}/ilisp/comint-ipc.elc
 ${EMACS_LISPPREFIX}/ilisp/comint-v18.el
 ${EMACS_LISPPREFIX}/ilisp/completer.el
 ${EMACS_LISPPREFIX}/ilisp/completer.elc
 @@ -20,32 +20,26 @@ ${EMACS_LISPPREFIX}/ilisp/extra/hyperspe
 ${EMACS_LISPPREFIX}/ilisp/extra/hyperspec.elc
 ${EMACS_LISPPREFIX}/ilisp/guile-ilisp.scm
 ${EMACS_LISPPREFIX}/ilisp/ilcompat.el
 ${EMACS_LISPPREFIX}/ilisp/ilcompat.elc
 ${EMACS_LISPPREFIX}/ilisp/ild.el
 ${EMACS_LISPPREFIX}/ilisp/ild.elc
 ${EMACS_LISPPREFIX}/ilisp/ilfsf18.el
 ${EMACS_LISPPREFIX}/ilisp/ilfsf19.el
 ${EMACS_LISPPREFIX}/ilisp/ilfsf20.el
 ${FOR_emacs20}${EMACS_LISPPREFIX}/ilisp/ilfsf20.elc
 ${EMACS_LISPPREFIX}/ilisp/ilfsf21.el
 ${FOR_emacs21}${EMACS_LISPPREFIX}/ilisp/ilfsf21.elc
 ${FOR_emacs21nox}${EMACS_LISPPREFIX}/ilisp/ilfsf21.elc
 ${FOR_emacs22}${EMACS_LISPPREFIX}/ilisp/ilfsf21.elc
 ${FOR_emacs22nox}${EMACS_LISPPREFIX}/ilisp/ilfsf21.elc
 ${FOR_emacs23}${EMACS_LISPPREFIX}/ilisp/ilfsf21.elc
 ${FOR_emacs23nox}${EMACS_LISPPREFIX}/ilisp/ilfsf21.elc
 ${FOR_emacs24}${EMACS_LISPPREFIX}/ilisp/ilfsf21.elc
 ${FOR_emacs24nox}${EMACS_LISPPREFIX}/ilisp/ilfsf21.elc
 ${EMACS_LISPPREFIX}/ilisp/ilisp-acl.el
 ${EMACS_LISPPREFIX}/ilisp/ilisp-acl.elc
 ${EMACS_LISPPREFIX}/ilisp/ilisp-aut.el
 ${EMACS_LISPPREFIX}/ilisp/ilisp-aut.elc
 ${EMACS_LISPPREFIX}/ilisp/ilisp-bat.el
 ${EMACS_LISPPREFIX}/ilisp/ilisp-bug.el
 ${EMACS_LISPPREFIX}/ilisp/ilisp-ccl.el
 ${EMACS_LISPPREFIX}/ilisp/ilisp-ccl.elc
 ${EMACS_LISPPREFIX}/ilisp/ilisp-chs.el
 ${EMACS_LISPPREFIX}/ilisp/ilisp-chs.elc
 ${EMACS_LISPPREFIX}/ilisp/ilisp-cl-easy-menu.el
 ${EMACS_LISPPREFIX}/ilisp/ilisp-cl-easy-menu.elc
 ${EMACS_LISPPREFIX}/ilisp/ilisp-cl.el

--- pkgsrc/devel/flim/PLIST 2010/07/24 06:57:42 1.10
+++ pkgsrc/devel/flim/PLIST 2017/09/29 12:40:26 1.11

 @@ -1,14 +1,14 @@
-@comment $NetBSD: PLIST,v 1.10 2010/07/24 06:57:42 wiz Exp $
+@comment $NetBSD: PLIST,v 1.11 2017/09/29 12:40:26 wiz Exp $
 ${EMACS_INFOPREFIX}/mime-en.info
 ${EMACS_INFOPREFIX}/mime-ja.info
 ${FOR_xemacs214}${EMACS_LISPPREFIX}/flim/auto-autoloads.el
 ${FOR_xemacs214}${EMACS_LISPPREFIX}/flim/auto-autoloads.elc
 ${FOR_xemacs214}${EMACS_LISPPREFIX}/flim/custom-load.el
 ${FOR_xemacs214}${EMACS_LISPPREFIX}/flim/custom-load.elc
 ${FOR_xemacs215}${EMACS_LISPPREFIX}/flim/auto-autoloads.el
 ${FOR_xemacs215}${EMACS_LISPPREFIX}/flim/auto-autoloads.elc
 ${FOR_xemacs215}${EMACS_LISPPREFIX}/flim/custom-load.el
 ${FOR_xemacs215}${EMACS_LISPPREFIX}/flim/custom-load.elc
 ${EMACS_LISPPREFIX}/flim/eword-decode.el
 ${EMACS_LISPPREFIX}/flim/eword-decode.elc
 ${EMACS_LISPPREFIX}/flim/eword-encode.el
 @@ -21,28 +21,26 @@ ${EMACS_LISPPREFIX}/flim/hmac-md5.el
 ${EMACS_LISPPREFIX}/flim/hmac-md5.elc
 ${EMACS_LISPPREFIX}/flim/hmac-sha1.el
 ${EMACS_LISPPREFIX}/flim/hmac-sha1.elc
 ${EMACS_LISPPREFIX}/flim/luna.el
 ${EMACS_LISPPREFIX}/flim/luna.elc
 ${EMACS_LISPPREFIX}/flim/lunit.el
 ${EMACS_LISPPREFIX}/flim/lunit.elc
 ${FOR_xemacs215}${EMACS_LISPPREFIX}/flim/mailcap.el
 ${FOR_xemacs215}${EMACS_LISPPREFIX}/flim/mailcap.elc
 ${FOR_emacs20}${EMACS_LISPPREFIX}/flim/md4.el
 ${FOR_emacs20}${EMACS_LISPPREFIX}/flim/md4.elc
 ${FOR_emacs21}${EMACS_LISPPREFIX}/flim/md4.el
 ${FOR_emacs21}${EMACS_LISPPREFIX}/flim/md4.elc
 ${FOR_emacs22}${EMACS_LISPPREFIX}/flim/md4.el
 ${FOR_emacs22}${EMACS_LISPPREFIX}/flim/md4.elc
 ${FOR_emacs20}${EMACS_LISPPREFIX}/flim/md5-el.el
 ${FOR_emacs20}${EMACS_LISPPREFIX}/flim/md5-el.elc
 ${EMACS_LISPPREFIX}/flim/md5.el
 ${EMACS_LISPPREFIX}/flim/md5.elc
 ${EMACS_LISPPREFIX}/flim/mel-b-ccl.el
 ${EMACS_LISPPREFIX}/flim/mel-b-ccl.elc
 ${EMACS_LISPPREFIX}/flim/mel-b-el.el
 ${EMACS_LISPPREFIX}/flim/mel-b-el.elc
 ${EMACS_LISPPREFIX}/flim/mel-g.el
 ${EMACS_LISPPREFIX}/flim/mel-g.elc
 ${EMACS_LISPPREFIX}/flim/mel-q-ccl.el
 ${EMACS_LISPPREFIX}/flim/mel-q-ccl.elc
 ${EMACS_LISPPREFIX}/flim/mel-q.el
 @@ -61,39 +59,35 @@ ${EMACS_LISPPREFIX}/flim/mime.el
 ${EMACS_LISPPREFIX}/flim/mime.elc
 ${EMACS_LISPPREFIX}/flim/mmbuffer.el
 ${EMACS_LISPPREFIX}/flim/mmbuffer.elc
 ${EMACS_LISPPREFIX}/flim/mmcooked.el
 ${EMACS_LISPPREFIX}/flim/mmcooked.elc
 ${EMACS_LISPPREFIX}/flim/mmexternal.el
 ${EMACS_LISPPREFIX}/flim/mmexternal.elc
 ${EMACS_LISPPREFIX}/flim/mmgeneric.el
 ${EMACS_LISPPREFIX}/flim/mmgeneric.elc
 ${FOR_emacs20}${EMACS_LISPPREFIX}/flim/ntlm.el
 ${FOR_emacs20}${EMACS_LISPPREFIX}/flim/ntlm.elc
 ${FOR_emacs21}${EMACS_LISPPREFIX}/flim/ntlm.el
 ${FOR_emacs21}${EMACS_LISPPREFIX}/flim/ntlm.elc
 ${FOR_emacs22}${EMACS_LISPPREFIX}/flim/ntlm.el
 ${FOR_emacs22}${EMACS_LISPPREFIX}/flim/ntlm.elc
 ${EMACS_LISPPREFIX}/flim/qmtp.el
 ${EMACS_LISPPREFIX}/flim/qmtp.elc
 ${EMACS_LISPPREFIX}/flim/sasl-cram.el
 ${EMACS_LISPPREFIX}/flim/sasl-cram.elc
 ${EMACS_LISPPREFIX}/flim/sasl-digest.el
 ${EMACS_LISPPREFIX}/flim/sasl-digest.elc
 ${FOR_emacs20}${EMACS_LISPPREFIX}/flim/sasl-ntlm.el
 ${FOR_emacs20}${EMACS_LISPPREFIX}/flim/sasl-ntlm.elc
 ${FOR_emacs21}${EMACS_LISPPREFIX}/flim/sasl-ntlm.el
 ${FOR_emacs21}${EMACS_LISPPREFIX}/flim/sasl-ntlm.elc
 ${FOR_emacs22}${EMACS_LISPPREFIX}/flim/sasl-ntlm.el
 ${FOR_emacs22}${EMACS_LISPPREFIX}/flim/sasl-ntlm.elc
 ${EMACS_LISPPREFIX}/flim/sasl-scram.el
 ${EMACS_LISPPREFIX}/flim/sasl-scram.elc
 ${EMACS_LISPPREFIX}/flim/sasl.el
 ${EMACS_LISPPREFIX}/flim/sasl.elc
 ${EMACS_LISPPREFIX}/flim/sha1-el.el
 ${EMACS_LISPPREFIX}/flim/sha1-el.elc
 ${EMACS_LISPPREFIX}/flim/sha1.el
 ${EMACS_LISPPREFIX}/flim/sha1.elc
 ${EMACS_LISPPREFIX}/flim/smtp.el
 ${EMACS_LISPPREFIX}/flim/smtp.elc
 ${EMACS_LISPPREFIX}/flim/std11.el
 ${EMACS_LISPPREFIX}/flim/std11.elc

--- pkgsrc/devel/js2-mode/Makefile 2017/08/16 21:22:11 1.9
+++ pkgsrc/devel/js2-mode/Makefile 2017/09/29 12:40:27 1.10

 @@ -1,30 +1,29 @@
-# $NetBSD: Makefile,v 1.9 2017/08/16 21:22:11 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2017/09/29 12:40:27 wiz Exp $
 DISTNAME=	js2-20080406
 PKGREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	http://js2-mode.googlecode.com/files/
 EXTRACT_SUFX=	.el
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://code.google.com/archive/p/js2-mode/
 COMMENT=	Improved JavaScript mode for GNU Emacs
 WRKSRC=		${WRKDIR}
 USE_LANGUAGES=	# none
 MESSAGE_SUBST+=	LISPDIR=${EMACS_LISPPREFIX:Q}
 # no xemacs at all; emacs21 doesn't support full functionality
-EMACS_VERSIONS_ACCEPTED=	emacs25 emacs24 emacs23 emacs22 emacs22nox
+EMACS_VERSIONS_ACCEPTED=	emacs25
 do-build:
 	cd ${WRKSRC} && ${EMACS_BIN} -batch -f batch-byte-compile ${DISTNAME}.el
 do-install:
 	${INSTALL_DATA_DIR} ${DESTDIR}${EMACS_LISPPREFIX}
 	${INSTALL_DATA} ${WRKSRC}/${DISTNAME}.el ${DESTDIR}${EMACS_LISPPREFIX}/js2.el
 	${INSTALL_DATA} ${WRKSRC}/${DISTNAME}.elc ${DESTDIR}${EMACS_LISPPREFIX}/js2.elc
 .include "../../editors/emacs/modules.mk"
 .include "../../mk/bsd.pkg.mk"

--- pkgsrc/devel/python-mode/Attic/Makefile 2017/09/03 08:53:08 1.28
+++ pkgsrc/devel/python-mode/Attic/Makefile 2017/09/29 12:40:27 1.29

 @@ -1,37 +1,32 @@
-# $NetBSD: Makefile,v 1.28 2017/09/03 08:53:08 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2017/09/29 12:40:27 wiz Exp $
 DISTNAME=	python-mode-1.0
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
 PKGREVISION=	2
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=python-mode/}
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://sourceforge.net/projects/python-mode/
 COMMENT=	Emacs mode for editing python files
 ELISP_FILES=	python-mode.el
 # Could be installed as well, but what about pycomplete.py?
 #ELISP_FILES+=	doctest-mode.el pycomplete.el
 # Note that XEmacs >=21.4.4 includes a python-mode in the prog-modes
 # package. Also, python-mode does not appear to work as is with XEmacs 21.1
-EMACS_VERSIONS_ACCEPTED=	emacs24 emacs24nox \
+EMACS_VERSIONS_ACCEPTED=	emacs21 emacs21nox emacs20
 				emacs23 emacs23nox \
 				emacs22 emacs22nox \
 				emacs21 emacs21nox \
 				emacs20
 .include "../../editors/emacs/modules.mk"
 INSTALLATION_DIRS=	${EMACS_LISPPREFIX:S/^${PREFIX}\///}
 do-build:
 	for file in ${ELISP_FILES}; do \
 		${EMACS_BIN} --no-init-file -batch \
 		-f batch-byte-compile ${WRKSRC}/$${file}; \
 	done
 do-install:
 	for file in ${ELISP_FILES}; do \

--- pkgsrc/doc/CHANGES-2017 2017/09/29 11:06:57 1.4192
+++ pkgsrc/doc/CHANGES-2017 2017/09/29 12:40:29 1.4193

 @@ -1,14 +1,14 @@
-$NetBSD: CHANGES-2017,v 1.4192 2017/09/29 11:06:57 adam Exp $
+$NetBSD: CHANGES-2017,v 1.4193 2017/09/29 12:40:29 wiz Exp $
 Changes to the packages collection and infrastructure in 2017:
 	Updated ham/fldigi to 3.23.19 [mef 2017-01-01]
 	Updated cad/gtkwave to 3.3.79 [mef 2017-01-01]
 	Updated devel/py-requests to 2.12.4nb1 [ryoon 2017-01-01]
 	Updated archivers/xz to 5.2.3 [mef 2017-01-01]
 	Updated sysutils/py-psutil to 5.0.1 [ryoon 2017-01-01]
 	Updated net/aria2 to 1.30.0 [ryoon 2017-01-01]
 	Updated audio/chromaprint to 1.4.2 [mef 2017-01-01]
 	Updated cad/klayout to 0.24.9 [mef 2017-01-01]
 	Updated textproc/xapian to 1.4.2 [schmonz 2017-01-01]
 	Updated textproc/xapian-omega to 1.4.2 [schmonz 2017-01-01]
 @@ -5938,13 +5938,20 @@ Changes to the packages collection and i
 	Added devel/go-siphash version 1.0.0 [alnsn 2017-09-29]
 	Added devel/go-goptlib version 0.7 [alnsn 2017-09-29]
 	Added net/obfs4proxy version 0.0.7 [alnsn 2017-09-29]
 	Updated net/lftp to 4.8.2 [adam 2017-09-29]
 	Updated security/py-asn1crypto to 0.23.0 [adam 2017-09-29]
 	Updated devel/py-click-threading to 0.4.4 [adam 2017-09-29]
 	Updated devel/py-faker to 0.8.4 [adam 2017-09-29]
 	Updated devel/p5-Log-Any to 1.700 [wen 2017-09-29]
 	Updated textproc/p5-XML-SemanticDiff to 1.0006 [wen 2017-09-29]
 	Updated www/mini_httpd to 1.27 [wen 2017-09-29]
 	Added time/py-ligotimegps version 1.1 [wiz 2017-09-29]
 	Added textproc/py-jsonpickle version 0.9.5 [adam 2017-09-29]
 	Updated textproc/py-deepdiff to 3.3.0 [adam 2017-09-29]
 	Removed editors/emacs22 [wiz 2017-09-29]
 	Removed editors/emacs22-nox11 [wiz 2017-09-29]
 	Removed editors/emacs23 [wiz 2017-09-29]
 	Removed editors/emacs23-nox11 [wiz 2017-09-29]
 	Removed editors/emacs24 [wiz 2017-09-29]
 	Removed editors/emacs24-nox11 [wiz 2017-09-29]
 	Removed inputmethod/ibus-el [wiz 2017-09-29]

--- pkgsrc/editors/emacs/Makefile.common 2017/01/01 02:06:46 1.41
+++ pkgsrc/editors/emacs/Makefile.common 2017/09/29 12:40:27 1.42

 @@ -1,14 +1,14 @@
-# $NetBSD: Makefile.common,v 1.41 2017/01/01 02:06:46 tron Exp $
+# $NetBSD: Makefile.common,v 1.42 2017/09/29 12:40:27 wiz Exp $
+#
 # used by editors/emacs/Makefile
 # used by editors/emacs-nox11/Makefile
 CATEGORIES=	editors
 MASTER_SITES=	# empty
 DISTFILES=	# empty
 MAINTAINER=	dholland@NetBSD.org
 COMMENT=	Meta-package for installing the preferred Emacs version
 META_PACKAGE=	yes
 @@ -52,65 +52,41 @@ EMACS_PACKAGE=		${EMACS_BASE_TYPE}
 DEPENDS+=	${EMACS_PACKAGE}>=${EMACS_MAJOR}:${EMACS_PKGDIR}
+#
 # 2. Now it gets gross. Before this meta-package was introduced, the
 # emacs packages all had PKGNAME set to "emacs". Now the meta-package
 # is called "emacs" and the emacs packages themselves have the emacs
 # major version in them. But in order to make updates work properly,
 # the version of the package called "emacs" cannot go down. We need to
 # set MY_EMACS_VERSION accordingly. The following were the versions at
 # the time the renaming was done:
 #   emacs20		20.7nb16
 #   emacs21		21.4anb26
 #   emacs21-nox11	21.4anb13
 #   emacs22		22.3nb26
 #   emacs22-nox11	22.3nb3
 #   emacs23		23.4nb12
 #   emacs23-nox11	23.4nb1
 #   emacs24		24.2nb6
 #   emacs24-nox11	24.2
 #   emacs25+		n/a
+#
 # Set VER to the version from the above table, and REV to the
 # PKGREVISION value.
+#
 .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
+#
 # Get the actual version from version.mk.
+#
 .include "${EMACS_PKGDIR}/version.mk"
 MY_EMACS_VERSION=	${_EMACS_VERSION_MAJOR}.${_EMACS_VERSION_MINOR}
 .if defined(_EMACS_VERSION_MICRO)

--- pkgsrc/editors/emacs/modules.mk 2017/01/01 02:48:43 1.21
+++ pkgsrc/editors/emacs/modules.mk 2017/09/29 12:40:27 1.22

 @@ -1,14 +1,14 @@
-# $NetBSD: modules.mk,v 1.21 2017/01/01 02:48:43 dholland Exp $
+# $NetBSD: modules.mk,v 1.22 2017/09/29 12:40:27 wiz Exp $
+#
 # This Makefile fragment handles Emacs Lisp Packages (== ELPs).
+#
 # Note to users:
+#
 #	* Users choose one favourite Emacs version.
+#
 #	* Emacs Lisp files are installed...
 #		GNU emacs
 #			-> ${PREFIX}/share/emacs/site-lisp/foo/...
 #		XEmacs
 #			->${PREFIX}/lib/xemacs/site-packages/lisp/foo/...
+#
 @@ -31,56 +31,50 @@
 #	  installable for GNU Emacs/XEmacs might be possible.)
+#
 #	* Assume each ELP supports all Emacs versions by default.  If the
 #	  ELP supports only certain Emacs versions, define EMACS_VERSIONS
 #	  _ACCEPTED explicitly before including mk/emacs.mk.
+#
 # Variables for users:
+#
 #	EMACS_TYPE
 #		Description:
 #			The user's favourite Emacs version.  The default
 #			value is set in mk/defaults/mk.conf.
 #		Possible values:
-#			emacs25, emacs24, emacs24nox,
+#			emacs25, emacs21, emacs21nox, emacs20,
 #			emacs23, emacs23nox, emacs22, emacs22nox,
 #			emacs21, emacs21nox, emacs20,
 #			xemacs215, xemacs215nox, xemacs214, xemacs214nox
 #		Default value:
 #			emacs25
+#
 # Variables ELPs can provide:
+#
 #	EMACS_MODULES
 #		Description:
 #			List of Emacs LISP modules that the current ELP
 #			needs at run-time.
 #		Possible values:
 #			base, leim
 #		Default value:
 #			<undefined>
+#
 #	EMACS_VERSIONS_ACCEPTED
 #		Description:
 #			Versions the ELP accepts (supports).
 #		Possible values:
-#			emacs25, emacs24, emacs24nox,
+#			emacs25, emacs21, emacs21nox, emacs20,
 #			emacs23, emacs23nox, emacs22, emacs22nox,
 #			emacs21, emacs21nox, emacs20,
 #			xemacs215, xemacs215nox, xemacs214, xemacs214nox
 #		Default value:
-#			emacs25, emacs24, emacs24nox,
+#			emacs25, emacs21, emacs21nox, emacs20,
 #			emacs23, emacs23nox, emacs22, emacs22nox,
 #			emacs21, emacs21nox, emacs20,
 #			xemacs215, xemacs215nox, xemacs214, xemacs214nox
+#
 #	EMACS_BUILDLINK
 #		Description:
 #			Whether create buildlink directory of *.el / *.elc
 #			files.  ELPs which include other ELP's buildlink3.mk
 #			must define this value.
 #		Possible values:
 #			<defined>, <undefined>
 #		Default value:
 #			<undefined>
+#
 # Variables provided for ELPs:
 @@ -170,30 +164,30 @@
 #		Description:
 #			Same as the one in Makefile, except that
 #			${PREFIX} is omitted in PLIST.
 #		Possible values:
 #			share/emacs/site-lisp
 #			lib/xemacs/site-packages/lisp
+#
 #	EMACS_VERSION
 #		Description:
 #			XXX
 #		Possible values:
 #			XXX
+#
-#	FOR_{emacs25,emacs24,emacs24nox,emacs23,emacs23nox,emacs22,emacs22nox,emacs21,emacs21nox,emacs20,xemacs215,xemacs215nox,xemacs214,xemacs214nox}
+#	FOR_{emacs25,emacs21,emacs21nox,emacs20,xemacs215,xemacs215nox,xemacs214,xemacs214nox}
 #	FOR_{emacs,xemacs}
 #	FOR_{emacs_x,emacs_nox}
-#	NOTFOR_{emacs25,emacs24,emacs24nox,emacs23,emacs23nox,emacs22,emacs22nox,emacs21,emacs21nox,emacs20,xemacs215,xemacs215nox,xemacs214,xemacs214nox}
+#	NOTFOR_{emacs25,emacs21,emacs21nox,emacs20,xemacs215,xemacs215nox,xemacs214,xemacs214nox}
 #	NOTFOR_{emacs,xemacs}
 #	NOTFOR_{emacs_x,emacs_nox}
 #		Description:
 #			These macros will become either an empty string or
 #			"@comment" depending on the Emacs version; when
 #			"emacs21" is used, ${FOR_emacs} and ${FOR_emacs21}
 #			become "" (empty), and other macros become
 #			"@comment"; this means that only the PLIST lines
 #			prefixed by ${FOR_emacs} and ${FOR_emacs21} are
 #			valid.
+#
 #			NOTFOR_* is the opposite of FOR_*.
 #		Possible values:
 @@ -217,40 +211,33 @@ _SYS_VARS.emacs=	EMACS_BIN EMACS_ETCPREF
 			EMACS_VERSION_MAJOR EMACS_VERSION_MINOR \
 			EMACS_VERSION_MICRO
 _DEF_VARS.emacs=	_EMACS_TYPE _EMACS_PKGBASE
 BUILD_DEFS+=		${_USER_VARS.emacs}
 BUILD_DEFS_EFFECTS+=	${_SYS_VARS.emacs}
 .include "../../mk/bsd.prefs.mk"
+#
 # Constants
+#
 _EMACS_VERSIONS_ALL= \
-	emacs20 emacs21 emacs21nox emacs22 emacs22nox emacs23 emacs23nox \
+	emacs20 emacs21 emacs21nox emacs25 emacs25nox \
 	emacs24 emacs24nox emacs25 emacs25nox \
 	xemacs214 xemacs214nox xemacs215 xemacs215nox
 _EMACS_PKGDIR_MAP= \
 	emacs20@../../editors/emacs20 \
 	emacs21@../../editors/emacs21 \
 	emacs21nox@../../editors/emacs21-nox11 \
 	emacs22@../../editors/emacs22 \
 	emacs22nox@../../editors/emacs22-nox11 \
 	emacs23@../../editors/emacs23 \
 	emacs23nox@../../editors/emacs23-nox11 \
 	emacs24@../../editors/emacs24 \
 	emacs24nox@../../editors/emacs24-nox11 \
 	emacs25@../../editors/emacs25 \
 	emacs25nox@../../editors/emacs25-nox11 \
 	xemacs214@../../editors/xemacs \
 	xemacs214nox@../../editors/xemacs-nox11 \
 	xemacs215@../../editors/xemacs-current \
 	xemacs215nox@../../editors/xemacs-current-nox11
 _EMACS_ETCDIR.emacs=		share
 _EMACS_INFODIR.emacs=		${PKGINFODIR}
 _EMACS_LISPDIR.emacs=		share/emacs/site-lisp
 _EMACS_PKGNAME_PREFIX.emacs=
 _EMACS_CONFLICTS.emacs=		xemacs-${PKGBASE}-[0-9]*

--- pkgsrc/editors/tamago/Makefile 2013/06/10 21:51:04 1.27
+++ pkgsrc/editors/tamago/Makefile 2017/09/29 12:40:27 1.28

 @@ -1,31 +1,27 @@
-# $NetBSD: Makefile,v 1.27 2013/06/10 21:51:04 jnemeth Exp $
+# $NetBSD: Makefile,v 1.28 2017/09/29 12:40:27 wiz Exp $
 DISTNAME=	tamago-4.0.6
 PKGNAME=	${EMACS_PKGNAME_PREFIX}tamago-20020909
 PKGREVISION=	4
 CATEGORIES=	editors
 MASTER_SITES=	http://unit.aist.go.jp/itri/itri-gist/ftp.m17n.org/pub/tamago/
 MAINTAINER=	tech-pkg-ja@jp.NetBSD.org
 HOMEPAGE=	http://www.m17n.org/tamago/
 COMMENT=	CJK characters inputting system for emacs + leim
 GNU_CONFIGURE=	yes
 MAKE_FLAGS+=	prefix=${DESTDIR:Q}${PREFIX}
 # XXX please someone adjust paths and PLIST for XEmacs...
-EMACS_VERSIONS_ACCEPTED=	emacs24 emacs24nox \
+EMACS_VERSIONS_ACCEPTED=	emacs21 emacs21nox emacs20
 				emacs23 emacs23nox \
 				emacs22 emacs22nox \
 				emacs21 emacs21nox \
 				emacs20
 EMACS_MODULES+=	leim
 .include "../../editors/emacs/modules.mk"
 PLIST_VARS+=	jisx0213
 .if ${EMACS_FLAVOR} == "emacs" && ${EMACS_VERSION_MAJOR} >= 21
 PLIST.jisx0213=	yes
 .endif
 .include "../../mk/bsd.pkg.mk"

--- pkgsrc/inputmethod/skk/Makefile 2017/03/06 10:00:15 1.35
+++ pkgsrc/inputmethod/skk/Makefile 2017/09/29 12:40:27 1.36

 @@ -1,34 +1,32 @@
-# $NetBSD: Makefile,v 1.35 2017/03/06 10:00:15 ryoon Exp $
+# $NetBSD: Makefile,v 1.36 2017/09/29 12:40:27 wiz Exp $
 DISTNAME=	ddskk-16.2
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME:S/^ddskk/skk/}
 CATEGORIES=	japanese inputmethod
 MASTER_SITES=	http://openlab.ring.gr.jp/skk/maintrunk/
 MASTER_SITES+=	http://openlab.ring.gr.jp/skk/maintrunk/old-releases/
 MAINTAINER=	uebayasi@NetBSD.org
 HOMEPAGE=	http://openlab.ring.gr.jp/skk/index.html
 COMMENT=	Japanese input methods for Emacs
 LICENSE=	gnu-gpl-v2
 CONFLICTS=	ddskk-[0-9]*
 EMACS_MODULES+=	base leim
 EMACS_BUILDLINK=YES
-EMACS_VERSIONS_ACCEPTED=	emacs25 emacs25nox emacs24 emacs24nox
+EMACS_VERSIONS_ACCEPTED=	emacs25 emacs25nox
 EMACS_VERSIONS_ACCEPTED+=	emacs23 emacs23nox
 MAKE_FLAGS+=	EMACS=${EMACS_BIN:Q}
 MAKE_ENV=	prefix=${DESTDIR:Q}${PREFIX:Q} \
 		EMACS_INFOPREFIX=${DESTDIR:Q}${EMACS_INFOPREFIX:Q} \
 		EMACS_LISPPREFIX=${DESTDIR:Q}${EMACS_LISPPREFIX:Q}
 BUILD_TARGET=	elc
 INFO_FILES=	YES
 SUBST_CLASSES+=			fix-paths
 SUBST_STAGE.fix-paths=		pre-configure
 SUBST_MESSAGE.fix-paths=	Fix user-destdir pathes.
 SUBST_FILES.fix-paths=		skk-setup.el.in
 @@ -36,22 +34,22 @@ SUBST_SED.fix-paths=		-e 's,@TUT@,${PREF
 # Substitute directory definitions during do-configure.
 post-extract:
 	set -e; \
 	${MV} ${WRKSRC}/SKK-CFG ${WRKSRC}/SKK-CFG.orig; \
 	${CP} ${FILESDIR}/SKK-CFG ${WRKSRC}
 .include "options.mk"
 .include "../../editors/emacs/modules.mk"
 PLIST_VARS+=	jisx0213
-.if ${EMACS_VERSION_MAJOR} >= 23 || ${EMACS_VERSION_MAJOR} == 21
+.if ${EMACS_VERSION_MAJOR} >= 21
 PLIST.jisx0213=	yes
 .endif
 .if ${EMACS_VERSION_MAJOR} == 21
 .  include "../../devel/apel/buildlink3.mk"
 .endif
 .include "../../editors/mule-ucs/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

--- pkgsrc/lang/eieio/Makefile 2013/04/06 20:27:22 1.23
+++ pkgsrc/lang/eieio/Makefile 2017/09/29 12:40:27 1.24

 @@ -1,28 +1,27 @@
-# $NetBSD: Makefile,v 1.23 2013/04/06 20:27:22 rodent Exp $
+# $NetBSD: Makefile,v 1.24 2017/09/29 12:40:27 wiz Exp $
 DISTNAME=	eieio-0.17
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
 PKGREVISION=	4
 CATEGORIES=	lang editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=cedet/}
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://cedet.sourceforge.net/eieio.shtml
 COMMENT=	Enhanced Integration of Emacs Interpreted Objects
 EMACS_VERSIONS_ACCEPTED= \
-	emacs20 emacs21 emacs21nox emacs22 emacs22nox \
+	emacs20 emacs21 emacs21nox
 	xemacs214 xemacs214nox xemacs215 xemacs215nox
 EMACS_MODULES+=	base
 MAKEFLAGS+=	EMACS=${EMACS_BIN:Q}
 NO_CONFIGURE=	yes
 USE_TOOLS+=	gmake
 INFO_FILES=	yes
 # XXX $cd ${WRKSRC}; ${MAKE} -V eieio_LISP
 SRCS=	eieio.el eieio-comp.el eieio-opt.el eieio-custom.el eieio-doc.el \
 	eieio-base.el
 # XXX $cd ${WRKSRC}; ${MAKE} -V examples_LISP

--- pkgsrc/mail/mailcrypt/Makefile 2014/11/23 06:08:29 1.25
+++ pkgsrc/mail/mailcrypt/Makefile 2017/09/29 12:40:27 1.26

 @@ -1,29 +1,26 @@
-# $NetBSD: Makefile,v 1.25 2014/11/23 06:08:29 mef Exp $
+# $NetBSD: Makefile,v 1.26 2017/09/29 12:40:27 wiz Exp $
 DISTNAME=	mailcrypt-3.5.9
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
 CATEGORIES=	mail security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mailcrypt/}
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://mailcrypt.sourceforge.net/
 COMMENT=	Emacs frontend for PGP and GPG
 # What we would like to say here is: "we want GNU emacs"
 EMACS_VERSIONS_ACCEPTED=	emacs25 \
 				emacs24 emacs24nox \
 				emacs23 emacs23nox \
 				emacs22 emacs22nox \
 				emacs21 emacs21nox \
 				emacs20
 GNU_CONFIGURE=	yes
 USE_TOOLS+=	autoconf makeinfo
 MAKE_FLAGS+=	prefix=${DESTDIR:Q}${PREFIX:Q} \
 		lispdir=${DESTDIR:Q}${EMACS_LISPPREFIX:Q} \
 		infodir=${DESTDIR:Q}${PREFIX:Q}/${PKGINFODIR}
 INFO_FILES=	yes
 pre-configure:
 		(cd ${WRKSRC}; autoconf)

--- pkgsrc/mail/mew/Makefile 2016/09/18 13:59:01 1.94
+++ pkgsrc/mail/mew/Makefile 2017/09/29 12:40:27 1.95

 @@ -1,37 +1,36 @@
-# $NetBSD: Makefile,v 1.94 2016/09/18 13:59:01 ryoon Exp $
+# $NetBSD: Makefile,v 1.95 2017/09/29 12:40:27 wiz Exp $
 DISTNAME=	mew-6.7
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
 CATEGORIES=	mail
 MASTER_SITES=	http://www.mew.org/Release/
 MAINTAINER=	uebayasi@NetBSD.org
 HOMEPAGE=	http://www.mew.org/
 COMMENT=	Messaging in the Emacs World
 LICENSE=	modified-bsd
 INSTALLATION_DIRS=	${MEW_CONTRIB_DIR:C|^${PREFIX}/||}
 DEPENDS+=	${RUBY_PKGPREFIX}-sqlite3>=1.1:../../databases/ruby-sqlite3
 CONFLICTS+=	mew-xemacs-[0-9]* incm-[0-9]*
 INFO_FILES=	yes
 GNU_CONFIGURE=	yes
-EMACS_VERSIONS_ACCEPTED=	emacs25 emacs25nox emacs24 emacs24nox
+EMACS_VERSIONS_ACCEPTED=	emacs25 emacs25nox
 EMACS_VERSIONS_ACCEPTED+=	emacs23 emacs23nox emacs22 emacs22nox
 EMACS_VERSIONS_ACCEPTED+=	emacs21 emacs21nox
 EMACS_MODULES+=			base
 MAKE_FLAGS+=	DESTDIR=${DESTDIR:Q}
 MAKE_FLAGS+=	prefix=${PREFIX:Q}
 MAKE_FLAGS+=	exec_prefix=${PREFIX:Q}
 MAKE_FLAGS+=	EMACS=${EMACS_BIN:Q}
 MAKE_FLAGS+=	elispdir=${EMACS_LISPPREFIX:Q}/mew
 MAKE_FLAGS+=	etcdir=${EMACS_ETCPREFIX:Q}/mew
 MAKE_FLAGS+=	infodir=${EMACS_INFOPREFIX:Q}
 MAKE_FLAGS+=	mandir=${PREFIX:Q}/${PKGMANDIR:Q}/man1
 CONFIGURE_ARGS+=	--with-etcdir=${EMACS_ETCPREFIX}/mew

--- pkgsrc/mail/wl/Attic/PLIST 2017/09/12 08:19:46 1.18
+++ pkgsrc/mail/wl/Attic/PLIST 2017/09/29 12:40:27 1.19

 @@ -1,14 +1,14 @@
-@comment $NetBSD: PLIST,v 1.18 2017/09/12 08:19:46 dholland Exp $
+@comment $NetBSD: PLIST,v 1.19 2017/09/29 12:40:27 wiz Exp $
 ${EMACS_INFOPREFIX}/wl-ja.info
 ${EMACS_INFOPREFIX}/wl.info
 ${EMACS_LISPPREFIX}/wl/acap.el
 ${EMACS_LISPPREFIX}/wl/acap.elc
 ${EMACS_LISPPREFIX}/wl/bbdb-wl.el
 ${EMACS_LISPPREFIX}/wl/bbdb-wl.elc
 ${EMACS_LISPPREFIX}/wl/elmo-access.el
 ${EMACS_LISPPREFIX}/wl/elmo-access.elc
 ${EMACS_LISPPREFIX}/wl/elmo-archive.el
 ${EMACS_LISPPREFIX}/wl/elmo-archive.elc
 ${EMACS_LISPPREFIX}/wl/elmo-cache.el
 ${EMACS_LISPPREFIX}/wl/elmo-cache.elc
 ${EMACS_LISPPREFIX}/wl/elmo-date.el
 @@ -115,38 +115,26 @@ ${EMACS_LISPPREFIX}/wl/wl-batch.el
 ${EMACS_LISPPREFIX}/wl/wl-batch.elc
 ${EMACS_LISPPREFIX}/wl/wl-complete.el
 ${EMACS_LISPPREFIX}/wl/wl-complete.elc
 ${EMACS_LISPPREFIX}/wl/wl-demo.el
 ${EMACS_LISPPREFIX}/wl/wl-demo.elc
 ${FOR_xemacs214}${EMACS_LISPPREFIX}/wl/wl-dnd.el
 ${FOR_xemacs214}${EMACS_LISPPREFIX}/wl/wl-dnd.elc
 ${EMACS_LISPPREFIX}/wl/wl-draft.el
 ${EMACS_LISPPREFIX}/wl/wl-draft.elc
 ${FOR_emacs21}${EMACS_LISPPREFIX}/wl/wl-e21.el
 ${FOR_emacs21}${EMACS_LISPPREFIX}/wl/wl-e21.elc
 ${FOR_emacs21nox}${EMACS_LISPPREFIX}/wl/wl-e21.el
 ${FOR_emacs21nox}${EMACS_LISPPREFIX}/wl/wl-e21.elc
 ${FOR_emacs22}${EMACS_LISPPREFIX}/wl/wl-e21.el
 ${FOR_emacs22}${EMACS_LISPPREFIX}/wl/wl-e21.elc
 ${FOR_emacs22nox}${EMACS_LISPPREFIX}/wl/wl-e21.el
 ${FOR_emacs22nox}${EMACS_LISPPREFIX}/wl/wl-e21.elc
 ${FOR_emacs23}${EMACS_LISPPREFIX}/wl/wl-e21.el
 ${FOR_emacs23}${EMACS_LISPPREFIX}/wl/wl-e21.elc
 ${FOR_emacs23nox}${EMACS_LISPPREFIX}/wl/wl-e21.el
 ${FOR_emacs23nox}${EMACS_LISPPREFIX}/wl/wl-e21.elc
 ${FOR_emacs24}${EMACS_LISPPREFIX}/wl/wl-e21.el
 ${FOR_emacs24}${EMACS_LISPPREFIX}/wl/wl-e21.elc
 ${FOR_emacs24nox}${EMACS_LISPPREFIX}/wl/wl-e21.el
 ${FOR_emacs24nox}${EMACS_LISPPREFIX}/wl/wl-e21.elc
 ${FOR_emacs25}${EMACS_LISPPREFIX}/wl/wl-e21.el
 ${FOR_emacs25}${EMACS_LISPPREFIX}/wl/wl-e21.elc
 ${FOR_emacs25nox}${EMACS_LISPPREFIX}/wl/wl-e21.el
 ${FOR_emacs25nox}${EMACS_LISPPREFIX}/wl/wl-e21.elc
 ${FOR_xemacs214}${EMACS_LISPPREFIX}/wl/wl-xmas.el
 ${FOR_xemacs214}${EMACS_LISPPREFIX}/wl/wl-xmas.elc
 ${EMACS_LISPPREFIX}/wl/wl-expire.el
 ${EMACS_LISPPREFIX}/wl/wl-expire.elc
 ${EMACS_LISPPREFIX}/wl/wl-fldmgr.el
 ${EMACS_LISPPREFIX}/wl/wl-fldmgr.elc
 ${EMACS_LISPPREFIX}/wl/wl-folder.el
 ${EMACS_LISPPREFIX}/wl/wl-folder.elc
 ${EMACS_LISPPREFIX}/wl/wl-highlight.el

--- pkgsrc/meta-pkgs/bulk-large/Makefile 2017/09/26 10:27:06 1.33
+++ pkgsrc/meta-pkgs/bulk-large/Makefile 2017/09/29 12:40:27 1.34

 @@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.33 2017/09/26 10:27:06 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2017/09/29 12:40:27 wiz Exp $
-DISTNAME=	bulk-large-20170926
+DISTNAME=	bulk-large-20170929
 CATEGORIES=	meta-pkgs
 MASTER_SITES=	# empty
 DISTFILES=	# empty
 MAINTAINER=	dholland@NetBSD.org
 COMMENT=	Meta-package for a standard largish limited bulk build
 META_PACKAGE=	yes
 RESTRICTED=		Just for test build purpose
 NO_BIN_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
 @@ -58,27 +58,27 @@ BUILD_DEPENDS+=	qt4-tools-[0-9]*:../../x
+#
 BUILD_DEPENDS+=	konversation>=1.4:../../chat/konversation
 BUILD_DEPENDS+=	asterisk>=11:../../comms/asterisk
 BUILD_DEPENDS+=	avr-gcc-[0-9]*:../../cross/avr-gcc
 BUILD_DEPENDS+=	avr-libc-[0-9]*:../../cross/avr-libc
 BUILD_DEPENDS+=	avr-gdb-[0-9]*:../../cross/avr-gdb
 BUILD_DEPENDS+=	mysql-client>=5.5<5.6:../../databases/mysql55-client
 BUILD_DEPENDS+=	mysql-server>=5.5<5.6:../../databases/mysql55-server
 BUILD_DEPENDS+=	mysql-client>=5.6:../../databases/mysql56-client
 BUILD_DEPENDS+=	mysql-server>=5.6:../../databases/mysql56-server
 BUILD_DEPENDS+=	postgresql93-[0-9]*:../../databases/postgresql93
 BUILD_DEPENDS+=	valgrind-[0-9]*:../../devel/valgrind
 BUILD_DEPENDS+=	abiword-[0-9]*:../../editors/abiword
-BUILD_DEPENDS+=	emacs24>=24<25:../../editors/emacs24
+BUILD_DEPENDS+=	emacs25>=25<26:../../editors/emacs25
 BUILD_DEPENDS+=	emacs-packages-[0-9]*:../../editors/emacs-packages
 BUILD_DEPENDS+=	xemacs-packages-[0-9]*:../../editors/xemacs-packages
 BUILD_DEPENDS+=	p5-Padre-[0-9]*:../../editors/p5-Padre
 BUILD_DEPENDS+=	glusterfs-[0-9]*:../../filesystems/glusterfs
 BUILD_DEPENDS+=	tahoe-lafs-[0-9]*:../../filesystems/tahoe-lafs
 BUILD_DEPENDS+=	blender-[0-9]*:../../graphics/blender
 BUILD_DEPENDS+=	gimp-[0-9]*:../../graphics/gimp
 BUILD_DEPENDS+=	graphviz-[0-9]*:../../graphics/graphviz
 BUILD_DEPENDS+=	claws-mail-[0-9]*:../../mail/claws-mail
 BUILD_DEPENDS+=	evolution-[0-9]*:../../mail/evolution
 BUILD_DEPENDS+=	${PHP_PKG_PREFIX}-roundcube-[0-9]*:../../mail/roundcube
 BUILD_DEPENDS+=	squirrelmail-[0-9]*:../../mail/squirrelmail
 BUILD_DEPENDS+=	thunderbird-[0-9]*:../../mail/thunderbird

--- pkgsrc/meta-pkgs/bulk-medium/Makefile 2017/08/29 12:23:25 1.43
+++ pkgsrc/meta-pkgs/bulk-medium/Makefile 2017/09/29 12:40:27 1.44

 @@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.43 2017/08/29 12:23:25 wiz Exp $
+# $NetBSD: Makefile,v 1.44 2017/09/29 12:40:27 wiz Exp $
-DISTNAME=	bulk-medium-20170620
+DISTNAME=	bulk-medium-20170929
 CATEGORIES=	meta-pkgs
 MASTER_SITES=	# empty
 DISTFILES=	# empty
 MAINTAINER=	dholland@NetBSD.org
 COMMENT=	Meta-package for a standard medium-sized limited bulk build
 META_PACKAGE=	yes
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # py-matplotlib-gtk2
 RESTRICTED=		Just for test build purpose
 NO_BIN_ON_CDROM=	${RESTRICTED}
 @@ -57,27 +57,27 @@ BUILD_DEPENDS+=	jabberd>=1<2:../../chat/
 BUILD_DEPENDS+=	jabberd>=2:../../chat/jabberd2
 BUILD_DEPENDS+=	sirc-[0-9]*:../../chat/sirc
 BUILD_DEPENDS+=	xchat-[0-9]*:../../chat/xchat
 BUILD_DEPENDS+=	xchat-perl-[0-9]*:../../chat/xchat-perl
 BUILD_DEPENDS+=	xchat-python-[0-9]*:../../chat/xchat-python
 BUILD_DEPENDS+=	fribidi-[0-9]*:../../converters/fribidi
 BUILD_DEPENDS+=	mysql-client>=5.5<5.6:../../databases/mysql55-client
 BUILD_DEPENDS+=	mysql-client>=5.6:../../databases/mysql56-client
 BUILD_DEPENDS+=	openldap-client-[0-9]*:../../databases/openldap-client
 BUILD_DEPENDS+=	git-[0-9]*:../../devel/git
 BUILD_DEPENDS+=	git-base-[0-9]*:../../devel/git-base
 BUILD_DEPENDS+=	git-docs-[0-9]*:../../devel/git-docs
 BUILD_DEPENDS+=	mercurial-[0-9]*:../../devel/mercurial
-BUILD_DEPENDS+=	emacs24>=24<25:../../editors/emacs24
+BUILD_DEPENDS+=	emacs25>=25<26:../../editors/emacs25
 BUILD_DEPENDS+=	emacs-packages-[0-9]*:../../editors/emacs-packages
 BUILD_DEPENDS+=	nvi-[0-9]*:../../editors/nvi
 BUILD_DEPENDS+=	vim-gtk2-[0-9]*:../../editors/vim-gtk2
 BUILD_DEPENDS+=	xemacs-packages-[0-9]*:../../editors/xemacs-packages
 BUILD_DEPENDS+=	qemu-[0-9]*:../../emulators/qemu
 BUILD_DEPENDS+=	simh-[0-9]*:../../emulators/simh
 BUILD_DEPENDS+=	tme-[0-9]*:../../emulators/tme
 BUILD_DEPENDS+=	wine>=1.6<1.7:../../emulators/wine
 BUILD_DEPENDS+=	ImageMagick-[0-9]*:../../graphics/ImageMagick
 BUILD_DEPENDS+=	gnuplot-[0-9]*:../../graphics/gnuplot
 BUILD_DEPENDS+=	netpbm-[0-9]*:../../graphics/netpbm
 BUILD_DEPENDS+=	${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
 BUILD_DEPENDS+=	${PYPKGPREFIX}-matplotlib-gtk-[0-9]*:../../graphics/py-matplotlib-gtk2

--- pkgsrc/meta-pkgs/bulk-small/Makefile 2016/07/09 06:38:34 1.19
+++ pkgsrc/meta-pkgs/bulk-small/Makefile 2017/09/29 12:40:28 1.20

 @@ -1,17 +1,16 @@
-# $NetBSD: Makefile,v 1.19 2016/07/09 06:38:34 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2017/09/29 12:40:28 wiz Exp $
-DISTNAME=	bulk-small-20151224
+DISTNAME=	bulk-small-20170929
 PKGREVISION=	1
 CATEGORIES=	meta-pkgs
 MASTER_SITES=	# empty
 DISTFILES=	# empty
 MAINTAINER=	dholland@NetBSD.org
 COMMENT=	Meta-package for a standard short limited bulk build
 META_PACKAGE=	yes
 RESTRICTED=		Just for test build purpose
 NO_BIN_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
 @@ -49,27 +48,27 @@ NO_BIN_ON_FTP=		${RESTRICTED}
 # 1. Applications. These should be either very small or very widely used,
 # or preferably both; all others should go in bulk-medium.
+#
 # Please do not "fix" the emacs reference by updating it to emacs23 or
 # newer, as those versions of emacs take longer to build than this
 # entire package's time budget.
+#
 BUILD_DEPENDS+=	ircII-[0-9]*:../../chat/ircII
 BUILD_DEPENDS+=	irssi-[0-9]*:../../chat/irssi
 BUILD_DEPENDS+=	irssi-icb-[0-9]*:../../chat/irssi-icb
 BUILD_DEPENDS+=	weechat-[0-9]*:../../chat/weechat
 BUILD_DEPENDS+=	base64-[0-9]*:../../converters/base64
 BUILD_DEPENDS+=	mpack-[0-9]*:../../converters/mpack
-BUILD_DEPENDS+=	emacs22>=22<23:../../editors/emacs22
+BUILD_DEPENDS+=	emacs21>=21<22:../../editors/emacs21
 BUILD_DEPENDS+=	nano-[0-9]*:../../editors/nano
 BUILD_DEPENDS+=	vim-[0-9]*:../../editors/vim
 BUILD_DEPENDS+=	vim-share-[0-9]*:../../editors/vim-share
 BUILD_DEPENDS+=	mutt>=1.5:../../mail/mutt
 BUILD_DEPENDS+=	procmail-[0-9]*:../../mail/procmail
 BUILD_DEPENDS+=	screen-[0-9]*:../../misc/screen
 BUILD_DEPENDS+=	rsync-[0-9]*:../../net/rsync
 BUILD_DEPENDS+=	wget-[0-9]*:../../net/wget
 BUILD_DEPENDS+=	pkg_chk-[0-9]*:../../pkgtools/pkg_chk
 BUILD_DEPENDS+=	pkg_rolling-replace-[0-9]*:../../pkgtools/pkg_rolling-replace
 BUILD_DEPENDS+=	pkgin-[0-9]*:../../pkgtools/pkgin
 BUILD_DEPENDS+=	enscript-[0-9]*:../../print/enscript
 BUILD_DEPENDS+=	ghostscript-gpl-[0-9]*:../../print/ghostscript-gpl

--- pkgsrc/misc/bbdb/Attic/Makefile 2017/08/01 14:59:02 1.31
+++ pkgsrc/misc/bbdb/Attic/Makefile 2017/09/29 12:40:28 1.32

 @@ -1,30 +1,27 @@
-# $NetBSD: Makefile,v 1.31 2017/08/01 14:59:02 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2017/09/29 12:40:28 wiz Exp $
 DISTNAME=		bbdb-2.35
 PKGNAME=		${EMACS_PKGNAME_PREFIX}${DISTNAME}
 PKGREVISION=		1
 CATEGORIES=		mail misc news
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=bbdb/}
 MAINTAINER=		minoura@NetBSD.org
 HOMEPAGE=		https://sourceforge.net/projects/bbdb/
 COMMENT=		Insidious Big Brother DataBase, a rolodex-like database Emacs program
 # bbdb is included in xemacs-packages
-EMACS_VERSIONS_ACCEPTED=	emacs25 \
+EMACS_VERSIONS_ACCEPTED=	emacs25 emacs21 emacs21nox
 				emacs24 emacs24nox emacs23 emacs23nox \
 				emacs22 emacs22nox emacs21 emacs21nox \
 CONFLICTS+=		xemacs-packages-[0-9]*
 USE_PKGLOCALEDIR=	yes
 CONFIGURE_ARGS+=	--enable-rmail
 GNU_CONFIGURE=		yes
 BUILD_TARGET=		all mhe
 USE_TOOLS+=		makeinfo
 INFO_FILES=		yes
 LISPDIR=		${EMACS_LISPPREFIX}/bbdb
 INSTALLATION_DIRS=	${EMACS_INFOPREFIX}
 MAKE_JOBS_SAFE=		no

--- pkgsrc/misc/elscreen/Makefile 2017/01/19 18:52:18 1.23
+++ pkgsrc/misc/elscreen/Makefile 2017/09/29 12:40:28 1.24

 @@ -1,15 +1,14 @@
-# $NetBSD: Makefile,v 1.23 2017/01/19 18:52:18 agc Exp $
+# $NetBSD: Makefile,v 1.24 2017/09/29 12:40:28 wiz Exp $
 DISTNAME=	elscreen-1.4.6
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
 PKGREVISION=	2
 CATEGORIES=	misc
 MASTER_SITES=	ftp://ftp.morishima.net/pub/morishima.net/naoto/ElScreen/
 MASTER_SITES+=	ftp://ftp.morishima.net/pub/morishima.net/naoto/ElScreen/old/
 DISTFILES=	${DISTNAME}.tar.gz \
 		elscreen-color-theme-0.0.0.tar.gz \
 		elscreen-dired-0.1.0.tar.gz \
 		elscreen-dnd-0.0.0.tar.gz \
 		elscreen-gf-1.5.3.tar.gz \
 		elscreen-goby-0.0.0.tar.gz \
 @@ -22,28 +21,26 @@ MAINTAINER=	uebayasi@NetBSD.org
 HOMEPAGE=	http://www.morishima.net/~naoto/software/elscreen/
 COMMENT=	Window manager within Emacs
 LICENSE=	gnu-gpl-v2
 USE_LANGUAGES+=	c
 NO_BUILD=	yes
 EMACS_BUILDLINK=# empty
 # Emacs 24 or later is not supported. Try wip/elscreen-current
 # instead.
 EMACS_VERSIONS_ACCEPTED= \
 	emacs23 emacs23nox \
 	emacs22 emacs22nox \
 	emacs21 emacs21nox \
 	emacs20
 INSTALLATION_DIRS+= ${EMACS_LISPPREFIX}/elscreen
 INSTALLATION_DIRS+= share/doc/elscreen
 do-install:
 	${INSTALL_DATA} ${WRKDIR}/*/*.el ${DESTDIR}${EMACS_LISPPREFIX}/elscreen
 	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/elscreen
 .include "../../editors/emacs/modules.mk"
 .include "../../devel/apel/buildlink3.mk"

--- pkgsrc/misc/lookup/Makefile 2013/04/06 20:27:25 1.24
+++ pkgsrc/misc/lookup/Makefile 2017/09/29 12:40:28 1.25

 @@ -1,30 +1,29 @@
-# $NetBSD: Makefile,v 1.24 2013/04/06 20:27:25 rodent Exp $
+# $NetBSD: Makefile,v 1.25 2017/09/29 12:40:28 wiz Exp $
 DISTNAME=	lookup-1.4.1
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
 PKGREVISION=	2
 CATEGORIES=	textproc
 MASTER_SITES=	http://openlab.jp/edict/lookup/dist/
 MAINTAINER=	uebayasi@NetBSD.org
 HOMEPAGE=	http://openlab.jp/edict/lookup/index.html.ja
 COMMENT=	Electric dictionary agent for Emacs
 MAKE_JOBS_SAFE=	no
 DEPENDS+=	eblook>=1.4:../../textproc/eblook
-EMACS_VERSIONS_ACCEPTED=	emacs23 emacs22 emacs22nox emacs21 emacs21nox emacs20 xemacs214 xemacs215
+EMACS_VERSIONS_ACCEPTED=	emacs21 emacs21nox emacs20 xemacs214 xemacs215
 EMACS_BUILDLINK=# defined
 GNU_CONFIGURE=	YES
 MAKEFLAGS+=	lispdir=${EMACS_LISPPREFIX}/lookup
 INFO_FILES=	yes
 CONFIGURE_ARGS+=${EMACS_FLAVOR}
 .include "../../editors/emacs/modules.mk"
 .include "../../devel/apel/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

--- pkgsrc/mk/defaults/mk.conf 2017/09/06 16:49:28 1.282
+++ pkgsrc/mk/defaults/mk.conf 2017/09/29 12:40:28 1.283

 @@ -1,14 +1,14 @@
-# $NetBSD: mk.conf,v 1.282 2017/09/06 16:49:28 wiz Exp $
+# $NetBSD: mk.conf,v 1.283 2017/09/29 12:40:28 wiz Exp $
+#
 # This file provides default values for variables that may be overridden
 # in the MAKECONF file, which is /etc/mk.conf by default.
+#
 # Note: This file is included after the MAKECONF file, so you cannot query
 # these default values in the MAKECONF using the ".if" and ".for"
 # preprocessing directives.
 # ************************************************************************
 # NOTE TO PEOPLE EDITING THIS FILE - USE LEADING SPACES, NOT LEADING TABS.
 # ************************************************************************
 @@ -908,29 +908,27 @@ DJBDNS_DJBDNS_GROUP?=	djbdns
 DT_LAYOUT?= US
 # Used by dt package to specify the keyboard layout.
 # Possible: US, FI, FR, GER, DV
 # Default: US
 ELK_GUI?=	none
 # Used by elk to determine which GUI API modules are enabled.
 # Possible: none, or some combination of xaw and/or motif
 # Default: none
 EMACS_TYPE?=	emacs25
 # Used by emacs/modules.mk to determine which emacs version should be installed
 # and emacs lisp packages should be built for.
-# Possible: emacs25, emacs25nox, emacs24, emacs24nox,
+# Possible: emacs25, emacs25nox, emacs21, emacs21nox, emacs20,
 #	emacs23, emacs23nox, emacs22, emacs22nox,
 #	emacs21, emacs21nox, emacs20,
 #	xemacs214, xemacs215
 # Default: emacs25
 EXIM_GROUP?=	mail
 # Used in the exim package to specify the server group.
 # Possible: any group name
 # Default: mail
 EXIM_USER?=	mail
 # Used in the exim package to specify the server user.
 # Possible: any user name
 # Default: mail

--- pkgsrc/pkgtools/pkglint/files/Attic/vardefs.go 2017/09/06 16:49:28 1.28
+++ pkgsrc/pkgtools/pkglint/files/Attic/vardefs.go 2017/09/29 12:40:28 1.29

 @@ -167,27 +167,27 @@ func (gd *GlobalData) InitVartypes() {
 		usr("CYRUS_IDLE", lkNone, enum("poll idled no"))
 		usr("CYRUS_GROUP", lkNone, BtUserGroupName)
 		usr("CYRUS_USER", lkNone, BtUserGroupName)
 		usr("DBUS_GROUP", lkNone, BtUserGroupName)
 		usr("DBUS_USER", lkNone, BtUserGroupName)
 		usr("DEFANG_GROUP", lkNone, BtUserGroupName)
 		usr("DEFANG_USER", lkNone, BtUserGroupName)
 		usr("DEFANG_SPOOLDIR", lkNone, BtPathname)
 		usr("DEFAULT_IRC_SERVER", lkNone, BtIdentifier)
 		usr("DEFAULT_SERIAL_DEVICE", lkNone, BtPathname)
 		usr("DIALER_GROUP", lkNone, BtUserGroupName)
 		usr("DT_LAYOUT", lkNone, enum("US FI FR GER DV"))
 		usr("ELK_GUI", lkShell, enum("none xaw motif"))
-		usr("EMACS_TYPE", lkNone, enum("emacs25 emacs25nox emacs24 emacs24nox emacs23 emacs23nox emacs22 emacs22nox emacs21 emacs21nox emacs20 xemacs214 xemacs215"))
+		usr("EMACS_TYPE", lkNone, enum("emacs25 emacs25nox emacs21 emacs21nox emacs20 xemacs214 xemacs215"))
 		usr("EXIM_GROUP", lkNone, BtUserGroupName)
 		usr("EXIM_USER", lkNone, BtUserGroupName)
 		usr("FLUXBOX_USE_XINERAMA", lkNone, enum("YES NO"))
 		usr("FLUXBOX_USE_KDE", lkNone, enum("YES NO"))
 		usr("FLUXBOX_USE_GNOME", lkNone, enum("YES NO"))
 		usr("FLUXBOX_USE_XFT", lkNone, enum("YES NO"))
 		usr("FOX_USE_XUNICODE", lkNone, enum("YES NO"))
 		usr("FREEWNN_USER", lkNone, BtUserGroupName)
 		usr("FREEWNN_GROUP", lkNone, BtUserGroupName)
 		usr("GAMES_USER", lkNone, BtUserGroupName)
 		usr("GAMES_GROUP", lkNone, BtUserGroupName)
 		usr("GAMEMODE", lkNone, BtFileMode)
 		usr("GAMEDIRMODE", lkNone, BtFileMode)
 @@ -502,30 +502,30 @@ func (gd *GlobalData) InitVartypes() {
 	acl("ECHO", lkNone, BtShellCommand, "*: use")
 	sys("ECHO_MSG", lkNone, BtShellCommand)
 	sys("ECHO_N", lkNone, BtShellCommand)
 	pkg("EGDIR", lkNone, BtPathname) // Not defined anywhere, but used in many places like this.
 	sys("EMACS_BIN", lkNone, BtPathname)
 	sys("EMACS_ETCPREFIX", lkNone, BtPathname)
 	sys("EMACS_FLAVOR", lkNone, enum("emacs xemacs"))
 	sys("EMACS_INFOPREFIX", lkNone, BtPathname)
 	sys("EMACS_LISPPREFIX", lkNone, BtPathname)
 	acl("EMACS_MODULES", lkShell, BtIdentifier, "Makefile, Makefile.common: set, append")
 	sys("EMACS_PKGNAME_PREFIX", lkNone, BtIdentifier) // Or the empty string.
 	sys("EMACS_TYPE", lkNone, enum("emacs xemacs"))
 	acl("EMACS_USE_LEIM", lkNone, BtYes, "")
-	acl("EMACS_VERSIONS_ACCEPTED", lkShell, enum("emacs25 emacs24 emacs24nox emacs23 emacs23nox emacs22 emacs22nox emacs21 emacs21nox emacs20 xemacs215 xemacs215nox xemacs214 xemacs214nox"), "Makefile: set")
+	acl("EMACS_VERSIONS_ACCEPTED", lkShell, enum("emacs25 emacs21 emacs21nox emacs20 xemacs215 xemacs215nox xemacs214 xemacs214nox"), "Makefile: set")
 	sys("EMACS_VERSION_MAJOR", lkNone, BtInteger)
 	sys("EMACS_VERSION_MINOR", lkNone, BtInteger)
-	acl("EMACS_VERSION_REQD", lkShell, enum("emacs24 emacs24nox emacs23 emacs23nox emacs22 emacs22nox emacs21 emacs21nox emacs20 xemacs215 xemacs214"), "Makefile: set, append")
+	acl("EMACS_VERSION_REQD", lkShell, enum("emacs25 emacs25nox emacs21 emacs21nox emacs20 xemacs215 xemacs214"), "Makefile: set, append")
 	sys("EMULDIR", lkNone, BtPathname)
 	sys("EMULSUBDIR", lkNone, BtPathname)
 	sys("OPSYS_EMULDIR", lkNone, BtPathname)
 	sys("EMULSUBDIRSLASH", lkNone, BtPathname)
 	sys("EMUL_ARCH", lkNone, enum("arm i386 m68k none ns32k sparc vax x86_64"))
 	sys("EMUL_DISTRO", lkNone, BtIdentifier)
 	sys("EMUL_IS_NATIVE", lkNone, BtYes)
 	pkg("EMUL_MODULES.*", lkShell, BtIdentifier)
 	sys("EMUL_OPSYS", lkNone, enum("darwin freebsd hpux irix linux osf1 solaris sunos none"))
 	pkg("EMUL_PKG_FMT", lkNone, enum("plain rpm"))
 	usr("EMUL_PLATFORM", lkNone, BtEmulPlatform)
 	pkg("EMUL_PLATFORMS", lkShell, BtEmulPlatform)
 	usr("EMUL_PREFER", lkShell, BtEmulPlatform)

--- pkgsrc/pkgtools/pkglint4/files/makevars.map 2017/09/06 16:49:28 1.6
+++ pkgsrc/pkgtools/pkglint4/files/makevars.map 2017/09/29 12:40:28 1.7

 @@ -1,14 +1,14 @@
-# $NetBSD: makevars.map,v 1.6 2017/09/06 16:49:28 wiz Exp $
+# $NetBSD: makevars.map,v 1.7 2017/09/29 12:40:28 wiz Exp $
+#
 # This file contains the guessed type of some variables, according to
 # their current use in pkgsrc.
+#
 # The type YesNo is used for variables that are checked using
 #     .if defined(VAR) && !empty(VAR:M[Yy][Ee][Ss])
+#
 # The type Yes is used for variables that are checked using
 #     .if defined(VAR)
+#
 # The type List is used for lists of things. There are two types of lists,
 # InternalList and List, which are described in the pkgsrc guide, chapter
 @@ -301,30 +301,30 @@ ECHO_N			ShellCommand [$system]
 EGDIR			Pathname [$package]
 # ^^ This variable is not defined by the system, but has been established
 # as a convention.
 EMACS_BIN		Pathname [$system]
 EMACS_ETCPREFIX		Pathname [$system]
 EMACS_FLAVOR		{ emacs xemacs } [$system]
 EMACS_INFOPREFIX	Pathname [$system]
 EMACS_LISPPREFIX	Pathname [$system]
 EMACS_MODULES		List of Identifier [m:as,c:as]
 EMACS_PKGNAME_PREFIX	Identifier [$system]
 # ^^ or the empty string.
 EMACS_TYPE		{ emacs xemacs } [$system]
 EMACS_USE_LEIM		Yes
-EMACS_VERSIONS_ACCEPTED	List of { emacs25 emacs24 emacs24nox emacs23 emacs23nox emacs22 emacs22nox emacs21 emacs21nox emacs20 xemacs215 xemacs215nox xemacs214 xemacs214nox} [m:s]
+EMACS_VERSIONS_ACCEPTED	List of { emacs25 emacs21 emacs21nox emacs20 xemacs215 xemacs215nox xemacs214 xemacs214nox} [m:s]
 EMACS_VERSION_MAJOR	Integer [$system]
 EMACS_VERSION_MINOR	Integer [$system]
-EMACS_VERSION_REQD	List of { emacs24 emacs24nox emacs23 emacs23nox emacs22 emacs22nox emacs21 emacs21nox emacs20 xemacs215 xemacs214 } [m:as]
+EMACS_VERSION_REQD	List of { emacs25 emacs21 emacs21nox emacs20 xemacs215 xemacs214 } [m:as]
 EMULDIR			Pathname [$system]
 EMULSUBDIR		Pathname [$system]
 OPSYS_EMULDIR		Pathname [$system]
 EMULSUBDIRSLASH		Pathname [$system]
 EMUL_ARCH		{ i386 none } [$system]
 EMUL_DISTRO		Identifier [$system]
 EMUL_IS_NATIVE		Yes [$system]
 EMUL_MODULES.*		List of Identifier [$package]
 EMUL_OPSYS		{ freebsd hpux irix linux osf1 solaris sunos none } [$system]
 EMUL_PKG_FMT		{ plain rpm } [$package]
 EMUL_PLATFORM		EmulPlatform [$user]
 EMUL_PLATFORMS		List of EmulPlatform [$package]
 EMUL_PREFER		List of EmulPlatform [$user]

--- pkgsrc/security/EasyPG/Makefile 2015/06/29 11:06:49 1.19
+++ pkgsrc/security/EasyPG/Makefile 2017/09/29 12:40:28 1.20

 @@ -1,25 +1,25 @@
-# $NetBSD: Makefile,v 1.19 2015/06/29 11:06:49 ryoon Exp $
+# $NetBSD: Makefile,v 1.20 2017/09/29 12:40:28 wiz Exp $
 DISTNAME=	epg-0.0.16
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME:S/epg/EasyPG/}
 PKGREVISION=	3
 CATEGORIES=	security mail
 MASTER_SITES=	${MASTER_SITE_OSDN:=epg/29289/}
 MAINTAINER=	gdt@NetBSD.org
 HOMEPAGE=	http://www.easypg.org/
 COMMENT=	GnuPG interface for emacs
 GNU_CONFIGURE=	YES
 MAKE_FLAGS+=	lispdir=${EMACS_LISPPREFIX:Q}
 INSTALL_MAKE_FLAGS+=	lispdir=${DESTDIR}${EMACS_LISPPREFIX:Q}
 INFO_FILES=	yes
 # per README: GnuPG 1.4.3
 DEPENDS+=	gnupg>=1.4.3:../../security/gnupg
 # per README: GNU Emacs 21.4, XEmacs 21.4, or later
-EMACS_VERSIONS_ACCEPTED=  emacs21 emacs21nox emacs22 emacs22nox xemacs214 xemacs215
+EMACS_VERSIONS_ACCEPTED=  emacs21 emacs21nox xemacs214 xemacs215
 .include "../../editors/emacs/modules.mk"
 .include "../../mk/bsd.pkg.mk"

--- pkgsrc/textproc/nxml-mode/Makefile 2013/02/17 19:18:09 1.11
+++ pkgsrc/textproc/nxml-mode/Makefile 2017/09/29 12:40:28 1.12

 @@ -1,27 +1,27 @@
-# $NetBSD: Makefile,v 1.11 2013/02/17 19:18:09 dholland Exp $
+# $NetBSD: Makefile,v 1.12 2017/09/29 12:40:28 wiz Exp $
 DISTNAME=		nxml-mode-20041004
 PKGREVISION=		3
 CATEGORIES=		textproc editors
 MASTER_SITES=		http://www.thaiopensource.com/download/
 MAINTAINER=		tonio@NetBSD.org
 HOMEPAGE=		http://www.thaiopensource.com/nxml-mode/
 COMMENT=		Major mode for editing XML documents for emacs
 NO_CONFIGURE=		yes
 USE_TOOLS+=		makeinfo
-EMACS_VERSIONS_ACCEPTED=	emacs22 emacs22nox emacs21 emacs21nox
+EMACS_VERSIONS_ACCEPTED=	emacs21 emacs21nox
 MESSAGE_SUBST+=		LISPDIR=${EMACS_LISPPREFIX:Q}
 INSTALLATION_DIRS=	${EMACS_LISPPREFIX:Q}/nxml-mode/schema \
 			${EMACS_LISPPREFIX:Q}/nxml-mode/char-name/unicode ${EMACS_INFOPREFIX:Q}
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/*.el* ${DESTDIR}${EMACS_LISPPREFIX:Q}/nxml-mode
 	${INSTALL_DATA} ${WRKSRC}/schema/*.rnc ${DESTDIR}${EMACS_LISPPREFIX:Q}/nxml-mode/schema
 	${INSTALL_DATA} ${WRKSRC}/schema/*.xml ${DESTDIR}${EMACS_LISPPREFIX:Q}/nxml-mode/schema
 	${INSTALL_DATA} ${WRKSRC}/char-name/unicode/*.el ${DESTDIR}${EMACS_LISPPREFIX:Q}/nxml-mode/char-name/unicode
 	${INSTALL_DATA} ${WRKSRC}/nxml-mode.info ${DESTDIR}${EMACS_INFOPREFIX:Q}
 .include "../../editors/emacs/modules.mk"

--- pkgsrc/www/emacs-w3m/Makefile 2016/12/12 13:53:10 1.32
+++ pkgsrc/www/emacs-w3m/Makefile 2017/09/29 12:40:28 1.33

 @@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.32 2016/12/12 13:53:10 hauke Exp $
+# $NetBSD: Makefile,v 1.33 2017/09/29 12:40:28 wiz Exp $
 DISTNAME=	emacs-w3m-1.4.4
 PKGREVISION=	4
 CATEGORIES=	www
 MASTER_SITES=	${HOMEPAGE}
 MAINTAINER=	uebayasi@NetBSD.org
 HOMEPAGE=	http://emacs-w3m.namazu.org/
 COMMENT=	Simple w3m interface for Emacs
 INSTALLATION_DIRS=	${ETCDIR}
 USE_TOOLS+=	makeinfo
 @@ -21,27 +21,27 @@ CONFIGURE_ARGS+=--with-emacs=${EMACS_BIN
 CONFIGURE_ARGS+=--with-icondir=${ICONDIR}
 BUILD_TARGET=	default
 INSTALL_TARGET=	${INSTALL_TARGET.${EMACS_FLAVOR}}
 MAKE_FLAGS=	prefix=${DESTDIR}${PREFIX} ICONDIR=${DESTDIR}${ICONDIR}
 PLIST_SUBST+=	ETCDIR=${ETCDIR:Q}
 SUBST_CLASSES+=	fix-icondir
 SUBST_STAGE.fix-icondir=	pre-configure
 SUBST_FILES.fix-icondir=	Makefile.in w3m.el w3mhack.el
 SUBST_SED.fix-icondir=		-e 's|etc/images/w3m|etc/w3m|g'
 SUBST_SED.fix-icondir+=		-e 's|images/w3m|w3m|g'
 EMACS_BUILDLINK=# defined
-EMACS_VERSIONS_ACCEPTED=	emacs22 emacs22nox emacs21 emacs21nox emacs20 \
+EMACS_VERSIONS_ACCEPTED=	emacs21 emacs21nox emacs20 \
 				xemacs215 xemacs215nox xemacs214 xemacs214nox
 .include "../../editors/emacs/modules.mk"
 # GNU Emacs 21 or later and XEmacs have GUI support
 PLIST_VARS+=	gui
 .if (${EMACS_FLAVOR} == "emacs" && ${EMACS_VERSION_MAJOR} > 20) || \
     ${EMACS_FLAVOR} == "xemacs"
 PLIST.gui=	yes
 .endif
 # Work around an xemacs rendering bug for optimized GIFs, see
 # <https://github.com/doitian/emacs-w3m>, 2b

--- pkgsrc/www/emacs-w3m/PLIST 2016/12/12 13:53:10 1.13
+++ pkgsrc/www/emacs-w3m/PLIST 2017/09/29 12:40:28 1.14

 @@ -1,14 +1,14 @@
-@comment $NetBSD: PLIST,v 1.13 2016/12/12 13:53:10 hauke Exp $
+@comment $NetBSD: PLIST,v 1.14 2017/09/29 12:40:28 wiz Exp $
 ${NOTFOR_emacs}${EMACS_INFOPREFIX}/emacs-w3m-ja.info
 ${NOTFOR_emacs}${EMACS_INFOPREFIX}/emacs-w3m-ja.info-1
 ${NOTFOR_emacs}${EMACS_INFOPREFIX}/emacs-w3m-ja.info-2
 ${NOTFOR_emacs}${EMACS_INFOPREFIX}/emacs-w3m-ja.info-3
 ${NOTFOR_emacs}${EMACS_INFOPREFIX}/emacs-w3m-ja.info-4
 ${NOTFOR_emacs}${EMACS_INFOPREFIX}/emacs-w3m.info
 ${EMACS_LISPPREFIX}/w3m/ChangeLog
 ${EMACS_LISPPREFIX}/w3m/ChangeLog.1
 ${EMACS_LISPPREFIX}/w3m/mew-w3m.el
 ${PLIST.mew}${EMACS_LISPPREFIX}/w3m/mew-w3m.elc
 ${EMACS_LISPPREFIX}/w3m/mime-w3m.el
 ${EMACS_LISPPREFIX}/w3m/mime-w3m.elc
 ${EMACS_LISPPREFIX}/w3m/octet.el
 @@ -20,36 +20,32 @@ ${EMACS_LISPPREFIX}/w3m/w3m-bookmark.el
 ${EMACS_LISPPREFIX}/w3m/w3m-bookmark.elc
 ${EMACS_LISPPREFIX}/w3m/w3m-bug.el
 ${EMACS_LISPPREFIX}/w3m/w3m-bug.elc
 ${EMACS_LISPPREFIX}/w3m/w3m-cookie.el
 ${EMACS_LISPPREFIX}/w3m/w3m-cookie.elc
 ${EMACS_LISPPREFIX}/w3m/w3m-dtree.el
 ${EMACS_LISPPREFIX}/w3m/w3m-dtree.elc
 ${EMACS_LISPPREFIX}/w3m/w3m-e19.el
 ${EMACS_LISPPREFIX}/w3m/w3m-e20.el
 ${FOR_emacs20}${EMACS_LISPPREFIX}/w3m/w3m-e20.elc
 ${EMACS_LISPPREFIX}/w3m/w3m-e21.el
 ${FOR_emacs21}${EMACS_LISPPREFIX}/w3m/w3m-e21.elc
 ${FOR_emacs21nox}${EMACS_LISPPREFIX}/w3m/w3m-e21.elc
 ${FOR_emacs22}${EMACS_LISPPREFIX}/w3m/w3m-e21.elc
 ${FOR_emacs22nox}${EMACS_LISPPREFIX}/w3m/w3m-e21.elc
 ${EMACS_LISPPREFIX}/w3m/w3m-form.el
 ${EMACS_LISPPREFIX}/w3m/w3m-form.elc
 ${EMACS_LISPPREFIX}/w3m/w3m-fsf.el
 ${FOR_emacs20}${EMACS_LISPPREFIX}/w3m/w3m-fsf.elc
 ${FOR_emacs21}${EMACS_LISPPREFIX}/w3m/w3m-fsf.elc
 ${FOR_emacs21nox}${EMACS_LISPPREFIX}/w3m/w3m-fsf.elc
 ${FOR_emacs22}${EMACS_LISPPREFIX}/w3m/w3m-fsf.elc
 ${FOR_emacs22nox}${EMACS_LISPPREFIX}/w3m/w3m-fsf.elc
 ${EMACS_LISPPREFIX}/w3m/w3m-hist.el
 ${EMACS_LISPPREFIX}/w3m/w3m-hist.elc
 ${EMACS_LISPPREFIX}/w3m/w3m-image.el
 ${EMACS_LISPPREFIX}/w3m/w3m-image.elc
 ${EMACS_LISPPREFIX}/w3m/w3m-lnum.el
 ${EMACS_LISPPREFIX}/w3m/w3m-lnum.elc
 ${EMACS_LISPPREFIX}/w3m/w3m-namazu.el
 ${EMACS_LISPPREFIX}/w3m/w3m-namazu.elc
 ${EMACS_LISPPREFIX}/w3m/w3m-om.el
 ${EMACS_LISPPREFIX}/w3m/w3m-perldoc.el
 ${EMACS_LISPPREFIX}/w3m/w3m-perldoc.elc
 ${EMACS_LISPPREFIX}/w3m/w3m-proc.el
 ${EMACS_LISPPREFIX}/w3m/w3m-proc.elc

--- pkgsrc/www/emacs-w3m-snapshot/PLIST 2015/07/23 12:19:10 1.7
+++ pkgsrc/www/emacs-w3m-snapshot/PLIST 2017/09/29 12:40:28 1.8

 @@ -1,22 +1,21 @@
-@comment $NetBSD: PLIST,v 1.7 2015/07/23 12:19:10 mef Exp $
+@comment $NetBSD: PLIST,v 1.8 2017/09/29 12:40:28 wiz Exp $
 info/emacs-w3m-ja.info
 info/emacs-w3m.info
 ${EMACS_LISPPREFIX}/w3m/ChangeLog
 ${EMACS_LISPPREFIX}/w3m/ChangeLog.1
 ${FOR_emacs21}${EMACS_LISPPREFIX}/w3m/bookmark-w3m.el
-${FOR_emacs22}${EMACS_LISPPREFIX}/w3m/bookmark-w3m.el
+${NOTFOR_emacs21}${EMACS_LISPPREFIX}/w3m/bookmark-w3m.el.gz
-${NOTFOR_emacs21}${NOTFOR_emacs22}${NOTFOR_emacs22nox}${EMACS_LISPPREFIX}/w3m/bookmark-w3m.el.gz
+${NOTFOR_emacs21}${NOTFOR_emacs21nox}${NOTFOR_emacs20}${EMACS_LISPPREFIX}/w3m/bookmark-w3m.elc
 ${NOTFOR_emacs22}${NOTFOR_emacs22nox}${NOTFOR_emacs21}${NOTFOR_emacs21nox}${NOTFOR_emacs20}${EMACS_LISPPREFIX}/w3m/bookmark-w3m.elc
 ${EMACS_LISPPREFIX}/w3m/mew-shimbun.el
 ${PLIST.mew}${EMACS_LISPPREFIX}/w3m/mew-shimbun.elc
 ${EMACS_LISPPREFIX}/w3m/mew-w3m.el
 ${PLIST.mew}${EMACS_LISPPREFIX}/w3m/mew-w3m.elc
 ${EMACS_LISPPREFIX}/w3m/mime-w3m.el.gz
 ${EMACS_LISPPREFIX}/w3m/mime-w3m.elc
 ${EMACS_LISPPREFIX}/w3m/nnshimbun.el.gz
 ${EMACS_LISPPREFIX}/w3m/nnshimbun.elc
 ${EMACS_LISPPREFIX}/w3m/octet.el.gz
 ${EMACS_LISPPREFIX}/w3m/octet.elc
 ${EMACS_LISPPREFIX}/w3m/sChangeLog
 ${EMACS_LISPPREFIX}/w3m/sb-2ch.el.gz
 ${EMACS_LISPPREFIX}/w3m/sb-2ch.elc

--- pkgsrc/www/w3/Makefile 2013/04/06 20:27:29 1.29
+++ pkgsrc/www/w3/Makefile 2017/09/29 12:40:28 1.30

 @@ -1,27 +1,26 @@
-# $NetBSD: Makefile,v 1.29 2013/04/06 20:27:29 rodent Exp $
+# $NetBSD: Makefile,v 1.30 2017/09/29 12:40:28 wiz Exp $
 DISTNAME=	w3-4.0pre.47
 PKGNAME=	${EMACS_PKGNAME_PREFIX}w3-4.0b47
 PKGREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_XEMACS:=emacs-w3/}
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.gnu.org/software/w3/
 COMMENT=	World Wide Web browser for Emacs
 # included in xemacs-packages
 # emacs22 doesn't work
 EMACS_VERSIONS_ACCEPTED=	emacs21 emacs21nox emacs20
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-emacs
 CONFIGURE_ARGS+=	--enable-site-install
 CONFIGURE_ARGS+=	--with-lispdir=${EMACS_LISPPREFIX}/w3
 CONFIGURE_ARGS+=	--datadir=${ETCDIR}
 INFO_FILES=		yes
 PLIST_SUBST+=	ETCDIR=${ETCDIR:S/^${PREFIX}\///:Q}
 ETCDIR=		${ETCDIR.${EMACS_FLAVOR}}