CVS commit: pkgsrc

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Aug 25 17:33:16 UTC 2026

Modified Files:
        pkgsrc/doc: CHANGES-2026
        pkgsrc/editors: Makefile
        pkgsrc/editors/emacs: Makefile.common modules.mk
Removed Files:
        pkgsrc/editors/emacs26: DESCR Makefile Makefile.common PLIST
            PLIST.cocoa PLIST.gnustep buildlink3.mk distinfo hacks.mk
            options.mk version.mk
        pkgsrc/editors/emacs26-nox11: DESCR Makefile buildlink3.mk version.mk
        pkgsrc/editors/emacs26/files: site-init.el
        pkgsrc/editors/emacs26/patches: patch-configure patch-configure.ac
            patch-src_inotify.c patch-src_unexmacosx.c
        pkgsrc/editors/emacs27: DESCR Makefile Makefile.common PLIST
            PLIST.cocoa PLIST.gnustep buildlink3.mk distinfo hacks.mk
            options.mk version.mk
        pkgsrc/editors/emacs27-nox11: DESCR Makefile buildlink3.mk version.mk
        pkgsrc/editors/emacs27/files: site-init.el
        pkgsrc/editors/emacs27/patches: patch-lib-src_emacsclient.c
            patch-src_Makefile.in patch-src_inotify.c
        pkgsrc/editors/emacs28: DESCR Makefile Makefile.common PLIST
            PLIST.cocoa PLIST.gnustep buildlink3.mk distinfo options.mk
            version.mk
        pkgsrc/editors/emacs28-nox11: DESCR Makefile buildlink3.mk version.mk
        pkgsrc/editors/emacs28/files: site-init.el

Log Message:
*: remove emacs26*. emacs27*, emacs28*

We still have 20, 21, and 29-31, that's plenty of versions.


To generate a diff of this commit:
cvs rdiff -u -r1.5529 -r1.5530 pkgsrc/doc/CHANGES-2026
cvs rdiff -u -r1.268 -r1.269 pkgsrc/editors/Makefile
cvs rdiff -u -r1.46 -r1.47 pkgsrc/editors/emacs/Makefile.common
cvs rdiff -u -r1.39 -r1.40 pkgsrc/editors/emacs/modules.mk
cvs rdiff -u -r1.1 -r0 pkgsrc/editors/emacs26/DESCR \
    pkgsrc/editors/emacs26/PLIST.cocoa pkgsrc/editors/emacs26/PLIST.gnustep \
    pkgsrc/editors/emacs26/buildlink3.mk pkgsrc/editors/emacs26/hacks.mk
cvs rdiff -u -r1.75 -r0 pkgsrc/editors/emacs26/Makefile
cvs rdiff -u -r1.4 -r0 pkgsrc/editors/emacs26/Makefile.common
cvs rdiff -u -r1.2 -r0 pkgsrc/editors/emacs26/PLIST
cvs rdiff -u -r1.7 -r0 pkgsrc/editors/emacs26/distinfo
cvs rdiff -u -r1.13 -r0 pkgsrc/editors/emacs26/options.mk
cvs rdiff -u -r1.3 -r0 pkgsrc/editors/emacs26/version.mk
cvs rdiff -u -r1.1 -r0 pkgsrc/editors/emacs26-nox11/DESCR \
    pkgsrc/editors/emacs26-nox11/buildlink3.mk \
    pkgsrc/editors/emacs26-nox11/version.mk
cvs rdiff -u -r1.4 -r0 pkgsrc/editors/emacs26-nox11/Makefile
cvs rdiff -u -r1.1 -r0 pkgsrc/editors/emacs26/files/site-init.el
cvs rdiff -u -r1.1 -r0 pkgsrc/editors/emacs26/patches/patch-configure \
    pkgsrc/editors/emacs26/patches/patch-configure.ac \
    pkgsrc/editors/emacs26/patches/patch-src_inotify.c \
    pkgsrc/editors/emacs26/patches/patch-src_unexmacosx.c
