pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc



Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Sep 25 09:48:13 UTC 2026

Modified Files:
        pkgsrc/cad/dinotrace-mode: Makefile
        pkgsrc/cad/verilog-mode: Makefile
        pkgsrc/chat/emacs-jabber: Makefile
        pkgsrc/chat/irchat-pj: PLIST
        pkgsrc/devel/apel: Makefile
        pkgsrc/devel/cflow-mode: Makefile
        pkgsrc/devel/cmake-mode: Makefile
        pkgsrc/devel/cobol-mode: Makefile
        pkgsrc/devel/cqual: Makefile PLIST
        pkgsrc/devel/dash-el: Makefile
        pkgsrc/devel/doxymacs: Makefile
        pkgsrc/devel/ecb: Makefile
        pkgsrc/devel/flim: Makefile
        pkgsrc/devel/haskell-mode: Makefile
        pkgsrc/devel/js2-mode: Makefile
        pkgsrc/devel/lua-mode: Makefile
        pkgsrc/devel/pcl-cvs: Makefile
        pkgsrc/devel/php-mode: Makefile
        pkgsrc/devel/rainbow-delimiters-el: Makefile
        pkgsrc/devel/rsltc: Makefile PLIST
        pkgsrc/devel/semantic: Makefile
        pkgsrc/devel/semi: Makefile options.mk
        pkgsrc/devel/sml-mode: Makefile
        pkgsrc/devel/zig-mode: Makefile
        pkgsrc/editors/emacs-packages: Makefile
        pkgsrc/editors/emacs20: Makefile PLIST
        pkgsrc/editors/emacs29: Makefile.common PLIST
        pkgsrc/editors/emacs29-nox11: version.mk
        pkgsrc/editors/emacs30: Makefile.common PLIST
        pkgsrc/editors/emacs30-nox11: version.mk
        pkgsrc/editors/emacs31: Makefile.common PLIST
        pkgsrc/editors/emacs31-nox11: version.mk
        pkgsrc/editors/gnuserv: Makefile
        pkgsrc/editors/javascript-mode: Makefile
        pkgsrc/editors/manued: Makefile
        pkgsrc/editors/matlab-mode: Makefile
        pkgsrc/editors/speedbar: Makefile
        pkgsrc/editors/tamago: Makefile
        pkgsrc/editors/xemacs-current-nox11: version.mk
        pkgsrc/editors/xemacs-nox11: version.mk
        pkgsrc/graphics/artist: Makefile
        pkgsrc/graphics/graphviz-dot-mode: Makefile
        pkgsrc/inputmethod/tamago-tsunagi: Makefile PLIST
        pkgsrc/inputmethod/tc: Makefile
        pkgsrc/lang/eieio: Makefile
        pkgsrc/mail/mailutils: PLIST
        pkgsrc/mail/mew: PLIST
        pkgsrc/mail/mu: Makefile distinfo
        pkgsrc/mail/mu/patches: patch-mu4e_meson.build
        pkgsrc/mail/rmail-mime: Makefile
        pkgsrc/mail/vm: Makefile
        pkgsrc/mail/wl-snapshot: Makefile options.mk
        pkgsrc/math/ess: Makefile
        pkgsrc/math/texdrive: Makefile
        pkgsrc/misc/color-theme: Makefile
        pkgsrc/misc/elscreen: Makefile
        pkgsrc/misc/emacs-neotree: Makefile
        pkgsrc/misc/emacs-wiki: Makefile
        pkgsrc/misc/howm: Makefile
        pkgsrc/misc/lookup: Makefile
        pkgsrc/misc/mic-paren: Makefile
        pkgsrc/net/twittering-mode: Makefile PLIST
        pkgsrc/textproc/dictem: Makefile
        pkgsrc/textproc/emacs-dict-client: Makefile PLIST
        pkgsrc/textproc/emacs-muse: Makefile
        pkgsrc/textproc/flycheck-mode: Makefile
        pkgsrc/textproc/ispell-emacs: Makefile
        pkgsrc/textproc/markdown-mode: Makefile
        pkgsrc/textproc/po-mode: Makefile
        pkgsrc/textproc/xslide: Makefile
        pkgsrc/www/emacs-w3m: Makefile buildlink3.mk
        pkgsrc/www/emacs-w3m-snapshot: Makefile buildlink3.mk

Log Message:
*: adapt packages to new emacs framework

With a lot of help from Showta Ishizaki.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 pkgsrc/cad/dinotrace-mode/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/cad/verilog-mode/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/chat/emacs-jabber/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/chat/irchat-pj/PLIST
cvs rdiff -u -r1.46 -r1.47 pkgsrc/devel/apel/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/devel/cflow-mode/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/devel/cmake-mode/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/cobol-mode/Makefile
cvs rdiff -u -r1.35 -r1.36 pkgsrc/devel/cqual/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/cqual/PLIST
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/dash-el/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/devel/doxymacs/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/ecb/Makefile
cvs rdiff -u -r1.46 -r1.47 pkgsrc/devel/flim/Makefile
cvs rdiff -u -r1.24 -r1.25 pkgsrc/devel/haskell-mode/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/devel/js2-mode/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/devel/lua-mode/Makefile
cvs rdiff -u -r1.30 -r1.31 pkgsrc/devel/pcl-cvs/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/devel/php-mode/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/rainbow-delimiters-el/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/devel/rsltc/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/rsltc/PLIST
cvs rdiff -u -r1.39 -r1.40 pkgsrc/devel/semantic/Makefile
cvs rdiff -u -r1.40 -r1.41 pkgsrc/devel/semi/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/semi/options.mk
cvs rdiff -u -r1.22 -r1.23 pkgsrc/devel/sml-mode/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/zig-mode/Makefile
cvs rdiff -u -r1.39 -r1.40 pkgsrc/editors/emacs-packages/Makefile
cvs rdiff -u -r1.68 -r1.69 pkgsrc/editors/emacs20/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/editors/emacs20/PLIST
cvs rdiff -u -r1.3 -r1.4 pkgsrc/editors/emacs29/Makefile.common \
    pkgsrc/editors/emacs29/PLIST
cvs rdiff -u -r1.1 -r1.2 pkgsrc/editors/emacs29-nox11/version.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/editors/emacs30/Makefile.common
cvs rdiff -u -r1.2 -r1.3 pkgsrc/editors/emacs30/PLIST
cvs rdiff -u -r1.2 -r1.3 pkgsrc/editors/emacs30-nox11/version.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/editors/emacs31/Makefile.common \
    pkgsrc/editors/emacs31/PLIST
cvs rdiff -u -r1.1 -r1.2 pkgsrc/editors/emacs31-nox11/version.mk
cvs rdiff -u -r1.20 -r1.21 pkgsrc/editors/gnuserv/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/editors/javascript-mode/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/editors/manued/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/editors/matlab-mode/Makefile
cvs rdiff -u -r1.30 -r1.31 pkgsrc/editors/speedbar/Makefile
cvs rdiff -u -r1.32 -r1.33 pkgsrc/editors/tamago/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/editors/xemacs-current-nox11/version.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/editors/xemacs-nox11/version.mk
cvs rdiff -u -r1.15 -r1.16 pkgsrc/graphics/artist/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/graphics/graphviz-dot-mode/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/inputmethod/tamago-tsunagi/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/inputmethod/tamago-tsunagi/PLIST
cvs rdiff -u -r1.26 -r1.27 pkgsrc/inputmethod/tc/Makefile
cvs rdiff -u -r1.30 -r1.31 pkgsrc/lang/eieio/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/mail/mailutils/PLIST
cvs rdiff -u -r1.21 -r1.22 pkgsrc/mail/mew/PLIST
cvs rdiff -u -r1.29 -r1.30 pkgsrc/mail/mu/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/mail/mu/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/mail/mu/patches/patch-mu4e_meson.build
cvs rdiff -u -r1.15 -r1.16 pkgsrc/mail/rmail-mime/Makefile
cvs rdiff -u -r1.47 -r1.48 pkgsrc/mail/vm/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/mail/wl-snapshot/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/mail/wl-snapshot/options.mk
cvs rdiff -u -r1.38 -r1.39 pkgsrc/math/ess/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/math/texdrive/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/misc/color-theme/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/misc/elscreen/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/misc/emacs-neotree/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/misc/emacs-wiki/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/misc/howm/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/misc/lookup/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/misc/mic-paren/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/net/twittering-mode/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/twittering-mode/PLIST
cvs rdiff -u -r1.15 -r1.16 pkgsrc/textproc/dictem/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/textproc/emacs-dict-client/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/textproc/emacs-dict-client/PLIST
cvs rdiff -u -r1.13 -r1.14 pkgsrc/textproc/emacs-muse/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/textproc/flycheck-mode/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/textproc/ispell-emacs/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/textproc/markdown-mode/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/textproc/po-mode/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/textproc/xslide/Makefile
cvs rdiff -u -r1.40 -r1.41 pkgsrc/www/emacs-w3m/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/www/emacs-w3m/buildlink3.mk
cvs rdiff -u -r1.22 -r1.23 pkgsrc/www/emacs-w3m-snapshot/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/www/emacs-w3m-snapshot/buildlink3.mk

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

Modified files:

Index: pkgsrc/cad/dinotrace-mode/Makefile
diff -u pkgsrc/cad/dinotrace-mode/Makefile:1.21 pkgsrc/cad/dinotrace-mode/Makefile:1.22
--- pkgsrc/cad/dinotrace-mode/Makefile:1.21     Wed Aug 26 14:37:04 2026
+++ pkgsrc/cad/dinotrace-mode/Makefile  Fri Sep 25 09:48:04 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2026/08/26 14:37:04 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2026/09/25 09:48:04 wiz Exp $
 #
 
 VERSION=       9.4f
@@ -17,8 +17,7 @@ LICENSE=      gnu-gpl-v3
 
 DEPENDS+=      ${EMACS_PKGNAME_PREFIX}verilog-mode>=3.13:../../cad/verilog-mode
 
-# failed to build with emacs28; needs athena widgets which are not enabled by default
-EMACS_VERSIONS_ACCEPTED=       emacs26 emacs29
+EMACS_VERSIONS_ACCEPTED=       emacs29
 
 .include "../../mk/bsd.prefs.mk"
 .include "../../editors/emacs/modules.mk"

Index: pkgsrc/cad/verilog-mode/Makefile
diff -u pkgsrc/cad/verilog-mode/Makefile:1.15 pkgsrc/cad/verilog-mode/Makefile:1.16
--- pkgsrc/cad/verilog-mode/Makefile:1.15       Sun Sep 21 21:22:39 2025
+++ pkgsrc/cad/verilog-mode/Makefile    Fri Sep 25 09:48:05 2026
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2025/09/21 21:22:39 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.16 2026/09/25 09:48:05 wiz Exp $
 
 DISTNAME=              verilog-mode-3.60
 PKGNAME=               ${EMACS_PKGNAME_PREFIX}${DISTNAME}
@@ -15,19 +14,15 @@ COMMENT=            Verilog mode for Emacs
 
 WRKSRC=                        ${WRKDIR}
 
-.include "../../editors/emacs/modules.mk"
+EMACS_VERSIONS_INCOMPATIBLE=   xemacs214 xemacs215 xemacs214nox xemacs215nox
 
-.if ${EMACS_FLAVOR} == "emacs"
-EMACS= emacs
-.else
-EMACS= xemacs
-.endif
+.include "../../editors/emacs/modules.mk"
 
 SRCS=  verilog-mode.el
 
 do-build:
        for f in ${SRCS}; do                                            \
-               ${EMACS} --no-init-file --no-site-file -batch           \
+               ${EMACS_BIN} --no-init-file --no-site-file -batch               \
                -f batch-byte-compile ${WRKSRC}/$$f;                    \
        done
 

Index: pkgsrc/chat/emacs-jabber/Makefile
diff -u pkgsrc/chat/emacs-jabber/Makefile:1.10 pkgsrc/chat/emacs-jabber/Makefile:1.11
--- pkgsrc/chat/emacs-jabber/Makefile:1.10      Sat Sep 12 14:31:49 2026
+++ pkgsrc/chat/emacs-jabber/Makefile   Fri Sep 25 09:48:05 2026
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2026/09/12 14:31:49 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2026/09/25 09:48:05 wiz Exp $
 
 DISTNAME=              emacs-jabber-0.8.92
+PKGNAME=               ${EMACS_PKGNAME_PREFIX}${DISTNAME:S/emacs-//}
 CATEGORIES=            chat
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=emacs-jabber/}
 EXTRACT_SUFX=          .tar.bz2
@@ -20,7 +21,9 @@ CONFIGURE_ENV+=               EMACS=${EMACS_BIN}
 
 TEST_TARGET=           check
 
-EMACS_VERSIONS_ACCEPTED=       emacs20 xemacs215 xemacs215nox xemacs214 xemacs214nox
+MAKE_JOBS_SAFE=                no
+
+EMACS_VERSIONS_ACCEPTED=       #
 
 # net-utils, mule-ucs for xemacs
 EMACS_MODULES=         base

Index: pkgsrc/chat/irchat-pj/PLIST
diff -u pkgsrc/chat/irchat-pj/PLIST:1.5 pkgsrc/chat/irchat-pj/PLIST:1.6
--- pkgsrc/chat/irchat-pj/PLIST:1.5     Mon Jul 13 18:26:50 2009
+++ pkgsrc/chat/irchat-pj/PLIST Fri Sep 25 09:48:05 2026
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2009/07/13 18:26:50 hasso Exp $
+@comment $NetBSD: PLIST,v 1.6 2026/09/25 09:48:05 wiz Exp $
 bin/dcc
 ${EMACS_LISPPREFIX}/irchat-pj/irchat-commands.el
 ${EMACS_LISPPREFIX}/irchat-pj/irchat-commands.elc
@@ -25,11 +25,12 @@ ${EMACS_LISPPREFIX}/irchat-pj/irchat-pj-
 ${EMACS_LISPPREFIX}/irchat-pj/irchat-pj-sound.el
 ${EMACS_LISPPREFIX}/irchat-pj/irchat-pj-sound.elc
 ${EMACS_LISPPREFIX}/irchat-pj/irchat-pj-specific-emacs20.el
-${EMACS_LISPPREFIX}/irchat-pj/irchat-pj-specific-emacs20.elc
+${FOR_emacs}${EMACS_LISPPREFIX}/irchat-pj/irchat-pj-specific-emacs20.elc
 ${EMACS_LISPPREFIX}/irchat-pj/irchat-pj-specific-mule2.el
 ${EMACS_LISPPREFIX}/irchat-pj/irchat-pj-specific-nemacs.el
 ${EMACS_LISPPREFIX}/irchat-pj/irchat-pj-specific-other-emacsen.el
 ${EMACS_LISPPREFIX}/irchat-pj/irchat-pj-specific-xmas.el
+${FOR_xemacs}${EMACS_LISPPREFIX}/irchat-pj/irchat-pj-specific-xmas.elc
 ${EMACS_LISPPREFIX}/irchat-pj/irchat-pj-version-string.el
 ${EMACS_LISPPREFIX}/irchat-pj/irchat-pj-version-string.elc
 ${EMACS_LISPPREFIX}/irchat-pj/irchat-setpath.el

Index: pkgsrc/devel/apel/Makefile
diff -u pkgsrc/devel/apel/Makefile:1.46 pkgsrc/devel/apel/Makefile:1.47
--- pkgsrc/devel/apel/Makefile:1.46     Sat Sep 12 14:31:49 2026
+++ pkgsrc/devel/apel/Makefile  Fri Sep 25 09:48:05 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2026/09/12 14:31:49 wiz Exp $
+# $NetBSD: Makefile,v 1.47 2026/09/25 09:48:05 wiz Exp $
 
 DISTNAME=      apel-10.8.0.20201107
 PKGNAME=       ${EMACS_PKGNAME_PREFIX}${DISTNAME}
@@ -40,8 +40,8 @@ MAKE_FLAGS.xemacs=    PACKAGEDIR=${EMACS_LI
 .include "../../editors/emacs/modules.mk"
 
 PLIST_VARS+=   emacs23 emacs19
-.if empty(EMACS_TYPE:Mxemacs)
-.  if !empty(EMACS_TYPE:Memacs2[3-9]*) || !empty(EMACS_TYPE:Memacs3[0-9]*)
+.if ${EMACS_FLAVOR} != "xemacs"
+.  if ${EMACS_VERSION_MAJOR} >= 23
 PLIST.emacs23= yes
 .  else
 PLIST.emacs19= yes

Index: pkgsrc/devel/cflow-mode/Makefile
diff -u pkgsrc/devel/cflow-mode/Makefile:1.12 pkgsrc/devel/cflow-mode/Makefile:1.13
--- pkgsrc/devel/cflow-mode/Makefile:1.12       Sun Mar  2 00:24:21 2025
+++ pkgsrc/devel/cflow-mode/Makefile    Fri Sep 25 09:48:05 2026
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2025/03/02 00:24:21 mef Exp $
+# $NetBSD: Makefile,v 1.13 2026/09/25 09:48:05 wiz Exp $
 
 DISTNAME=      cflow-1.7
-PKGNAME=       cflow-mode-1.7
+PKGNAME=       ${EMACS_PKGNAME_PREFIX}cflow-mode-1.7
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_GNU:=cflow/}
 

Index: pkgsrc/devel/cmake-mode/Makefile
diff -u pkgsrc/devel/cmake-mode/Makefile:1.9 pkgsrc/devel/cmake-mode/Makefile:1.10
--- pkgsrc/devel/cmake-mode/Makefile:1.9        Wed Aug 17 13:28:10 2022
+++ pkgsrc/devel/cmake-mode/Makefile    Fri Sep 25 09:48:05 2026
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2022/08/17 13:28:10 tnn Exp $
-#
+# $NetBSD: Makefile,v 1.10 2026/09/25 09:48:05 wiz Exp $
 
 .include "../../devel/cmake/Makefile.common"
 
