CVS commit: pkgsrc

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc
From: "Thomas Klausner" <wiz%netbsd.org@localhost>
Date: Sat, 12 Sep 2026 14:31:57 +0000

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sat Sep 12 14:31:57 UTC 2026

Modified Files:
        pkgsrc/chat/emacs-jabber: Makefile
        pkgsrc/chat/riece: Makefile
        pkgsrc/devel/apel: Makefile
        pkgsrc/devel/ecb: Makefile
        pkgsrc/devel/emacs-ilisp: Makefile PLIST
        pkgsrc/devel/js2-mode: Makefile
        pkgsrc/devel/pcl-cvs: Makefile
        pkgsrc/devel/semantic: Makefile
        pkgsrc/doc: CHANGES-2026
        pkgsrc/editors: Makefile
        pkgsrc/editors/emacs: Makefile.common modules.mk
        pkgsrc/editors/mule-ucs: Makefile
        pkgsrc/editors/speedbar: Makefile
        pkgsrc/editors/tamago: Makefile
        pkgsrc/inputmethod/anthy-elisp: Makefile
        pkgsrc/inputmethod/anthy-unicode-elisp: Makefile
        pkgsrc/inputmethod/iiimecf: Makefile
        pkgsrc/inputmethod/tc: Makefile
        pkgsrc/mail/mailcrypt: Makefile
        pkgsrc/mail/mew: Makefile
        pkgsrc/math/calc: Makefile
        pkgsrc/meta-pkgs/bulk-small: Makefile
        pkgsrc/misc: Makefile
        pkgsrc/misc/elscreen: Makefile
        pkgsrc/misc/lookup: Makefile
        pkgsrc/mk/defaults: mk.conf
        pkgsrc/textproc: Makefile
        pkgsrc/www/emacs-w3m: Makefile
        pkgsrc/www/emacs-w3m-snapshot: Makefile PLIST
        pkgsrc/www/w3: Makefile
Removed Files:
        pkgsrc/editors/emacs21: DESCR Makefile Makefile.common PLIST
            buildlink3.mk distinfo hacks.mk options.mk version.mk
        pkgsrc/editors/emacs21-nox11: DESCR Makefile buildlink3.mk version.mk
        pkgsrc/editors/emacs21/files: amd64.h darwin.h dragonfly.h powermac.h
            sh3el.h site-init.el unexmacosx.c
        pkgsrc/editors/emacs21/patches: patch-CVE-2017-14482 patch-aa patch-ab
            patch-ac patch-ad patch-ae patch-af patch-ag patch-ah patch-ai
            patch-aj patch-ak patch-al patch-am patch-an patch-ao patch-ap
            patch-aq patch-ar patch-as patch-at patch-au patch-av patch-aw
            patch-ax patch-ay patch-az patch-ba patch-bb patch-cf
            patch-src_Makefile.in patch-src_alloc_c patch-src_gmalloc.c
            patch-src_syntax.c patch-xx
        pkgsrc/editors/jde: DESCR MESSAGE Makefile PLIST distinfo
        pkgsrc/editors/jde/patches: patch-aa
        pkgsrc/misc/bbdb2: DESCR Makefile PLIST buildlink3.mk distinfo
        pkgsrc/misc/bbdb2/patches: patch-aa patch-lisp_bbdb-com.el
            patch-lisp_bbdb-mhe.el patch-lisp_bbdb-whois.el
        pkgsrc/textproc/nxml-mode: DESCR MESSAGE Makefile PLIST distinfo

Log Message:
emacs21*: remove

No active users found on request to pkgsrc-users two weeks ago.
emacs20 remains.

Remove packages limited to emacs21:
bbdb2: use bbdb3
nxml-mode: included in modern emacs
jde: I guess more modern Java IDEs for emacs exist nowadays


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/chat/emacs-jabber/Makefile
cvs rdiff -u -r1.35 -r1.36 pkgsrc/chat/riece/Makefile
cvs rdiff -u -r1.45 -r1.46 pkgsrc/devel/apel/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/ecb/Makefile
cvs rdiff -u -r1.24 -r1.25 pkgsrc/devel/emacs-ilisp/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/devel/emacs-ilisp/PLIST
cvs rdiff -u -r1.15 -r1.16 pkgsrc/devel/js2-mode/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/devel/pcl-cvs/Makefile
cvs rdiff -u -r1.38 -r1.39 pkgsrc/devel/semantic/Makefile
cvs rdiff -u -r1.6023 -r1.6024 pkgsrc/doc/CHANGES-2026
cvs rdiff -u -r1.269 -r1.270 pkgsrc/editors/Makefile
cvs rdiff -u -r1.47 -r1.48 pkgsrc/editors/emacs/Makefile.common
cvs rdiff -u -r1.40 -r1.41 pkgsrc/editors/emacs/modules.mk
cvs rdiff -u -r1.4 -r0 pkgsrc/editors/emacs21/DESCR \
    pkgsrc/editors/emacs21/buildlink3.mk pkgsrc/editors/emacs21/version.mk
cvs rdiff -u -r1.51 -r0 pkgsrc/editors/emacs21/Makefile
cvs rdiff -u -r1.23 -r0 pkgsrc/editors/emacs21/Makefile.common
cvs rdiff -u -r1.8 -r0 pkgsrc/editors/emacs21/PLIST
cvs rdiff -u -r1.26 -r0 pkgsrc/editors/emacs21/distinfo
cvs rdiff -u -r1.2 -r0 pkgsrc/editors/emacs21/hacks.mk
cvs rdiff -u -r1.5 -r0 pkgsrc/editors/emacs21/options.mk
cvs rdiff -u -r1.4 -r0 pkgsrc/editors/emacs21-nox11/DESCR \
    pkgsrc/editors/emacs21-nox11/version.mk
cvs rdiff -u -r1.15 -r0 pkgsrc/editors/emacs21-nox11/Makefile
cvs rdiff -u -r1.3 -r0 pkgsrc/editors/emacs21-nox11/buildlink3.mk
cvs rdiff -u -r1.1 -r0 pkgsrc/editors/emacs21/files/amd64.h \
    pkgsrc/editors/emacs21/files/darwin.h \
    pkgsrc/editors/emacs21/files/powermac.h \
    pkgsrc/editors/emacs21/files/sh3el.h \
    pkgsrc/editors/emacs21/files/unexmacosx.c
cvs rdiff -u -r1.4 -r0 pkgsrc/editors/emacs21/files/dragonfly.h
cvs rdiff -u -r1.3 -r0 pkgsrc/editors/emacs21/files/site-init.el
cvs rdiff -u -r1.1 -r0 pkgsrc/editors/emacs21/patches/patch-CVE-2017-14482 \
    pkgsrc/editors/emacs21/patches/patch-ac \
    pkgsrc/editors/emacs21/patches/patch-af \
    pkgsrc/editors/emacs21/patches/patch-ai \
    pkgsrc/editors/emacs21/patches/patch-aj \
    pkgsrc/editors/emacs21/patches/patch-al \
    pkgsrc/editors/emacs21/patches/patch-am \
    pkgsrc/editors/emacs21/patches/patch-an \
    pkgsrc/editors/emacs21/patches/patch-ao \
    pkgsrc/editors/emacs21/patches/patch-ap \
    pkgsrc/editors/emacs21/patches/patch-aq \
    pkgsrc/editors/emacs21/patches/patch-ar \
    pkgsrc/editors/emacs21/patches/patch-as \
    pkgsrc/editors/emacs21/patches/patch-at \
    pkgsrc/editors/emacs21/patches/patch-au \
    pkgsrc/editors/emacs21/patches/patch-aw \
    pkgsrc/editors/emacs21/patches/patch-ay \
    pkgsrc/editors/emacs21/patches/patch-az \
    pkgsrc/editors/emacs21/patches/patch-ba \
    pkgsrc/editors/emacs21/patches/patch-bb \
    pkgsrc/editors/emacs21/patches/patch-src_alloc_c \
    pkgsrc/editors/emacs21/patches/patch-src_gmalloc.c \
    pkgsrc/editors/emacs21/patches/patch-src_syntax.c