cvs rdiff -u -r1.1 -r0 pkgsrc/editors/emacs27/DESCR \
    pkgsrc/editors/emacs27/PLIST.gnustep pkgsrc/editors/emacs27/buildlink3.mk \
    pkgsrc/editors/emacs27/hacks.mk
cvs rdiff -u -r1.64 -r0 pkgsrc/editors/emacs27/Makefile
cvs rdiff -u -r1.4 -r0 pkgsrc/editors/emacs27/Makefile.common \
    pkgsrc/editors/emacs27/options.mk
cvs rdiff -u -r1.2 -r0 pkgsrc/editors/emacs27/PLIST \
    pkgsrc/editors/emacs27/PLIST.cocoa pkgsrc/editors/emacs27/version.mk
cvs rdiff -u -r1.7 -r0 pkgsrc/editors/emacs27/distinfo
cvs rdiff -u -r1.1 -r0 pkgsrc/editors/emacs27-nox11/DESCR \
    pkgsrc/editors/emacs27-nox11/buildlink3.mk \
    pkgsrc/editors/emacs27-nox11/version.mk
cvs rdiff -u -r1.5 -r0 pkgsrc/editors/emacs27-nox11/Makefile
cvs rdiff -u -r1.1 -r0 pkgsrc/editors/emacs27/files/site-init.el
cvs rdiff -u -r1.2 -r0 \
    pkgsrc/editors/emacs27/patches/patch-lib-src_emacsclient.c
cvs rdiff -u -r1.1 -r0 pkgsrc/editors/emacs27/patches/patch-src_Makefile.in \
    pkgsrc/editors/emacs27/patches/patch-src_inotify.c
cvs rdiff -u -r1.1 -r0 pkgsrc/editors/emacs28/DESCR \
    pkgsrc/editors/emacs28/PLIST.gnustep pkgsrc/editors/emacs28/buildlink3.mk
cvs rdiff -u -r1.54 -r0 pkgsrc/editors/emacs28/Makefile
cvs rdiff -u -r1.3 -r0 pkgsrc/editors/emacs28/Makefile.common \
    pkgsrc/editors/emacs28/options.mk
cvs rdiff -u -r1.2 -r0 pkgsrc/editors/emacs28/PLIST \
    pkgsrc/editors/emacs28/PLIST.cocoa pkgsrc/editors/emacs28/distinfo \
    pkgsrc/editors/emacs28/version.mk
cvs rdiff -u -r1.1 -r0 pkgsrc/editors/emacs28-nox11/DESCR \
    pkgsrc/editors/emacs28-nox11/buildlink3.mk \
    pkgsrc/editors/emacs28-nox11/version.mk
cvs rdiff -u -r1.3 -r0 pkgsrc/editors/emacs28-nox11/Makefile
cvs rdiff -u -r1.1 -r0 pkgsrc/editors/emacs28/files/site-init.el

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

Modified files:

Index: pkgsrc/doc/CHANGES-2026
diff -u pkgsrc/doc/CHANGES-2026:1.5529 pkgsrc/doc/CHANGES-2026:1.5530
--- pkgsrc/doc/CHANGES-2026:1.5529      Tue Aug 25 17:25:34 2026
+++ pkgsrc/doc/CHANGES-2026     Tue Aug 25 17:33:12 2026
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2026,v 1.5529 2026/08/25 17:25:34 wiz Exp $
+$NetBSD: CHANGES-2026,v 1.5530 2026/08/25 17:33:12 wiz Exp $
 
 Changes to the packages collection and infrastructure in 2026:
 
@@ -8151,3 +8151,9 @@ Changes to the packages collection and i
        Updated shells/oh-my-posh to 30.7.0 [pin 2026-08-25]
        Added editors/emacs31 version 31.1 [wiz 2026-08-25]
        Added editors/emacs31-nox11 version 31.1 [wiz 2026-08-25]
