*: guess supported emacs versions, remove obsolete ones

[Thomas Klausner (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Wed Aug 26 16:37:30 2026 +0200
Changeset:	fbaae13f3fe46053f92596555f4e9d2e6ed60dd4

Modified Files:
	apel-git/Makefile
	cask/Makefile
	emacs-w3m-cvs/Makefile
	emacs-w3m/Makefile
	tc-git/Makefile
	tc/Makefile

Log Message:
*: guess supported emacs versions, remove obsolete ones

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

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

diffstat:
 apel-git/Makefile      |  2 +-
 cask/Makefile          |  2 +-
 emacs-w3m-cvs/Makefile |  3 +--
 emacs-w3m/Makefile     |  3 ++-
 tc-git/Makefile        | 12 ------------
 tc/Makefile            | 12 ------------
 6 files changed, 5 insertions(+), 29 deletions(-)

diffs:
diff --git a/apel-git/Makefile b/apel-git/Makefile
index 358f2dee19..659a1aa3eb 100644
--- a/apel-git/Makefile
+++ b/apel-git/Makefile
@@ -32,7 +32,7 @@ MAKE_FLAGS+=	VERSION_SPECIFIC_LISPDIR=${EMACS_LISPPREFIX}
 MAKE_FLAGS+=	${MAKE_FLAGS.${EMACS_FLAVOR}}
 
 # apel is included in xemacs-packages
-EMACS_VERSIONS_ACCEPTED=	emacs21 emacs21nox emacs20 emacs26 emacs27
+EMACS_VERSIONS_ACCEPTED=	emacs21 emacs21nox emacs20
 
 BUILD_TARGET.emacs=	elc
 BUILD_TARGET.xemacs=	package
diff --git a/cask/Makefile b/cask/Makefile
index 9447810db3..52d3233b13 100644
--- a/cask/Makefile
+++ b/cask/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE=	https://github.com/cask/cask/
 COMMENT=	Project management tool for Emacs
 LICENSE=	gnu-gpl-v3
 
-DEPENDS+=	emacs28-[0-9]*:../../editors/emacs28
+DEPENDS+=	emacs30-[0-9]*:../../editors/emacs30
 
 USE_LANGUAGES=	# none
 USE_TOOLS+=	bash:run gmake
diff --git a/emacs-w3m-cvs/Makefile b/emacs-w3m-cvs/Makefile
index 3cb398a35d..2284bb9f6f 100644
--- a/emacs-w3m-cvs/Makefile
+++ b/emacs-w3m-cvs/Makefile
@@ -45,8 +45,7 @@ SUBST_SED.fix-icondir+=		-e 's|images/w3m|w3m|g'
 
 EMACS_BUILDLINK=
 EMACS_VERSIONS_ACCEPTED=	emacs21 emacs21nox emacs20 \
-				xemacs215 xemacs214 \
-				emacs25 emacs26 emacs27
+				xemacs215 xemacs214
 
 EVAL_PREFIX+=		W3MPREFIX=w3m
 
diff --git a/emacs-w3m/Makefile b/emacs-w3m/Makefile
index 5512a3cb0e..93d12470a5 100644
--- a/emacs-w3m/Makefile
+++ b/emacs-w3m/Makefile
@@ -37,8 +37,9 @@ WRKSRC=	${WRKDIR}/${PKGBASE}-${GITHUB_TAG}
 
 EMACS_BUILDLINK=		# empty
 EMACS_VERSIONS_ACCEPTED=	emacs21 emacs21nox emacs20 \
-				emacs28 emacs28nox \
 				emacs29 emacs29nox \
+				emacs30 emacs30nox \
+				emacs31 emacs31nox \
 				xemacs215 xemacs215nox xemacs214 xemacs214nox
 
 .include "../../editors/emacs/modules.mk"
diff --git a/tc-git/Makefile b/tc-git/Makefile
index dbf894fd2e..ead2da2c13 100644
--- a/tc-git/Makefile
+++ b/tc-git/Makefile
@@ -68,18 +68,6 @@ SUBST_SED.s2i=		-e s/string-to-int/string-to-number/g
 pre-configure:
 	cd ${WRKSRC} && aclocal && automake --add-missing && autoconf
 
-# To avoid byte-compile error 'Invalid syntax ?', convert EUC-JP to UTF-8
-# Just one file is to be converted now,
-.if (${EMACS_TYPE} == emacs25) || \
-    (${EMACS_TYPE} == emacs26)
-post-patch:
-	(cd ${WRKSRC}/lisp; \
-	for i in tc-bushu.el;  \
-	do ${MV} $$i $$i.bak; \
-	iconv -f euc-jp -t utf-8 < $$i.bak >$$i ; \
-	done )
-.endif
-
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/README    		${DESTDIR}${PREFIX}/share/tc/README.euc
 	${INSTALL_DATA} ${WRKSRC}/doc/manual.pdf	${DESTDIR}${PREFIX}/share/tc
diff --git a/tc/Makefile b/tc/Makefile
index eb7842abc0..0796ae59ff 100644
--- a/tc/Makefile
+++ b/tc/Makefile
@@ -86,18 +86,6 @@ SUBST_SED.l2e=		-e s/last-command-char/last-command-event/g
 pre-configure:
 	cd ${WRKSRC} && aclocal && automake --add-missing && autoconf
 
-# To avoid byte-compile error 'Invalid syntax ?', convert EUC-JP to UTF-8
-# Just one file is to be converted now,
-.if (${EMACS_TYPE} == emacs25) || \
-    (${EMACS_TYPE} == emacs26)
-post-patch:
-	(cd ${WRKSRC}/lisp; \
-	for i in tc-bushu.el;  \
-	do ${MV} $$i $$i.bak; \
-	iconv -f euc-jp -t utf-8 < $$i.bak >$$i ; \
-	done )
-.endif
-
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/README    		${DESTDIR}${PREFIX}/share/tc/README.euc
 	${INSTALL_DATA} ${WRKSRC}/doc/manual.pdf	${DESTDIR}${PREFIX}/share/tc