cvs rdiff -u -r1.4 -r0 pkgsrc/editors/emacs21/patches/patch-aa \
    pkgsrc/editors/emacs21/patches/patch-ae \
    pkgsrc/editors/emacs21/patches/patch-ak \
    pkgsrc/editors/emacs21/patches/patch-xx
cvs rdiff -u -r1.7 -r0 pkgsrc/editors/emacs21/patches/patch-ab
cvs rdiff -u -r1.3 -r0 pkgsrc/editors/emacs21/patches/patch-ad \
    pkgsrc/editors/emacs21/patches/patch-ax \
    pkgsrc/editors/emacs21/patches/patch-src_Makefile.in
cvs rdiff -u -r1.2 -r0 pkgsrc/editors/emacs21/patches/patch-ag \
    pkgsrc/editors/emacs21/patches/patch-ah \
    pkgsrc/editors/emacs21/patches/patch-av \
    pkgsrc/editors/emacs21/patches/patch-cf
cvs rdiff -u -r1.1 -r0 pkgsrc/editors/jde/DESCR pkgsrc/editors/jde/MESSAGE
cvs rdiff -u -r1.32 -r0 pkgsrc/editors/jde/Makefile
cvs rdiff -u -r1.4 -r0 pkgsrc/editors/jde/PLIST
cvs rdiff -u -r1.7 -r0 pkgsrc/editors/jde/distinfo
cvs rdiff -u -r1.2 -r0 pkgsrc/editors/jde/patches/patch-aa
cvs rdiff -u -r1.23 -r1.24 pkgsrc/editors/mule-ucs/Makefile
cvs rdiff -u -r1.29 -r1.30 pkgsrc/editors/speedbar/Makefile
cvs rdiff -u -r1.31 -r1.32 pkgsrc/editors/tamago/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/inputmethod/anthy-elisp/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/inputmethod/anthy-unicode-elisp/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/inputmethod/iiimecf/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/inputmethod/tc/Makefile
cvs rdiff -u -r1.33 -r1.34 pkgsrc/mail/mailcrypt/Makefile
cvs rdiff -u -r1.112 -r1.113 pkgsrc/mail/mew/Makefile
cvs rdiff -u -r1.30 -r1.31 pkgsrc/math/calc/Makefile
cvs rdiff -u -r1.61 -r1.62 pkgsrc/meta-pkgs/bulk-small/Makefile
cvs rdiff -u -r1.688 -r1.689 pkgsrc/misc/Makefile
cvs rdiff -u -r1.2 -r0 pkgsrc/misc/bbdb2/DESCR
cvs rdiff -u -r1.4 -r0 pkgsrc/misc/bbdb2/Makefile
cvs rdiff -u -r1.1 -r0 pkgsrc/misc/bbdb2/PLIST \
    pkgsrc/misc/bbdb2/buildlink3.mk pkgsrc/misc/bbdb2/distinfo
cvs rdiff -u -r1.1 -r0 pkgsrc/misc/bbdb2/patches/patch-aa \
    pkgsrc/misc/bbdb2/patches/patch-lisp_bbdb-com.el \
    pkgsrc/misc/bbdb2/patches/patch-lisp_bbdb-mhe.el \
    pkgsrc/misc/bbdb2/patches/patch-lisp_bbdb-whois.el
cvs rdiff -u -r1.27 -r1.28 pkgsrc/misc/elscreen/Makefile
cvs rdiff -u -r1.27 -r1.28 pkgsrc/misc/lookup/Makefile
cvs rdiff -u -r1.358 -r1.359 pkgsrc/mk/defaults/mk.conf
cvs rdiff -u -r1.1601 -r1.1602 pkgsrc/textproc/Makefile
cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/textproc/nxml-mode/DESCR \
    pkgsrc/textproc/nxml-mode/MESSAGE
cvs rdiff -u -r1.13 -r0 pkgsrc/textproc/nxml-mode/Makefile
cvs rdiff -u -r1.3 -r0 pkgsrc/textproc/nxml-mode/PLIST
cvs rdiff -u -r1.4 -r0 pkgsrc/textproc/nxml-mode/distinfo
cvs rdiff -u -r1.39 -r1.40 pkgsrc/www/emacs-w3m/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/www/emacs-w3m-snapshot/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/www/emacs-w3m-snapshot/PLIST
cvs rdiff -u -r1.32 -r1.33 pkgsrc/www/w3/Makefile

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

Modified files:

Index: pkgsrc/chat/emacs-jabber/Makefile
diff -u pkgsrc/chat/emacs-jabber/Makefile:1.9 pkgsrc/chat/emacs-jabber/Makefile:1.10
--- pkgsrc/chat/emacs-jabber/Makefile:1.9       Mon Nov 17 11:00:27 2025
+++ pkgsrc/chat/emacs-jabber/Makefile   Sat Sep 12 14:31:49 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2025/11/17 11:00:27 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2026/09/12 14:31:49 wiz Exp $
 
 DISTNAME=              emacs-jabber-0.8.92
 CATEGORIES=            chat
@@ -20,7 +20,7 @@ CONFIGURE_ENV+=               EMACS=${EMACS_BIN}
 
 TEST_TARGET=           check
 
-EMACS_VERSIONS_ACCEPTED=       emacs21 emacs21nox emacs20 xemacs215 xemacs215nox xemacs214 xemacs214nox
+EMACS_VERSIONS_ACCEPTED=       emacs20 xemacs215 xemacs215nox xemacs214 xemacs214nox
 
 # net-utils, mule-ucs for xemacs
 EMACS_MODULES=         base

Index: pkgsrc/chat/riece/Makefile
diff -u pkgsrc/chat/riece/Makefile:1.35 pkgsrc/chat/riece/Makefile:1.36
--- pkgsrc/chat/riece/Makefile:1.35     Wed Aug 26 14:37:05 2026
+++ pkgsrc/chat/riece/Makefile  Sat Sep 12 14:31:49 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2026/08/26 14:37:05 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2026/09/12 14:31:49 wiz Exp $
 
 DISTNAME=      riece-9.0.0
 PKGNAME=       ${EMACS_PKGNAME_PREFIX}${DISTNAME}
@@ -14,9 +14,7 @@ COMMENT=      IRC client for Emacs
 INSTALLATION_DIRS=     ${EMACS_LISPPREFIX:C|^${PREFIX}/||}/riece \
                        ${EMACS_INFOPREFIX:C|^${PREFIX}/||}
 
-EMACS_VERSIONS_ACCEPTED= \
-               emacs21 emacs21nox \
-               xemacs215 xemacs215nox xemacs214 xemacs214nox
+EMACS_VERSIONS_ACCEPTED= xemacs215 xemacs215nox xemacs214 xemacs214nox
 EMACS_MODULES= base
 
 GNU_CONFIGURE= YES