+       Removed editors/emacs26 successor editors/emacs31 [wiz 2026-08-25]
+       Removed editors/emacs26-nox11 successor editors/emacs31-nox11 [wiz 2026-08-25]
+       Removed editors/emacs27 successor editors/emacs31 [wiz 2026-08-25]
+       Removed editors/emacs27-nox11 successor editors/emacs31-nox11 [wiz 2026-08-25]
+       Removed editors/emacs28 successor editors/emacs31 [wiz 2026-08-25]
+       Removed editors/emacs28-nox11 successor editors/emacs31-nox11 [wiz 2026-08-25]

Index: pkgsrc/editors/Makefile
diff -u pkgsrc/editors/Makefile:1.268 pkgsrc/editors/Makefile:1.269
--- pkgsrc/editors/Makefile:1.268       Tue Aug 25 17:24:12 2026
+++ pkgsrc/editors/Makefile     Tue Aug 25 17:33:12 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.268 2026/08/25 17:24:12 wiz Exp $
+# $NetBSD: Makefile,v 1.269 2026/08/25 17:33:12 wiz Exp $
 #
 
 COMMENT=       Text and binary editors
@@ -36,12 +36,6 @@ SUBDIR+=     emacs-packages
 SUBDIR+=       emacs20
 SUBDIR+=       emacs21
 SUBDIR+=       emacs21-nox11
-SUBDIR+=       emacs26
-SUBDIR+=       emacs26-nox11
-SUBDIR+=       emacs27
-SUBDIR+=       emacs27-nox11
-SUBDIR+=       emacs28
-SUBDIR+=       emacs28-nox11
 SUBDIR+=       emacs29
 SUBDIR+=       emacs29-nox11
 SUBDIR+=       emacs30

Index: pkgsrc/editors/emacs/Makefile.common
diff -u pkgsrc/editors/emacs/Makefile.common:1.46 pkgsrc/editors/emacs/Makefile.common:1.47
--- pkgsrc/editors/emacs/Makefile.common:1.46   Thu Apr  7 10:35:28 2022
+++ pkgsrc/editors/emacs/Makefile.common        Tue Aug 25 17:33:12 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.46 2022/04/07 10:35:28 ryoon Exp $
+# $NetBSD: Makefile.common,v 1.47 2026/08/25 17:33:12 wiz Exp $
 #
 # used by editors/emacs/Makefile
 # used by editors/emacs-nox11/Makefile
@@ -38,8 +38,8 @@ PKG_FAIL_REASON+=     "EMACS_TYPE is xemacs.
 # (Set these to avoid crashing out below.)
 EMACS_PKGDIR=          ../../editors/xemacs
 EMACS_PACKAGE=         xemacs
-.elif ${MY_EMACS_TYPE} == "emacs28"
-EMACS_PKGDIR=          ../../editors/emacs28
+.elif ${MY_EMACS_TYPE} == "emacs29"
+EMACS_PKGDIR=          ../../editors/emacs29
 EMACS_PACKAGE=         ${EMACS_BASE_TYPE}
 .elif !empty(MY_EMACS_TYPE:M*nox)
 EMACS_PKGDIR=          ../../editors/${EMACS_BASE_TYPE}-nox11

Index: pkgsrc/editors/emacs/modules.mk
diff -u pkgsrc/editors/emacs/modules.mk:1.39 pkgsrc/editors/emacs/modules.mk:1.40
--- pkgsrc/editors/emacs/modules.mk:1.39        Tue Aug 25 17:27:27 2026
+++ pkgsrc/editors/emacs/modules.mk     Tue Aug 25 17:33:12 2026
@@ -1,4 +1,4 @@
-# $NetBSD: modules.mk,v 1.39 2026/08/25 17:27:27 wiz Exp $
+# $NetBSD: modules.mk,v 1.40 2026/08/25 17:33:12 wiz Exp $
 #
 # This Makefile fragment handles Emacs Lisp Packages (== ELPs).
 #
@@ -44,8 +44,7 @@
 #              Possible values:
 #                      emacs31 emacs31nox
 #                      emacs30 emacs30nox
-#                      emacs29 emacs29nox emacs28 emacs28nox
-#                      emacs27 emacs27nox emacs26 emacs26nox
+#                      emacs29 emacs29nox
 #                      emacs21 emacs21nox
 #                      emacs20 xemacs215 xemacs215nox
 #                      xemacs214 xemacs214nox
