*: remove references to removed emacs versions (22, 23, 24)

[Thomas Klausner <wiz%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Fri Sep 29 22:45:38 2017 +0200
Changeset:	a4bdbd63f3262f778d7108d681aeabf97731a555

Modified Files:
	apel-git/Makefile
	elscreen-git/Makefile
	emacs-git/modules.mk
	emacs-w3m-cvs/Makefile
	emacs-w3m-cvs/PLIST
	flim/PLIST
	slime/Makefile
	tc-git/Makefile

Log Message:
*: remove references to removed emacs versions (22, 23, 24)

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=a4bdbd63f3262f778d7108d681aeabf97731a555

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

diffstat:
 apel-git/Makefile      |  3 +--
 elscreen-git/Makefile  |  2 +-
 emacs-git/modules.mk   | 27 +++++++--------------------
 emacs-w3m-cvs/Makefile |  4 ++--
 emacs-w3m-cvs/PLIST    |  4 ----
 flim/PLIST             |  6 ------
 slime/Makefile         |  4 +---
 tc-git/Makefile        |  4 +---
 8 files changed, 13 insertions(+), 41 deletions(-)

diffs:
diff --git a/apel-git/Makefile b/apel-git/Makefile
index 47508eb002..33f5364cd9 100644
--- a/apel-git/Makefile
+++ b/apel-git/Makefile
@@ -35,8 +35,7 @@ MAKE_FLAGS+=	VERSION_SPECIFIC_LISPDIR=${EMACS_LISPPREFIX:Q}
 MAKE_FLAGS+=	${MAKE_FLAGS.${EMACS_FLAVOR}}
 
 # apel is included in xemacs-packages
-EMACS_VERSIONS_ACCEPTED=emacs24 emacs24nox emacs23 emacs23nox emacs22 emacs22nox \
-			emacs21 emacs21nox emacs20 emacs25 emacs26
+EMACS_VERSIONS_ACCEPTED=emacs21 emacs21nox emacs20 emacs25 emacs26
 
 BUILD_TARGET.emacs=	elc
 BUILD_TARGET.xemacs=	package
diff --git a/elscreen-git/Makefile b/elscreen-git/Makefile
index e2309ac689..5e76fd79ae 100644
--- a/elscreen-git/Makefile
+++ b/elscreen-git/Makefile
@@ -8,7 +8,7 @@ CONFLICTS+=	elscreen-[0-9]*
 
 MAINTAINER=	pho%cielonegro.org@localhost
 HOMEPAGE=	https://github.com/knu/elscreen
-COMMENT=	Window manager within Emacs (for emacs24)
+COMMENT=	Window manager within Emacs
 LICENSE=	gnu-gpl-v2
 
 GIT_REPOSITORIES=	knu
diff --git a/emacs-git/modules.mk b/emacs-git/modules.mk
index f1b154c1a9..4b20672bec 100644
--- a/emacs-git/modules.mk
+++ b/emacs-git/modules.mk
@@ -41,12 +41,10 @@
 #			The user's favourite Emacs version.  The default
 #			value is set in mk/defaults/mk.conf.
 #		Possible values:
-#			emacs25, emacs25nox, emacs24, emacs24nox,
-#			emacs23, emacs23nox, emacs22, emacs22nox,
-#			emacs21, emacs21nox, emacs20,
+#			emacs25, emacs25nox, emacs21, emacs21nox, emacs20,
 #			xemacs215, xemacs215nox, xemacs214, xemacs214nox
 #		Default value:
-#			emacs24
+#			emacs25
 #
 # Variables ELPs can provide:
 #
@@ -63,14 +61,10 @@
 #		Description:
 #			Versions the ELP accepts (supports).
 #		Possible values:
-#			emacs25, emacs25nox, emacs24, emacs24nox,
-#			emacs23, emacs23nox, emacs22, emacs22nox,
-#			emacs21, emacs21nox, emacs20,
+#			emacs25, emacs25nox, emacs21, emacs21nox, emacs20,
 #			xemacs215, xemacs215nox, xemacs214, xemacs214nox
 #		Default value:
-#			emacs25, emacs25nox, emacs24, emacs24nox,
-#			emacs23, emacs23nox, emacs22, emacs22nox,
-#			emacs21, emacs21nox, emacs20,
+#			emacs25, emacs25nox, emacs21, emacs21nox, emacs20,
 #			xemacs215, xemacs215nox, xemacs214, xemacs214nox
 #
 #	EMACS_BUILDLINK
@@ -180,10 +174,10 @@
 #		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:
@@ -227,20 +221,13 @@ BUILD_DEFS_EFFECTS+=	${_SYS_VARS.emacs}
 #
 
 _EMACS_VERSIONS_ALL= \
-	emacs20 emacs21 emacs21nox emacs22 emacs22nox emacs23 emacs23nox \
-	emacs24 emacs24nox emacs25 emacs26 emacs27\
+	emacs20 emacs21 emacs21nox emacs25 emacs26 emacs27\
 	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 \
 	emacs26@../../editors/emacs26 \
diff --git a/emacs-w3m-cvs/Makefile b/emacs-w3m-cvs/Makefile
index 9f3b06000d..d0ab0b497a 100644
--- a/emacs-w3m-cvs/Makefile
+++ b/emacs-w3m-cvs/Makefile
@@ -44,9 +44,9 @@ SUBST_SED.fix-icondir=		-e 's|etc/images/w3m|etc/w3m|g'
 SUBST_SED.fix-icondir+=		-e 's|images/w3m|w3m|g'
 
 EMACS_BUILDLINK=
-EMACS_VERSIONS_ACCEPTED=	emacs22 emacs22nox emacs21 emacs21nox emacs20 \
+EMACS_VERSIONS_ACCEPTED=	emacs21 emacs21nox emacs20 \
 				xemacs215 xemacs214 \
-				emacs23 emacs24 emacs25 emacs26
+				emacs25 emacs26
 
 EVAL_PREFIX+=		W3MPREFIX=w3m
 
diff --git a/emacs-w3m-cvs/PLIST b/emacs-w3m-cvs/PLIST
index 98b88bb1c7..7a789d21d7 100644
--- a/emacs-w3m-cvs/PLIST
+++ b/emacs-w3m-cvs/PLIST
@@ -33,8 +33,6 @@ ${FOR_emacs20}${EMACS_LISPPREFIX}/w3m/w3m-e20.elc
 ${FOR_emacs21}${EMACS_LISPPREFIX}/w3m/w3m-e21.el.gz
 ${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-ems.el.gz
 ${EMACS_LISPPREFIX}/w3m/w3m-ems.elc
 ${EMACS_LISPPREFIX}/w3m/w3m-favicon.el.gz
@@ -50,8 +48,6 @@ ${FOR_emacs21}${EMACS_LISPPREFIX}/w3m/w3m-fsf.el.gz
 ${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.gz
 ${EMACS_LISPPREFIX}/w3m/w3m-hist.elc
 ${EMACS_LISPPREFIX}/w3m/w3m-image.el.gz
diff --git a/flim/PLIST b/flim/PLIST
index bc42fa2051..37cb367967 100644
--- a/flim/PLIST
+++ b/flim/PLIST
@@ -31,8 +31,6 @@ ${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
@@ -71,8 +69,6 @@ ${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
@@ -83,8 +79,6 @@ ${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
diff --git a/slime/Makefile b/slime/Makefile
index a1594d986f..df930dcbd0 100644
--- a/slime/Makefile
+++ b/slime/Makefile
@@ -21,9 +21,7 @@ NO_CONFIGURE=		yes
 INFO_FILES=		yes
 
 EMACS_VERSIONS_ACCEPTED= \
-			emacs25 emacs25nox \
-			emacs24 emacs24nox \
-			emacs23 emacs23nox
+			emacs25 emacs25nox
 
 INSTALLATION_DIRS+=	${EMACS_INFOPREFIX}
 INSTALLATION_DIRS+=	${EMACS_LISPPREFIX}/slime
diff --git a/tc-git/Makefile b/tc-git/Makefile
index c6e1513942..446e9ff0f1 100644
--- a/tc-git/Makefile
+++ b/tc-git/Makefile
@@ -80,9 +80,7 @@ pre-configure:
 		)
 # To avoid byte-compile error 'Invalid syntax ?', convert EUC-JP to UTF-8
 # Just one file is to be converted now,
-.if !empty(EMACS_TYPE:Memacs23) || \
-    !empty(EMACS_TYPE:Memacs24) || \
-    !empty(EMACS_TYPE:Memacs25) || \
+.if !empty(EMACS_TYPE:Memacs25) || \
     !empty(EMACS_TYPE:Memacs26)
 post-patch:
 	(cd ${WRKSRC}/lisp; \