Index: pkgsrc/devel/apel/Makefile
diff -u pkgsrc/devel/apel/Makefile:1.45 pkgsrc/devel/apel/Makefile:1.46
--- pkgsrc/devel/apel/Makefile:1.45     Wed Aug 26 14:37:05 2026
+++ pkgsrc/devel/apel/Makefile  Sat Sep 12 14:31:49 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2026/08/26 14:37:05 wiz Exp $
+# $NetBSD: Makefile,v 1.46 2026/09/12 14:31:49 wiz Exp $
 
 DISTNAME=      apel-10.8.0.20201107
 PKGNAME=       ${EMACS_PKGNAME_PREFIX}${DISTNAME}
@@ -25,7 +25,7 @@ MAKE_FLAGS+=  VERSION_SPECIFIC_LISPDIR=${
 MAKE_FLAGS+=   ${MAKE_FLAGS.${EMACS_FLAVOR}}
 
 # apel is included in xemacs-packages
-EMACS_VERSIONS_INCOMPATIBLE=   emacs21 emacs21nox emacs20
+EMACS_VERSIONS_INCOMPATIBLE=   emacs20
 EMACS_VERSIONS_ACCEPTED+=      emacs29 emacs29nox
 EMACS_VERSIONS_ACCEPTED+=      emacs30 emacs30nox
 EMACS_VERSIONS_ACCEPTED+=      emacs31 emacs31nox

Index: pkgsrc/devel/ecb/Makefile
diff -u pkgsrc/devel/ecb/Makefile:1.4 pkgsrc/devel/ecb/Makefile:1.5
--- pkgsrc/devel/ecb/Makefile:1.4       Sun May  5 21:27:35 2024
+++ pkgsrc/devel/ecb/Makefile   Sat Sep 12 14:31:49 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2024/05/05 21:27:35 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2026/09/12 14:31:49 wiz Exp $
 
 DISTNAME=      ecb-2.50
 PKGNAME=       ${EMACS_PKGNAME_PREFIX}${DISTNAME}
@@ -16,7 +16,7 @@ LICENSE=      gnu-gpl-v2
 USE_TOOLS=     find gmake makeinfo tar
 INFO_FILES=    yes
 
-EMACS_VERSIONS_ACCEPTED=       emacs21 emacs21nox xemacs215 xemacs215nox xemacs214 xemacs214nox
+EMACS_VERSIONS_ACCEPTED=       xemacs215 xemacs215nox xemacs214 xemacs214nox
 
 MAKE_FLAGS+=           EMACS=${EMACS_BIN}
 MAKE_FLAGS+=           SHELL=${SH:Q}

Index: pkgsrc/devel/emacs-ilisp/Makefile
diff -u pkgsrc/devel/emacs-ilisp/Makefile:1.24 pkgsrc/devel/emacs-ilisp/Makefile:1.25
--- pkgsrc/devel/emacs-ilisp/Makefile:1.24      Sat May 14 22:25:34 2022
+++ pkgsrc/devel/emacs-ilisp/Makefile   Sat Sep 12 14:31:49 2026
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2022/05/14 22:25:34 dholland Exp $
-#
+# $NetBSD: Makefile,v 1.25 2026/09/12 14:31:49 wiz Exp $
 
 DISTNAME=      ilisp-20021222
 PKGNAME=       ${EMACS_PKGNAME_PREFIX}emacs-${DISTNAME}
@@ -12,7 +11,7 @@ HOMEPAGE=     https://sourceforge.net/projec
 COMMENT=       Emacs interface to embedded Lisp process
 #LICENSE=      # ILISP License, see COPYING file.
 
-EMACS_VERSIONS_ACCEPTED= emacs20 emacs21 emacs21nox
+EMACS_VERSIONS_ACCEPTED= emacs20
 
 MAKE_ENV+=     EMACS=${EMACS_BIN:Q}
 BUILD_TARGET=  compile

Index: pkgsrc/devel/emacs-ilisp/PLIST
diff -u pkgsrc/devel/emacs-ilisp/PLIST:1.14 pkgsrc/devel/emacs-ilisp/PLIST:1.15
--- pkgsrc/devel/emacs-ilisp/PLIST:1.14 Fri Sep 29 12:40:26 2017
+++ pkgsrc/devel/emacs-ilisp/PLIST      Sat Sep 12 14:31:49 2026
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2017/09/29 12:40:26 wiz Exp $
+@comment $NetBSD: PLIST,v 1.15 2026/09/12 14:31:49 wiz Exp $
 share/doc/emacs-ilisp/INSTALLATION
 share/doc/emacs-ilisp/README
 ${EMACS_LISPPREFIX}/ilisp/allegro.lisp
@@ -28,8 +28,6 @@ ${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
 ${EMACS_LISPPREFIX}/ilisp/ilisp-acl.el
 ${EMACS_LISPPREFIX}/ilisp/ilisp-acl.elc
 ${EMACS_LISPPREFIX}/ilisp/ilisp-aut.el

Index: pkgsrc/devel/js2-mode/Makefile
diff -u pkgsrc/devel/js2-mode/Makefile:1.15 pkgsrc/devel/js2-mode/Makefile:1.16
--- pkgsrc/devel/js2-mode/Makefile:1.15 Wed Aug 26 14:37:05 2026
+++ pkgsrc/devel/js2-mode/Makefile      Sat Sep 12 14:31:49 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2026/08/26 14:37:05 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2026/09/12 14:31:49 wiz Exp $
 
 DISTNAME=      js2-20080406
 PKGREVISION=   3
@@ -14,7 +14,7 @@ WRKSRC=               ${WRKDIR}
 USE_LANGUAGES= # none
 MESSAGE_SUBST+=        LISPDIR=${EMACS_LISPPREFIX:Q}
 
-# no xemacs at all; emacs21 doesn't support full functionality
+# no xemacs at all
 EMACS_VERSIONS_ACCEPTED+=      emacs29 emacs29nox emacs30 emacs30nox emacs31 emacs31nox
 
 do-build:

Index: pkgsrc/devel/pcl-cvs/Makefile
diff -u pkgsrc/devel/pcl-cvs/Makefile:1.28 pkgsrc/devel/pcl-cvs/Makefile:1.29
--- pkgsrc/devel/pcl-cvs/Makefile:1.28  Sat May 14 22:25:34 2022
+++ pkgsrc/devel/pcl-cvs/Makefile       Sat Sep 12 14:31:49 2026
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2022/05/14 22:25:34 dholland Exp $
-#
+# $NetBSD: Makefile,v 1.29 2026/09/12 14:31:49 wiz Exp $
 
 DISTNAME=      pcl-cvs-2.9.9
 PKGNAME=       ${EMACS_PKGNAME_PREFIX}${DISTNAME}
@@ -14,7 +13,6 @@ COMMENT=      Front-end to CVS for emacs
 DEPENDS+=      emacs20-elib>=1.0:../../devel/emacs20-elib
 
 CONFLICTS=     emacs-21.*
-CONFLICTS+=    emacs21
 
 EMACS_VERSIONS_ACCEPTED=       emacs20
 

Index: pkgsrc/devel/semantic/Makefile
diff -u pkgsrc/devel/semantic/Makefile:1.38 pkgsrc/devel/semantic/Makefile:1.39
--- pkgsrc/devel/semantic/Makefile:1.38 Mon Nov 17 11:00:40 2025
+++ pkgsrc/devel/semantic/Makefile      Sat Sep 12 14:31:49 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2025/11/17 11:00:40 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2026/09/12 14:31:49 wiz Exp $
 
 DISTNAME=      semantic-1.4.4
 PKGNAME=       ${EMACS_PKGNAME_PREFIX}${DISTNAME}
@@ -19,7 +19,7 @@ INFO_FILES=   yes
 MAKE_FLAGS+=   EMACS=${EMACS_BIN}
 
 # speedbar
-EMACS_VERSIONS_ACCEPTED=        emacs21 emacs21nox emacs20 xemacs215 xemacs215nox xemacs214 xemacs214nox
+EMACS_VERSIONS_ACCEPTED=        emacs20 xemacs215 xemacs215nox xemacs214 xemacs214nox
 
 # XXX cd ${WRKSRC}; ${MAKE} -V semantic_LISP
 SRCS=  semantic.el semantic-util.el semantic-bnf.el semantic-ctxt.el

Index: pkgsrc/doc/CHANGES-2026
diff -u pkgsrc/doc/CHANGES-2026:1.6023 pkgsrc/doc/CHANGES-2026:1.6024
--- pkgsrc/doc/CHANGES-2026:1.6023      Sat Sep 12 12:14:51 2026
+++ pkgsrc/doc/CHANGES-2026     Sat Sep 12 14:31:52 2026
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2026,v 1.6023 2026/09/12 12:14:51 wiz Exp $
+$NetBSD: CHANGES-2026,v 1.6024 2026/09/12 14:31:52 wiz Exp $
 
 Changes to the packages collection and infrastructure in 2026:
 
@@ -9194,3 +9194,9 @@ Changes to the packages collection and i
        Updated devel/libblkid to 2.42.3 [wiz 2026-09-12]
        Updated x11/mcookie to 2.42.3 [wiz 2026-09-12]
        Updated devel/autogen to 5.18.16nb18 [wiz 2026-09-12]
+       Removed editors/emacs21 [wiz 2026-09-12]
+       Removed editors/emacs21-nox11 [wiz 2026-09-12]
+       Removed editors/leim21 [wiz 2026-09-12]
+       Removed editors/jde [wiz 2026-09-12]
+       Removed misc/bbdb2 [wiz 2026-09-12]
+       Removed textproc/nxml-mode [wiz 2026-09-12]

Index: pkgsrc/editors/Makefile
diff -u pkgsrc/editors/Makefile:1.269 pkgsrc/editors/Makefile:1.270
--- pkgsrc/editors/Makefile:1.269       Tue Aug 25 17:33:12 2026
+++ pkgsrc/editors/Makefile     Sat Sep 12 14:31:52 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.269 2026/08/25 17:33:12 wiz Exp $
+# $NetBSD: Makefile,v 1.270 2026/09/12 14:31:52 wiz Exp $
 #
 
 COMMENT=       Text and binary editors
@@ -34,8 +34,6 @@ SUBDIR+=      emacs
 SUBDIR+=       emacs-nox11
 SUBDIR+=       emacs-packages
 SUBDIR+=       emacs20
-SUBDIR+=       emacs21
-SUBDIR+=       emacs21-nox11
 SUBDIR+=       emacs29
 SUBDIR+=       emacs29-nox11
 SUBDIR+=       emacs30
@@ -63,7 +61,6 @@ SUBDIR+=      hexedit
 SUBDIR+=       hexer
 SUBDIR+=       hnb
 SUBDIR+=       javascript-mode
-SUBDIR+=       jde
 SUBDIR+=       jed
 SUBDIR+=       joe
 SUBDIR+=       jove
@@ -78,7 +75,6 @@ SUBDIR+=      l3afpad
 SUBDIR+=       le
 SUBDIR+=       leafpad
 SUBDIR+=       leim20
-SUBDIR+=       leim21
 SUBDIR+=       libinfinity
 SUBDIR+=       lpe
 SUBDIR+=       lyx

Index: pkgsrc/editors/emacs/Makefile.common
diff -u pkgsrc/editors/emacs/Makefile.common:1.47 pkgsrc/editors/emacs/Makefile.common:1.48
--- pkgsrc/editors/emacs/Makefile.common:1.47   Tue Aug 25 17:33:12 2026
+++ pkgsrc/editors/emacs/Makefile.common        Sat Sep 12 14:31:50 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.47 2026/08/25 17:33:12 wiz Exp $
+# $NetBSD: Makefile.common,v 1.48 2026/09/12 14:31:50 wiz Exp $
 #
 # used by editors/emacs/Makefile
 # used by editors/emacs-nox11/Makefile
@@ -60,8 +60,6 @@ DEPENDS+=     ${EMACS_PACKAGE}>=${EMACS_MAJO
 # 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
 #   emacs25+           n/a
 #
 # Set VER to the version from the above table, and REV to the
@@ -71,12 +69,6 @@ DEPENDS+=    ${EMACS_PACKAGE}>=${EMACS_MAJO
 .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
 .else
 VER=   ${_EMACS_VERSION_MAJOR}
 REV=   0

Index: pkgsrc/editors/emacs/modules.mk
diff -u pkgsrc/editors/emacs/modules.mk:1.40 pkgsrc/editors/emacs/modules.mk:1.41
--- pkgsrc/editors/emacs/modules.mk:1.40        Tue Aug 25 17:33:12 2026
+++ pkgsrc/editors/emacs/modules.mk     Sat Sep 12 14:31:50 2026
@@ -1,4 +1,4 @@
-# $NetBSD: modules.mk,v 1.40 2026/08/25 17:33:12 wiz Exp $
+# $NetBSD: modules.mk,v 1.41 2026/09/12 14:31:50 wiz Exp $
 #
 # This Makefile fragment handles Emacs Lisp Packages (== ELPs).
 #
@@ -45,7 +45,6 @@
 #                      emacs31 emacs31nox
 #                      emacs30 emacs30nox
 #                      emacs29 emacs29nox
-#                      emacs21 emacs21nox
 #                      emacs20 xemacs215 xemacs215nox
 #                      xemacs214 xemacs214nox
 #              Default value:
@@ -69,14 +68,12 @@
 #                      emacs31 emacs31nox
 #                      emacs30 emacs30nox
 #                      emacs29 emacs29nox
-#                      emacs21 emacs21nox
 #                      emacs20 xemacs215 xemacs215nox
 #                      xemacs214 xemacs214nox
 #              Default value:
 #                      emacs31 emacs31nox
 #                      emacs30 emacs30nox
 #                      emacs29 emacs29nox
-#                      emacs21 emacs21nox
 #                      emacs20 xemacs215 xemacs215nox
 #                      xemacs214 xemacs214nox
 #
@@ -187,19 +184,19 @@
 #              Possible values:
 #                      XXX
 #
-#      FOR_{emacs31,emacs31nox,emacs30,emacs30nox,emacs29,emacs29nox,emacs21,emacs21nox,emacs20,xemacs215,xemacs215nox,xemacs214,xemacs214nox}
+#      FOR_{emacs31,emacs31nox,emacs30,emacs30nox,emacs29,emacs29nox,emacs20,xemacs215,xemacs215nox,xemacs214,xemacs214nox}
 #      FOR_{emacs,xemacs}
 #      FOR_{emacs_x,emacs_nox}
-#      NOTFOR_{emacs31,emacs31nox,emacs30, emacs30nox,emacs29,emacs29nox,emacs21,emacs21nox,emacs20,xemacs215,xemacs215nox,xemacs214,xemacs214nox}
+#      NOTFOR_{emacs31,emacs31nox,emacs30, emacs30nox,emacs29,emacs29nox,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}
+#                      "emacs20" is used, ${FOR_emacs} and ${FOR_emacs20}
 #                      become "" (empty), and other macros become
 #                      "@comment"; this means that only the PLIST lines
-#                      prefixed by ${FOR_emacs} and ${FOR_emacs21} are
+#                      prefixed by ${FOR_emacs} and ${FOR_emacs20} are
 #                      valid.
 #
 #                      NOTFOR_* is the opposite of FOR_*.
@@ -237,14 +234,12 @@ BUILD_DEFS_EFFECTS+=      ${_SYS_VARS.emacs}
 #
 
 _EMACS_VERSIONS_ALL= \
-       emacs20 emacs21 emacs21nox emacs29 emacs29nox  \
+       emacs20 emacs29 emacs29nox  \
        emacs30 emacs30nox emacs31 emacs31nox \
        xemacs214 xemacs214nox xemacs215 xemacs215nox
 
 _EMACS_PKGDIR_MAP= \
        emacs20@../../editors/emacs20 \
-       emacs21@../../editors/emacs21 \
-       emacs21nox@../../editors/emacs21-nox11 \
        emacs29@../../editors/emacs29 \
        emacs29nox@../../editors/emacs29-nox11 \
        emacs30@../../editors/emacs30 \

Index: pkgsrc/editors/mule-ucs/Makefile
diff -u pkgsrc/editors/mule-ucs/Makefile:1.23 pkgsrc/editors/mule-ucs/Makefile:1.24
--- pkgsrc/editors/mule-ucs/Makefile:1.23       Sat May 14 22:25:36 2022
+++ pkgsrc/editors/mule-ucs/Makefile    Sat Sep 12 14:31:50 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2022/05/14 22:25:36 dholland Exp $
+# $NetBSD: Makefile,v 1.24 2026/09/12 14:31:50 wiz Exp $
 
 DISTNAME=      Mule-UCS-0.84
 PKGNAME=       ${EMACS_PKGNAME_PREFIX}${DISTNAME}
@@ -16,7 +16,7 @@ INSTALLATION_DIRS=    ${EMACS_LISPPREFIX:C|
                        ${EMACS_LISPPREFIX:C|^${PREFIX}/||}/mule-ucs/reldata
 
 # Mule 4.1 feature required by Mule-UCS was added to 20.7nb1.
-EMACS_VERSIONS_ACCEPTED=       emacs21 emacs21nox emacs20
+EMACS_VERSIONS_ACCEPTED=       emacs20
 BUILDLINK_API_DEPENDS.emacs20+=        emacs>=20.7nb1
 
 MESSAGE_SUBST+=        EMACS_LISPPREFIX=${EMACS_LISPPREFIX}

Index: pkgsrc/editors/speedbar/Makefile
diff -u pkgsrc/editors/speedbar/Makefile:1.29 pkgsrc/editors/speedbar/Makefile:1.30
--- pkgsrc/editors/speedbar/Makefile:1.29       Mon Nov 17 11:00:43 2025
+++ pkgsrc/editors/speedbar/Makefile    Sat Sep 12 14:31:50 2026
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2025/11/17 11:00:43 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.30 2026/09/12 14:31:50 wiz Exp $
 
 DISTNAME=      speedbar-0.14beta4
 PKGNAME=       ${EMACS_PKGNAME_PREFIX}speedbar-0.14rc4
@@ -11,7 +10,7 @@ MAINTAINER=   pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://cedet.sourceforge.net/speedbar.shtml
 COMMENT=       Directory and code browser for emacs
 
-EMACS_VERSIONS_ACCEPTED=       emacs21 emacs21nox emacs20 xemacs215 xemacs215nox xemacs214 xemacs214nox
+EMACS_VERSIONS_ACCEPTED=       emacs20 xemacs215 xemacs215nox xemacs214 xemacs214nox
 
 .include "../../editors/emacs/modules.mk"
 

Index: pkgsrc/editors/tamago/Makefile
diff -u pkgsrc/editors/tamago/Makefile:1.31 pkgsrc/editors/tamago/Makefile:1.32
--- pkgsrc/editors/tamago/Makefile:1.31 Tue Feb 10 08:17:04 2026
+++ pkgsrc/editors/tamago/Makefile      Sat Sep 12 14:31:50 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2026/02/10 08:17:04 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2026/09/12 14:31:50 wiz Exp $
 
 DISTNAME=      tamago-4.0.6
 PKGNAME=       ${EMACS_PKGNAME_PREFIX}tamago-20020909
@@ -13,7 +13,7 @@ COMMENT=      CJK characters inputting system
 GNU_CONFIGURE= yes
 MAKE_FLAGS+=   prefix=${DESTDIR}${PREFIX}
 # XXX please someone adjust paths and PLIST for XEmacs...
-EMACS_VERSIONS_ACCEPTED=       emacs21 emacs21nox emacs20
+EMACS_VERSIONS_ACCEPTED=       emacs20
 EMACS_MODULES+=        leim
 
 .include "../../editors/emacs/modules.mk"

Index: pkgsrc/inputmethod/anthy-elisp/Makefile
diff -u pkgsrc/inputmethod/anthy-elisp/Makefile:1.14 pkgsrc/inputmethod/anthy-elisp/Makefile:1.15
--- pkgsrc/inputmethod/anthy-elisp/Makefile:1.14        Wed May  8 12:20:52 2024
+++ pkgsrc/inputmethod/anthy-elisp/Makefile     Sat Sep 12 14:31:50 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2024/05/08 12:20:52 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2026/09/12 14:31:50 wiz Exp $
 
 .include       "../../inputmethod/anthy/Makefile.common"
 PKGNAME=       ${EMACS_PKGNAME_PREFIX}anthy-elisp-${ANTHY_VERSION}
@@ -14,7 +14,7 @@ GNU_CONFIGURE=        yes
 CONFIGURE_ENV+=        EMACS=${EMACS_BIN:Q}
 EMACS_MODULES+=        base leim
 
-EMACS_VERSIONS_ACCEPTED=       emacs21 emacs21nox emacs20 xemacs215 xemacs215nox xemacs214 xemacs214nox
+EMACS_VERSIONS_ACCEPTED=       emacs20 xemacs215 xemacs215nox xemacs214 xemacs214nox
 
 .include "../../editors/emacs/modules.mk"
 

Index: pkgsrc/inputmethod/anthy-unicode-elisp/Makefile
diff -u pkgsrc/inputmethod/anthy-unicode-elisp/Makefile:1.1 pkgsrc/inputmethod/anthy-unicode-elisp/Makefile:1.2
--- pkgsrc/inputmethod/anthy-unicode-elisp/Makefile:1.1 Fri Aug 28 11:30:35 2026
+++ pkgsrc/inputmethod/anthy-unicode-elisp/Makefile     Sat Sep 12 14:31:50 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2026/08/28 11:30:35 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2026/09/12 14:31:50 wiz Exp $
 
 .include       "../../inputmethod/anthy-unicode/Makefile.common"
 
@@ -15,17 +15,17 @@ CONFIGURE_ENV+=             EMACS=${EMACS_BIN:Q}
 EMACS_MODULES+=                base leim
 
 # The accepted versions were measured, not guessed: on NetBSD 11.0/amd64 the
-# package was built with emacs26, 28, 29, 30 and 31, and with emacs20.7 and
-# emacs21.4, and japanese-anthy-unicode was driven through a conversion
+# package was built with emacs26, 28, 29, 30 and 31, and with emacs20.7,
+# and japanese-anthy-unicode was driven through a conversion
 # (nihongo -> the kanji) and deactivate-input-method in each.
 #
-# emacs20 and emacs21 additionally need the patch
+# emacs20 additionally needs the patch
 # (patch-src-util_anthy-unicode.el) and Mule-UCS; see the
 # EMACS_VERSION_MAJOR < 22 block below.
 EMACS_VERSIONS_ACCEPTED=       emacs29 emacs29nox
 EMACS_VERSIONS_ACCEPTED+=      emacs30 emacs30nox
 EMACS_VERSIONS_ACCEPTED+=      emacs31 emacs31nox
-EMACS_VERSIONS_ACCEPTED+=      emacs21 emacs21nox emacs20
+EMACS_VERSIONS_ACCEPTED+=      emacs20
 
 .include "../../editors/emacs/modules.mk"
 

Index: pkgsrc/inputmethod/iiimecf/Makefile
diff -u pkgsrc/inputmethod/iiimecf/Makefile:1.17 pkgsrc/inputmethod/iiimecf/Makefile:1.18
--- pkgsrc/inputmethod/iiimecf/Makefile:1.17    Sat May 14 22:25:37 2022
+++ pkgsrc/inputmethod/iiimecf/Makefile Sat Sep 12 14:31:50 2026
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2022/05/14 22:25:37 dholland Exp $
-#
+# $NetBSD: Makefile,v 1.18 2026/09/12 14:31:50 wiz Exp $
 
 DISTNAME=      IIIMECF-0.6
 PKGNAME=       ${EMACS_PKGNAME_PREFIX}iiimecf-0.6
@@ -11,7 +10,7 @@ MAINTAINER=   uebayasi%NetBSD.org@localhost
 #HOMEPAGE=
 COMMENT=       Emacs Lisp library for IIIM Protocol
 
-EMACS_VERSIONS_ACCEPTED=       emacs21 emacs21nox emacs20
+EMACS_VERSIONS_ACCEPTED=       emacs20
 EMACS_BUILDLINK=               # defined
 
 do-build:

Index: pkgsrc/inputmethod/tc/Makefile
diff -u pkgsrc/inputmethod/tc/Makefile:1.25 pkgsrc/inputmethod/tc/Makefile:1.26
--- pkgsrc/inputmethod/tc/Makefile:1.25 Wed Aug 26 14:37:05 2026
+++ pkgsrc/inputmethod/tc/Makefile      Sat Sep 12 14:31:50 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2026/08/26 14:37:05 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2026/09/12 14:31:50 wiz Exp $
 
 DISTNAME=      tc-2.3.1
 PKGNAME=       ${EMACS_PKGNAME_PREFIX}${DISTNAME}
@@ -23,7 +23,7 @@ SUBST_FILES.string-to-int=    \
        lisp/tc-pre.el
 SUBST_SED.string-to-int=       -e 's/string-to-int/string-to-number/'
 
-EMACS_VERSIONS_ACCEPTED=       emacs29 emacs29nox emacs21 emacs21nox emacs20 xemacs215 xemacs215nox xemacs214 xemacs214nox
+EMACS_VERSIONS_ACCEPTED=       emacs29 emacs29nox emacs20 xemacs215 xemacs215nox xemacs214 xemacs214nox
 
 .include "../../editors/emacs/modules.mk"
 

Index: pkgsrc/mail/mailcrypt/Makefile
diff -u pkgsrc/mail/mailcrypt/Makefile:1.33 pkgsrc/mail/mailcrypt/Makefile:1.34
--- pkgsrc/mail/mailcrypt/Makefile:1.33 Wed Aug 26 14:37:05 2026
+++ pkgsrc/mail/mailcrypt/Makefile      Sat Sep 12 14:31:51 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2026/08/26 14:37:05 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2026/09/12 14:31:51 wiz Exp $
 
 DISTNAME=      mailcrypt-3.5.9
 PKGNAME=       ${EMACS_PKGNAME_PREFIX}${DISTNAME}
@@ -12,7 +12,6 @@ COMMENT=      Emacs frontend for PGP and GPG
 
 # What we would like to say here is: "we want GNU emacs"
 EMACS_VERSIONS_ACCEPTED=       emacs20
-EMACS_VERSIONS_ACCEPTED+=      emacs21 emacs21nox
 EMACS_VERSIONS_ACCEPTED+=      emacs29 emacs29nox
 EMACS_VERSIONS_ACCEPTED+=      emacs30 emacs30nox
 EMACS_VERSIONS_ACCEPTED+=      emacs31 emacs31nox

Index: pkgsrc/mail/mew/Makefile
diff -u pkgsrc/mail/mew/Makefile:1.112 pkgsrc/mail/mew/Makefile:1.113
--- pkgsrc/mail/mew/Makefile:1.112      Wed Aug 26 14:37:05 2026
+++ pkgsrc/mail/mew/Makefile    Sat Sep 12 14:31:51 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.112 2026/08/26 14:37:05 wiz Exp $
+# $NetBSD: Makefile,v 1.113 2026/09/12 14:31:51 wiz Exp $
 
 DISTNAME=      mew-6.11
 PKGNAME=       ${EMACS_PKGNAME_PREFIX}${DISTNAME}
@@ -24,7 +24,6 @@ GNU_CONFIGURE=        yes
 EMACS_VERSIONS_ACCEPTED=       emacs31 emacs31nox
 EMACS_VERSIONS_ACCEPTED+=      emacs30 emacs30nox
 EMACS_VERSIONS_ACCEPTED+=      emacs29 emacs29nox
-EMACS_VERSIONS_ACCEPTED+=      emacs21 emacs21nox
 EMACS_MODULES+=                        base
 
 MAKE_FLAGS+=           DESTDIR=${DESTDIR:Q}

Index: pkgsrc/math/calc/Makefile
diff -u pkgsrc/math/calc/Makefile:1.30 pkgsrc/math/calc/Makefile:1.31
--- pkgsrc/math/calc/Makefile:1.30      Sat May 14 22:25:39 2022
+++ pkgsrc/math/calc/Makefile   Sat Sep 12 14:31:51 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2022/05/14 22:25:39 dholland Exp $
+# $NetBSD: Makefile,v 1.31 2026/09/12 14:31:51 wiz Exp $
 
 DISTNAME=      calc-2.02f
 PKGNAME=       ${EMACS_PKGNAME_PREFIX}${DISTNAME}
@@ -10,8 +10,7 @@ MAINTAINER=   pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://directory.fsf.org/project/calc/
 COMMENT=       Advanced Calculator for GNU Emacs
 
-EMACS_VERSIONS_ACCEPTED=       emacs21 emacs21nox emacs20 \
-                               xemacs215 xemacs215nox xemacs214 xemacs214nox
+EMACS_VERSIONS_ACCEPTED=       emacs20 xemacs215 xemacs215nox xemacs214 xemacs214nox
 
 .include "../../editors/emacs/modules.mk"
 

Index: pkgsrc/meta-pkgs/bulk-small/Makefile
diff -u pkgsrc/meta-pkgs/bulk-small/Makefile:1.61 pkgsrc/meta-pkgs/bulk-small/Makefile:1.62
--- pkgsrc/meta-pkgs/bulk-small/Makefile:1.61   Thu Dec 18 21:22:59 2025
+++ pkgsrc/meta-pkgs/bulk-small/Makefile        Sat Sep 12 14:31:51 2026
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.61 2025/12/18 21:22:59 maya Exp $
+# $NetBSD: Makefile,v 1.62 2026/09/12 14:31:51 wiz Exp $
 
-DISTNAME=      bulk-small-20231107
-PKGREVISION=   1
+DISTNAME=      bulk-small-20260912
 CATEGORIES=    meta-pkgs
 MASTER_SITES=  # empty
 DISTFILES=     # empty
@@ -39,10 +38,6 @@ PYTHON_VERSIONS_ACCEPTED=    ${PYTHON_VERSI
 # 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.
-#
 DEPENDS+=      ircII-[0-9]*:../../chat/ircII
 DEPENDS+=      irssi-[0-9]*:../../chat/irssi
 DEPENDS+=      base64-[0-9]*:../../converters/base64
@@ -71,10 +66,6 @@ DEPENDS+=    lynx-[0-9]*:../../www/lynx
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} != "Darwin"
-DEPENDS+=      emacs21-nox11>=21<22:../../editors/emacs21-nox11
-.endif
-
 # We do not want to build software that's already included.
 
 .if ${OPSYS} != "NetBSD"
@@ -180,11 +171,6 @@ TRANSITIVE+=       libgcrypt-[0-9]*:../../secu
 TRANSITIVE+=   libgpg-error-[0-9]*:../../security/libgpg-error # via libotr
 TRANSITIVE+=   glib2-tools-[0-9]*:../../devel/glib2-tools
 
-# required by editors/emacs21
-TRANSITIVE+=   tradcpp-[0-9]*:../../devel/tradcpp
-TRANSITIVE+=   imake-[0-9]*:../../devel/imake
-TRANSITIVE+=   xorg-cf-files-[0-9]*:../../x11/xorg-cf-files    # via imake
-
 # required by mail/mutt
 TRANSITIVE+=   help2man-[0-9]*:../../converters/help2man       # via autoconf
 TRANSITIVE+=   db4-[0-9]*:../../databases/db4

Index: pkgsrc/misc/Makefile
diff -u pkgsrc/misc/Makefile:1.688 pkgsrc/misc/Makefile:1.689
--- pkgsrc/misc/Makefile:1.688  Fri Sep 11 10:23:52 2026
+++ pkgsrc/misc/Makefile        Sat Sep 12 14:31:52 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.688 2026/09/11 10:23:52 adam Exp $
+# $NetBSD: Makefile,v 1.689 2026/09/12 14:31:52 wiz Exp $
 #
 
 COMMENT=       Miscellaneous utilities
@@ -22,7 +22,6 @@ SUBDIR+=      attica
 SUBDIR+=       attica-qt5
 SUBDIR+=       autocue
 SUBDIR+=       bbappconf
-SUBDIR+=       bbdb2
 SUBDIR+=       bbdb3
 SUBDIR+=       bbweather
 SUBDIR+=       bibletime

Index: pkgsrc/misc/elscreen/Makefile
diff -u pkgsrc/misc/elscreen/Makefile:1.27 pkgsrc/misc/elscreen/Makefile:1.28
--- pkgsrc/misc/elscreen/Makefile:1.27  Mon Dec  8 10:03:12 2025
+++ pkgsrc/misc/elscreen/Makefile       Sat Sep 12 14:31:51 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2025/12/08 10:03:12 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2026/09/12 14:31:51 wiz Exp $
 
 DISTNAME=      elscreen-1.4.6
 PKGNAME=       ${EMACS_PKGNAME_PREFIX}${DISTNAME}
@@ -30,9 +30,7 @@ EMACS_BUILDLINK=      # empty
 
 # Emacs 24 or later is not supported. Try wip/elscreen-current
 # instead.
-EMACS_VERSIONS_ACCEPTED= \
-       emacs21 emacs21nox \
-       emacs20
+EMACS_VERSIONS_ACCEPTED= emacs20
 
 INSTALLATION_DIRS+=    ${EMACS_LISPPREFIX}/elscreen
 INSTALLATION_DIRS+=    share/doc/elscreen

Index: pkgsrc/misc/lookup/Makefile
diff -u pkgsrc/misc/lookup/Makefile:1.27 pkgsrc/misc/lookup/Makefile:1.28
--- pkgsrc/misc/lookup/Makefile:1.27    Sat May 14 22:25:40 2022
+++ pkgsrc/misc/lookup/Makefile Sat Sep 12 14:31:51 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2022/05/14 22:25:40 dholland Exp $
+# $NetBSD: Makefile,v 1.28 2026/09/12 14:31:51 wiz Exp $
 
 DISTNAME=      lookup-1.4.1
 PKGNAME=       ${EMACS_PKGNAME_PREFIX}${DISTNAME}
@@ -14,7 +14,7 @@ MAKE_JOBS_SAFE=       no
 
 DEPENDS+=      eblook>=1.4:../../textproc/eblook
 
-EMACS_VERSIONS_ACCEPTED=       emacs21 emacs21nox emacs20 xemacs214 xemacs215
+EMACS_VERSIONS_ACCEPTED=       emacs20 xemacs214 xemacs215
 EMACS_BUILDLINK=               # defined
 
 GNU_CONFIGURE= YES

Index: pkgsrc/mk/defaults/mk.conf
diff -u pkgsrc/mk/defaults/mk.conf:1.358 pkgsrc/mk/defaults/mk.conf:1.359
--- pkgsrc/mk/defaults/mk.conf:1.358    Wed Aug 26 14:37:06 2026
+++ pkgsrc/mk/defaults/mk.conf  Sat Sep 12 14:31:51 2026
@@ -1,4 +1,4 @@
-# $NetBSD: mk.conf,v 1.358 2026/08/26 14:37:06 wiz Exp $
+# $NetBSD: mk.conf,v 1.359 2026/09/12 14:31:51 wiz Exp $
 #
 
 # This file provides default values for variables that may be overridden
@@ -1004,7 +1004,7 @@ EMACS_TYPE?=      emacs30
 # Used by emacs/modules.mk to determine which emacs version should be installed
 # and emacs lisp packages should be built for.
 # Possible: emacs31, emacs31nox, emacs30, emacs30nox, emacs29, emacs29nox,
-#       emacs21, emacs21nox, emacs20, xemacs214, xemacs215
+#       emacs20, xemacs214, xemacs215
 # Default: emacs30
 
 EXIM_GROUP?=   mail

Index: pkgsrc/textproc/Makefile
diff -u pkgsrc/textproc/Makefile:1.1601 pkgsrc/textproc/Makefile:1.1602
--- pkgsrc/textproc/Makefile:1.1601     Wed Sep  9 02:27:49 2026
+++ pkgsrc/textproc/Makefile    Sat Sep 12 14:31:52 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1601 2026/09/09 02:27:49 charlotte Exp $
+# $NetBSD: Makefile,v 1.1602 2026/09/12 14:31:52 wiz Exp $
 #
 
 COMMENT=       Text processing utilities (does not include desktop publishing)
@@ -728,7 +728,6 @@ SUBDIR+=    nltk_data-wordnet_ic
 SUBDIR+=       nltk_data-words
 SUBDIR+=       nltk_data-ycoe
 SUBDIR+=       nuspell
-SUBDIR+=       nxml-mode
 SUBDIR+=       o3read
 SUBDIR+=       ocaml-csv
 SUBDIR+=       ocaml-easy-format

Index: pkgsrc/www/emacs-w3m/Makefile
diff -u pkgsrc/www/emacs-w3m/Makefile:1.39 pkgsrc/www/emacs-w3m/Makefile:1.40
--- pkgsrc/www/emacs-w3m/Makefile:1.39  Wed Aug 26 14:37:06 2026
+++ pkgsrc/www/emacs-w3m/Makefile       Sat Sep 12 14:31:51 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2026/08/26 14:37:06 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2026/09/12 14:31:51 wiz Exp $
 
 DISTNAME=      emacs-w3m-1.4.5
 CATEGORIES=    www
@@ -36,7 +36,7 @@ WRKSRC=       ${WRKDIR}/${PKGBASE}-${GITHUB_TA
 #SUBST_SED.fix-icondir+=       -e 's|images/w3m|w3m|g'
 
 EMACS_BUILDLINK=               # empty
-EMACS_VERSIONS_ACCEPTED=       emacs21 emacs21nox emacs20 \
+EMACS_VERSIONS_ACCEPTED=       emacs20 \
                                emacs29 emacs29nox \
                                emacs30 emacs30nox \
                                emacs31 emacs31nox \

Index: pkgsrc/www/emacs-w3m-snapshot/Makefile
diff -u pkgsrc/www/emacs-w3m-snapshot/Makefile:1.21 pkgsrc/www/emacs-w3m-snapshot/Makefile:1.22
--- pkgsrc/www/emacs-w3m-snapshot/Makefile:1.21 Thu Aug 27 11:15:37 2026
+++ pkgsrc/www/emacs-w3m-snapshot/Makefile      Sat Sep 12 14:31:51 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2026/08/27 11:15:37 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2026/09/12 14:31:51 wiz Exp $
 
 VERSION=       1.4.632
 DATE_TIME=     20210106.2144
@@ -36,7 +36,7 @@ SUBST_SED.paths=      -e 's|@W3M@|${PREFIX}/b
 BUILD_DEFS+=           VARBASE
 BUILD_DEFS+=           GAMEDATAMODE
 
-EMACS_VERSIONS_ACCEPTED=       emacs29 emacs29nox emacs21 emacs21nox emacs20 xemacs215 xemacs215nox xemacs214 xemacs214nox
+EMACS_VERSIONS_ACCEPTED=       emacs29 emacs29nox emacs20 xemacs215 xemacs215nox xemacs214 xemacs214nox
 
 .include "options.mk"
 

Index: pkgsrc/www/emacs-w3m-snapshot/PLIST
diff -u pkgsrc/www/emacs-w3m-snapshot/PLIST:1.10 pkgsrc/www/emacs-w3m-snapshot/PLIST:1.11
--- pkgsrc/www/emacs-w3m-snapshot/PLIST:1.10    Mon Oct 21 23:47:07 2019
+++ pkgsrc/www/emacs-w3m-snapshot/PLIST Sat Sep 12 14:31:51 2026
@@ -1,12 +1,11 @@
-@comment $NetBSD: PLIST,v 1.10 2019/10/21 23:47:07 mef Exp $
+@comment $NetBSD: PLIST,v 1.11 2026/09/12 14:31:51 wiz Exp $
 info/emacs-w3m-ja.info
 info/emacs-w3m.info
-${NOTFOR_emacs21}${EMACS_LISPPREFIX}/w3m/.dir-locals.el
+${EMACS_LISPPREFIX}/w3m/.dir-locals.el
 ${EMACS_LISPPREFIX}/w3m/ChangeLog
 ${EMACS_LISPPREFIX}/w3m/ChangeLog.1
-${FOR_emacs21}${EMACS_LISPPREFIX}/w3m/bookmark-w3m.el
-${NOTFOR_emacs21}${EMACS_LISPPREFIX}/w3m/bookmark-w3m.el.gz
-${NOTFOR_emacs21}${NOTFOR_emacs21nox}${NOTFOR_emacs20}${EMACS_LISPPREFIX}/w3m/bookmark-w3m.elc
+${EMACS_LISPPREFIX}/w3m/bookmark-w3m.el.gz
+${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
@@ -290,8 +289,6 @@ ${EMACS_LISPPREFIX}/w3m/w3m-bookmark.el.
 ${EMACS_LISPPREFIX}/w3m/w3m-bookmark.elc
 ${EMACS_LISPPREFIX}/w3m/w3m-bug.el.gz
 ${EMACS_LISPPREFIX}/w3m/w3m-bug.elc
-${FOR_emacs21}${EMACS_LISPPREFIX}/w3m/w3m-ccl.el.gz
-${FOR_emacs21}${EMACS_LISPPREFIX}/w3m/w3m-ccl.elc
 ${EMACS_LISPPREFIX}/w3m/w3m-cookie.el.gz
 ${EMACS_LISPPREFIX}/w3m/w3m-cookie.elc
 ${EMACS_LISPPREFIX}/w3m/w3m-dtree.el.gz
@@ -332,8 +329,6 @@ ${EMACS_LISPPREFIX}/w3m/w3m-symbol.el.gz
 ${EMACS_LISPPREFIX}/w3m/w3m-symbol.elc
 ${EMACS_LISPPREFIX}/w3m/w3m-tabmenu.el.gz
 ${EMACS_LISPPREFIX}/w3m/w3m-tabmenu.elc
-${FOR_emacs21}${EMACS_LISPPREFIX}/w3m/w3m-ucs.el.gz
-${FOR_emacs21}${EMACS_LISPPREFIX}/w3m/w3m-ucs.elc
 ${EMACS_LISPPREFIX}/w3m/w3m-util.el.gz
 ${EMACS_LISPPREFIX}/w3m/w3m-util.elc
 ${EMACS_LISPPREFIX}/w3m/w3m-save.el.gz

Index: pkgsrc/www/w3/Makefile
diff -u pkgsrc/www/w3/Makefile:1.32 pkgsrc/www/w3/Makefile:1.33
--- pkgsrc/www/w3/Makefile:1.32 Sat May 14 22:25:42 2022
+++ pkgsrc/www/w3/Makefile      Sat Sep 12 14:31:52 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2022/05/14 22:25:42 dholland Exp $
+# $NetBSD: Makefile,v 1.33 2026/09/12 14:31:52 wiz Exp $
 
 DISTNAME=      w3-4.0pre.47
 PKGNAME=       ${EMACS_PKGNAME_PREFIX}w3-4.0b47
@@ -11,7 +11,7 @@ HOMEPAGE=     https://www.gnu.org/software/w
 COMMENT=       World Wide Web browser for Emacs
 
 # included in xemacs-packages
-EMACS_VERSIONS_ACCEPTED=       emacs21 emacs21nox emacs20
+EMACS_VERSIONS_ACCEPTED=       emacs20
 
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --with-emacs

Prev by Date: CVS commit: pkgsrc/graphics/gexiv2-0.16
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/graphics/gexiv2-0.16
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index