@@ -69,16 +68,14 @@
 #              Possible values:
 #                      emacs31 emacs31nox
 #                      emacs30 emacs30nox
-#                      emacs29 emacs29nox emacs28 emacs28nox
-#                      emacs27 emacs27nox emacs26 emacs26nox
+#                      emacs29 emacs29nox
 #                      emacs21 emacs21nox
 #                      emacs20 xemacs215 xemacs215nox
 #                      xemacs214 xemacs214nox
 #              Default value:
 #                      emacs31 emacs31nox
 #                      emacs30 emacs30nox
-#                      emacs29 emacs29nox emacs28 emacs28nox
-#                      emacs27 emacs27nox emacs26 emacs26nox
+#                      emacs29 emacs29nox
 #                      emacs21 emacs21nox
 #                      emacs20 xemacs215 xemacs215nox
 #                      xemacs214 xemacs214nox
@@ -144,7 +141,7 @@
 #              Description:
 #                      Emacs major version.
 #              Possible values:
-#                      20, 21, 26, 27, 28, 29, 30, 31, <integers more than that in the future>
+#                      20, 21, 29, 30, 31, <integers more than that in the future>
 #
 #      EMACS_VERSION_MINOR
 #              Description:
@@ -190,10 +187,10 @@
 #              Possible values:
 #                      XXX
 #
-#      FOR_{emacs31,emacs31nox,emacs30,emacs30nox,emacs29,emacs29nox,emacs28,emacs28nox,emacs27,emacs27nox,emacs26,emacs26nox,emacs21,emacs21nox,emacs20,xemacs215,xemacs215nox,xemacs214,xemacs214nox}
+#      FOR_{emacs31,emacs31nox,emacs30,emacs30nox,emacs29,emacs29nox,emacs21,emacs21nox,emacs20,xemacs215,xemacs215nox,xemacs214,xemacs214nox}
 #      FOR_{emacs,xemacs}
 #      FOR_{emacs_x,emacs_nox}
-#      NOTFOR_{emacs31,emacs31nox,emacs30, 
emacs30nox,emacs29,emacs29nox,emacs28,emacs28nox,emacs27,emacs27nox,emacs26,emacs26nox,emacs21,emacs21nox,emacs20,xemacs215,xemacs215nox,xemacs214,xemacs214nox}
+#      NOTFOR_{emacs31,emacs31nox,emacs30, emacs30nox,emacs29,emacs29nox,emacs21,emacs21nox,emacs20,xemacs215,xemacs215nox,xemacs214,xemacs214nox}
 #      NOTFOR_{emacs,xemacs}
 #      NOTFOR_{emacs_x,emacs_nox}
 #              Description:
@@ -240,8 +237,7 @@ BUILD_DEFS_EFFECTS+=        ${_SYS_VARS.emacs}
 #
 
 _EMACS_VERSIONS_ALL= \
-       emacs20 emacs21 emacs21nox emacs26 emacs26nox \
-       emacs27 emacs27nox emacs28 emacs28nox emacs29 emacs29nox  \
+       emacs20 emacs21 emacs21nox emacs29 emacs29nox  \
        emacs30 emacs30nox emacs31 emacs31nox \
        xemacs214 xemacs214nox xemacs215 xemacs215nox
 
@@ -249,12 +245,6 @@ _EMACS_PKGDIR_MAP= \
        emacs20@../../editors/emacs20 \
        emacs21@../../editors/emacs21 \
        emacs21nox@../../editors/emacs21-nox11 \
-       emacs26@../../editors/emacs26 \
-       emacs26nox@../../editors/emacs26-nox11 \
-       emacs27@../../editors/emacs27 \
-       emacs27nox@../../editors/emacs27-nox11 \
-       emacs28@../../editors/emacs28 \
-       emacs28nox@../../editors/emacs28-nox11 \
        emacs29@../../editors/emacs29 \
        emacs29nox@../../editors/emacs29-nox11 \
        emacs30@../../editors/emacs30 \