@@ -9,6 +8,8 @@ COMMENT=        Emacs mode for CMake syntax hig
 USE_LANGUAGES= # none
 MESSAGE_SUBST+=        LISPDIR=${EMACS_LISPPREFIX:Q}
 
+EMACS_VERSIONS_INCOMPATIBLE=   emacs20 xemacs214 xemacs215 xemacs214nox xemacs215nox
+
 do-build:
        cd ${WRKSRC}/Auxiliary && ${EMACS_BIN} -batch -f batch-byte-compile cmake-mode.el
 

Index: pkgsrc/devel/cobol-mode/Makefile
diff -u pkgsrc/devel/cobol-mode/Makefile:1.4 pkgsrc/devel/cobol-mode/Makefile:1.5
--- pkgsrc/devel/cobol-mode/Makefile:1.4        Sat Dec 30 01:21:25 2023
+++ pkgsrc/devel/cobol-mode/Makefile    Fri Sep 25 09:48:05 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2023/12/30 01:21:25 zafer Exp $
+# $NetBSD: Makefile,v 1.5 2026/09/25 09:48:05 wiz Exp $
 
 DISTNAME=      cobol-mode.el
 PKGNAME=       ${EMACS_PKGNAME_PREFIX}${DISTNAME}-0.0.20150505
@@ -12,7 +12,7 @@ HOMEPAGE=     https://www.emacswiki.org/emac
 COMMENT=       Emacs mode for editing COBOL source code
 LICENSE=       gnu-gpl-v2
 
-DIST_SUBDIR=   ${PKGNAME_NOREV}
+DIST_SUBDIR=   cobol-mode.el-${PKGVERSION_NOREV}
 
 WRKSRC=                ${WRKDIR}
 NO_BUILD=      yes

Index: pkgsrc/devel/cqual/Makefile
diff -u pkgsrc/devel/cqual/Makefile:1.35 pkgsrc/devel/cqual/Makefile:1.36
--- pkgsrc/devel/cqual/Makefile:1.35    Mon Dec  1 09:16:58 2025
+++ pkgsrc/devel/cqual/Makefile Fri Sep 25 09:48:05 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2025/12/01 09:16:58 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2026/09/25 09:48:05 wiz Exp $
 
 DISTNAME=              cqual-0.991
 PKGREVISION=           21
@@ -12,6 +12,7 @@ COMMENT=              Tool for adding type qualifier
 MAKE_JOBS_SAFE=                no
 USE_PKGLOCALEDIR=      yes
 GNU_CONFIGURE=         yes
+INSTALL_MAKE_FLAGS+=   lispdir=${EMACS_LISPPREFIX}/cqual
 USE_TOOLS+=            gmake perl:run bison m4
 
 REPLACE_PERL+=         bin/*

Index: pkgsrc/devel/cqual/PLIST
diff -u pkgsrc/devel/cqual/PLIST:1.4 pkgsrc/devel/cqual/PLIST:1.5
--- pkgsrc/devel/cqual/PLIST:1.4        Sun Jun 14 17:48:38 2009
+++ pkgsrc/devel/cqual/PLIST    Fri Sep 25 09:48:05 2026
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 17:48:38 joerg Exp $
+@comment $NetBSD: PLIST,v 1.5 2026/09/25 09:48:05 wiz Exp $
 bin/cqual
 bin/gcqual
 bin/iquals
@@ -15,20 +15,20 @@ share/cqual/linux-syscalls.cq
 share/cqual/prelude.cq
 share/cqual/proto-noderef.cq
 share/doc/cqual/user-guide.pdf
-share/emacs/site-lisp/cqual/avltree.el
-share/emacs/site-lisp/cqual/cqual-pam.el
-share/emacs/site-lisp/cqual/elib-node.el
-share/emacs/site-lisp/cqual/pam-3.el
-share/emacs/site-lisp/cqual/pam-blob.el
-share/emacs/site-lisp/cqual/pam-copyright.el
-share/emacs/site-lisp/cqual/pam-executions.el
-share/emacs/site-lisp/cqual/pam-faces.el
-share/emacs/site-lisp/cqual/pam-hyper.el
-share/emacs/site-lisp/cqual/pam-overlays.el
-share/emacs/site-lisp/cqual/pam-util.el
-share/emacs/site-lisp/cqual/pam-vars.el
-share/emacs/site-lisp/cqual/pam-window.el
-share/emacs/site-lisp/cqual/stack-m.el
+${EMACS_LISPPREFIX}/cqual/avltree.el
+${EMACS_LISPPREFIX}/cqual/cqual-pam.el
+${EMACS_LISPPREFIX}/cqual/elib-node.el
+${EMACS_LISPPREFIX}/cqual/pam-3.el
+${EMACS_LISPPREFIX}/cqual/pam-blob.el
+${EMACS_LISPPREFIX}/cqual/pam-copyright.el
+${EMACS_LISPPREFIX}/cqual/pam-executions.el
+${EMACS_LISPPREFIX}/cqual/pam-faces.el
+${EMACS_LISPPREFIX}/cqual/pam-hyper.el
+${EMACS_LISPPREFIX}/cqual/pam-overlays.el
+${EMACS_LISPPREFIX}/cqual/pam-util.el
+${EMACS_LISPPREFIX}/cqual/pam-vars.el
+${EMACS_LISPPREFIX}/cqual/pam-window.el
+${EMACS_LISPPREFIX}/cqual/stack-m.el
 share/examples/cqual/README
 share/examples/cqual/linux-lock.c
 share/examples/cqual/linux-lock.i

Index: pkgsrc/devel/dash-el/Makefile
diff -u pkgsrc/devel/dash-el/Makefile:1.1 pkgsrc/devel/dash-el/Makefile:1.2
--- pkgsrc/devel/dash-el/Makefile:1.1   Sun Apr  7 18:56:40 2024
+++ pkgsrc/devel/dash-el/Makefile       Fri Sep 25 09:48:05 2026
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.1 2024/04/07 18:56:40 ryoon Exp $
+# $NetBSD: Makefile,v 1.2 2026/09/25 09:48:05 wiz Exp $
 
 DISTNAME=      dash.el-2.19.1
-PKGNAME=       ${DISTNAME:C/\.el/-el/}
+PKGNAME=       ${EMACS_PKGNAME_PREFIX}${DISTNAME:C/\.el/-el/}
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=magnars/}
 GITHUB_PROJECT=        dash.el
@@ -12,6 +12,8 @@ HOMEPAGE=     https://github.com/magnars/das
 COMMENT=       Modern list api for Emacs. No 'cl required
 LICENSE=       gnu-gpl-v3
 
+EMACS_VERSIONS_INCOMPATIBLE=   emacs20
+
 INSTALLATION_DIRS=     ${EMACS_LISPPREFIX}/dash
 
 do-build:

Index: pkgsrc/devel/doxymacs/Makefile
diff -u pkgsrc/devel/doxymacs/Makefile:1.28 pkgsrc/devel/doxymacs/Makefile:1.29
--- pkgsrc/devel/doxymacs/Makefile:1.28 Wed Jan  7 08:46:28 2026
+++ pkgsrc/devel/doxymacs/Makefile      Fri Sep 25 09:48:06 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2026/01/07 08:46:28 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2026/09/25 09:48:06 wiz Exp $
 #
 
 DISTNAME=      doxymacs-1.8.0
@@ -24,7 +24,7 @@ COMMENT=      Doxygen editing support for Ema
 .if ${EMACS_FLAVOR} == xemacs
 DEPENDS+=      xemacs-packages-[0-9]*:../../editors/xemacs-packages
 .elif ${EMACS_VERSION_MAJOR} <= 21
-DEPENDS+=      w3-[0-9]*:../../www/w3
+DEPENDS+=      ${EMACS_PKGNAME_PREFIX}w3-[0-9]*:../../www/w3
 .endif
 
 GNU_CONFIGURE=         yes

Index: pkgsrc/devel/ecb/Makefile
diff -u pkgsrc/devel/ecb/Makefile:1.5 pkgsrc/devel/ecb/Makefile:1.6
--- pkgsrc/devel/ecb/Makefile:1.5       Sat Sep 12 14:31:49 2026
+++ pkgsrc/devel/ecb/Makefile   Fri Sep 25 09:48:06 2026
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.5 2026/09/12 14:31:49 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2026/09/25 09:48:06 wiz Exp $
 
 DISTNAME=      ecb-2.50
 PKGNAME=       ${EMACS_PKGNAME_PREFIX}${DISTNAME}
 PKGREVISION=   1
 CATEGORIES=    devel
-
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=ecb-home/}
+GITHUB_PROJECT=        ecb
 GITHUB_TAG=    1330a44cf3c171781083b0b926ab7622f64e6e81
 
 MAINTAINER=    pho%cielonegro.org@localhost
@@ -16,7 +16,7 @@ LICENSE=      gnu-gpl-v2
 USE_TOOLS=     find gmake makeinfo tar
 INFO_FILES=    yes
 
-EMACS_VERSIONS_ACCEPTED=       xemacs215 xemacs215nox xemacs214 xemacs214nox
+EMACS_VERSIONS_ACCEPTED=       # empty
 
 MAKE_FLAGS+=           EMACS=${EMACS_BIN}
 MAKE_FLAGS+=           SHELL=${SH:Q}
@@ -25,14 +25,14 @@ EMACS_BUILDLINK=    yes
 
 INSTALLATION_DIRS+=    \
        ${PKGINFODIR} \
-       ${EMACS_LISPPREFIX}/${PKGBASE}
+       ${EMACS_LISPPREFIX}/ecb
 
 do-install:
-       ${INSTALL_DATA} ${WRKSRC}/*.el  ${DESTDIR}${EMACS_LISPPREFIX}/${PKGBASE}
-       ${INSTALL_DATA} ${WRKSRC}/*.elc ${DESTDIR}${EMACS_LISPPREFIX}/${PKGBASE}
+       ${INSTALL_DATA} ${WRKSRC}/*.el  ${DESTDIR}${EMACS_LISPPREFIX}/ecb
+       ${INSTALL_DATA} ${WRKSRC}/*.elc ${DESTDIR}${EMACS_LISPPREFIX}/ecb
        ${INSTALL_DATA} ${WRKSRC}/info-help/ecb.info* ${DESTDIR}${PREFIX}/${PKGINFODIR}
        ${TAR} -cf - -C ${WRKSRC} ecb-images | \
-               ${TAR} -xf - -C ${DESTDIR}${EMACS_LISPPREFIX}/${PKGBASE}
+               ${TAR} -xf - -C ${DESTDIR}${EMACS_LISPPREFIX}/ecb
 
 .include "../../editors/emacs/modules.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/flim/Makefile
diff -u pkgsrc/devel/flim/Makefile:1.46 pkgsrc/devel/flim/Makefile:1.47
--- pkgsrc/devel/flim/Makefile:1.46     Fri Dec 12 10:17:16 2025
+++ pkgsrc/devel/flim/Makefile  Fri Sep 25 09:48:06 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2025/12/12 10:17:16 wiz Exp $
+# $NetBSD: Makefile,v 1.47 2026/09/25 09:48:06 wiz Exp $
 
 DISTNAME=      flim-1.14.9
 PKGNAME=       ${EMACS_PKGNAME_PREFIX}${DISTNAME}
@@ -32,6 +32,8 @@ MAKEFLAGS.emacs+=     EMACS=${EMACS_BIN}
 MAKEFLAGS.xemacs+=     XEMACS=${EMACS_BIN} \
                        PACKAGEDIR=${EMACS_LISPPREFIX:C|/lisp$||}
 
+EMACS_VERSIONS_INCOMPATIBLE=   emacs20 # apel
+EMACS_VERSIONS_INCOMPATIBLE+=  xemacs214 xemacs215 xemacs214nox xemacs215nox
 EMACS_MODULES=         base
 EMACS_BUILDLINK=       # empty
 
@@ -66,7 +68,7 @@ post-install:
 .include "../../editors/emacs/modules.mk"
 
 .if (${EMACS_FLAVOR} != "xemacs")
-BUILDLINK_API_DEPENDS.apel+=   apel>=10.8
+BUILDLINK_API_DEPENDS.apel+=   ${EMACS_PKGNAME_PREFIX}apel>=10.8
 .include "../../devel/apel/buildlink3.mk"
 .endif
 

Index: pkgsrc/devel/haskell-mode/Makefile
diff -u pkgsrc/devel/haskell-mode/Makefile:1.24 pkgsrc/devel/haskell-mode/Makefile:1.25
--- pkgsrc/devel/haskell-mode/Makefile:1.24     Sat May 14 22:25:34 2022
+++ pkgsrc/devel/haskell-mode/Makefile  Fri Sep 25 09:48:06 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2022/05/14 22:25:34 dholland Exp $
+# $NetBSD: Makefile,v 1.25 2026/09/25 09:48:06 wiz Exp $
 
 DISTNAME=              haskell-mode-1.44
 PKGNAME=               ${EMACS_PKGNAME_PREFIX}${DISTNAME}
@@ -13,6 +13,8 @@ COMMENT=              Haskell mode for Emacs
 INSTALLATION_DIRS=     ${EMACS_LISPPREFIX:C|^${PREFIX}/||}/haskell-mode \
                        share/doc/haskell-mode
 
+EMACS_VERSIONS_INCOMPATIBLE=   xemacs214 xemacs215 xemacs214nox xemacs215nox
+
 HTML=  .emacs fontlock.hs indent.hs index.html installation-guide.html
 SRCS=  haskell-decl-scan.el haskell-doc.el haskell-font-lock.el        \
        haskell-ghci.el haskell-hugs.el haskell-indent.el               \

Index: pkgsrc/devel/js2-mode/Makefile
diff -u pkgsrc/devel/js2-mode/Makefile:1.16 pkgsrc/devel/js2-mode/Makefile:1.17
--- pkgsrc/devel/js2-mode/Makefile:1.16 Sat Sep 12 14:31:49 2026
+++ pkgsrc/devel/js2-mode/Makefile      Fri Sep 25 09:48:06 2026
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2026/09/12 14:31:49 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2026/09/25 09:48:06 wiz Exp $
 
 DISTNAME=      js2-20080406
+PKGNAME=       ${EMACS_PKGNAME_PREFIX}${DISTNAME}
 PKGREVISION=   3
 CATEGORIES=    devel
 MASTER_SITES=  http://js2-mode.googlecode.com/files/
@@ -14,8 +15,7 @@ WRKSRC=               ${WRKDIR}
 USE_LANGUAGES= # none
 MESSAGE_SUBST+=        LISPDIR=${EMACS_LISPPREFIX:Q}
 
-# no xemacs at all
-EMACS_VERSIONS_ACCEPTED+=      emacs29 emacs29nox emacs30 emacs30nox emacs31 emacs31nox
+EMACS_VERSIONS_ACCEPTED+=      emacs31 emacs30 emacs29
 
 do-build:
        cd ${WRKSRC} && ${EMACS_BIN} -batch -f batch-byte-compile ${DISTNAME}.el

Index: pkgsrc/devel/lua-mode/Makefile
diff -u pkgsrc/devel/lua-mode/Makefile:1.13 pkgsrc/devel/lua-mode/Makefile:1.14
--- pkgsrc/devel/lua-mode/Makefile:1.13 Wed Aug 17 12:43:43 2022
+++ pkgsrc/devel/lua-mode/Makefile      Fri Sep 25 09:48:06 2026
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.13 2022/08/17 12:43:43 tnn Exp $
+# $NetBSD: Makefile,v 1.14 2026/09/25 09:48:06 wiz Exp $
 
 DISTNAME=      lua-mode-20210802
 PKGNAME=       ${EMACS_PKGNAME_PREFIX}${DISTNAME}
 PKGREVISION=   1
 CATEGORIES=    devel lua
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=immerrr/}
+GITHUB_PROJECT=        lua-mode
 GITHUB_TAG=    v${PKGVERSION_NOREV}
 
 MAINTAINER=    cheusov%NetBSD.org@localhost
@@ -19,6 +20,8 @@ INSTALLATION_DIRS=    ${EMACS_LISPPREFIX}
 
 EMACS_MODULES=         base
 
+EMACS_VERSIONS_INCOMPATIBLE=   emacs20 xemacs214 xemacs215 xemacs214nox xemacs215nox
+
 .include "../../editors/emacs/modules.mk"
 
 do-build:

Index: pkgsrc/devel/pcl-cvs/Makefile
diff -u pkgsrc/devel/pcl-cvs/Makefile:1.30 pkgsrc/devel/pcl-cvs/Makefile:1.31
--- pkgsrc/devel/pcl-cvs/Makefile:1.30  Mon Sep 14 12:37:59 2026
+++ pkgsrc/devel/pcl-cvs/Makefile       Fri Sep 25 09:48:06 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2026/09/14 12:37:59 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2026/09/25 09:48:06 wiz Exp $
 
 DISTNAME=      pcl-cvs-2.9.9
 PKGNAME=       ${EMACS_PKGNAME_PREFIX}${DISTNAME}
@@ -23,6 +23,8 @@ PKG_FAIL_REASON+=     "${PKGNAME} is only fo
 .endif
 
 INSTALL_MAKE_FLAGS+=   PREFIX=${DESTDIR:Q}${PREFIX:Q}
+INSTALL_MAKE_FLAGS+=   lispdir=${DESTDIR:Q}${EMACS_LISPPREFIX:Q}
+INSTALL_MAKE_FLAGS+=   infodir=${DESTDIR:Q}${PREFIX:Q}/${PKGINFODIR}
 
 BUILD_TARGET=  default
 INFO_FILES=    yes

Index: pkgsrc/devel/php-mode/Makefile
diff -u pkgsrc/devel/php-mode/Makefile:1.9 pkgsrc/devel/php-mode/Makefile:1.10
--- pkgsrc/devel/php-mode/Makefile:1.9  Sat May 14 22:25:35 2022
+++ pkgsrc/devel/php-mode/Makefile      Fri Sep 25 09:48:06 2026
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2022/05/14 22:25:35 dholland Exp $
-#
+# $NetBSD: Makefile,v 1.10 2026/09/25 09:48:06 wiz Exp $
 
 DISTNAME=      php-mode-1.13.1
 PKGNAME=       ${EMACS_PKGNAME_PREFIX}${DISTNAME}
@@ -15,6 +14,8 @@ LICENSE=      gnu-gpl-v3
 
 NO_CONFIGURE=          yes
 
+EMACS_VERSIONS_INCOMPATIBLE=   emacs20 xemacs214 xemacs215 xemacs214nox xemacs215nox
+
 do-build:
        cd ${WRKSRC} && ${EMACS_BIN} -batch -f batch-byte-compile php-mode.el
 

Index: pkgsrc/devel/rainbow-delimiters-el/Makefile
diff -u pkgsrc/devel/rainbow-delimiters-el/Makefile:1.5 pkgsrc/devel/rainbow-delimiters-el/Makefile:1.6
--- pkgsrc/devel/rainbow-delimiters-el/Makefile:1.5     Sat May 14 22:25:36 2022
+++ pkgsrc/devel/rainbow-delimiters-el/Makefile Fri Sep 25 09:48:07 2026
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2022/05/14 22:25:36 dholland Exp $
+# $NetBSD: Makefile,v 1.6 2026/09/25 09:48:07 wiz Exp $
 
 DISTNAME=      rainbow-delimiters-1.3.5
+PKGNAME=       ${EMACS_PKGNAME_PREFIX}${DISTNAME}
 PKGREVISION=   1
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=Fanael/}

Index: pkgsrc/devel/rsltc/Makefile
diff -u pkgsrc/devel/rsltc/Makefile:1.18 pkgsrc/devel/rsltc/Makefile:1.19
--- pkgsrc/devel/rsltc/Makefile:1.18    Sat May 14 22:25:34 2022
+++ pkgsrc/devel/rsltc/Makefile Fri Sep 25 09:48:07 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2022/05/14 22:25:34 dholland Exp $
+# $NetBSD: Makefile,v 1.19 2026/09/25 09:48:07 wiz Exp $
 #
 
 DISTNAME=              rsltcsrc
@@ -33,11 +33,11 @@ post-extract:
 
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/rsltc ${DESTDIR}${PREFIX}/bin
-       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/emacs/site-lisp/rsl
+       ${INSTALL_DATA_DIR} ${DESTDIR}${EMACS_LISPPREFIX}/rsl
        (cd ${WRKSRC} ; for i in rsltc.el tokenise.el rslconvert.el rsl-mode.el ; do\
                ${EMACS_BIN} -batch -l path.el -f batch-byte-compile $$i ;\
-               ${INSTALL_DATA} $$i ${DESTDIR}${PREFIX}/share/emacs/site-lisp/rsl ;\
-               ${INSTALL_DATA} $${i}c ${DESTDIR}${PREFIX}/share/emacs/site-lisp/rsl ;\
+               ${INSTALL_DATA} $$i ${DESTDIR}${EMACS_LISPPREFIX}/rsl ;\
+               ${INSTALL_DATA} $${i}c ${DESTDIR}${EMACS_LISPPREFIX}/rsl ;\
        done)
 
 .include "../../editors/emacs/modules.mk"

Index: pkgsrc/devel/rsltc/PLIST
diff -u pkgsrc/devel/rsltc/PLIST:1.2 pkgsrc/devel/rsltc/PLIST:1.3
--- pkgsrc/devel/rsltc/PLIST:1.2        Sun Jun 14 17:49:07 2009
+++ pkgsrc/devel/rsltc/PLIST    Fri Sep 25 09:48:07 2026
@@ -1,10 +1,10 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:49:07 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2026/09/25 09:48:07 wiz Exp $
 bin/rsltc
-share/emacs/site-lisp/rsl/rsl-mode.el
-share/emacs/site-lisp/rsl/rsl-mode.elc
-share/emacs/site-lisp/rsl/rslconvert.el
-share/emacs/site-lisp/rsl/rslconvert.elc
-share/emacs/site-lisp/rsl/rsltc.el
-share/emacs/site-lisp/rsl/rsltc.elc
-share/emacs/site-lisp/rsl/tokenise.el
-share/emacs/site-lisp/rsl/tokenise.elc
+${EMACS_LISPPREFIX}/rsl/rsl-mode.el
+${EMACS_LISPPREFIX}/rsl/rsl-mode.elc
+${EMACS_LISPPREFIX}/rsl/rslconvert.el
+${EMACS_LISPPREFIX}/rsl/rslconvert.elc
+${EMACS_LISPPREFIX}/rsl/rsltc.el
+${EMACS_LISPPREFIX}/rsl/rsltc.elc
+${EMACS_LISPPREFIX}/rsl/tokenise.el
+${EMACS_LISPPREFIX}/rsl/tokenise.elc

Index: pkgsrc/devel/semantic/Makefile
diff -u pkgsrc/devel/semantic/Makefile:1.39 pkgsrc/devel/semantic/Makefile:1.40
--- pkgsrc/devel/semantic/Makefile:1.39 Sat Sep 12 14:31:49 2026
+++ pkgsrc/devel/semantic/Makefile      Fri Sep 25 09:48:07 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2026/09/12 14:31:49 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2026/09/25 09:48:07 wiz Exp $
 
 DISTNAME=      semantic-1.4.4
 PKGNAME=       ${EMACS_PKGNAME_PREFIX}${DISTNAME}
@@ -18,8 +18,7 @@ INFO_FILES=   yes
 
 MAKE_FLAGS+=   EMACS=${EMACS_BIN}
 
-# speedbar
-EMACS_VERSIONS_ACCEPTED=        emacs20 xemacs215 xemacs215nox xemacs214 xemacs214nox
+EMACS_VERSIONS_ACCEPTED=       # empty
 
 # XXX cd ${WRKSRC}; ${MAKE} -V semantic_LISP
 SRCS=  semantic.el semantic-util.el semantic-bnf.el semantic-ctxt.el

Index: pkgsrc/devel/semi/Makefile
diff -u pkgsrc/devel/semi/Makefile:1.40 pkgsrc/devel/semi/Makefile:1.41
--- pkgsrc/devel/semi/Makefile:1.40     Sun Dec 24 14:24:52 2023
+++ pkgsrc/devel/semi/Makefile  Fri Sep 25 09:48:07 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2023/12/24 14:24:52 zafer Exp $
+# $NetBSD: Makefile,v 1.41 2026/09/25 09:48:07 wiz Exp $
 #
 
 DISTNAME=      semi-1.14.6
@@ -32,6 +32,9 @@ INFO_FILES=   yes
 EMACS_MODULES=         base
 EMACS_BUILDLINK=       # defined
 
+EMACS_VERSIONS_INCOMPATIBLE=   emacs20 # apel
+EMACS_VERSIONS_INCOMPATIBLE+=  xemacs214 xemacs215 xemacs214nox xemacs215nox
+
 BUILD_TARGET.emacs=    elc
 BUILD_TARGET.xemacs=   package
 INSTALL_TARGET.emacs=  install

Index: pkgsrc/devel/semi/options.mk
diff -u pkgsrc/devel/semi/options.mk:1.7 pkgsrc/devel/semi/options.mk:1.8
--- pkgsrc/devel/semi/options.mk:1.7    Sun Jun  5 02:39:18 2022
+++ pkgsrc/devel/semi/options.mk        Fri Sep 25 09:48:07 2026
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.7 2022/06/05 02:39:18 mef Exp $
+# $NetBSD: options.mk,v 1.8 2026/09/25 09:48:07 wiz Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.semi
-PKG_SUPPORTED_OPTIONS=         semi-bbdb
+PKG_SUPPORTED_OPTIONS=         # empty
 PKG_OPTIONS_OPTIONAL_GROUPS=   semi-browser
 PKG_OPTIONS_GROUP.semi-browser=        w3 w3m
 PKG_SUGGESTED_OPTIONS=
@@ -10,11 +10,6 @@ PKG_SUGGESTED_OPTIONS=
 
 PLIST_VARS+=   bbdb w3
 
-.if !empty(PKG_OPTIONS:Msemi-bbdb)
-.include "../../misc/bbdb2/buildlink3.mk"
-PLIST.bbdb=    yes
-.endif
-
 .if !empty(PKG_OPTIONS:Mw3)
 .include "../../www/w3/buildlink3.mk"
 PLIST.w3=      yes

Index: pkgsrc/devel/sml-mode/Makefile
diff -u pkgsrc/devel/sml-mode/Makefile:1.22 pkgsrc/devel/sml-mode/Makefile:1.23
--- pkgsrc/devel/sml-mode/Makefile:1.22 Sat May 14 22:25:35 2022
+++ pkgsrc/devel/sml-mode/Makefile      Fri Sep 25 09:48:07 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2022/05/14 22:25:35 dholland Exp $
+# $NetBSD: Makefile,v 1.23 2026/09/25 09:48:07 wiz Exp $
 
 DISTNAME=      sml-mode-3.9.5
 PKGNAME=       ${EMACS_PKGNAME_PREFIX}${DISTNAME}
@@ -11,10 +11,14 @@ COMMENT=    Emacs mode for editing Standard
 
 BUILD_TARGET=  default
 
+MAKE_FLAGS+=   EMACS=${EMACS_BIN}
+
 INFO_FILES=    yes
 
 INSTALLATION_DIRS=     ${EMACS_INFOPREFIX} ${EMACS_LISPPREFIX}/sml-mode
 
+EMACS_VERSIONS_INCOMPATIBLE=   xemacs214 xemacs215 xemacs214nox xemacs215nox
+
 do-install:
        cd ${WRKSRC} && ${INSTALL_DATA} *.el *.elc README NEWS TODO \
                ChangeLog ${DESTDIR}${EMACS_LISPPREFIX}/sml-mode

Index: pkgsrc/devel/zig-mode/Makefile
diff -u pkgsrc/devel/zig-mode/Makefile:1.2 pkgsrc/devel/zig-mode/Makefile:1.3
--- pkgsrc/devel/zig-mode/Makefile:1.2  Sat May 14 22:25:36 2022
+++ pkgsrc/devel/zig-mode/Makefile      Fri Sep 25 09:48:07 2026
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.2 2022/05/14 22:25:36 dholland Exp $
+# $NetBSD: Makefile,v 1.3 2026/09/25 09:48:07 wiz Exp $
 
 DISTNAME=      zig-mode-0.0.20220105
 PKGNAME=       ${EMACS_PKGNAME_PREFIX}${DISTNAME}
 PKGREVISION=   1
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=ziglang/}
+GITHUB_PROJECT=        zig-mode
 GITHUB_TAG=    aa20d630b8c413dab8d6bd120ec3ed5db5c9da70
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
@@ -14,6 +15,8 @@ LICENSE=      gnu-gpl-v3
 
 NO_CONFIGURE=          yes
 
+EMACS_VERSIONS_INCOMPATIBLE=   xemacs214 xemacs215 xemacs214nox xemacs215nox
+
 do-build:
        cd ${WRKSRC} && ${EMACS_BIN} -batch -f batch-byte-compile zig-mode.el
 

Index: pkgsrc/editors/emacs-packages/Makefile
diff -u pkgsrc/editors/emacs-packages/Makefile:1.39 pkgsrc/editors/emacs-packages/Makefile:1.40
--- pkgsrc/editors/emacs-packages/Makefile:1.39 Wed May  1 20:37:09 2024
+++ pkgsrc/editors/emacs-packages/Makefile      Fri Sep 25 09:48:07 2026
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.39 2024/05/01 20:37:09 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2026/09/25 09:48:07 wiz Exp $
 
-DISTNAME=      emacs-packages-0.12
-PKGREVISION=   3
+DISTNAME=      emacs-packages-0.13
 CATEGORIES=    editors meta-pkgs
 MASTER_SITES=  # empty
 DISTFILES=     # empty
@@ -12,6 +11,9 @@ COMMENT=      Meta-package for the GNU Emacs 
 
 META_PACKAGE=  yes
 
+# TODO: would work, but needs a lot of .if cases
+EMACS_VERSIONS_INCOMPATIBLE=   xemacs214 xemacs215 xemacs214nox xemacs215nox
+
 .include "../../editors/emacs/modules.mk"
 
 # XXX
@@ -36,14 +38,14 @@ DEPENDS+=   ${EMACS_PKGNAME_PREFIX}elib-[0
 .if ${EMACS_VERSION_MAJOR} < 24
 DEPENDS+=      ${EMACS_PKGNAME_PREFIX}elscreen-[0-9]*:../../misc/elscreen
 .endif
-DEPENDS+=      ${EMACS_PKGNAME_PREFIX}emacs-dict-client-[0-9]*:../../textproc/emacs-dict-client
+DEPENDS+=      ${EMACS_PKGNAME_PREFIX}dict-client-[0-9]*:../../textproc/emacs-dict-client
 .if ${EMACS_VERSION_MAJOR} < 22
 DEPENDS+=      ${EMACS_PKGNAME_PREFIX}emacs-ilisp-[0-9]*:../../devel/emacs-ilisp
 .endif
-.if ${EMACS_VERSION_MAJOR} < 23
-DEPENDS+=      ${EMACS_PKGNAME_PREFIX}emacs-w3m-[0-9]*:../../www/emacs-w3m
+.if ${EMACS_VERSION_MAJOR} < 30
+DEPENDS+=      ${EMACS_PKGNAME_PREFIX}w3m-[0-9]*:../../www/emacs-w3m-snapshot
 .else
-DEPENDS+=      ${EMACS_PKGNAME_PREFIX}emacs-w3m-[0-9]*:../../www/emacs-w3m-snapshot
+DEPENDS+=      ${EMACS_PKGNAME_PREFIX}w3m-[0-9]*:../../www/emacs-w3m
 .endif
 DEPENDS+=      ${EMACS_PKGNAME_PREFIX}ess-[0-9]*:../../math/ess
 DEPENDS+=      ${EMACS_PKGNAME_PREFIX}etach-[0-9]*:../../mail/etach
@@ -58,7 +60,7 @@ DEPENDS+=     ${EMACS_PKGNAME_PREFIX}ispell-
 #.if defined(_EMACS_VERSION_EMACS_MAJOR) && ${_EMACS_VERSION_EMACS_MAJOR} == "21"
 #DEPENDS+=     ${EMACS_PKGNAME_PREFIX}jde-[0-9]*:../../editors/jde
 #.endif
-DEPENDS+=      ${EMACS_PKGNAME_PREFIX}riece-[0-9]*:../../chat/riece
+#DEPENDS+=     ${EMACS_PKGNAME_PREFIX}riece-[0-9]*:../../chat/riece
 #DEPENDS+=     ${EMACS_PKGNAME_PREFIX}lookup-[0-9]*:../../misc/lookup
 DEPENDS+=      ${EMACS_PKGNAME_PREFIX}mailcrypt-[0-9]*:../../mail/mailcrypt
 DEPENDS+=      ${EMACS_PKGNAME_PREFIX}matlab-mode-[0-9]*:../../editors/matlab-mode
@@ -84,14 +86,18 @@ DEPENDS+=   ${EMACS_PKGNAME_PREFIX}speedba
 .if ${EMACS_VERSION_MAJOR} < 22
 DEPENDS+=      ${EMACS_PKGNAME_PREFIX}tamago-[0-9]*:../../editors/tamago
 .endif
+.if ${EMACS_VERSION_MAJOR} == 29
 DEPENDS+=      ${EMACS_PKGNAME_PREFIX}tc-[0-9]*:../../inputmethod/tc
+.endif
 DEPENDS+=      ${EMACS_PKGNAME_PREFIX}verilog-mode-[0-9]*:../../cad/verilog-mode
-DEPENDS+=      ${EMACS_PKGNAME_PREFIX}vm-[0-9]*:../../mail/vm
+#DEPENDS+=     ${EMACS_PKGNAME_PREFIX}vm-[0-9]*:../../mail/vm
 .if ${EMACS_VERSION_MAJOR} < 22
 DEPENDS+=      ${EMACS_PKGNAME_PREFIX}w3-[0-9]*:../../www/w3
 .endif
 DEPENDS+=      ${EMACS_PKGNAME_PREFIX}wl-[0-9]*:../../mail/wl-snapshot
+.if ${EMACS_VERSION_MAJOR} > 30
 DEPENDS+=      ${EMACS_PKGNAME_PREFIX}zenicb-[0-9]*:../../chat/zenicb
+.endif
 DEPENDS+=      ${EMACS_PKGNAME_PREFIX}zenirc-[0-9]*:../../chat/zenirc
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/editors/emacs20/Makefile
diff -u pkgsrc/editors/emacs20/Makefile:1.68 pkgsrc/editors/emacs20/Makefile:1.69
--- pkgsrc/editors/emacs20/Makefile:1.68        Mon Sep 14 12:38:31 2026
+++ pkgsrc/editors/emacs20/Makefile     Fri Sep 25 09:48:07 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.68 2026/09/14 12:38:31 wiz Exp $
+# $NetBSD: Makefile,v 1.69 2026/09/25 09:48:07 wiz Exp $
 
 DISTNAME=      emacs-20.7
 PKGNAME=       ${DISTNAME:S/emacs/emacs20/}
@@ -111,3 +111,15 @@ post-install:
        ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DESTDIR}${PREFIX}/share/emacs
 
 .include "../../mk/bsd.pkg.mk"
+
+# The lisp of other packages lives under this version's directory and so
+# does their info, but Emacs builds Info-default-directory-list from its
+# own --infodir at configure time and cannot be told at run time except
+# through INFOPATH.  This adds the version's info directory to the list
+# at startup.
+post-install: emacs-info-path
+emacs-info-path:
+       ${ECHO} '(setq Info-default-directory-list (append Info-default-directory-list' \
+               > ${DESTDIR}${PREFIX}/share/emacs/${PKGVERSION_NOREV}/site-lisp/site-start.el
+       ${ECHO} '  (list (expand-file-name "../info" (file-name-directory load-file-name)))))' \
+               >> ${DESTDIR}${PREFIX}/share/emacs/${PKGVERSION_NOREV}/site-lisp/site-start.el

Index: pkgsrc/editors/emacs20/PLIST
diff -u pkgsrc/editors/emacs20/PLIST:1.8 pkgsrc/editors/emacs20/PLIST:1.9
--- pkgsrc/editors/emacs20/PLIST:1.8    Sun Jun 14 18:53:00 2009
+++ pkgsrc/editors/emacs20/PLIST        Fri Sep 25 09:48:07 2026
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2009/06/14 18:53:00 joerg Exp $
+@comment $NetBSD: PLIST,v 1.9 2026/09/25 09:48:07 wiz Exp $
 bin/emacs
 bin/emacs-${PKGVERSION}
 bin/emacs-b2m
@@ -1275,5 +1275,6 @@ share/emacs/${PKGVERSION}/lisp/xt-mouse.
 share/emacs/${PKGVERSION}/lisp/zone-mode.el
 share/emacs/${PKGVERSION}/lisp/zone-mode.elc
 share/emacs/${PKGVERSION}/site-lisp/subdirs.el
+share/emacs/${PKGVERSION}/site-lisp/site-start.el
 share/emacs/site-lisp/subdirs.el
 @pkgdir share/emacs/${PKGVERSION}/leim

Index: pkgsrc/editors/emacs29/Makefile.common
diff -u pkgsrc/editors/emacs29/Makefile.common:1.3 pkgsrc/editors/emacs29/Makefile.common:1.4
--- pkgsrc/editors/emacs29/Makefile.common:1.3  Mon Aug 14 05:13:31 2023
+++ pkgsrc/editors/emacs29/Makefile.common      Fri Sep 25 09:48:07 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.3 2023/08/14 05:13:31 wiz Exp $
+# $NetBSD: Makefile.common,v 1.4 2026/09/25 09:48:07 wiz Exp $
 #
 # used by editors/emacs29/Makefile
 # used by editors/emacs29-nox11/Makefile
@@ -85,3 +85,15 @@ post-extract:
        ${CHMOD} -R go-w ${WRKSRC}
 
 .include "../../devel/libgetopt/buildlink3.mk"
+
+# The lisp of other packages lives under this version's directory and so
+# does their info, but Emacs builds Info-default-directory-list from its
+# own --infodir at configure time and cannot be told at run time except
+# through INFOPATH.  This adds the version's info directory to the list
+# at startup; without it the files land where nothing looks.
+post-install: emacs-info-path
+emacs-info-path:
+       ${ECHO} '(setq Info-default-directory-list (append Info-default-directory-list' \
+               > ${DESTDIR}${PREFIX}/share/emacs/${PKGVERSION_NOREV}/site-lisp/site-start.el
+       ${ECHO} '  (list (expand-file-name "../info" (file-name-directory load-file-name)))))' \
+               >> ${DESTDIR}${PREFIX}/share/emacs/${PKGVERSION_NOREV}/site-lisp/site-start.el
Index: pkgsrc/editors/emacs29/PLIST
diff -u pkgsrc/editors/emacs29/PLIST:1.3 pkgsrc/editors/emacs29/PLIST:1.4
--- pkgsrc/editors/emacs29/PLIST:1.3    Mon Aug 14 05:13:31 2023
+++ pkgsrc/editors/emacs29/PLIST        Fri Sep 25 09:48:07 2026
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2023/08/14 05:13:31 wiz Exp $
+@comment $NetBSD: PLIST,v 1.4 2026/09/25 09:48:07 wiz Exp $
 bin/ctags
 bin/ebrowse
 bin/emacs
@@ -4210,6 +4210,7 @@ share/emacs/${PKGVERSION}/lisp/xwidget.e
 share/emacs/${PKGVERSION}/lisp/yank-media.el.gz
 share/emacs/${PKGVERSION}/lisp/yank-media.elc
 share/emacs/${PKGVERSION}/site-lisp/subdirs.el
+share/emacs/${PKGVERSION}/site-lisp/site-start.el
 share/emacs/site-lisp/subdirs.el
 share/icons/hicolor/128x128/apps/emacs.png
 share/icons/hicolor/16x16/apps/emacs.png

Index: pkgsrc/editors/emacs29-nox11/version.mk
diff -u pkgsrc/editors/emacs29-nox11/version.mk:1.1 pkgsrc/editors/emacs29-nox11/version.mk:1.2
--- pkgsrc/editors/emacs29-nox11/version.mk:1.1 Mon Jul 31 15:05:54 2023
+++ pkgsrc/editors/emacs29-nox11/version.mk     Fri Sep 25 09:48:08 2026
@@ -1,7 +1,7 @@
-# $NetBSD: version.mk,v 1.1 2023/07/31 15:05:54 ryoon Exp $
+# $NetBSD: version.mk,v 1.2 2026/09/25 09:48:08 wiz Exp $
 
-_EMACS_FLAVOR= emacs
-_EMACS_REQD=   emacs29-nox11>=29.1<30
+# The only thing that differs from the X11 build is which package to
+# ask for.
+.include "../../editors/emacs29/version.mk"
 
-_EMACS_VERSION_MAJOR=  29
-_EMACS_VERSION_MINOR=  1
+_EMACS_REQD=   emacs29-nox11>=29.1<30

Index: pkgsrc/editors/emacs30/Makefile.common
diff -u pkgsrc/editors/emacs30/Makefile.common:1.4 pkgsrc/editors/emacs30/Makefile.common:1.5
--- pkgsrc/editors/emacs30/Makefile.common:1.4  Tue Feb 24 07:13:49 2026
+++ pkgsrc/editors/emacs30/Makefile.common      Fri Sep 25 09:48:08 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.4 2026/02/24 07:13:49 triaxx Exp $
+# $NetBSD: Makefile.common,v 1.5 2026/09/25 09:48:08 wiz Exp $
 #
 # used by editors/emacs30/Makefile
 # used by editors/emacs30-nox11/Makefile
@@ -89,3 +89,15 @@ post-install:
 .if ${OPSYS} != "Darwin"
 .  include "../../devel/libgetopt/buildlink3.mk"
 .endif
+
+# The lisp of other packages lives under this version's directory and so
+# does their info, but Emacs builds Info-default-directory-list from its
+# own --infodir at configure time and cannot be told at run time except
+# through INFOPATH.  This adds the version's info directory to the list
+# at startup; without it the files land where nothing looks.
+post-install: emacs-info-path
+emacs-info-path:
+       ${ECHO} '(setq Info-default-directory-list (append Info-default-directory-list' \
+               > ${DESTDIR}${PREFIX}/share/emacs/${PKGVERSION_NOREV}/site-lisp/site-start.el
+       ${ECHO} '  (list (expand-file-name "../info" (file-name-directory load-file-name)))))' \
+               >> ${DESTDIR}${PREFIX}/share/emacs/${PKGVERSION_NOREV}/site-lisp/site-start.el

Index: pkgsrc/editors/emacs30/PLIST
diff -u pkgsrc/editors/emacs30/PLIST:1.2 pkgsrc/editors/emacs30/PLIST:1.3
--- pkgsrc/editors/emacs30/PLIST:1.2    Wed Dec 24 22:21:00 2025
+++ pkgsrc/editors/emacs30/PLIST        Fri Sep 25 09:48:08 2026
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2025/12/24 22:21:00 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2026/09/25 09:48:08 wiz Exp $
 bin/ctags
 bin/ebrowse
 bin/emacs
@@ -4360,6 +4360,7 @@ share/emacs/${PKGVERSION}/lisp/xwidget.e
 share/emacs/${PKGVERSION}/lisp/yank-media.el.gz
 share/emacs/${PKGVERSION}/lisp/yank-media.elc
 share/emacs/${PKGVERSION}/site-lisp/subdirs.el
+share/emacs/${PKGVERSION}/site-lisp/site-start.el
 share/emacs/site-lisp/subdirs.el
 share/icons/hicolor/128x128/apps/emacs.png
 share/icons/hicolor/16x16/apps/emacs.png

Index: pkgsrc/editors/emacs30-nox11/version.mk
diff -u pkgsrc/editors/emacs30-nox11/version.mk:1.2 pkgsrc/editors/emacs30-nox11/version.mk:1.3
--- pkgsrc/editors/emacs30-nox11/version.mk:1.2 Sat Aug 15 02:18:20 2026
+++ pkgsrc/editors/emacs30-nox11/version.mk     Fri Sep 25 09:48:08 2026
@@ -1,7 +1,7 @@
-# $NetBSD: version.mk,v 1.2 2026/08/15 02:18:20 wiz Exp $
+# $NetBSD: version.mk,v 1.3 2026/09/25 09:48:08 wiz Exp $
 
-_EMACS_FLAVOR= emacs
-_EMACS_REQD=   emacs30-nox11>=30.1<31
+# The only thing that differs from the X11 build is which package to
+# ask for.
+.include "../../editors/emacs30/version.mk"
 
-_EMACS_VERSION_MAJOR=  30
-_EMACS_VERSION_MINOR=  2
+_EMACS_REQD=   emacs30-nox11>=30.1<31

Index: pkgsrc/editors/emacs31/Makefile.common
diff -u pkgsrc/editors/emacs31/Makefile.common:1.1 pkgsrc/editors/emacs31/Makefile.common:1.2
--- pkgsrc/editors/emacs31/Makefile.common:1.1  Tue Aug 25 17:22:37 2026
+++ pkgsrc/editors/emacs31/Makefile.common      Fri Sep 25 09:48:08 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.1 2026/08/25 17:22:37 wiz Exp $
+# $NetBSD: Makefile.common,v 1.2 2026/09/25 09:48:08 wiz Exp $
 #
 # used by editors/emacs31/Makefile
 # used by editors/emacs31-nox11/Makefile
@@ -89,3 +89,15 @@ post-install:
 .if ${OPSYS} != "Darwin"
 .  include "../../devel/libgetopt/buildlink3.mk"
 .endif
+
+# The lisp of other packages lives under this version's directory and so
+# does their info, but Emacs builds Info-default-directory-list from its
+# own --infodir at configure time and cannot be told at run time except
+# through INFOPATH.  This adds the version's info directory to the list
+# at startup; without it the files land where nothing looks.
+post-install: emacs-info-path
+emacs-info-path:
+       ${ECHO} '(setq Info-default-directory-list (append Info-default-directory-list' \
+               > ${DESTDIR}${PREFIX}/share/emacs/${PKGVERSION_NOREV}/site-lisp/site-start.el
+       ${ECHO} '  (list (expand-file-name "../info" (file-name-directory load-file-name)))))' \
+               >> ${DESTDIR}${PREFIX}/share/emacs/${PKGVERSION_NOREV}/site-lisp/site-start.el
Index: pkgsrc/editors/emacs31/PLIST
diff -u pkgsrc/editors/emacs31/PLIST:1.1 pkgsrc/editors/emacs31/PLIST:1.2
--- pkgsrc/editors/emacs31/PLIST:1.1    Tue Aug 25 17:22:38 2026
+++ pkgsrc/editors/emacs31/PLIST        Fri Sep 25 09:48:08 2026
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2026/08/25 17:22:38 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2026/09/25 09:48:08 wiz Exp $
 bin/ebrowse
 bin/emacs
 bin/emacs-${PKGVERSION}
@@ -4428,6 +4428,7 @@ share/emacs/${PKGVERSION}/lisp/xwidget.e
 share/emacs/${PKGVERSION}/lisp/yank-media.el.gz
 share/emacs/${PKGVERSION}/lisp/yank-media.elc
 share/emacs/${PKGVERSION}/site-lisp/subdirs.el
+share/emacs/${PKGVERSION}/site-lisp/site-start.el
 share/emacs/site-lisp/subdirs.el
 share/icons/hicolor/128x128/apps/emacs.png
 share/icons/hicolor/16x16/apps/emacs.png

Index: pkgsrc/editors/emacs31-nox11/version.mk
diff -u pkgsrc/editors/emacs31-nox11/version.mk:1.1 pkgsrc/editors/emacs31-nox11/version.mk:1.2
--- pkgsrc/editors/emacs31-nox11/version.mk:1.1 Tue Aug 25 17:23:51 2026
+++ pkgsrc/editors/emacs31-nox11/version.mk     Fri Sep 25 09:48:08 2026
@@ -1,7 +1,7 @@
-# $NetBSD: version.mk,v 1.1 2026/08/25 17:23:51 wiz Exp $
+# $NetBSD: version.mk,v 1.2 2026/09/25 09:48:08 wiz Exp $
 
-_EMACS_FLAVOR= emacs
-_EMACS_REQD=   emacs31-nox11>=31.1<32
+# The only thing that differs from the X11 build is which package to
+# ask for.
+.include "../../editors/emacs31/version.mk"
 
-_EMACS_VERSION_MAJOR=  31
-_EMACS_VERSION_MINOR=  1
+_EMACS_REQD=   emacs31-nox11>=31.1<32

Index: pkgsrc/editors/gnuserv/Makefile
diff -u pkgsrc/editors/gnuserv/Makefile:1.20 pkgsrc/editors/gnuserv/Makefile:1.21
--- pkgsrc/editors/gnuserv/Makefile:1.20        Mon Sep 11 21:18:49 2023
+++ pkgsrc/editors/gnuserv/Makefile     Fri Sep 25 09:48:08 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2023/09/11 21:18:49 vins Exp $
+# $NetBSD: Makefile,v 1.21 2026/09/25 09:48:08 wiz Exp $
 
 DISTNAME=      gnuserv-3.12.8
 PKGNAME=       ${EMACS_PKGNAME_PREFIX}${DISTNAME}
@@ -10,7 +10,7 @@ MAINTAINER=   pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://www.emacswiki.org/emacs/GnuClient
 COMMENT=       Improved version of emacsserver for GNU Emacs
 
-CONFLICTS+=    xemacs-[0-9]* xemacs-current-[0-9]* # bin/gnuattach; bin/gnuclient
+CONFLICTS+=    xemacs-[0-9]* xemacs-nox11-[0-9]* # bin/gnuattach; bin/gnuclient
 GNU_CONFIGURE= YES
 
 CONFIGURE_ARGS+=       --with-x        # X support
@@ -19,10 +19,14 @@ CONFIGURE_ARGS+=    --with-resolv   # hostnam
 CONFIGURE_ARGS+=       --x-includes=${X11BASE}/include
 CONFIGURE_ARGS+=       --x-libraries=${X11BASE}/lib
 
+MAKE_FLAGS+=           EMACS=${EMACS_BIN}
+
+EMACS_VERSIONS_INCOMPATIBLE=   emacs20 xemacs214 xemacs214nox xemacs215 xemacs215nox
+
 EL_FILES=              devices.el gnuserv.el gnuserv-compat.el
 
 INSTALLATION_DIRS+=    ${EMACS_LISPPREFIX} share/applications  \
-                       share/doc/${PKGBASE}
+                       share/doc/gnuserv
 
 .PHONY: el-install doc-install
 

Index: pkgsrc/editors/javascript-mode/Makefile
diff -u pkgsrc/editors/javascript-mode/Makefile:1.6 pkgsrc/editors/javascript-mode/Makefile:1.7
--- pkgsrc/editors/javascript-mode/Makefile:1.6 Sat May 14 22:25:37 2022
+++ pkgsrc/editors/javascript-mode/Makefile     Fri Sep 25 09:48:08 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2022/05/14 22:25:37 dholland Exp $
+# $NetBSD: Makefile,v 1.7 2026/09/25 09:48:08 wiz Exp $
 
 DISTNAME=      javascript-2.2.1
 PKGNAME=       ${EMACS_PKGNAME_PREFIX}${DISTNAME:S/-/-mode-/}
@@ -11,6 +11,8 @@ MAINTAINER=   cheusov%NetBSD.org@localhost
 #HOMEPAGE=     http://www.brgeight.se/
 COMMENT=       Javascript major mode for Emacs
 
+EMACS_VERSIONS_INCOMPATIBLE=   emacs20 xemacs214 xemacs215 xemacs214nox xemacs215nox
+
 INSTALLATION_DIRS=     ${EMACS_LISPPREFIX}
 
 NO_CONFIGURE=          yes

Index: pkgsrc/editors/manued/Makefile
diff -u pkgsrc/editors/manued/Makefile:1.1 pkgsrc/editors/manued/Makefile:1.2
--- pkgsrc/editors/manued/Makefile:1.1  Sun Apr  7 17:55:08 2024
+++ pkgsrc/editors/manued/Makefile      Fri Sep 25 09:48:08 2026
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.1 2024/04/07 17:55:08 ryoon Exp $
+# $NetBSD: Makefile,v 1.2 2026/09/25 09:48:08 wiz Exp $
 
 DISTNAME=      manued-eeff13e4416aeedf6cd88b049bb7bba4b5b80ef7
-PKGNAME=       manued-0.0.0.20191018
+PKGNAME=       ${EMACS_PKGNAME_PREFIX}manued-0.0.0.20191018
 CATEGORIES=    editors
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=yamauchih/}
 GITHUB_PROJECT=        manued

Index: pkgsrc/editors/matlab-mode/Makefile
diff -u pkgsrc/editors/matlab-mode/Makefile:1.17 pkgsrc/editors/matlab-mode/Makefile:1.18
--- pkgsrc/editors/matlab-mode/Makefile:1.17    Fri Jan  9 07:40:41 2026
+++ pkgsrc/editors/matlab-mode/Makefile Fri Sep 25 09:48:09 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2026/01/09 07:40:41 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2026/09/25 09:48:09 wiz Exp $
 
 DISTNAME=              matlab.el
 # we do this because we want DIST_SUBDIR to not change based on
@@ -23,6 +23,9 @@ DIST_SUBDIR=          ${BASEPKGNAME}
 EMACS= emacs
 .else
 EMACS= xemacs
+# matlab.el requires tempo, which lives in xemacs-packages rather
+# than in XEmacs itself, so the byte-compile below cannot find it.
+DEPENDS+=      xemacs-packages-[0-9]*:../../editors/xemacs-packages
 .endif
 
 SRCS=  matlab.el
@@ -34,7 +37,7 @@ do-build:
        done
 
 do-install:
-       ${INSTALL_DATA_DIR} ${DESTDIR}${EMACS_LISPPREFIX}/${PKGBASE:C|^xemacs-||}
-       cd ${WRKSRC} && ${INSTALL_DATA} ${SRCS} ${SRCS:.el=.elc} ${DESTDIR}${EMACS_LISPPREFIX}/${PKGBASE}
+       ${INSTALL_DATA_DIR} ${DESTDIR}${EMACS_LISPPREFIX}/${PKGBASE:C|^${EMACS_PKGNAME_PREFIX}||}
+       cd ${WRKSRC} && ${INSTALL_DATA} ${SRCS} ${SRCS:.el=.elc} ${DESTDIR}${EMACS_LISPPREFIX}/${PKGBASE:C|^${EMACS_PKGNAME_PREFIX}||}
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/editors/speedbar/Makefile
diff -u pkgsrc/editors/speedbar/Makefile:1.30 pkgsrc/editors/speedbar/Makefile:1.31
--- pkgsrc/editors/speedbar/Makefile:1.30       Sat Sep 12 14:31:50 2026
+++ pkgsrc/editors/speedbar/Makefile    Fri Sep 25 09:48:09 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2026/09/12 14:31:50 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2026/09/25 09:48:09 wiz Exp $
 
 DISTNAME=      speedbar-0.14beta4
 PKGNAME=       ${EMACS_PKGNAME_PREFIX}speedbar-0.14rc4
@@ -10,11 +10,12 @@ MAINTAINER= pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://cedet.sourceforge.net/speedbar.shtml
 COMMENT=       Directory and code browser for emacs
 
-EMACS_VERSIONS_ACCEPTED=       emacs20 xemacs215 xemacs215nox xemacs214 xemacs214nox
+EMACS_VERSIONS_ACCEPTED=       emacs20
 
 .include "../../editors/emacs/modules.mk"
 
-PKGSRC_MAKE_ENV+=      EMACS=${EMACS}
+MAKE_FLAGS+=   EMACS=${EMACS_BIN}
+MAKE_ENV+=     EMACS=${EMACS_BIN}
 
 NO_CONFIGURE=  yes
 USE_TOOLS+=    gmake

Index: pkgsrc/editors/tamago/Makefile
diff -u pkgsrc/editors/tamago/Makefile:1.32 pkgsrc/editors/tamago/Makefile:1.33
--- pkgsrc/editors/tamago/Makefile:1.32 Sat Sep 12 14:31:50 2026
+++ pkgsrc/editors/tamago/Makefile      Fri Sep 25 09:48:09 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2026/09/12 14:31:50 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2026/09/25 09:48:09 wiz Exp $
 
 DISTNAME=      tamago-4.0.6
 PKGNAME=       ${EMACS_PKGNAME_PREFIX}tamago-20020909
@@ -11,6 +11,7 @@ MAINTAINER=   tech-pkg-ja%jp.NetBSD.org@localhost
 COMMENT=       CJK characters inputting system for emacs + leim
 
 GNU_CONFIGURE= yes
+MAKE_FLAGS+=   lispdir=${DESTDIR}${EMACS_LISPPREFIX}
 MAKE_FLAGS+=   prefix=${DESTDIR}${PREFIX}
 # XXX please someone adjust paths and PLIST for XEmacs...
 EMACS_VERSIONS_ACCEPTED=       emacs20

Index: pkgsrc/editors/xemacs-current-nox11/version.mk
diff -u pkgsrc/editors/xemacs-current-nox11/version.mk:1.2 pkgsrc/editors/xemacs-current-nox11/version.mk:1.3
--- pkgsrc/editors/xemacs-current-nox11/version.mk:1.2  Sat Jun  8 10:41:00 2019
+++ pkgsrc/editors/xemacs-current-nox11/version.mk      Fri Sep 25 09:48:09 2026
@@ -1,9 +1,7 @@
-# $NetBSD: version.mk,v 1.2 2019/06/08 10:41:00 rillig Exp $
+# $NetBSD: version.mk,v 1.3 2026/09/25 09:48:09 wiz Exp $
 
-_EMACS_FLAVOR=         xemacs
-_EMACS_REQD=           xemacs-nox11>=21.5<21.6
-_EMACS_PKGDEP.base=    xemacs-packages>=1.15:../../editors/xemacs-packages
-_EMACS_PKGDEP.leim=
+# The only thing that differs from the X11 build is which package to
+# ask for.
+.include "../../editors/xemacs-current/version.mk"
 
-_EMACS_VERSION_MAJOR=  21
-_EMACS_VERSION_MINOR=  5
+_EMACS_REQD=           xemacs-nox11>=21.5<21.6

Index: pkgsrc/editors/xemacs-nox11/version.mk
diff -u pkgsrc/editors/xemacs-nox11/version.mk:1.2 pkgsrc/editors/xemacs-nox11/version.mk:1.3
--- pkgsrc/editors/xemacs-nox11/version.mk:1.2  Sat Jun  8 10:41:00 2019
+++ pkgsrc/editors/xemacs-nox11/version.mk      Fri Sep 25 09:48:09 2026
@@ -1,9 +1,7 @@
-# $NetBSD: version.mk,v 1.2 2019/06/08 10:41:00 rillig Exp $
+# $NetBSD: version.mk,v 1.3 2026/09/25 09:48:09 wiz Exp $
 
-_EMACS_FLAVOR=         xemacs
-_EMACS_REQD=           xemacs-nox11>=21.4<21.5
-_EMACS_PKGDEP.base=    xemacs-packages>=1.15:../../editors/xemacs-packages
-_EMACS_PKGDEP.leim=
+# The only thing that differs from the X11 build is which package to
+# ask for.
+.include "../../editors/xemacs/version.mk"
 
-_EMACS_VERSION_MAJOR=  21
-_EMACS_VERSION_MINOR=  4
+_EMACS_REQD=           xemacs-nox11>=21.4<21.5

Index: pkgsrc/graphics/artist/Makefile
diff -u pkgsrc/graphics/artist/Makefile:1.15 pkgsrc/graphics/artist/Makefile:1.16
--- pkgsrc/graphics/artist/Makefile:1.15        Sat May 14 22:25:37 2022
+++ pkgsrc/graphics/artist/Makefile     Fri Sep 25 09:48:09 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2022/05/14 22:25:37 dholland Exp $
+# $NetBSD: Makefile,v 1.16 2026/09/25 09:48:09 wiz Exp $
 
 DISTNAME=      artist-1.2.6
 PKGNAME=       ${EMACS_PKGNAME_PREFIX}${DISTNAME}
@@ -16,6 +16,8 @@ INSTALLATION_DIRS+=   ${DOCDIR} \
 
 GNU_CONFIGURE=         yes
 
+EMACS_VERSIONS_INCOMPATIBLE=   xemacs214 xemacs215 xemacs214nox xemacs215nox
+
 .include "../../editors/emacs/modules.mk"
 
 MAKE_FLAGS+=   EMACS=${EMACS_FLAVOR} \

Index: pkgsrc/graphics/graphviz-dot-mode/Makefile
diff -u pkgsrc/graphics/graphviz-dot-mode/Makefile:1.5 pkgsrc/graphics/graphviz-dot-mode/Makefile:1.6
--- pkgsrc/graphics/graphviz-dot-mode/Makefile:1.5      Fri Dec 22 19:15:06 2023
+++ pkgsrc/graphics/graphviz-dot-mode/Makefile  Fri Sep 25 09:48:09 2026
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2023/12/22 19:15:06 zafer Exp $
+# $NetBSD: Makefile,v 1.6 2026/09/25 09:48:09 wiz Exp $
 
 DISTNAME=      graphviz-dot-mode
-PKGNAME=       ${DISTNAME}-0.3.7
+PKGNAME=       ${EMACS_PKGNAME_PREFIX}${DISTNAME}-0.3.7
 PKGREVISION=   2
 CATEGORIES=    graphics
 MASTER_SITES=  #

Index: pkgsrc/inputmethod/tamago-tsunagi/Makefile
diff -u pkgsrc/inputmethod/tamago-tsunagi/Makefile:1.5 pkgsrc/inputmethod/tamago-tsunagi/Makefile:1.6
--- pkgsrc/inputmethod/tamago-tsunagi/Makefile:1.5      Tue Feb 10 08:17:24 2026
+++ pkgsrc/inputmethod/tamago-tsunagi/Makefile  Fri Sep 25 09:48:09 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2026/02/10 08:17:24 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2026/09/25 09:48:09 wiz Exp $
 
 DISTNAME=      tamago-tsunagi-5.0.7.1
 PKGNAME=       ${EMACS_PKGNAME_PREFIX}${DISTNAME}
@@ -14,7 +14,12 @@ LICENSE=     gnu-gpl-v2
 CONFLICTS=     tamago-anthy-[0-9]*
 CONFLICTS+=    tamago-[0-9]*
 
+MAKE_FLAGS+=   EMACS=${EMACS_BIN}
+
+EMACS_VERSIONS_INCOMPATIBLE=   emacs20 xemacs214 xemacs215 xemacs214nox xemacs215nox
+
 GNU_CONFIGURE=         yes
+INSTALL_MAKE_FLAGS+=   lispdir=${EMACS_LISPPREFIX}
 
 .include "../../editors/emacs/modules.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/inputmethod/tamago-tsunagi/PLIST
diff -u pkgsrc/inputmethod/tamago-tsunagi/PLIST:1.1 pkgsrc/inputmethod/tamago-tsunagi/PLIST:1.2
--- pkgsrc/inputmethod/tamago-tsunagi/PLIST:1.1 Sat Dec  9 03:28:49 2017
+++ pkgsrc/inputmethod/tamago-tsunagi/PLIST     Fri Sep 25 09:48:09 2026
@@ -1,72 +1,72 @@
-@comment $NetBSD: PLIST,v 1.1 2017/12/09 03:28:49 taca Exp $
-share/emacs/site-lisp/egg/egg-cnv.el
-share/emacs/site-lisp/egg/egg-cnv.elc
-share/emacs/site-lisp/egg/egg-com.el
-share/emacs/site-lisp/egg/egg-com.elc
-share/emacs/site-lisp/egg/egg-edep.el
-share/emacs/site-lisp/egg/egg-edep.elc
-share/emacs/site-lisp/egg/egg-mlh.el
-share/emacs/site-lisp/egg/egg-mlh.elc
-share/emacs/site-lisp/egg/egg-sim.el
-share/emacs/site-lisp/egg/egg-sim.elc
-share/emacs/site-lisp/egg/egg.el
-share/emacs/site-lisp/egg/egg.elc
-share/emacs/site-lisp/egg/egg/.nosearch
-share/emacs/site-lisp/egg/egg/anthy.el
-share/emacs/site-lisp/egg/egg/anthy.elc
-share/emacs/site-lisp/egg/egg/anthyipc.el
-share/emacs/site-lisp/egg/egg/anthyipc.elc
-share/emacs/site-lisp/egg/egg/canna.el
-share/emacs/site-lisp/egg/egg/canna.elc
-share/emacs/site-lisp/egg/egg/cannarpc.el
-share/emacs/site-lisp/egg/egg/cannarpc.elc
-share/emacs/site-lisp/egg/egg/sj3.el
-share/emacs/site-lisp/egg/egg/sj3.elc
-share/emacs/site-lisp/egg/egg/sj3rpc.el
-share/emacs/site-lisp/egg/egg/sj3rpc.elc
-share/emacs/site-lisp/egg/egg/wnn.el
-share/emacs/site-lisp/egg/egg/wnn.elc
-share/emacs/site-lisp/egg/egg/wnnrpc.el
-share/emacs/site-lisp/egg/egg/wnnrpc.elc
-share/emacs/site-lisp/egg/eggrc
-share/emacs/site-lisp/egg/its-keydef.el
-share/emacs/site-lisp/egg/its-keydef.elc
-share/emacs/site-lisp/egg/its.el
-share/emacs/site-lisp/egg/its.elc
-share/emacs/site-lisp/egg/its/.nosearch
-share/emacs/site-lisp/egg/its/ascii.el
-share/emacs/site-lisp/egg/its/ascii.elc
-share/emacs/site-lisp/egg/its/aynu.el
-share/emacs/site-lisp/egg/its/aynu.elc
-share/emacs/site-lisp/egg/its/bixing.el
-share/emacs/site-lisp/egg/its/bixing.elc
-share/emacs/site-lisp/egg/its/erpin.el
-share/emacs/site-lisp/egg/its/erpin.elc
-share/emacs/site-lisp/egg/its/greek.el
-share/emacs/site-lisp/egg/its/greek.elc
-share/emacs/site-lisp/egg/its/hangul.el
-share/emacs/site-lisp/egg/its/hangul.elc
-share/emacs/site-lisp/egg/its/hankata.el
-share/emacs/site-lisp/egg/its/hankata.elc
-share/emacs/site-lisp/egg/its/hira.el
-share/emacs/site-lisp/egg/its/hira.elc
-share/emacs/site-lisp/egg/its/jeonkak.el
-share/emacs/site-lisp/egg/its/jeonkak.elc
-share/emacs/site-lisp/egg/its/jiskana.el
-share/emacs/site-lisp/egg/its/jiskana.elc
-share/emacs/site-lisp/egg/its/kata.el
-share/emacs/site-lisp/egg/its/kata.elc
-share/emacs/site-lisp/egg/its/pinyin.el
-share/emacs/site-lisp/egg/its/pinyin.elc
-share/emacs/site-lisp/egg/its/quanjiao.el
-share/emacs/site-lisp/egg/its/quanjiao.elc
-share/emacs/site-lisp/egg/its/thai.el
-share/emacs/site-lisp/egg/its/thai.elc
-share/emacs/site-lisp/egg/its/zenkaku.el
-share/emacs/site-lisp/egg/its/zenkaku.elc
-share/emacs/site-lisp/egg/its/zhuyin.el
-share/emacs/site-lisp/egg/its/zhuyin.elc
-share/emacs/site-lisp/egg/leim-list.el
-share/emacs/site-lisp/egg/leim-list.elc
-share/emacs/site-lisp/egg/menudiag.el
-share/emacs/site-lisp/egg/menudiag.elc
+@comment $NetBSD: PLIST,v 1.2 2026/09/25 09:48:09 wiz Exp $
+${EMACS_LISPPREFIX}/egg/egg-cnv.el
+${EMACS_LISPPREFIX}/egg/egg-cnv.elc
+${EMACS_LISPPREFIX}/egg/egg-com.el
+${EMACS_LISPPREFIX}/egg/egg-com.elc
+${EMACS_LISPPREFIX}/egg/egg-edep.el
+${EMACS_LISPPREFIX}/egg/egg-edep.elc
+${EMACS_LISPPREFIX}/egg/egg-mlh.el
+${EMACS_LISPPREFIX}/egg/egg-mlh.elc
+${EMACS_LISPPREFIX}/egg/egg-sim.el
+${EMACS_LISPPREFIX}/egg/egg-sim.elc
+${EMACS_LISPPREFIX}/egg/egg.el
+${EMACS_LISPPREFIX}/egg/egg.elc
+${EMACS_LISPPREFIX}/egg/egg/.nosearch
+${EMACS_LISPPREFIX}/egg/egg/anthy.el
+${EMACS_LISPPREFIX}/egg/egg/anthy.elc
+${EMACS_LISPPREFIX}/egg/egg/anthyipc.el
+${EMACS_LISPPREFIX}/egg/egg/anthyipc.elc
+${EMACS_LISPPREFIX}/egg/egg/canna.el
+${EMACS_LISPPREFIX}/egg/egg/canna.elc
+${EMACS_LISPPREFIX}/egg/egg/cannarpc.el
+${EMACS_LISPPREFIX}/egg/egg/cannarpc.elc
+${EMACS_LISPPREFIX}/egg/egg/sj3.el
+${EMACS_LISPPREFIX}/egg/egg/sj3.elc
+${EMACS_LISPPREFIX}/egg/egg/sj3rpc.el
+${EMACS_LISPPREFIX}/egg/egg/sj3rpc.elc
+${EMACS_LISPPREFIX}/egg/egg/wnn.el
+${EMACS_LISPPREFIX}/egg/egg/wnn.elc
+${EMACS_LISPPREFIX}/egg/egg/wnnrpc.el
+${EMACS_LISPPREFIX}/egg/egg/wnnrpc.elc
+${EMACS_LISPPREFIX}/egg/eggrc
+${EMACS_LISPPREFIX}/egg/its-keydef.el
+${EMACS_LISPPREFIX}/egg/its-keydef.elc
+${EMACS_LISPPREFIX}/egg/its.el
+${EMACS_LISPPREFIX}/egg/its.elc
+${EMACS_LISPPREFIX}/egg/its/.nosearch
+${EMACS_LISPPREFIX}/egg/its/ascii.el
+${EMACS_LISPPREFIX}/egg/its/ascii.elc
+${EMACS_LISPPREFIX}/egg/its/aynu.el
+${EMACS_LISPPREFIX}/egg/its/aynu.elc
+${EMACS_LISPPREFIX}/egg/its/bixing.el
+${EMACS_LISPPREFIX}/egg/its/bixing.elc
+${EMACS_LISPPREFIX}/egg/its/erpin.el
+${EMACS_LISPPREFIX}/egg/its/erpin.elc
+${EMACS_LISPPREFIX}/egg/its/greek.el
+${EMACS_LISPPREFIX}/egg/its/greek.elc
+${EMACS_LISPPREFIX}/egg/its/hangul.el
+${EMACS_LISPPREFIX}/egg/its/hangul.elc
+${EMACS_LISPPREFIX}/egg/its/hankata.el
+${EMACS_LISPPREFIX}/egg/its/hankata.elc
+${EMACS_LISPPREFIX}/egg/its/hira.el
+${EMACS_LISPPREFIX}/egg/its/hira.elc
+${EMACS_LISPPREFIX}/egg/its/jeonkak.el
+${EMACS_LISPPREFIX}/egg/its/jeonkak.elc
+${EMACS_LISPPREFIX}/egg/its/jiskana.el
+${EMACS_LISPPREFIX}/egg/its/jiskana.elc
+${EMACS_LISPPREFIX}/egg/its/kata.el
+${EMACS_LISPPREFIX}/egg/its/kata.elc
+${EMACS_LISPPREFIX}/egg/its/pinyin.el
+${EMACS_LISPPREFIX}/egg/its/pinyin.elc
+${EMACS_LISPPREFIX}/egg/its/quanjiao.el
+${EMACS_LISPPREFIX}/egg/its/quanjiao.elc
+${EMACS_LISPPREFIX}/egg/its/thai.el
+${EMACS_LISPPREFIX}/egg/its/thai.elc
+${EMACS_LISPPREFIX}/egg/its/zenkaku.el
+${EMACS_LISPPREFIX}/egg/its/zenkaku.elc
+${EMACS_LISPPREFIX}/egg/its/zhuyin.el
+${EMACS_LISPPREFIX}/egg/its/zhuyin.elc
+${EMACS_LISPPREFIX}/egg/leim-list.el
+${EMACS_LISPPREFIX}/egg/leim-list.elc
+${EMACS_LISPPREFIX}/egg/menudiag.el
+${EMACS_LISPPREFIX}/egg/menudiag.elc

Index: pkgsrc/inputmethod/tc/Makefile
diff -u pkgsrc/inputmethod/tc/Makefile:1.26 pkgsrc/inputmethod/tc/Makefile:1.27
--- pkgsrc/inputmethod/tc/Makefile:1.26 Sat Sep 12 14:31:50 2026
+++ pkgsrc/inputmethod/tc/Makefile      Fri Sep 25 09:48:10 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2026/09/12 14:31:50 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2026/09/25 09:48:10 wiz Exp $
 
 DISTNAME=      tc-2.3.1
 PKGNAME=       ${EMACS_PKGNAME_PREFIX}${DISTNAME}
@@ -23,13 +23,13 @@ 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 emacs20 xemacs215 xemacs215nox xemacs214 xemacs214nox
+EMACS_VERSIONS_ACCEPTED=       emacs29 emacs29nox
 
 .include "../../editors/emacs/modules.mk"
 
+CONFIGURE_ARGS+=       --with-lispdir=${EMACS_LISPPREFIX}/tc
 .if ${EMACS_FLAVOR} == "xemacs"
 CONFIGURE_ARGS+=       --with-emacs=xemacs
-CONFIGURE_ARGS+=       --with-lispdir=${EMACS_LISPPREFIX}/tc
 .endif
 
 USE_TOOLS+=    gmake

Index: pkgsrc/lang/eieio/Makefile
diff -u pkgsrc/lang/eieio/Makefile:1.30 pkgsrc/lang/eieio/Makefile:1.31
--- pkgsrc/lang/eieio/Makefile:1.30     Mon Nov 17 11:01:01 2025
+++ pkgsrc/lang/eieio/Makefile  Fri Sep 25 09:48:10 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2025/11/17 11:01:01 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2026/09/25 09:48:10 wiz Exp $
 
 DISTNAME=      eieio-0.17
 PKGNAME=       ${EMACS_PKGNAME_PREFIX}${DISTNAME}
@@ -10,6 +10,8 @@ MAINTAINER=   pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://cedet.sourceforge.net/eieio.shtml
 COMMENT=       Enhanced Integration of Emacs Interpreted Objects
 
+EMACS_VERSIONS_ACCEPTED=       emacs20
+
 EMACS_MODULES+=        base
 MAKEFLAGS+=    EMACS=${EMACS_BIN:Q}
 

Index: pkgsrc/mail/mailutils/PLIST
diff -u pkgsrc/mail/mailutils/PLIST:1.2 pkgsrc/mail/mailutils/PLIST:1.3
--- pkgsrc/mail/mailutils/PLIST:1.2     Tue Sep  2 19:01:24 2025
+++ pkgsrc/mail/mailutils/PLIST Fri Sep 25 09:48:10 2026
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2025/09/02 19:01:24 vins Exp $
+@comment $NetBSD: PLIST,v 1.3 2026/09/25 09:48:10 wiz Exp $
 bin/decodemail
 bin/dotlock
 bin/frm
@@ -244,8 +244,8 @@ share/doc/mailutils/NEWS
 share/doc/mailutils/README
 share/doc/mailutils/THANKS
 share/doc/mailutils/TODO
-${PLIST.emacs}share/emacs/site-lisp/mailutils-mh.el
-${PLIST.emacs}share/emacs/site-lisp/mailutils-mh.elc
+${PLIST.emacs}${EMACS_LISPPREFIX}/mailutils-mh.el
+${PLIST.emacs}${EMACS_LISPPREFIX}/mailutils-mh.elc
 ${PLIST.nls}share/locale/ca/LC_MESSAGES/mailutils.mo
 ${PLIST.nls}share/locale/da/LC_MESSAGES/mailutils.mo
 ${PLIST.nls}share/locale/de/LC_MESSAGES/mailutils.mo

Index: pkgsrc/mail/mew/PLIST
diff -u pkgsrc/mail/mew/PLIST:1.21 pkgsrc/mail/mew/PLIST:1.22
--- pkgsrc/mail/mew/PLIST:1.21  Mon May 11 09:55:58 2026
+++ pkgsrc/mail/mew/PLIST       Fri Sep 25 09:48:10 2026
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.21 2026/05/11 09:55:58 taca Exp $
+@comment $NetBSD: PLIST,v 1.22 2026/09/25 09:48:10 wiz Exp $
 bin/cmew
 bin/incm
 bin/mew-pinentry
@@ -153,36 +153,36 @@ ${EMACS_LISPPREFIX}/mew/mew-virtual.elc
 ${EMACS_LISPPREFIX}/mew/mew-win32.el
 ${EMACS_LISPPREFIX}/mew/mew.el
 ${EMACS_LISPPREFIX}/mew/mew.elc
-share/mew/Mew.img
-share/mew/Mew.png
-share/mew/Mew.xbm
-share/mew/Mew.xpm
-share/mew/mew-Audio.xpm
-share/mew/mew-Blank.xpm
-share/mew/mew-External.xpm
-share/mew/mew-Folder.xpm
-share/mew/mew-Image.xpm
-share/mew/mew-Octet-Stream.xpm
-share/mew/mew-Postscript.xpm
-share/mew/mew-Rfc822.xpm
-share/mew/mew-Text.xpm
-share/mew/mew-Unknown.xpm
-share/mew/mew-Video.xpm
-share/mew/mew-attach.xpm
-share/mew/mew-cite.xpm
-share/mew/mew-forward.xpm
-share/mew/mew-inc.xpm
-share/mew/mew-lock.xpm
-share/mew/mew-next.xpm
-share/mew/mew-pgp-enc.xpm
-share/mew/mew-pgp-sigenc.xpm
-share/mew/mew-pgp-sign.xpm
-share/mew/mew-prev.xpm
-share/mew/mew-queue.xpm
-share/mew/mew-refile.xpm
-share/mew/mew-reply.xpm
-share/mew/mew-send.xpm
-share/mew/mew-sep.xpm
-share/mew/mew-show.xpm
-share/mew/mew-write.xpm
-share/mew/mew-yank.xpm
+${EMACS_ETCPREFIX}/mew/Mew.img
+${EMACS_ETCPREFIX}/mew/Mew.png
+${EMACS_ETCPREFIX}/mew/Mew.xbm
+${EMACS_ETCPREFIX}/mew/Mew.xpm
+${EMACS_ETCPREFIX}/mew/mew-Audio.xpm
+${EMACS_ETCPREFIX}/mew/mew-Blank.xpm
+${EMACS_ETCPREFIX}/mew/mew-External.xpm
+${EMACS_ETCPREFIX}/mew/mew-Folder.xpm
+${EMACS_ETCPREFIX}/mew/mew-Image.xpm
+${EMACS_ETCPREFIX}/mew/mew-Octet-Stream.xpm
+${EMACS_ETCPREFIX}/mew/mew-Postscript.xpm
+${EMACS_ETCPREFIX}/mew/mew-Rfc822.xpm
+${EMACS_ETCPREFIX}/mew/mew-Text.xpm
+${EMACS_ETCPREFIX}/mew/mew-Unknown.xpm
+${EMACS_ETCPREFIX}/mew/mew-Video.xpm
+${EMACS_ETCPREFIX}/mew/mew-attach.xpm
+${EMACS_ETCPREFIX}/mew/mew-cite.xpm
+${EMACS_ETCPREFIX}/mew/mew-forward.xpm
+${EMACS_ETCPREFIX}/mew/mew-inc.xpm
+${EMACS_ETCPREFIX}/mew/mew-lock.xpm
+${EMACS_ETCPREFIX}/mew/mew-next.xpm
+${EMACS_ETCPREFIX}/mew/mew-pgp-enc.xpm
+${EMACS_ETCPREFIX}/mew/mew-pgp-sigenc.xpm
+${EMACS_ETCPREFIX}/mew/mew-pgp-sign.xpm
+${EMACS_ETCPREFIX}/mew/mew-prev.xpm
+${EMACS_ETCPREFIX}/mew/mew-queue.xpm
+${EMACS_ETCPREFIX}/mew/mew-refile.xpm
+${EMACS_ETCPREFIX}/mew/mew-reply.xpm
+${EMACS_ETCPREFIX}/mew/mew-send.xpm
+${EMACS_ETCPREFIX}/mew/mew-sep.xpm
+${EMACS_ETCPREFIX}/mew/mew-show.xpm
+${EMACS_ETCPREFIX}/mew/mew-write.xpm
+${EMACS_ETCPREFIX}/mew/mew-yank.xpm

Index: pkgsrc/mail/mu/Makefile
diff -u pkgsrc/mail/mu/Makefile:1.29 pkgsrc/mail/mu/Makefile:1.30
--- pkgsrc/mail/mu/Makefile:1.29        Wed Sep  2 19:03:19 2026
+++ pkgsrc/mail/mu/Makefile     Fri Sep 25 09:48:10 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2026/09/02 19:03:19 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2026/09/25 09:48:10 wiz Exp $
 
 DISTNAME=      mu-1.14.3
 PKGREVISION=   1
@@ -11,7 +11,7 @@ HOMEPAGE=     https://www.djcbsoftware.nl/co
 COMMENT=       E-mail searching and indexing tools
 LICENSE=       gnu-gpl-v3
 
-MESON_ARGS+=   -Dinfodir=info
+MESON_ARGS+=   -Dinfodir=${PKGINFODIR}
 MESON_ARGS+=   -Dlispdir=${EMACS_LISPPREFIX}
 USE_LANGUAGES= c c++
 USE_TOOLS+=    pkg-config

Index: pkgsrc/mail/mu/distinfo
diff -u pkgsrc/mail/mu/distinfo:1.21 pkgsrc/mail/mu/distinfo:1.22
--- pkgsrc/mail/mu/distinfo:1.21        Tue Aug 11 14:40:33 2026
+++ pkgsrc/mail/mu/distinfo     Fri Sep 25 09:48:10 2026
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.21 2026/08/11 14:40:33 ktnb Exp $
+$NetBSD: distinfo,v 1.22 2026/09/25 09:48:10 wiz Exp $
 
 BLAKE2s (mu-1.14.3.tar.gz) = b4937b7df9fd2296ea4b2b12df8dbd7c31a41c854b8f955b78ba3122f33e5167
 SHA512 (mu-1.14.3.tar.gz) = 7ac28e81f646a9bdd0dd1140d7d0517b8a83eb4383c2a2e1b9e44ca1b1130e408c6db15da85b73f0ffd894a1b449bdb70a896fbd7527d79a843b42c4ae4b80fa
 Size (mu-1.14.3.tar.gz) = 1338427 bytes
 SHA1 (patch-lib_message_mu-contact.hh) = cc4cc391ab4bbd16f6c38e222057b392d68485e6
-SHA1 (patch-mu4e_meson.build) = 3581ab81c473ae058869b90e979fc77c96cf0670
+SHA1 (patch-mu4e_meson.build) = 7119708a5472bcc1b048a900e2db3b059e84aa0f

Index: pkgsrc/mail/mu/patches/patch-mu4e_meson.build
diff -u pkgsrc/mail/mu/patches/patch-mu4e_meson.build:1.2 pkgsrc/mail/mu/patches/patch-mu4e_meson.build:1.3
--- pkgsrc/mail/mu/patches/patch-mu4e_meson.build:1.2   Tue Aug 11 14:40:34 2026
+++ pkgsrc/mail/mu/patches/patch-mu4e_meson.build       Fri Sep 25 09:48:10 2026
@@ -1,10 +1,34 @@
-$NetBSD: patch-mu4e_meson.build,v 1.2 2026/08/11 14:40:34 ktnb Exp $
+$NetBSD: patch-mu4e_meson.build,v 1.3 2026/09/25 09:48:10 wiz Exp $
 
 Don't care about info errors
 
+Byte-compile mu4e-dbus.el unconditionally.  The build asks the Emacs whether
+dbusbind is compiled in and skips the file when it is not, but PLIST.emacs
+lists mu4e-dbus.elc with no condition, so the package cannot be built against
+an Emacs without D-Bus -- every *nox one, and an emacs30 with the dbus option
+off.  The file compiles clean without D-Bus: both of its requires pass
+'noerror.
+
 --- mu4e/meson.build.orig      2026-08-09 13:09:56.075658158 +0000
 +++ mu4e/meson.build
-@@ -156,6 +156,7 @@ if makeinfo.found()
+@@ -80,13 +80,9 @@
+ 
+ # do have we have dbus support?
+ mu4e_srcs += 'mu4e-dbus.el'
+-emacs_dbus = run_command(emacs, '--batch', '--eval', '(kill-emacs (if (featurep \'dbusbind) 0 1))',
+-                         check: false)
+-if emacs_dbus.returncode() == 0
+-  mu4e_bc_srcs += 'mu4e-dbus.el'
+-else
+-  message('mu4e-dbus.el cannot be byte-compiled')
+-endif
++# Byte-compile this whether or not the Emacs has dbusbind; both of its
++# requires are 'noerror, so it compiles without D-Bus.
++mu4e_bc_srcs += 'mu4e-dbus.el'
+ 
+ # note, we cannot compile mu4e-config.el without incurring
+ #  WARNING: Source item
+@@ -156,6 +152,7 @@ if makeinfo.found()
                  install: true,
                  depends: fdl_texi,
                  command: [makeinfo,

Index: pkgsrc/mail/rmail-mime/Makefile
diff -u pkgsrc/mail/rmail-mime/Makefile:1.15 pkgsrc/mail/rmail-mime/Makefile:1.16
--- pkgsrc/mail/rmail-mime/Makefile:1.15        Sat May 14 22:25:39 2022
+++ pkgsrc/mail/rmail-mime/Makefile     Fri Sep 25 09:48:10 2026
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2022/05/14 22:25:39 dholland Exp $
-#
+# $NetBSD: Makefile,v 1.16 2026/09/25 09:48:10 wiz Exp $
 
 DISTNAME=      rmail-mime-1.13.0
 PKGNAME=       ${EMACS_PKGNAME_PREFIX}${DISTNAME}
@@ -12,6 +11,8 @@ COMMENT=      MIME-capabilities for RMAIL in 
 
 DEPENDS+=      ${EMACS_PKGNAME_PREFIX}semi>=1.14.4:../../devel/semi
 
+EMACS_VERSIONS_INCOMPATIBLE=   emacs20 # apel via semi
+
 .include "../../editors/emacs/modules.mk"
 
 SITE_LISP=     ${EMACS_LISPPREFIX:C|^${PREFIX}/||}

Index: pkgsrc/mail/vm/Makefile
diff -u pkgsrc/mail/vm/Makefile:1.47 pkgsrc/mail/vm/Makefile:1.48
--- pkgsrc/mail/vm/Makefile:1.47        Sat Sep 12 21:48:41 2026
+++ pkgsrc/mail/vm/Makefile     Fri Sep 25 09:48:10 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2026/09/12 21:48:41 wiz Exp $
+# $NetBSD: Makefile,v 1.48 2026/09/25 09:48:10 wiz Exp $
 
 DISTNAME=      vm-8.2.0b
 PKGNAME=       ${EMACS_PKGNAME_PREFIX}${DISTNAME}
@@ -22,6 +22,8 @@ MAKE_ENV+=    PIXMAPDIR=${PIXMAPDIR:Q}
 MAKE_ENV+=     BINDIR=${PREFIX:Q}/bin
 PLIST_SUBST+=  PIXMAPDIR=${PIXMAPDIR:S/^${PREFIX}\///:Q}
 
+EMACS_VERSIONS_ACCEPTED=       # empty
+
 INSTALLATION_DIRS=     bin ${EMACS_INFOPREFIX} ${EMACS_LISPPREFIX}/vm  \
                        ${PIXMAPDIR}
 

Index: pkgsrc/mail/wl-snapshot/Makefile
diff -u pkgsrc/mail/wl-snapshot/Makefile:1.18 pkgsrc/mail/wl-snapshot/Makefile:1.19
--- pkgsrc/mail/wl-snapshot/Makefile:1.18       Mon Feb 16 08:29:54 2026
+++ pkgsrc/mail/wl-snapshot/Makefile    Fri Sep 25 09:48:11 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2026/02/16 08:29:54 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2026/09/25 09:48:11 wiz Exp $
 
 VERSION=       2023.08.18
 DISTNAME=      wanderlust
@@ -38,6 +38,8 @@ INSTALLATION_DIRS=    ${DOCDIR}/en ${DOCDIR
 
 EMACS_BUILDLINK=       # empty
 
+EMACS_VERSIONS_INCOMPATIBLE=   emacs20 # apel
+
 .include "options.mk"
 
 .include "../../devel/apel/buildlink3.mk"

Index: pkgsrc/mail/wl-snapshot/options.mk
diff -u pkgsrc/mail/wl-snapshot/options.mk:1.1.1.1 pkgsrc/mail/wl-snapshot/options.mk:1.2
--- pkgsrc/mail/wl-snapshot/options.mk:1.1.1.1  Wed Aug  5 22:23:57 2009
+++ pkgsrc/mail/wl-snapshot/options.mk  Fri Sep 25 09:48:11 2026
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1.1.1 2009/08/05 22:23:57 minskim Exp $
+# $NetBSD: options.mk,v 1.2 2026/09/25 09:48:11 wiz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.wl
 PKG_SUPPORTED_OPTIONS= w3m
@@ -9,6 +9,8 @@ PKG_SUGGESTED_OPTIONS=  w3m
 PLIST_VARS+=           w3m
 
 .if !empty(PKG_OPTIONS:Mw3m)
+EMACS_VERSIONS_INCOMPATIBLE=   emacs20 xemacs214 xemacs215 xemacs214nox xemacs215nox
+.include "../../editors/emacs/modules.mk"
 .include "../../www/emacs-w3m-snapshot/buildlink3.mk"
 PLIST.w3m=     yes
 .endif

Index: pkgsrc/math/ess/Makefile
diff -u pkgsrc/math/ess/Makefile:1.38 pkgsrc/math/ess/Makefile:1.39
--- pkgsrc/math/ess/Makefile:1.38       Tue Jun 28 11:34:36 2022
+++ pkgsrc/math/ess/Makefile    Fri Sep 25 09:48:11 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2022/06/28 11:34:36 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2026/09/25 09:48:11 wiz Exp $
 
 DISTNAME=      ess-13.09-1
 PKGNAME=       ${EMACS_PKGNAME_PREFIX}${DISTNAME:S/-1$/.1/}
@@ -15,6 +15,8 @@ USE_TOOLS+=   makeinfo perl gmake
 EMACS_MODULES= base
 INFO_FILES=    yes
 
+EMACS_VERSIONS_INCOMPATIBLE=   emacs20 xemacs214 xemacs215 xemacs214nox xemacs215nox
+
 MAKE_JOBS_SAFE=        no
 MAKE_ENV+=     LISPDIR=${EMACS_LISPPREFIX}/ess
 MAKEFLAGS+=    EMACS=${EMACS_BIN:Q}

Index: pkgsrc/math/texdrive/Makefile
diff -u pkgsrc/math/texdrive/Makefile:1.7 pkgsrc/math/texdrive/Makefile:1.8
--- pkgsrc/math/texdrive/Makefile:1.7   Sat May 14 22:25:39 2022
+++ pkgsrc/math/texdrive/Makefile       Fri Sep 25 09:48:11 2026
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2022/05/14 22:25:39 dholland Exp $
-#
+# $NetBSD: Makefile,v 1.8 2026/09/25 09:48:11 wiz Exp $
 
 DISTNAME=      texdrive
-PKGNAME=       texdrive-0.0.20081126.171834
+PKGNAME=       ${EMACS_PKGNAME_PREFIX}texdrive-0.0.20081126.171834
 PKGREVISION=   4
 CATEGORIES=    math
 MASTER_SITES=  http://www.djcbsoftware.nl/code/texdrive/
@@ -16,11 +15,13 @@ DEPENDS+=   tex-amsfonts-[0-9]*:../../font
 DEPENDS+=      tex-amsmath-[0-9]*:../../print/tex-amsmath
 DEPENDS+=      ImageMagick-[0-9]*:../../graphics/ImageMagick
 
-DIST_SUBDIR=   ${PKGNAME_NOREV}
+DIST_SUBDIR=   texdrive-0.0.20081126.171834
 WRKSRC=                ${WRKDIR}
 USE_LANGUAGES= # none
 MESSAGE_SUBST+=        LISPDIR=${EMACS_LISPPREFIX:Q}
 
+EMACS_VERSIONS_INCOMPATIBLE=   xemacs214 xemacs214nox xemacs215 xemacs215nox
+
 do-build:
        cd ${WRKSRC} && ${EMACS_BIN} -batch -f batch-byte-compile texdrive.el
 

Index: pkgsrc/misc/color-theme/Makefile
diff -u pkgsrc/misc/color-theme/Makefile:1.6 pkgsrc/misc/color-theme/Makefile:1.7
--- pkgsrc/misc/color-theme/Makefile:1.6        Sat Nov 12 09:10:23 2022
+++ pkgsrc/misc/color-theme/Makefile    Fri Sep 25 09:48:11 2026
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.6 2022/11/12 09:10:23 nikita Exp $
-#
+# $NetBSD: Makefile,v 1.7 2026/09/25 09:48:11 wiz Exp $
 
 DISTNAME=      color-theme-6.6.0
+PKGNAME=       ${EMACS_PKGNAME_PREFIX}${DISTNAME}
 PKGREVISION=   2
 CATEGORIES=    misc
-MASTER_SITES=  https://download.savannah.gnu.org/releases/${PKGBASE}/
+MASTER_SITES=  https://download.savannah.gnu.org/releases/color-theme/
 
 MAINTAINER=    pho%cielonegro.org@localhost
 HOMEPAGE=      https://www.nongnu.org/color-theme/
@@ -16,7 +16,9 @@ USE_LANGUAGES=        # none
 USE_TOOLS+=    gmake
 
 MAKE_FLAGS+=   EMACS=${EMACS_BIN}
-MAKE_FLAGS+=   ELISPDIR=${DESTDIR}${EMACS_LISPPREFIX}/${PKGBASE}
+MAKE_FLAGS+=   ELISPDIR=${DESTDIR}${EMACS_LISPPREFIX}/color-theme
+
+EMACS_VERSIONS_INCOMPATIBLE=   xemacs214 xemacs214nox xemacs215 xemacs215nox
 
 .include "../../editors/emacs/modules.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/misc/elscreen/Makefile
diff -u pkgsrc/misc/elscreen/Makefile:1.28 pkgsrc/misc/elscreen/Makefile:1.29
--- pkgsrc/misc/elscreen/Makefile:1.28  Sat Sep 12 14:31:51 2026
+++ pkgsrc/misc/elscreen/Makefile       Fri Sep 25 09:48:11 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2026/09/12 14:31:51 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2026/09/25 09:48:11 wiz Exp $
 
 DISTNAME=      elscreen-1.4.6
 PKGNAME=       ${EMACS_PKGNAME_PREFIX}${DISTNAME}
@@ -30,7 +30,11 @@ EMACS_BUILDLINK=     # empty
 
 # Emacs 24 or later is not supported. Try wip/elscreen-current
 # instead.
-EMACS_VERSIONS_ACCEPTED= emacs20
+#EMACS_VERSIONS_ACCEPTED= emacs20
+# but apel does not support emacs20
+#EMACS_VERSIONS_INCOMPATIBLE=  emacs20
+BROKEN=                "Needs fixing for emacs>20"
+EMACS_VERSIONS_ACCEPTED=
 
 INSTALLATION_DIRS+=    ${EMACS_LISPPREFIX}/elscreen
 INSTALLATION_DIRS+=    share/doc/elscreen

Index: pkgsrc/misc/emacs-neotree/Makefile
diff -u pkgsrc/misc/emacs-neotree/Makefile:1.2 pkgsrc/misc/emacs-neotree/Makefile:1.3
--- pkgsrc/misc/emacs-neotree/Makefile:1.2      Sat May 14 22:25:40 2022
+++ pkgsrc/misc/emacs-neotree/Makefile  Fri Sep 25 09:48:11 2026
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.2 2022/05/14 22:25:40 dholland Exp $
+# $NetBSD: Makefile,v 1.3 2026/09/25 09:48:11 wiz Exp $
 
 DISTNAME=      emacs-neotree-0.5.2.98fe213
-PKGNAME=       ${EMACS_PKGNAME_PREFIX}${DISTNAME}
+PKGNAME=       ${EMACS_PKGNAME_PREFIX}${DISTNAME:S/emacs-//}
 PKGREVISION=   1
 CATEGORIES=    misc
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=jaypei/}
+GITHUB_PROJECT=        emacs-neotree
 GITHUB_TAG=    98fe21334affaffe2334bf7c987edaf1980d2d0b
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
@@ -14,6 +15,8 @@ LICENSE=      gnu-gpl-v3
 
 NO_CONFIGURE=  yes
 
+EMACS_VERSIONS_INCOMPATIBLE=   emacs20 xemacs214 xemacs215 xemacs214nox xemacs215nox
+
 do-build:
        cd ${WRKSRC} && ${EMACS_BIN} -batch -f batch-byte-compile neotree.el
 

Index: pkgsrc/misc/emacs-wiki/Makefile
diff -u pkgsrc/misc/emacs-wiki/Makefile:1.9 pkgsrc/misc/emacs-wiki/Makefile:1.10
--- pkgsrc/misc/emacs-wiki/Makefile:1.9 Sat May 14 22:25:40 2022
+++ pkgsrc/misc/emacs-wiki/Makefile     Fri Sep 25 09:48:11 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2022/05/14 22:25:40 dholland Exp $
+# $NetBSD: Makefile,v 1.10 2026/09/25 09:48:11 wiz Exp $
 #
 
 DISTNAME=      ${EMACSWIKI}-${EMACSWIKIVERSION}
@@ -15,11 +15,12 @@ LICENSE=    gnu-gpl-v2
 
 EMACSWIKI=             emacs-wiki
 EMACSWIKIVERSION=      2.72
-DEPENDS=               semi>=1.14.6:../../devel/semi
+DEPENDS=               ${EMACS_PKGNAME_PREFIX}semi>=1.14.6:../../devel/semi
 
 USE_TOOLS+=            gmake makeinfo
 INFO_FILES=            yes
 INSTALL_MAKE_FLAGS+=   PREFIX=${DESTDIR}${PREFIX}
+INSTALL_MAKE_FLAGS+=   ELISPDIR=${DESTDIR}${EMACS_LISPPREFIX}/emacs-wiki
 
 .include "../../editors/emacs/modules.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/misc/howm/Makefile
diff -u pkgsrc/misc/howm/Makefile:1.22 pkgsrc/misc/howm/Makefile:1.23
--- pkgsrc/misc/howm/Makefile:1.22      Fri Jul 24 15:56:05 2026
+++ pkgsrc/misc/howm/Makefile   Fri Sep 25 09:48:11 2026
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2026/07/24 15:56:05 taca Exp $
+# $NetBSD: Makefile,v 1.23 2026/09/25 09:48:11 wiz Exp $
 
 DISTNAME=      howm-1.5.6
+PKGNAME=       ${EMACS_PKGNAME_PREFIX}${DISTNAME}
 PKGREVISION=   2
 CATEGORIES=    misc
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=kaorahi/}
@@ -15,6 +16,8 @@ DEPENDS+=     ${EMACS_PKGNAME_PREFIX}migemo-
 
 GNU_CONFIGURE= yes
 
+EMACS_VERSIONS_INCOMPATIBLE=   emacs20 xemacs214 xemacs214nox xemacs215 xemacs215nox
+
 .include "../../editors/emacs/modules.mk"
 .if ${EMACS_FLAVOR} == "xemacs"
 CONFIGURE_ARGS+=       --with-xemacs

Index: pkgsrc/misc/lookup/Makefile
diff -u pkgsrc/misc/lookup/Makefile:1.28 pkgsrc/misc/lookup/Makefile:1.29
--- pkgsrc/misc/lookup/Makefile:1.28    Sat Sep 12 14:31:51 2026
+++ pkgsrc/misc/lookup/Makefile Fri Sep 25 09:48:11 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2026/09/12 14:31:51 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2026/09/25 09:48:11 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=       emacs20 xemacs214 xemacs215
+EMACS_VERSIONS_ACCEPTED=       # 
 EMACS_BUILDLINK=               # defined
 
 GNU_CONFIGURE= YES

Index: pkgsrc/misc/mic-paren/Makefile
diff -u pkgsrc/misc/mic-paren/Makefile:1.2 pkgsrc/misc/mic-paren/Makefile:1.3
--- pkgsrc/misc/mic-paren/Makefile:1.2  Sat May 14 22:25:40 2022
+++ pkgsrc/misc/mic-paren/Makefile      Fri Sep 25 09:48:12 2026
@@ -1,10 +1,12 @@
-# $NetBSD: Makefile,v 1.2 2022/05/14 22:25:40 dholland Exp $
+# $NetBSD: Makefile,v 1.3 2026/09/25 09:48:12 wiz Exp $
 
 DISTNAME=      mic-paren-3.13
+PKGNAME=       ${EMACS_PKGNAME_PREFIX}${DISTNAME}
 PKGREVISION=   1
 CATEGORIES=    misc
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=emacsattic/}
 GITHUB_TAG=    d0410c7d805c9aaf51a1bcefaaef092bed5824c4
+WRKSRC=                ${WRKDIR}/mic-paren-${GITHUB_TAG}
 
 MAINTAINER=    pho%cielonegro.org@localhost
 HOMEPAGE=      https://melpa.org/\#/mic-paren

Index: pkgsrc/net/twittering-mode/Makefile
diff -u pkgsrc/net/twittering-mode/Makefile:1.3 pkgsrc/net/twittering-mode/Makefile:1.4
--- pkgsrc/net/twittering-mode/Makefile:1.3     Sat May 14 22:25:40 2022
+++ pkgsrc/net/twittering-mode/Makefile Fri Sep 25 09:48:12 2026
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2022/05/14 22:25:40 dholland Exp $
+# $NetBSD: Makefile,v 1.4 2026/09/25 09:48:12 wiz Exp $
 
 DISTNAME=      twittering-mode-3.0.0
+PKGNAME=       ${EMACS_PKGNAME_PREFIX}${DISTNAME}
 PKGREVISION=   1
 CATEGORIES=    net
 MASTER_SITES+= http://sourceforge.net/projects/twmode/files/twittering-mode-3.0.0/

Index: pkgsrc/net/twittering-mode/PLIST
diff -u pkgsrc/net/twittering-mode/PLIST:1.1 pkgsrc/net/twittering-mode/PLIST:1.2
--- pkgsrc/net/twittering-mode/PLIST:1.1        Fri Jun 14 13:41:46 2013
+++ pkgsrc/net/twittering-mode/PLIST    Fri Sep 25 09:48:12 2026
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1 2013/06/14 13:41:46 mef Exp $
-share/emacs/site-lisp/a-files/twittering-mode.el
+@comment $NetBSD: PLIST,v 1.2 2026/09/25 09:48:12 wiz Exp $
+${EMACS_LISPPREFIX}/a-files/twittering-mode.el

Index: pkgsrc/textproc/dictem/Makefile
diff -u pkgsrc/textproc/dictem/Makefile:1.15 pkgsrc/textproc/dictem/Makefile:1.16
--- pkgsrc/textproc/dictem/Makefile:1.15        Sun Jun 16 07:45:52 2024
+++ pkgsrc/textproc/dictem/Makefile     Fri Sep 25 09:48:12 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2024/06/16 07:45:52 cheusov Exp $
+# $NetBSD: Makefile,v 1.16 2026/09/25 09:48:12 wiz Exp $
 
 DISTNAME=              dictem-1.0.4
 PKGNAME=               ${EMACS_PKGNAME_PREFIX}${DISTNAME}
@@ -16,7 +16,7 @@ DEPENDS+=             dict-client>=1.9.14:../../tex
 SRCS=                  dictem.el
 DOCS=                  README NEWS COPYING # ChangeLog
 
-INSTALLATION_DIRS+=    share/doc/${PKGBASE} ${EMACS_LISPPREFIX}
+INSTALLATION_DIRS+=    share/doc/dictem ${EMACS_LISPPREFIX}
 
 do-build:
 .for f in ${SRCS}
@@ -29,7 +29,7 @@ do-install:
        cd ${WRKSRC} && ${INSTALL_DATA} ${SRCS} ${SRCS:.el=.elc}        \
                        ${DESTDIR}${EMACS_LISPPREFIX};          \
        cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS}                         \
-                       ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
+                       ${DESTDIR}${PREFIX}/share/doc/dictem
 
 .include "../../editors/emacs/modules.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/textproc/emacs-dict-client/Makefile
diff -u pkgsrc/textproc/emacs-dict-client/Makefile:1.15 pkgsrc/textproc/emacs-dict-client/Makefile:1.16
--- pkgsrc/textproc/emacs-dict-client/Makefile:1.15     Sat May 14 22:25:40 2022
+++ pkgsrc/textproc/emacs-dict-client/Makefile  Fri Sep 25 09:48:12 2026
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2022/05/14 22:25:40 dholland Exp $
+# $NetBSD: Makefile,v 1.16 2026/09/25 09:48:12 wiz Exp $
 
 DISTNAME=      dictionary-1.8.2
-PKGNAME=       ${EMACS_PKGNAME_PREFIX}${DISTNAME:S/dictionary/emacs-dict-client/}
+PKGNAME=       ${EMACS_PKGNAME_PREFIX}${DISTNAME:S/dictionary/dict-client/}
 PKGREVISION=   4
 CATEGORIES=    textproc
 MASTER_SITES=  ${HOMEPAGE}
@@ -12,6 +12,8 @@ COMMENT=      Emacs package for talking to a 
 
 INSTALLATION_DIRS=     ${EMACS_LISPPREFIX:C|^${PREFIX}/||}/dictionary
 
+MAKE_FLAGS+=   EMACS=${EMACS_BIN}
+
 do-install:
        cd ${WRKSRC}; \
        ${INSTALL_DATA} connection.elc connection.el dictionary.elc \

Index: pkgsrc/textproc/emacs-dict-client/PLIST
diff -u pkgsrc/textproc/emacs-dict-client/PLIST:1.2 pkgsrc/textproc/emacs-dict-client/PLIST:1.3
--- pkgsrc/textproc/emacs-dict-client/PLIST:1.2 Sun Jun 14 18:17:15 2009
+++ pkgsrc/textproc/emacs-dict-client/PLIST     Fri Sep 25 09:48:12 2026
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:17:15 joerg Exp $
-share/emacs/site-lisp/dictionary/connection.el
-share/emacs/site-lisp/dictionary/connection.elc
-share/emacs/site-lisp/dictionary/dictionary-init.el
-share/emacs/site-lisp/dictionary/dictionary.el
-share/emacs/site-lisp/dictionary/dictionary.elc
-share/emacs/site-lisp/dictionary/link.el
-share/emacs/site-lisp/dictionary/link.elc
+@comment $NetBSD: PLIST,v 1.3 2026/09/25 09:48:12 wiz Exp $
+${EMACS_LISPPREFIX}/dictionary/connection.el
+${EMACS_LISPPREFIX}/dictionary/connection.elc
+${EMACS_LISPPREFIX}/dictionary/dictionary-init.el
+${EMACS_LISPPREFIX}/dictionary/dictionary.el
+${EMACS_LISPPREFIX}/dictionary/dictionary.elc
+${EMACS_LISPPREFIX}/dictionary/link.el
+${EMACS_LISPPREFIX}/dictionary/link.elc

Index: pkgsrc/textproc/emacs-muse/Makefile
diff -u pkgsrc/textproc/emacs-muse/Makefile:1.13 pkgsrc/textproc/emacs-muse/Makefile:1.14
--- pkgsrc/textproc/emacs-muse/Makefile:1.13    Sat Dec 30 16:40:42 2023
+++ pkgsrc/textproc/emacs-muse/Makefile Fri Sep 25 09:48:12 2026
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2023/12/30 16:40:42 zafer Exp $
+# $NetBSD: Makefile,v 1.14 2026/09/25 09:48:12 wiz Exp $
 
 DISTNAME=      muse-3.20
-PKGNAME=       ${EMACS_PKGNAME_PREFIX}emacs-${DISTNAME}
+PKGNAME=       ${EMACS_PKGNAME_PREFIX}${DISTNAME}
 PKGREVISION=   2
 CATEGORIES=    textproc editors
 MASTER_SITES=  #
@@ -18,6 +18,8 @@ INFO_FILES=   yes
 MAKE_FLAGS+=           -I..
 INSTALLATION_DIRS=     share/doc/emacs-muse share/examples/emacs-muse
 
+EMACS_VERSIONS_INCOMPATIBLE=   emacs20 xemacs214 xemacs214nox xemacs215 xemacs215nox
+
 pre-build:
        sed -e "s,@PREFIX@,${PREFIX}," -e "s,@LISPDIR@,${EMACS_LISPPREFIX}," \
                -e "s,@EMACS@,${EMACS_BIN}," ${FILESDIR}/Makefile.defs \

Index: pkgsrc/textproc/flycheck-mode/Makefile
diff -u pkgsrc/textproc/flycheck-mode/Makefile:1.1 pkgsrc/textproc/flycheck-mode/Makefile:1.2
--- pkgsrc/textproc/flycheck-mode/Makefile:1.1  Sun Apr  7 19:02:45 2024
+++ pkgsrc/textproc/flycheck-mode/Makefile      Fri Sep 25 09:48:12 2026
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.1 2024/04/07 19:02:45 ryoon Exp $
+# $NetBSD: Makefile,v 1.2 2026/09/25 09:48:12 wiz Exp $
 
 DISTNAME=      flycheck-33.0
-PKGNAME=       ${DISTNAME:S/flycheck-/flycheck-mode-/}
+PKGNAME=       ${EMACS_PKGNAME_PREFIX}${DISTNAME:S/flycheck-/flycheck-mode-/}
 CATEGORIES=    textproc
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=flycheck/}
 GITHUB_PROJECT=        flycheck
@@ -12,7 +12,9 @@ HOMEPAGE=     https://www.flycheck.org/
 COMMENT=       On the fly syntax checking for GNU Emacs
 LICENSE=       gnu-gpl-v3
 
-DEPENDS+=      dash-el-[0-9]*:../../devel/dash-el
+DEPENDS+=      ${EMACS_PKGNAME_PREFIX}dash-el-[0-9]*:../../devel/dash-el
+
+EMACS_VERSIONS_INCOMPATIBLE=   emacs20 xemacs214 xemacs214nox xemacs215 xemacs215nox
 
 USE_LANGUAGES= # none
 NO_CONFIGURE=  yes

Index: pkgsrc/textproc/ispell-emacs/Makefile
diff -u pkgsrc/textproc/ispell-emacs/Makefile:1.16 pkgsrc/textproc/ispell-emacs/Makefile:1.17
--- pkgsrc/textproc/ispell-emacs/Makefile:1.16  Wed Dec 31 09:00:52 2025
+++ pkgsrc/textproc/ispell-emacs/Makefile       Fri Sep 25 09:48:12 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2025/12/31 09:00:52 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2026/09/25 09:48:12 wiz Exp $
 
 DISTNAME=      ispell.el
 PKGNAME=       ${EMACS_PKGNAME_PREFIX}ispell-emacs-3.6
@@ -15,7 +15,7 @@ INSTALLATION_DIRS=    ${EMACS_LISPPREFIX:C|
 
 DEPENDS+=      ispell-[0-9]*:../../textproc/ispell
 
-DIST_SUBDIR=   ${PKGNAME_NOREV:C|^xemacs-||}
+DIST_SUBDIR=   ispell-emacs-${PKGVERSION_NOREV}
 WRKSRC=                ${WRKDIR}
 
 NO_CONFIGURE=  yes

Index: pkgsrc/textproc/markdown-mode/Makefile
diff -u pkgsrc/textproc/markdown-mode/Makefile:1.11 pkgsrc/textproc/markdown-mode/Makefile:1.12
--- pkgsrc/textproc/markdown-mode/Makefile:1.11 Sat May 14 22:25:41 2022
+++ pkgsrc/textproc/markdown-mode/Makefile      Fri Sep 25 09:48:12 2026
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.11 2022/05/14 22:25:41 dholland Exp $
+# $NetBSD: Makefile,v 1.12 2026/09/25 09:48:12 wiz Exp $
 
 DISTNAME=      markdown-mode-2.4
 PKGNAME=       ${EMACS_PKGNAME_PREFIX}${DISTNAME}
 PKGREVISION=   1
 CATEGORIES=    textproc
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=jrblevin/}
+GITHUB_PROJECT=        markdown-mode
 GITHUB_TAG=    v${PKGVERSION_NOREV}
 
 MAINTAINER=    minskim%NetBSD.org@localhost
@@ -19,6 +20,8 @@ INSTALLATION_DIRS=    ${EMACS_LISPPREFIX}
 
 EMACS_MODULES= base
 
+EMACS_VERSIONS_INCOMPATIBLE=   emacs20 xemacs214 xemacs215 xemacs214nox xemacs215nox
+
 .include "../../editors/emacs/modules.mk"
 
 do-build:

Index: pkgsrc/textproc/po-mode/Makefile
diff -u pkgsrc/textproc/po-mode/Makefile:1.6 pkgsrc/textproc/po-mode/Makefile:1.7
--- pkgsrc/textproc/po-mode/Makefile:1.6        Sat May 14 22:25:41 2022
+++ pkgsrc/textproc/po-mode/Makefile    Fri Sep 25 09:48:13 2026
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2022/05/14 22:25:41 dholland Exp $
+# $NetBSD: Makefile,v 1.7 2026/09/25 09:48:13 wiz Exp $
 
 DISTNAME=              gettext-0.18.1.1
-PKGNAME=               po-mode-2.2
+PKGNAME=               ${EMACS_PKGNAME_PREFIX}po-mode-2.2
 PKGREVISION=           2
 CATEGORIES=            textproc
 MASTER_SITES=          ${MASTER_SITE_GNU:=gettext/}

Index: pkgsrc/textproc/xslide/Makefile
diff -u pkgsrc/textproc/xslide/Makefile:1.15 pkgsrc/textproc/xslide/Makefile:1.16
--- pkgsrc/textproc/xslide/Makefile:1.15        Mon Nov 17 11:01:35 2025
+++ pkgsrc/textproc/xslide/Makefile     Fri Sep 25 09:48:13 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2025/11/17 11:01:35 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2026/09/25 09:48:13 wiz Exp $
 #
 
 DISTNAME=              xslide-0.2.2
@@ -17,6 +17,7 @@ COMMENT=              XSL major mode for emacs
 EMACS= emacs
 .else
 EMACS= xemacs
+DEPENDS+=      xemacs-packages-[0-9]*:../../editors/xemacs-packages
 .endif
 
 SRCS=  xslide-abbrev.el xslide-data.el xslide-font.el xslide-process.el xslide.el
@@ -32,8 +33,8 @@ do-build:
        done
 
 do-install:
-       ${INSTALL_DATA_DIR} ${DESTDIR}${EMACS_LISPPREFIX}/${PKGBASE}
-       cd ${WRKSRC} && ${INSTALL_DATA} ${SRCS} ${SRCS:.el=.elc} ${DESTDIR}${EMACS_LISPPREFIX}/${PKGBASE}
+       ${INSTALL_DATA_DIR} ${DESTDIR}${EMACS_LISPPREFIX}/${PKGBASE:C|^${EMACS_PKGNAME_PREFIX}||}
+       cd ${WRKSRC} && ${INSTALL_DATA} ${SRCS} ${SRCS:.el=.elc} ${DESTDIR}${EMACS_LISPPREFIX}/${PKGBASE:C|^${EMACS_PKGNAME_PREFIX}||}
        ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/xslide
        ${INSTALL_DATA} ${WRKSRC}/README.TXT ${DESTDIR}${PREFIX}/share/doc/xslide
        ${INSTALL_DATA} ${WRKSRC}/dot_emacs ${DESTDIR}${PREFIX}/share/doc/xslide

Index: pkgsrc/www/emacs-w3m/Makefile
diff -u pkgsrc/www/emacs-w3m/Makefile:1.40 pkgsrc/www/emacs-w3m/Makefile:1.41
--- pkgsrc/www/emacs-w3m/Makefile:1.40  Sat Sep 12 14:31:51 2026
+++ pkgsrc/www/emacs-w3m/Makefile       Fri Sep 25 09:48:13 2026
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.40 2026/09/12 14:31:51 wiz Exp $
+# $NetBSD: Makefile,v 1.41 2026/09/25 09:48:13 wiz Exp $
 
 DISTNAME=      emacs-w3m-1.4.5
+PKGNAME=       ${EMACS_PKGNAME_PREFIX}${DISTNAME:S/emacs-//}
+PKGREVISION=   1
 CATEGORIES=    www
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=emacs-w3m/}
 GITHUB_TAG=    329cfcfc0448a45a0779ded7b51332a343d02a18
-PKGREVISION=   1
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://emacs-w3m.namazu.org/
@@ -20,8 +21,9 @@ DEPENDS+=     w3m{,-img}>=0.5.1nb2:../../www
 
 HAS_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --with-emacs=${EMACS_BIN:Q}
+CONFIGURE_ARGS+=       --with-lispdir=${EMACS_LISPPREFIX:Q}/w3m
 CONFIGURE_ARGS+=       --with-icondir=${ICONDIR}
-CONFIGURE_ARGS+=       --infodir=${PREFIX}/info
+CONFIGURE_ARGS+=       --infodir=${PREFIX}/${PKGINFODIR}
 BUILD_TARGET=          default
 INSTALL_TARGET=                ${INSTALL_TARGET.${EMACS_FLAVOR}}
 #AKE_FLAGS=            prefix=${DESTDIR}${PREFIX} ICONDIR=${DESTDIR}${ICONDIR}
@@ -36,11 +38,9 @@ WRKSRC=      ${WRKDIR}/${PKGBASE}-${GITHUB_TA
 #SUBST_SED.fix-icondir+=       -e 's|images/w3m|w3m|g'
 
 EMACS_BUILDLINK=               # empty
-EMACS_VERSIONS_ACCEPTED=       emacs20 \
-                               emacs29 emacs29nox \
+EMACS_VERSIONS_ACCEPTED=       emacs31 emacs31nox \
                                emacs30 emacs30nox \
-                               emacs31 emacs31nox \
-                               xemacs215 xemacs215nox xemacs214 xemacs214nox
+                               emacs29 emacs29nox
 
 .include "../../editors/emacs/modules.mk"
 

Index: pkgsrc/www/emacs-w3m/buildlink3.mk
diff -u pkgsrc/www/emacs-w3m/buildlink3.mk:1.3 pkgsrc/www/emacs-w3m/buildlink3.mk:1.4
--- pkgsrc/www/emacs-w3m/buildlink3.mk:1.3      Sun Jan  7 13:04:36 2018
+++ pkgsrc/www/emacs-w3m/buildlink3.mk  Fri Sep 25 09:48:13 2026
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:36 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2026/09/25 09:48:13 wiz Exp $
 #
 
 BUILDLINK_TREE+=       emacs-w3m
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        emacs-w3m
 .if !defined(EMACS_W3M_BUILDLINK3_MK)
 EMACS_W3M_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.emacs-w3m+=      ${EMACS_PKGNAME_PREFIX}emacs-w3m>=1.4
+BUILDLINK_API_DEPENDS.emacs-w3m+=      ${EMACS_PKGNAME_PREFIX}w3m>=1.4
 BUILDLINK_PKGSRCDIR.emacs-w3m?=                ../../www/emacs-w3m
 
 BUILDLINK_CONTENTS_FILTER.emacs-w3m=   ${EGREP} '.*\.el$$|.*\.elc$$'

Index: pkgsrc/www/emacs-w3m-snapshot/Makefile
diff -u pkgsrc/www/emacs-w3m-snapshot/Makefile:1.22 pkgsrc/www/emacs-w3m-snapshot/Makefile:1.23
--- pkgsrc/www/emacs-w3m-snapshot/Makefile:1.22 Sat Sep 12 14:31:51 2026
+++ pkgsrc/www/emacs-w3m-snapshot/Makefile      Fri Sep 25 09:48:13 2026
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.22 2026/09/12 14:31:51 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2026/09/25 09:48:13 wiz Exp $
 
 VERSION=       1.4.632
 DATE_TIME=     20210106.2144
 HASH=          f29aada
 DISTNAME=      w3m-el-snapshot_${VERSION}+0.${DATE_TIME}.${HASH}
-PKGNAME=       ${EMACS_PKGNAME_PREFIX}emacs-${DISTNAME:S/-el-snapshot_/-/:S/+0//:S/.${HASH}//}
+PKGNAME=       ${EMACS_PKGNAME_PREFIX}${DISTNAME:S/-el-snapshot_/-/:S/+0//:S/.${HASH}//}
 PKGREVISION=   1
 CATEGORIES=    www
 MASTER_SITES=  ${MASTER_SITE_DEBIAN:=pool/main/w/w3m-el-snapshot/}
@@ -18,6 +18,8 @@ LICENSE=      gnu-gpl-v2
 USE_TOOLS+=    makeinfo gzip autoconf
 INFO_FILES=    yes
 
+EMACS_VERSIONS_INCOMPATIBLE=    emacs20 xemacs214 xemacs215 xemacs214nox xemacs215nox
+
 DEPENDS+=      w3m{,-img}>=0.5.2nb3:../../www/w3m
 
 GNU_CONFIGURE=         yes
@@ -36,8 +38,6 @@ SUBST_SED.paths=      -e 's|@W3M@|${PREFIX}/b
 BUILD_DEFS+=           VARBASE
 BUILD_DEFS+=           GAMEDATAMODE
 
-EMACS_VERSIONS_ACCEPTED=       emacs29 emacs29nox emacs20 xemacs215 xemacs215nox xemacs214 xemacs214nox
-
 .include "options.mk"
 
 .include "../../devel/apel/buildlink3.mk"

Index: pkgsrc/www/emacs-w3m-snapshot/buildlink3.mk
diff -u pkgsrc/www/emacs-w3m-snapshot/buildlink3.mk:1.2 pkgsrc/www/emacs-w3m-snapshot/buildlink3.mk:1.3
--- pkgsrc/www/emacs-w3m-snapshot/buildlink3.mk:1.2     Mon Oct 21 23:47:07 2019
+++ pkgsrc/www/emacs-w3m-snapshot/buildlink3.mk Fri Sep 25 09:48:13 2026
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2019/10/21 23:47:07 mef Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2026/09/25 09:48:13 wiz Exp $
 #
 
 BUILDLINK_TREE+=       emacs-w3m
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        emacs-w3m
 .if !defined(EMACS_W3M_BUILDLINK3_MK)
 EMACS_W3M_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.emacs-w3m+=      ${EMACS_PKGNAME_PREFIX}emacs-w3m>=1.4.50
+BUILDLINK_API_DEPENDS.emacs-w3m+=      ${EMACS_PKGNAME_PREFIX}w3m>=1.4.50
 BUILDLINK_PKGSRCDIR.emacs-w3m?=                ../../www/emacs-w3m-snapshot
 
 BUILDLINK_CONTENTS_FILTER.emacs-w3m=   ${EGREP} '.*\.el$$|.*\.elc$$'



Home | Main Index | Thread Index | Old Index