*: adapt emacs packages to new framework

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: *: adapt emacs packages to new framework
From: Thomas Klausner (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>
Date: Fri, 25 Sep 2026 09:48:30 +0000
Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Fri Sep 25 11:48:06 2026 +0200
Changeset:	90cf8c54adb3f728dde409f84c66f0fec1040a58

Modified Files:
	cedet/Makefile
	csv-mode/Makefile
	csv-mode/PLIST
	csv-mode/distinfo
	dash-el/Makefile
	dash-el/buildlink3.mk
	elscreen-git/Makefile
	emacs-compat/Makefile
	emacs-compat/buildlink3.mk
	emacs-pr-el/Makefile
	emacs-session/Makefile
	emacs-w3m/Makefile
	haskell-mode/Makefile
	magit-git/Makefile
	magit-git/distinfo
	mediawiki-mode/Makefile
	mpc-el/Makefile
	mu-cite/Makefile
	navi2ch-current/Makefile
	navi2ch-current/PLIST
	org-caldav-git/Makefile
	org-caldav-git/PLIST
	popup-el-current/Makefile
	rst-mode/Makefile
	rst-mode/distinfo
	semi/Makefile
	slime/Makefile
	t-gnus/Makefile
	tc-git/Makefile
	tc-git/PLIST
	tc/Makefile
	tc/PLIST
	textile-mode/Makefile
	transient/Makefile
	transient/buildlink3.mk
	tuareg-mode/Makefile
	tuareg-mode/distinfo
	undo-tree/Makefile
	undo-tree/distinfo
	vimrc-mode/Makefile
	with-editor/Makefile
	with-editor/buildlink3.mk
	wl-snapshot/Makefile
	wl-snapshot/options.mk
Removed Files:
	csv-mode/patches/patch-csv-mode.el
	magit-git/patches/patch-default.mk

Log Message:
*: adapt emacs packages to new framework

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

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

diffstat:
 cedet/Makefile                     |   3 +-
 csv-mode/Makefile                  |  16 +++---
 csv-mode/PLIST                     |   5 +-
 csv-mode/distinfo                  |   5 +-
 csv-mode/patches/patch-csv-mode.el |  24 --------
 dash-el/Makefile                   |   4 +-
 dash-el/buildlink3.mk              |   2 +-
 elscreen-git/Makefile              |   4 +-
 emacs-compat/Makefile              |  18 +++---
 emacs-compat/buildlink3.mk         |   2 +-
 emacs-pr-el/Makefile               |   3 +
 emacs-session/Makefile             |   9 +--
 emacs-w3m/Makefile                 |   7 +--
 haskell-mode/Makefile              |   3 +-
 magit-git/Makefile                 |  20 ++++---
 magit-git/distinfo                 |   1 -
 magit-git/patches/patch-default.mk |  53 ------------------
 mediawiki-mode/Makefile            |   8 +--
 mpc-el/Makefile                    |   5 +-
 mu-cite/Makefile                   |   9 ++-
 navi2ch-current/Makefile           |   2 +
 navi2ch-current/PLIST              |   2 +-
 org-caldav-git/Makefile            |  11 ++--
 org-caldav-git/PLIST               |   8 +--
 popup-el-current/Makefile          |  12 ++--
 rst-mode/Makefile                  |   5 +-
 rst-mode/distinfo                  |   5 +-
 semi/Makefile                      |   3 +
 slime/Makefile                     |   8 +--
 t-gnus/Makefile                    |   4 +-
 tc-git/Makefile                    |   9 +--
 tc-git/PLIST                       | 110 ++++++++++++++++++-------------------
 tc/Makefile                        |  11 ++--
 tc/PLIST                           | 110 ++++++++++++++++++-------------------
 textile-mode/Makefile              |   3 +-
 transient/Makefile                 |   5 +-
 transient/buildlink3.mk            |   2 +-
 tuareg-mode/Makefile               |   2 +-
 tuareg-mode/distinfo               |   5 +-
 undo-tree/Makefile                 |   5 +-
 undo-tree/distinfo                 |   5 +-
 vimrc-mode/Makefile                |  16 +++---
 with-editor/Makefile               |   6 +-
 with-editor/buildlink3.mk          |   2 +-
 wl-snapshot/Makefile               |   2 +
 wl-snapshot/options.mk             |   1 +
 46 files changed, 262 insertions(+), 293 deletions(-)

diffs:
diff --git a/cedet/Makefile b/cedet/Makefile
index a17d76c17e..380a985116 100644
--- a/cedet/Makefile
+++ b/cedet/Makefile
@@ -1,5 +1,4 @@
 # $NetBSD: Makefile,v 1.9 2012/09/24 18:26:52 asau Exp $
-#
 
 DISTNAME=	cedet-1.0.1
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
@@ -18,6 +17,8 @@ MAKE_FLAGS+=		EMACS=${EMACS_BIN}
 EMACS_MODULES+=		base
 EMACS_BUILDLINK=	yes
 
+EMACS_VERSIONS_ACCEPTED=	# empty
+
 MESSAGE_SUBST+=	LISPDIR=${EMACS_LISPPREFIX}
 
 CEDET_DIRS= \
diff --git a/csv-mode/Makefile b/csv-mode/Makefile
index 7a463aa3ed..9eb2f50f32 100644
--- a/csv-mode/Makefile
+++ b/csv-mode/Makefile
@@ -1,26 +1,26 @@
 # $NetBSD: Makefile,v 1.2 2012/09/24 18:26:56 asau Exp $
-#
 
-DISTNAME=	csv-mode
-PKGNAME=	${DISTNAME}-20040823
+DISTNAME=	csv-mode-1.27
+PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
 CATEGORIES=	editors
-MASTER_SITES=	http://www.emacswiki.org/emacs/download/
-EXTRACT_SUFX=	.el
+MASTER_SITES=	https://elpa.gnu.org/packages/
+EXTRACT_SUFX=	.tar
 
 MAINTAINER=	pho%cielonegro.org@localhost
 HOMEPAGE=	https://www.emacswiki.org/emacs/CsvMode
 COMMENT=	Emacs mode for editing comma-separated value files
 LICENSE=	gnu-gpl-v2
 
-WRKSRC=		${WRKDIR}
 USE_LANGUAGES=	# none
-NO_CONFIGURE=	YES
+NO_CONFIGURE=	yes
 
 INSTALLATION_DIRS+=	${EMACS_LISPPREFIX}
 
+EMACS_VERSIONS_INCOMPATIBLE=	emacs20 xemacs214 xemacs215 xemacs214nox xemacs215nox
+
 do-build:
 	cd ${WRKSRC} \
-		&& ${EMACS_BIN} -batch -f batch-byte-compile ${DISTNAME}.el
+		&& ${EMACS_BIN} -L . -batch -f batch-byte-compile *.el
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/*.el  ${DESTDIR}${EMACS_LISPPREFIX}
diff --git a/csv-mode/PLIST b/csv-mode/PLIST
index 65719e10ab..7c769a9a35 100644
--- a/csv-mode/PLIST
+++ b/csv-mode/PLIST
@@ -1,3 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2012/03/05 06:59:32 phonohawk Exp $
+@comment $NetBSD$
+${EMACS_LISPPREFIX}/csv-mode-pkg.el
+${EMACS_LISPPREFIX}/csv-mode-tests.el
+${EMACS_LISPPREFIX}/csv-mode-tests.elc
 ${EMACS_LISPPREFIX}/csv-mode.el
 ${EMACS_LISPPREFIX}/csv-mode.elc
diff --git a/csv-mode/distinfo b/csv-mode/distinfo
index deef80577f..ec6eac1526 100644
--- a/csv-mode/distinfo
+++ b/csv-mode/distinfo
@@ -1,5 +1,6 @@
 $NetBSD: distinfo,v 1.1.1.1 2012/03/05 06:59:32 phonohawk Exp $
 
-RMD160 (csv-mode.el) = 65fc0dc34c5efe97f5ca8a280a23e2f22c229636
-Size (csv-mode.el) = 51527 bytes
+BLAKE2s (csv-mode-1.27.tar) = 3df88bee39769cff24aa1e08dc507be20223bfb66a12139b8c3de38c0bb48dbc
+SHA512 (csv-mode-1.27.tar) = 12011d5d12b33d30ffc9c68b28050e216f580fe39b3eceea70c3577b4ca78edea2034c08bd737902951dd113c51cb73a0b1cf7d87e14409c1a82ada514762ae3
+Size (csv-mode-1.27.tar) = 102400 bytes
 SHA1 (patch-csv-mode.el) = 0d5ee5236caf4dfd57c9dcd7c3205200624aa908
diff --git a/csv-mode/patches/patch-csv-mode.el b/csv-mode/patches/patch-csv-mode.el
deleted file mode 100644
index 3467be0e5a..0000000000
--- a/csv-mode/patches/patch-csv-mode.el
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-csv-mode.el,v 1.1.1.1 2012/03/05 06:59:32 phonohawk Exp $
-
-This patch enables to align multibyte characters. – Sugawara
-
---- csv-mode.el.orig	2012-03-05 06:34:22.000000000 +0000
-+++ csv-mode.el
-@@ -1006,7 +1006,7 @@ BEG and END specify the region to align.
- 		(setq beg (point))	; beginning of current field
- 		(while (not (eolp))
- 		  (csv-end-of-field)
--		  (setq x (- (point) beg)) ; field width
-+		  (setq x (string-width (buffer-substring beg (point)))) ; field width
- 		  (if w
- 		      (if (> x (car w)) (setcar w x))
- 		    (setq w (list x)
-@@ -1026,7 +1026,7 @@ BEG and END specify the region to align.
- 		  (let ((left-padding 0) (right-padding 0) overlay)
- 		    (csv-end-of-field)
- 		    (set-marker end (point)) ; end of current field
--		    (setq x (- (point) beg) ; field width
-+		    (setq x (string-width (buffer-substring beg (point))) ; field width
- 			  x (- (car w) x)) ; required padding
- 
- 		    ;; beg = beginning of current field
diff --git a/dash-el/Makefile b/dash-el/Makefile
index d7bcebcd80..4c2d162fa1 100644
--- a/dash-el/Makefile
+++ b/dash-el/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD$
 
 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
@@ -14,6 +14,8 @@ LICENSE=	gnu-gpl-v3
 
 INSTALLATION_DIRS=	${EMACS_LISPPREFIX}/dash
 
+EMACS_VERSIONS_INCOMPATIBLE=	emacs20
+
 do-build:
 	${EMACS_BIN} --no-init-file --no-site-file -batch \
 		-f batch-byte-compile ${WRKSRC}/dash.el
diff --git a/dash-el/buildlink3.mk b/dash-el/buildlink3.mk
index bca7a552f4..48da09e82a 100644
--- a/dash-el/buildlink3.mk
+++ b/dash-el/buildlink3.mk
@@ -5,7 +5,7 @@ BUILDLINK_TREE+=	dash-el
 .if !defined(DASH_EL_BUILDLINK3_MK)
 DASH_EL_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.dash-el+=	dash-el-[0-9]*
+BUILDLINK_API_DEPENDS.dash-el+=	${EMACS_PKGNAME_PREFIX}dash-el-[0-9]*
 BUILDLINK_PKGSRCDIR.dash-el?=	../../wip/dash-el
 
 BUILDLINK_CONTENTS_FILTER.dash-el+=	${EGREP} '.*\.el$$|.*\.elc$$'
diff --git a/elscreen-git/Makefile b/elscreen-git/Makefile
index 4a83cade43..4141ce89fa 100644
--- a/elscreen-git/Makefile
+++ b/elscreen-git/Makefile
@@ -14,9 +14,11 @@ CONFLICTS+=	elscreen-[0-9]*
 
 USE_LANGUAGES=	# none
 
+EMACS_VERSIONS_ACCEPTED=	# empty
+
 do-build:
 	cd ${WRKSRC} && \
-	${EMACS_BIN} -batch -f batch-byte-compile *.el
+	${EMACS_BIN} -L . -batch -f batch-byte-compile *.el
 
 INSTALLATION_DIRS+=	${EMACS_LISPPREFIX}/elscreen
 INSTALLATION_DIRS+=	share/doc/elscreen
diff --git a/emacs-compat/Makefile b/emacs-compat/Makefile
index 992b387634..fb8c41a72d 100644
--- a/emacs-compat/Makefile
+++ b/emacs-compat/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD$
 
 DISTNAME=	compat-30.0.1.0
-PKGNAME=	emacs-${DISTNAME}
+PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=emacs-compat/}
 GITHUB_PROJECT=	compat
@@ -11,25 +11,25 @@ HOMEPAGE=	https://github.com/with-editor/
 COMMENT=
 LICENSE=	gnu-gpl-v3
 
-#AKE_ENV=	MANUAL_HTML_ARGS=
-
 NO_CONFIGURE=		yes
 USE_LANGUAGES=		#
 USE_TOOLS+=		gmake makeinfo
-#MAKE_JOBS_SAFE=	no
-
 
-#INFO_FILES=		yes
-#UILD_TARGET=		all
 TEST_TARGET=		check
 INSTALL_TARGET=		#
-INSTALLATION_DIRS=	${PREFIX}/share/emacs/site-lisp/compat
+INSTALLATION_DIRS=	${EMACS_LISPPREFIX}/compat
 AUTO_MKDIRS=		yes
 
+MAKE_FLAGS+=		EMACS=${EMACS_BIN}
+
+EMACS_VERSIONS_INCOMPATIBLE=	emacs20 # dash-el
+# hangs
+EMACS_VERSIONS_INCOMPATIBLE+=	xemacs214 xemacs215 xemacs214nox xemacs215nox
+
 do-install:
 	( cd ${WRKSRC} ; \
 	for i in *el *.elc COPYING README* ; do  \
-	${INSTALL_DATA}  $$i ${DESTDIR}${INSTALLATION_DIRS}  ; \
+	${INSTALL_DATA}  $$i ${DESTDIR}/${EMACS_LISPPREFIX}/compat  ; \
 	done \
 	)
 
diff --git a/emacs-compat/buildlink3.mk b/emacs-compat/buildlink3.mk
index 3d019263e4..a37bb884a7 100644
--- a/emacs-compat/buildlink3.mk
+++ b/emacs-compat/buildlink3.mk
@@ -5,7 +5,7 @@ BUILDLINK_TREE+=	emacs-compat
 .if !defined(EMACS_COMPAT_BUILDLINK3_MK)
 EMACS_COMPAT_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.emacs-compat+=	emacs-compat-[0-9]*
+BUILDLINK_API_DEPENDS.emacs-compat+=	${EMACS_PKGNAME_PREFIX}compat-[0-9]*
 BUILDLINK_PKGSRCDIR.emacs-compat?=	../../wip/emacs-compat
 
 BUILDLINK_CONTENTS_FILTER.emacs-compat+=	${EGREP} '.*\.el$$|.*\.elc$$'
diff --git a/emacs-pr-el/Makefile b/emacs-pr-el/Makefile
index 0256c8ac39..782d9cf88c 100644
--- a/emacs-pr-el/Makefile
+++ b/emacs-pr-el/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD: Makefile,v 1.3 2012/09/28 22:07:32 asau Exp $
 
 DISTNAME=		emacs-pr-el-0.0.1
+PKGNAME=		${EMACS_PKGNAME_PREFIX}${DISTNAME:S/emacs-//}
 CATEGORIES=		misc
 MASTER_SITES=		# empty
 DISTFILES=		# empty
@@ -14,6 +15,8 @@ NO_CHECKSUM=		yes
 
 WRKSRC=			${WRKDIR}
 
+EMACS_VERSIONS_INCOMPATIBLE=	emacs29 emacs29nox xemacs214 xemacs214nox xemacs215 xemacs215nox
+
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} != "NetBSD"
diff --git a/emacs-session/Makefile b/emacs-session/Makefile
index 0724b48796..5e9e18ad37 100644
--- a/emacs-session/Makefile
+++ b/emacs-session/Makefile
@@ -1,8 +1,7 @@
 # $NetBSD: Makefile,v 1.3 2012/09/28 22:07:33 asau Exp $
-#
 
 DISTNAME=	session-2.3
-PKGNAME=	emacs-${DISTNAME}
+PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=${PKGBASE}/}
 
@@ -14,8 +13,10 @@ LICENSE=	gnu-gpl-v2
 WRKSRC=		${WRKDIR}/session
 NO_CONFIGURE=	yes
 
+EMACS_VERSIONS_INCOMPATIBLE=	emacs20
+
 INSTALLATION_DIRS+=		${EMACS_LISPPREFIX}
-INSTALLATION_DIRS+=		share/doc/${PKGBASE}
+INSTALLATION_DIRS+=		share/doc/emacs-session
 
 do-build:
 	cd ${WRKSRC} && \
@@ -24,7 +25,7 @@ do-build:
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/lisp/*.el  ${DESTDIR}${EMACS_LISPPREFIX}
 	${INSTALL_DATA} ${WRKSRC}/lisp/*.elc ${DESTDIR}${EMACS_LISPPREFIX}
-	${INSTALL_DATA} ${WRKSRC}/README     ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
+	${INSTALL_DATA} ${WRKSRC}/README     ${DESTDIR}${PREFIX}/share/doc/emacs-session
 
 .include "../../editors/emacs/modules.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/emacs-w3m/Makefile b/emacs-w3m/Makefile
index 28338cb233..0860f3393e 100644
--- a/emacs-w3m/Makefile
+++ b/emacs-w3m/Makefile
@@ -36,11 +36,10 @@ WRKSRC=	${WRKDIR}/${PKGBASE}-${GITHUB_TAG}
 #SUBST_SED.fix-icondir+=	-e 's|images/w3m|w3m|g'
 
 EMACS_BUILDLINK=		# empty
-EMACS_VERSIONS_ACCEPTED=	emacs20 \
-				emacs29 emacs29nox \
+EMACS_VERSIONS_ACCEPTED=	emacs29 emacs29nox \
 				emacs30 emacs30nox \
 				emacs31 emacs31nox \
-				xemacs215 xemacs215nox xemacs214 xemacs214nox
+				xemacs214 xemacs214nox
 
 .include "../../editors/emacs/modules.mk"
 
@@ -54,7 +53,7 @@ PLIST.gui=	yes
 # Work around an xemacs rendering bug for optimized GIFs, see
 # <https://github.com/doitian/emacs-w3m>, 2b
 .if (${EMACS_FLAVOR} == "xemacs")
-DEPENDS+=	gifsicle:../../graphics/gifsicle
+DEPENDS+=	gifsicle-[0-9]*:../../graphics/gifsicle
 .endif
 
 DOCUMENTS=	COPYING ChangeLog ChangeLog.1 README README.ja
diff --git a/haskell-mode/Makefile b/haskell-mode/Makefile
index 9dcb42773e..612d0255fe 100644
--- a/haskell-mode/Makefile
+++ b/haskell-mode/Makefile
@@ -1,5 +1,5 @@
 # $NetBSD: Makefile,v 1.4 2012/09/29 17:05:53 asau Exp $
-#
+
 DISTNAME=		haskell-mode-2.7.0
 PKGNAME=		${EMACS_PKGNAME_PREFIX}${DISTNAME}
 CATEGORIES=		devel
@@ -10,6 +10,7 @@ MAINTAINER=		pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=		https://www.haskell.org/haskell-mode/
 COMMENT=		Haskell mode for Emacs
 
+EMACS_VERSIONS_INCOMPATIBLE=	emacs20 emacs31 emacs31nox xemacs214 xemacs215 xemacs214nox xemacs215nox
 
 MESSAGE_SUBST+=		LISPDIR=${EMACS_LISPPREFIX}
 
diff --git a/magit-git/Makefile b/magit-git/Makefile
index 62a1002a46..2db568a626 100644
--- a/magit-git/Makefile
+++ b/magit-git/Makefile
@@ -2,9 +2,11 @@
 
 VERSION=	4.1.3
 DISTNAME=	magit-${VERSION}
+PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=magit/}
 GITHUB_TAG=	v${VERSION}
+WRKSRC=		${WRKDIR}/${DISTNAME}
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	https://github.com/magit/
@@ -15,15 +17,13 @@ LICENSE=	gnu-gpl-v3
 DEPENDS+=	gtexinfo-[0-9]*:../../devel/gtexinfo
 DEPENDS+=	p5-gettext-[0-9]*:../../devel/p5-gettext
 
-#MAKE_ENV+=	MANUAL_HTML_ARGS=
-#MAKE_ENV+=	-DPREFIX=${PREFIX}
-#MAKE_ENV+=	-DDASH_DIR=${PREFIX}/share/emacs/site-lisp/dash
-#MAKE_ENV+=	-DINSTALL_INFO=install-info
-
-SUBST_CLASSES+=		lisp
-SUBST_FILES.lisp=	default.mk
-SUBST_STAGE.lisp=	pre-build
-SUBST_SED.lisp=		-e s.@@PREFIX@@.${PREFIX}.
+MAKE_FLAGS+=	MANUAL_HTML_ARGS=
+MAKE_FLAGS+=	INSTALL_INFO=install-info
+MAKE_FLAGS+=	COMPAT_DIR=${EMACS_LISPPREFIX}/compat
+MAKE_FLAGS+=	DASH_DIR=${EMACS_LISPPREFIX}/dash
+MAKE_FLAGS+=	TRANSIENT_DIR=${EMACS_LISPPREFIX}/transient
+MAKE_FLAGS+=	WITH_EDITOR_DIR=${EMACS_LISPPREFIX}/with-editor
+MAKE_FLAGS+=	lispdir=${EMACS_LISPPREFIX}/magit
 
 SUBST_CLASSES+=		batch
 SUBST_FILES.batch=	default.mk lisp/Makefile test/Makefile
@@ -36,6 +36,8 @@ USE_LANGUAGES=	#
 USE_TOOLS+=	gmake makeinfo
 MAKE_JOBS_SAFE=	no
 
+EMACS_VERSIONS_ACCEPTED=	emacs30
+
 .include "../../editors/emacs/modules.mk"
 
 #INFO_FILES=	yes
diff --git a/magit-git/distinfo b/magit-git/distinfo
index f1e26d5d22..e93c457573 100644
--- a/magit-git/distinfo
+++ b/magit-git/distinfo
@@ -4,4 +4,3 @@ BLAKE2s (magit-4.1.3.tar.gz) = b9c8bab2b4002a537ac4e2efb9b737f43eafb6fa37aea4213
 SHA512 (magit-4.1.3.tar.gz) = 1f589b9d08e29a072d71e363c4326db341890e25e52d8c5dd75c0f9dd5bb1e663d2fc0d5c6be396dd557318725cc063b7cb0ed2acddbf9fa980c6e36a415edf3
 Size (magit-4.1.3.tar.gz) = 676146 bytes
 SHA1 (patch-Makefile) = f5ca5309c2f62fa731dc40316622d8b7b13591ae
-SHA1 (patch-default.mk) = 26b19fb25656d1c471f347502640f76327a5a220
diff --git a/magit-git/patches/patch-default.mk b/magit-git/patches/patch-default.mk
deleted file mode 100644
index 8038c8a092..0000000000
--- a/magit-git/patches/patch-default.mk
+++ /dev/null
@@ -1,53 +0,0 @@
-$NetBSD$
-
-1. makeinfo unknown option css-ref
-
-2. adjust ELPA package to pkgsrc (DASH_DIR)
-
-3. set INSTALL_INFO
-
---- default.mk.orig	2024-12-07 07:14:31.000000000 +0900
-+++ default.mk	2024-12-30 13:59:47.275422244 +0900
-@@ -34,8 +34,10 @@ BATCH       = $(EMACS) -Q --batch $(EMAC
- LISP_EXTRA_TARGETS ?= check-declare
- 
- INSTALL_INFO     ?= $(shell command -v ginstall-info || printf install-info)
-+INSTALL_INFO	= install-info
- MAKEINFO         ?= makeinfo
- MANUAL_HTML_ARGS ?= --css-ref /assets/page.css
-+MANUAL_HTML_ARGS =
- 
- GITSTATS      ?= gitstats
- GITSTATS_DIR  ?= $(TOP)docs/stats
-@@ -144,6 +146,7 @@ COMPAT_DIR ?= $(shell \
- ifeq "$(COMPAT_DIR)" ""
-   COMPAT_DIR = $(TOP)../compat
- endif
-+COMPAT_DIR = @@PREFIX@@/share/emacs/site-lisp/compat
- 
- DASH_DIR ?= $(shell \
-   find -L $(ELPA_DIR) -maxdepth 1 -regex '.*/dash-[.0-9]*' 2> /dev/null | \
-@@ -151,6 +154,7 @@ DASH_DIR ?= $(shell \
- ifeq "$(DASH_DIR)" ""
-   DASH_DIR = $(TOP)../dash
- endif
-+DASH_DIR = @@PREFIX@@/share/emacs/site-lisp/dash
- 
- SEQ_DIR ?= $(shell \
-   find -L $(ELPA_DIR) -maxdepth 1 -regex '.*/seq-[.0-9]*' 2> /dev/null | \
-@@ -165,6 +169,7 @@ TRANSIENT_DIR ?= $(shell \
- ifeq "$(TRANSIENT_DIR)" ""
-   TRANSIENT_DIR = $(TOP)../transient/lisp
- endif
-+TRANSIENT_DIR = @@PREFIX@@/share/emacs/site-lisp/transient
- 
- WITH_EDITOR_DIR ?= $(shell \
-   find -L $(ELPA_DIR) -maxdepth 1 -regex '.*/with-editor-[.0-9]*' 2> /dev/null | \
-@@ -172,6 +177,7 @@ WITH_EDITOR_DIR ?= $(shell \
- ifeq "$(WITH_EDITOR_DIR)" ""
-   WITH_EDITOR_DIR = $(TOP)../with-editor/lisp
- endif
-+WITH_EDITOR_DIR = @@PREFIX@@/share/emacs/site-lisp/with-editor
- 
- MAGIT_SECTION_DIR ?= $(shell \
-   find -L $(ELPA_DIR) -maxdepth 1 -regex '.*/magit-section-[.0-9]*' 2> /dev/null | \
diff --git a/mediawiki-mode/Makefile b/mediawiki-mode/Makefile
index 691cf0c67d..fe90699131 100644
--- a/mediawiki-mode/Makefile
+++ b/mediawiki-mode/Makefile
@@ -1,20 +1,18 @@
 # $NetBSD: Makefile,v 1.3 2014/06/01 12:49:37 thomasklausner Exp $
-#
 
 DISTNAME=	mediawiki
-PKGNAME=	mediawiki-mode-2.2.4
+PKGNAME=	${EMACS_PKGNAME_PREFIX}mediawiki-mode-2.2.4
 CATEGORIES=	editors
 MASTER_SITES=	https://launchpad.net/mediawiki-el/2.2/${PKGVERSION_NOREV}/+download/
 EXTRACT_SUFX=	.el
 
-# FIXME: pkgsrc is not currently able to fetch distfiles from https
-# web servers. See http://gnats.netbsd.org/45680
-
 MAINTAINER=	pho%cielonegro.org@localhost
 HOMEPAGE=	https://www.emacswiki.org/emacs/MediaWikiMode
 COMMENT=	Emacs frontend for MediaWiki
 LICENSE=	gnu-gpl-v3
 
+EMACS_VERSIONS_INCOMPATIBLE=	emacs20 xemacs214 xemacs214nox xemacs215 xemacs215nox
+
 INSTALLATION_DIRS+=	${EMACS_LISPPREFIX}
 
 WRKSRC=		${WRKDIR}
diff --git a/mpc-el/Makefile b/mpc-el/Makefile
index f2dda8578d..898731efa7 100644
--- a/mpc-el/Makefile
+++ b/mpc-el/Makefile
@@ -1,8 +1,7 @@
 # $NetBSD: Makefile,v 1.3 2012/10/03 14:32:32 asau Exp $
-#
 
 DISTNAME=	mpc.el-p29
-PKGNAME=	mpc-el-29
+PKGNAME=	${EMACS_PKGNAME_PREFIX}mpc-el-29
 CATEGORIES=	audio
 MASTER_SITES=	http://www.iro.umontreal.ca/~monnier/elisp/
 
@@ -14,6 +13,8 @@ USE_TOOLS+=	gmake
 
 MESSAGE_SUBST+=		LISPDIR=${EMACS_LISPPREFIX}
 
+EMACS_VERSIONS_INCOMPATIBLE=	emacs20 emacs29 emacs30 emacs31 emacs29nox emacs30nox emacs31nox
+
 do-build:
 	cd ${WRKSRC} && \
 		rm -f *.elc *-autoloads.el && \
diff --git a/mu-cite/Makefile b/mu-cite/Makefile
index f3e98e362d..26face406e 100644
--- a/mu-cite/Makefile
+++ b/mu-cite/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD: Makefile,v 1.6 2014/06/15 13:29:21 makoto Exp $
 
 DISTNAME=	mu-cite-0.20240802
+PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_GITHUB:=cvs-m17n-org/}
 GITHUB_TAG=	62d42d2ef18a89bb109582f3b9466d46f9e7d4a0
@@ -10,7 +11,7 @@ HOMEPAGE=	http://emacs-21.ki.nu/application/mu-cite.html
 COMMENT=	Mail (MUA) companion to cite other's mail
 LICENSE=	gnu-gpl-v2
 
-WRKSRC=	${WRKDIR}/${PKGBASE:tu}-${GITHUB_TAG}
+WRKSRC=	${WRKDIR}/MU-CITE-${GITHUB_TAG}
 
 SUBST_CLASSES+=		dest
 SUBST_STAGE.dest=	pre-build
@@ -18,10 +19,12 @@ SUBST_MESSAGE.dest=	replacing for dest-dir
 SUBST_SED.dest=		-e 's|@@PREFIX@@|${DESTDIR}${PREFIX}|'
 SUBST_FILES.dest+=	Makefile
 
+EMACS_VERSIONS_INCOMPATIBLE=	emacs20 xemacs214 xemacs215 xemacs214nox xemacs215nox
+
 .include "../../editors/emacs/modules.mk"
 
-DEPENDS+=		flim-[0-9]*:../../devel/flim
-DEPENDS+=		bbdb-[0-9]*:../../misc/bbdb3
+DEPENDS+=		${EMACS_PKGNAME_PREFIX}flim-[0-9]*:../../devel/flim
+DEPENDS+=		${EMACS_PKGNAME_PREFIX}bbdb-[0-9]*:../../misc/bbdb3
 MAKE_DIRS+=		${PREFIX}/share/doc/mu-cite
 AUTO_MKDIRS=		yes
 
diff --git a/navi2ch-current/Makefile b/navi2ch-current/Makefile
index 23662bbb20..458cac5a63 100644
--- a/navi2ch-current/Makefile
+++ b/navi2ch-current/Makefile
@@ -16,6 +16,8 @@ GIT_REPOSITORIES=	master
 GIT_REPO.master=	git://navi2ch.git.sourceforge.net/gitroot/navi2ch/navi2ch
 GIT_MODULE.master=	navi2ch
 
+EMACS_VERSIONS_INCOMPATIBLE=	emacs20
+
 GNU_CONFIGURE=	yes
 USE_TOOLS+=	gmake
 INFO_FILES=	yes
diff --git a/navi2ch-current/PLIST b/navi2ch-current/PLIST
index 102011bd30..b669ae23e8 100644
--- a/navi2ch-current/PLIST
+++ b/navi2ch-current/PLIST
@@ -1,5 +1,5 @@
 @comment $NetBSD: PLIST,v 1.1.1.1 2011/08/14 08:20:06 phonohawk Exp $
-info/navi2ch.info
+${EMACS_INFOPREFIX}/navi2ch.info
 ${EMACS_LISPPREFIX}/navi2ch/navi2ch-article.el
 ${EMACS_LISPPREFIX}/navi2ch/navi2ch-article.elc
 ${EMACS_LISPPREFIX}/navi2ch/navi2ch-articles.el
diff --git a/org-caldav-git/Makefile b/org-caldav-git/Makefile
index c3de742988..d5c308c232 100644
--- a/org-caldav-git/Makefile
+++ b/org-caldav-git/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD: Makefile,v 1.1 2013/09/12 18:01:46 thomasklausner Exp $
 
 DISTNAME=		org-caldav-0.0
+PKGNAME=		${EMACS_PKGNAME_PREFIX}${DISTNAME}
 CATEGORIES=		time net
 MASTER_SITES=		https://github.com/dengste/org-caldav
 LICENSE=		gnu-gpl-v3
@@ -15,16 +16,18 @@ GIT_REPO.org-caldav=	https://github.com/dengste/org-caldav.git
 WRKSRC=			${WRKDIR}/org-caldav
 EGG_NAME=		${DISTNAME}.dev
 INSTALLATION_DIRS=	share/doc/org-caldav
-INSTALLATION_DIRS+=	${EMACS_LISPPREFIX}/${PKGBASE}
+INSTALLATION_DIRS+=	${EMACS_LISPPREFIX}/org-caldav
+
+EMACS_VERSIONS_INCOMPATIBLE=	emacs20 xemacs214 xemacs215 xemacs214nox xemacs215nox
 
 do-build:
 	cd ${WRKSRC} && \
 		${EMACS_BIN} -L . -Q -batch -f batch-byte-compile *.el
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/*.el   ${DESTDIR}${EMACS_LISPPREFIX}/${PKGBASE}
-	${INSTALL_DATA} ${WRKSRC}/*.elc  ${DESTDIR}${EMACS_LISPPREFIX}/${PKGBASE}
-	${INSTALL_DATA} ${WRKSRC}/README.md ${DESTDIR}${PREFIX}/share/doc/org-caldav
+	${INSTALL_DATA} ${WRKSRC}/*.el   ${DESTDIR}${EMACS_LISPPREFIX}/org-caldav
+	${INSTALL_DATA} ${WRKSRC}/*.elc  ${DESTDIR}${EMACS_LISPPREFIX}/org-caldav
+	${INSTALL_DATA} ${WRKSRC}/Readme.org ${DESTDIR}${PREFIX}/share/doc/org-caldav
 
 .include "../../editors/emacs/modules.mk"
 .include "../../wip/mk/git-package.mk"
diff --git a/org-caldav-git/PLIST b/org-caldav-git/PLIST
index 825d84fc6f..96855af583 100644
--- a/org-caldav-git/PLIST
+++ b/org-caldav-git/PLIST
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1 2013/09/12 18:01:46 thomasklausner Exp $
-share/doc/org-caldav/README.md
-${EMACS_LISPPREFIX}/org-caldav/org-caldav-testsuite.el
-${EMACS_LISPPREFIX}/org-caldav/org-caldav-testsuite.elc
+@comment $NetBSD$
+share/doc/org-caldav/Readme.org
+${EMACS_LISPPREFIX}/org-caldav/org-caldav-tests.el
+${EMACS_LISPPREFIX}/org-caldav/org-caldav-tests.elc
 ${EMACS_LISPPREFIX}/org-caldav/org-caldav.el
 ${EMACS_LISPPREFIX}/org-caldav/org-caldav.elc
diff --git a/popup-el-current/Makefile b/popup-el-current/Makefile
index bb28f78234..568dc98832 100644
--- a/popup-el-current/Makefile
+++ b/popup-el-current/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.1 2012/10/12 11:15:24 thomasklausner Exp $
-#
 
 DISTNAME=	popup-el-0
+PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
 CATEGORIES=	editors
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
@@ -13,17 +13,19 @@ GIT_REPOSITORIES=	popup-el
 GIT_REPO.popup-el=	https://github.com/auto-complete/popup-el.git
 .include "../../wip/mk/git-package.mk"
 
+EMACS_VERSIONS_INCOMPATIBLE=	emacs20 xemacs214 xemacs214nox xemacs215 xemacs215nox
+
 WRKSRC=			${WRKDIR}/popup-el
 
-INSTALLATION_DIRS=	${EMACS_LISPPREFIX}/${PKGBASE}
+INSTALLATION_DIRS=	${EMACS_LISPPREFIX}/popup-el
 
 do-build:
 	cd ${WRKSRC} && \
-		${EMACS_BIN} -Q -L . -batch -f batch-byte-compile *.el
+		${EMACS_BIN} -L . -batch -f batch-byte-compile *.el
 
 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}/popup-el
+	${INSTALL_DATA} ${WRKSRC}/*.elc  ${DESTDIR}${EMACS_LISPPREFIX}/popup-el
 
 .include "../../editors/emacs/modules.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/rst-mode/Makefile b/rst-mode/Makefile
index 61333099d3..1277826bfd 100644
--- a/rst-mode/Makefile
+++ b/rst-mode/Makefile
@@ -1,8 +1,7 @@
 # $NetBSD: Makefile,v 1.4 2012/10/07 14:53:44 asau Exp $
-#
 
 DISTNAME=	rst
-PKGNAME=	rst-mode-0.6
+PKGNAME=	${EMACS_PKGNAME_PREFIX}rst-mode-0.6
 CATEGORIES=	editors
 MASTER_SITES=	http://docutils.sourceforge.net/tools/editors/emacs/
 EXTRACT_SUFX=	.el
@@ -16,6 +15,8 @@ USE_LANGUAGES=	# none
 
 NO_CONFIGURE=	YES
 
+EMACS_VERSIONS_INCOMPATIBLE=	emacs20 xemacs214 xemacs214nox xemacs215 xemacs215nox
+
 do-build:
 	cd ${WRKSRC} \
 	&& ${EMACS_BIN} -batch -f batch-byte-compile rst.el
diff --git a/rst-mode/distinfo b/rst-mode/distinfo
index c88fbf0a3b..c40a6d06f9 100644
--- a/rst-mode/distinfo
+++ b/rst-mode/distinfo
@@ -1,4 +1,5 @@
 $NetBSD: distinfo,v 1.2 2009/07/30 06:07:12 phonohawk Exp $
 
-RMD160 (rst.el) = 2b0c55b16a73e353d60c66d34860c87980dc035a
-Size (rst.el) = 117357 bytes
+BLAKE2s (rst.el) = 48cb612311a3a3c04363fe8e492ff793d299ded236ee301792b5a8bde48c4fe8
+SHA512 (rst.el) = d00e7e49d87ab5ae522de74e46896ed11e84e793f0ab367825d9355f08cc7043f4ff178b394a140fd3378a429e4206f4a249d56993242db1f51d940dd6a72ccc
+Size (rst.el) = 167363 bytes
diff --git a/semi/Makefile b/semi/Makefile
index 964f671519..a0f0dcb564 100644
--- a/semi/Makefile
+++ b/semi/Makefile
@@ -7,6 +7,7 @@ CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=wanderlust/}
 GITHUB_TAG=	8264b478c4f6367ff4cea0c2f13abfda152a13d0
 
+BROKEN=		"github commit does not exist in repository"
 
 # This fix will be unnecessary for the next release.
 #PATCH_SITES=		${MASTER_SITE_LOCAL} #PATCHFILES=		semi-1.14.6-pgg-gpg.patch
@@ -32,6 +33,8 @@ INFO_FILES=	yes
 EMACS_MODULES=		base
 EMACS_BUILDLINK=	# defined
 
+EMACS_VERSIONS_INCOMPATIBLE=	emacs20 # apel
+
 BUILD_TARGET.emacs=	elc
 BUILD_TARGET.xemacs=	package
 INSTALL_TARGET.emacs=	install
diff --git a/slime/Makefile b/slime/Makefile
index 3e687c64e8..143dff4fc6 100644
--- a/slime/Makefile
+++ b/slime/Makefile
@@ -1,12 +1,11 @@
 # $NetBSD$
-#
 
 DISTNAME=		v${PKGVER}
 PKGVER=			2.20
 PKGNAME=		${EMACS_PKGNAME_PREFIX}slime-${PKGVER}
 CATEGORIES=		editors
 MASTER_SITES=		${MASTER_SITE_GITHUB:=slime}/slime/archive/
-DIST_SUBDIR=		${PKGBASE}
+DIST_SUBDIR=		slime
 
 MAINTAINER=		jfranz%bsdprojects.net@localhost
 HOMEPAGE=		https://common-lisp.net/project/slime/
@@ -19,9 +18,6 @@ USE_TOOLS+=		gmake makeinfo
 NO_CONFIGURE=		yes
 INFO_FILES=		yes
 
-EMACS_VERSIONS_ACCEPTED= \
-			emacs25 emacs25nox
-
 INSTALLATION_DIRS+=	${EMACS_INFOPREFIX}
 INSTALLATION_DIRS+=	${EMACS_LISPPREFIX}/slime
 INSTALLATION_DIRS+=	${EMACS_LISPPREFIX}/slime/lib
@@ -29,6 +25,8 @@ INSTALLATION_DIRS+=	${EMACS_LISPPREFIX}/slime/swank
 
 SLIME_LISPDIR=		${EMACS_LISPPREFIX}/slime
 
+EMACS_VERSIONS_ACCEPTED=	# empty
+
 do-build:
 	cd ${WRKSRC}/doc && ${GMAKE} slime.info
 	cd ${WRKSRC} && ${EMACS_BIN} --batch --no-init-file --no-site-lisp \
diff --git a/t-gnus/Makefile b/t-gnus/Makefile
index e8e521f454..7e316e9e34 100644
--- a/t-gnus/Makefile
+++ b/t-gnus/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD: Makefile,v 1.8 2012/10/07 17:17:20 asau Exp $
 
 DISTNAME=	t-gnus-6.17.2.00
+PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
 CATEGORIES=	mail
 FETCH_CMD=	${FILESDIR}/fetch.sh
 
@@ -8,8 +9,9 @@ MAINTAINER=	carton%Ivy.NET@localhost
 HOMEPAGE=	https://gnus.org/
 COMMENT=	Gnus is a flexible message reader running under GNU Emacs
 
-DEPENDS+=	semi>=1.14.6:../../devel/semi
+DEPENDS+=	${EMACS_PKGNAME_PREFIX}semi>=1.14.6:../../devel/semi
 
+EMACS_VERSIONS_INCOMPATIBLE=	emacs20 # semi
 
 WRKSRC=		${WRKDIR}/gnus
 
diff --git a/tc-git/Makefile b/tc-git/Makefile
index ead2da2c13..0fd7f7a33f 100644
--- a/tc-git/Makefile
+++ b/tc-git/Makefile
@@ -3,7 +3,6 @@
 DISTNAME=		tc-2.99.3
 PKGNAME=		${EMACS_PKGNAME_PREFIX}${DISTNAME}
 MASTER_SITES=   	${MASTER_SITE_GITHUB:=makoto-fujiwara/}
-PKG_REVISION=		1
 
 CATEGORIES=		inputmethod
 
@@ -14,7 +13,7 @@ COMMENT=		2-stroke non associative direct input for Kanji
 LICENSE=		gnu-gpl-v2
 
 INSTALLATION_DIRS=	${EMACS_INFOPREFIX} \
-			${EMACS_LISPPREFIX}/${DISTNAME} \
+			${EMACS_LISPPREFIX}/tc \
 			share/examples/tc
 
 EMACS_MODULES=		base
@@ -32,8 +31,10 @@ INFO_FILES=		YES
 
 MAKE_JOBS_SAFE=		no
 
-CONFIGURE_ARGS.emacs=	--with-lispdir=${EMACS_LISPPREFIX}/${DISTNAME}
-CONFIGURE_ARGS.emacs+=	--datadir=${PREFIX}/share
+CONFIGURE_ARGS=		--with-lispdir=${EMACS_LISPPREFIX}/tc
+CONFIGURE_ARGS+=	--datadir=${PREFIX}/share
+
+EMACS_VERSIONS_INCOMPATIBLE=	emacs20 emacs30 emacs30nox emacs31 emacs31nox xemacs215 xemacs215nox
 
 #.include "options.mk"
 PLIST_SUBST+=		DISTNAME=${DISTNAME}
diff --git a/tc-git/PLIST b/tc-git/PLIST
index 4501222782..888370dc8c 100644
--- a/tc-git/PLIST
+++ b/tc-git/PLIST
@@ -1,60 +1,60 @@
-@comment $NetBSD: PLIST,v 1.1 2013/01/22 13:54:21 makoto Exp $
+@comment $NetBSD$
 bin/tcinput
 info/tc.info
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/eelll.el
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/eelll.elc
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-bitmap.el
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-bushu.el
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-bushu.elc
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-complete.el
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-complete.elc
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-help.el
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-help.elc
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-image.el
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-image.elc
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-inst.el
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-inst.elc
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-is18.el
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-is18.elc
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-is19.el
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-is19.elc
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-is20.el
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-is20.elc
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-is22.el
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-is22.elc
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-ja-alnum.el
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-ja-alnum.elc
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-jiscode.el
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-jiscode.elc
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-mazegaki.el
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-mazegaki.elc
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-mkmzdic.el
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-mkmzdic.elc
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-pre.el
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-pre.elc
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-setup.el
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-setup.elc
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-stat.el
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-stat.elc
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-sysdep.el
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-tbl.el
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-tbl.elc
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-util.el
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-util.elc
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc.el
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc.elc
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/try-etbl.el
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/try-etbl.elc
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/try-tbl.el
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/try-tbl.elc
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/ttc-ltbl.el
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/ttc-ltbl.elc
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/ttc-rtbl.el
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/ttc-rtbl.elc
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/ttc-tbl.el
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/ttc-tbl.elc
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tutc-tbl.el
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tutc-tbl.elc
+${EMACS_LISPPREFIX}/tc/eelll.el
+${EMACS_LISPPREFIX}/tc/eelll.elc
+${EMACS_LISPPREFIX}/tc/tc-bitmap.el
+${EMACS_LISPPREFIX}/tc/tc-bushu.el
+${EMACS_LISPPREFIX}/tc/tc-bushu.elc
+${EMACS_LISPPREFIX}/tc/tc-complete.el
+${EMACS_LISPPREFIX}/tc/tc-complete.elc
+${EMACS_LISPPREFIX}/tc/tc-help.el
+${EMACS_LISPPREFIX}/tc/tc-help.elc
+${EMACS_LISPPREFIX}/tc/tc-image.el
+${EMACS_LISPPREFIX}/tc/tc-image.elc
+${EMACS_LISPPREFIX}/tc/tc-inst.el
+${EMACS_LISPPREFIX}/tc/tc-inst.elc
+${EMACS_LISPPREFIX}/tc/tc-is18.el
+${EMACS_LISPPREFIX}/tc/tc-is18.elc
+${EMACS_LISPPREFIX}/tc/tc-is19.el
+${EMACS_LISPPREFIX}/tc/tc-is19.elc
+${EMACS_LISPPREFIX}/tc/tc-is20.el
+${EMACS_LISPPREFIX}/tc/tc-is20.elc
+${EMACS_LISPPREFIX}/tc/tc-is22.el
+${EMACS_LISPPREFIX}/tc/tc-is22.elc
+${EMACS_LISPPREFIX}/tc/tc-ja-alnum.el
+${EMACS_LISPPREFIX}/tc/tc-ja-alnum.elc
+${EMACS_LISPPREFIX}/tc/tc-jiscode.el
+${EMACS_LISPPREFIX}/tc/tc-jiscode.elc
+${EMACS_LISPPREFIX}/tc/tc-mazegaki.el
+${EMACS_LISPPREFIX}/tc/tc-mazegaki.elc
+${EMACS_LISPPREFIX}/tc/tc-mkmzdic.el
+${EMACS_LISPPREFIX}/tc/tc-mkmzdic.elc
+${EMACS_LISPPREFIX}/tc/tc-pre.el
+${EMACS_LISPPREFIX}/tc/tc-pre.elc
+${EMACS_LISPPREFIX}/tc/tc-setup.el
+${EMACS_LISPPREFIX}/tc/tc-setup.elc
+${EMACS_LISPPREFIX}/tc/tc-stat.el
+${EMACS_LISPPREFIX}/tc/tc-stat.elc
+${EMACS_LISPPREFIX}/tc/tc-sysdep.el
+${EMACS_LISPPREFIX}/tc/tc-tbl.el
+${EMACS_LISPPREFIX}/tc/tc-tbl.elc
+${EMACS_LISPPREFIX}/tc/tc-util.el
+${EMACS_LISPPREFIX}/tc/tc-util.elc
+${EMACS_LISPPREFIX}/tc/tc.el
+${EMACS_LISPPREFIX}/tc/tc.elc
+${EMACS_LISPPREFIX}/tc/try-etbl.el
+${EMACS_LISPPREFIX}/tc/try-etbl.elc
+${EMACS_LISPPREFIX}/tc/try-tbl.el
+${EMACS_LISPPREFIX}/tc/try-tbl.elc
+${EMACS_LISPPREFIX}/tc/ttc-ltbl.el
+${EMACS_LISPPREFIX}/tc/ttc-ltbl.elc
+${EMACS_LISPPREFIX}/tc/ttc-rtbl.el
+${EMACS_LISPPREFIX}/tc/ttc-rtbl.elc
+${EMACS_LISPPREFIX}/tc/ttc-tbl.el
+${EMACS_LISPPREFIX}/tc/ttc-tbl.elc
+${EMACS_LISPPREFIX}/tc/tutc-tbl.el
+${EMACS_LISPPREFIX}/tc/tutc-tbl.elc
 share/examples/tc/sample.tc
 share/tc/EELLLTXT
 share/tc/EELLLTXT.tut
diff --git a/tc/Makefile b/tc/Makefile
index 0796ae59ff..36ca802590 100644
--- a/tc/Makefile
+++ b/tc/Makefile
@@ -2,9 +2,10 @@
 
 DISTNAME=		tc-2.99.3
 PKGNAME=		${EMACS_PKGNAME_PREFIX}${DISTNAME}
+PKGREVISION=		1
 MASTER_SITES=		${MASTER_SITE_GITHUB:=makoto-fujiwara/}
 CATEGORIES=		inputmethod
-PKGREVISION=		1
+GITHUB_PROJECT=		tc
 
 MAINTAINER=		makoto%ki.nu@localhost
 HOMEPAGE=		http://openlab.ring.gr.jp/tcode/index.html
@@ -13,7 +14,7 @@ COMMENT=		2-stroke non associative direct input for Kanji
 LICENSE=		gnu-gpl-v2
 
 INSTALLATION_DIRS=	${EMACS_INFOPREFIX} \
-			${EMACS_LISPPREFIX}/${DISTNAME} \
+			${EMACS_LISPPREFIX}/tc \
 			share/examples/tc
 
 EMACS_MODULES=		base
@@ -29,6 +30,8 @@ MAKEFLAGS+=		EMACS=${EMACS_BIN}
 MESSAGE_SUBST+=		LISPDIR=${EMACS_LISPPREFIX}
 INFO_FILES=		YES
 
+EMACS_VERSIONS_ACCEPTED=	emacs29 emacs29nox xemacs214 xemacs214nox
+
 # fatal: unable to access 'http://github.com/kanchoku/tc.git/': SSL certificate problem: unable to get local issuer certificate
 # Add "-c http.sslVerify=false" to git command or,
 #PKGSRC_SETENV=		GIT_SSL_NO_VERIFY=true
@@ -38,8 +41,8 @@ INFO_FILES=		YES
 #  For the target in etc/Makefile ->  bushu.expand bushu.index2: bushu.rev $(BATCH_SORT)
 MAKE_JOBS_SAFE=		no
 
-CONFIGURE_ARGS.emacs=	--with-lispdir=${EMACS_LISPPREFIX}/${DISTNAME}
-CONFIGURE_ARGS.emacs+=	--datadir=${PREFIX}/share
+CONFIGURE_ARGS=		--with-lispdir=${EMACS_LISPPREFIX}/tc
+CONFIGURE_ARGS+=	--datadir=${PREFIX}/share
 
 #.include "options.mk"
 PLIST_SUBST+=		DISTNAME=${DISTNAME}
diff --git a/tc/PLIST b/tc/PLIST
index 4501222782..888370dc8c 100644
--- a/tc/PLIST
+++ b/tc/PLIST
@@ -1,60 +1,60 @@
-@comment $NetBSD: PLIST,v 1.1 2013/01/22 13:54:21 makoto Exp $
+@comment $NetBSD$
 bin/tcinput
 info/tc.info
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/eelll.el
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/eelll.elc
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-bitmap.el
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-bushu.el
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-bushu.elc
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-complete.el
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-complete.elc
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-help.el
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-help.elc
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-image.el
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-image.elc
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-inst.el
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-inst.elc
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-is18.el
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-is18.elc
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-is19.el
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-is19.elc
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-is20.el
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-is20.elc
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-is22.el
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-is22.elc
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-ja-alnum.el
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-ja-alnum.elc
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-jiscode.el
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-jiscode.elc
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-mazegaki.el
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-mazegaki.elc
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-mkmzdic.el
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-mkmzdic.elc
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-pre.el
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-pre.elc
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-setup.el
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-setup.elc
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-stat.el
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-stat.elc
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-sysdep.el
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-tbl.el
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-tbl.elc
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-util.el
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc-util.elc
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc.el
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tc.elc
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/try-etbl.el
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/try-etbl.elc
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/try-tbl.el
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/try-tbl.elc
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/ttc-ltbl.el
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/ttc-ltbl.elc
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/ttc-rtbl.el
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/ttc-rtbl.elc
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/ttc-tbl.el
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/ttc-tbl.elc
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tutc-tbl.el
-${EMACS_LISPPREFIX}/tc-${PKGVERSION}/tutc-tbl.elc
+${EMACS_LISPPREFIX}/tc/eelll.el
+${EMACS_LISPPREFIX}/tc/eelll.elc
+${EMACS_LISPPREFIX}/tc/tc-bitmap.el
+${EMACS_LISPPREFIX}/tc/tc-bushu.el
+${EMACS_LISPPREFIX}/tc/tc-bushu.elc
+${EMACS_LISPPREFIX}/tc/tc-complete.el
+${EMACS_LISPPREFIX}/tc/tc-complete.elc
+${EMACS_LISPPREFIX}/tc/tc-help.el
+${EMACS_LISPPREFIX}/tc/tc-help.elc
+${EMACS_LISPPREFIX}/tc/tc-image.el
+${EMACS_LISPPREFIX}/tc/tc-image.elc
+${EMACS_LISPPREFIX}/tc/tc-inst.el
+${EMACS_LISPPREFIX}/tc/tc-inst.elc
+${EMACS_LISPPREFIX}/tc/tc-is18.el
+${EMACS_LISPPREFIX}/tc/tc-is18.elc
+${EMACS_LISPPREFIX}/tc/tc-is19.el
+${EMACS_LISPPREFIX}/tc/tc-is19.elc
+${EMACS_LISPPREFIX}/tc/tc-is20.el
+${EMACS_LISPPREFIX}/tc/tc-is20.elc
+${EMACS_LISPPREFIX}/tc/tc-is22.el
+${EMACS_LISPPREFIX}/tc/tc-is22.elc
+${EMACS_LISPPREFIX}/tc/tc-ja-alnum.el
+${EMACS_LISPPREFIX}/tc/tc-ja-alnum.elc
+${EMACS_LISPPREFIX}/tc/tc-jiscode.el
+${EMACS_LISPPREFIX}/tc/tc-jiscode.elc
+${EMACS_LISPPREFIX}/tc/tc-mazegaki.el
+${EMACS_LISPPREFIX}/tc/tc-mazegaki.elc
+${EMACS_LISPPREFIX}/tc/tc-mkmzdic.el
+${EMACS_LISPPREFIX}/tc/tc-mkmzdic.elc
+${EMACS_LISPPREFIX}/tc/tc-pre.el
+${EMACS_LISPPREFIX}/tc/tc-pre.elc
+${EMACS_LISPPREFIX}/tc/tc-setup.el
+${EMACS_LISPPREFIX}/tc/tc-setup.elc
+${EMACS_LISPPREFIX}/tc/tc-stat.el
+${EMACS_LISPPREFIX}/tc/tc-stat.elc
+${EMACS_LISPPREFIX}/tc/tc-sysdep.el
+${EMACS_LISPPREFIX}/tc/tc-tbl.el
+${EMACS_LISPPREFIX}/tc/tc-tbl.elc
+${EMACS_LISPPREFIX}/tc/tc-util.el
+${EMACS_LISPPREFIX}/tc/tc-util.elc
+${EMACS_LISPPREFIX}/tc/tc.el
+${EMACS_LISPPREFIX}/tc/tc.elc
+${EMACS_LISPPREFIX}/tc/try-etbl.el
+${EMACS_LISPPREFIX}/tc/try-etbl.elc
+${EMACS_LISPPREFIX}/tc/try-tbl.el
+${EMACS_LISPPREFIX}/tc/try-tbl.elc
+${EMACS_LISPPREFIX}/tc/ttc-ltbl.el
+${EMACS_LISPPREFIX}/tc/ttc-ltbl.elc
+${EMACS_LISPPREFIX}/tc/ttc-rtbl.el
+${EMACS_LISPPREFIX}/tc/ttc-rtbl.elc
+${EMACS_LISPPREFIX}/tc/ttc-tbl.el
+${EMACS_LISPPREFIX}/tc/ttc-tbl.elc
+${EMACS_LISPPREFIX}/tc/tutc-tbl.el
+${EMACS_LISPPREFIX}/tc/tutc-tbl.elc
 share/examples/tc/sample.tc
 share/tc/EELLLTXT
 share/tc/EELLLTXT.tut
diff --git a/textile-mode/Makefile b/textile-mode/Makefile
index 653e817530..e0f94bb99e 100644
--- a/textile-mode/Makefile
+++ b/textile-mode/Makefile
@@ -1,8 +1,7 @@
 # $NetBSD: Makefile,v 1.1 2014/03/19 07:34:07 phonohawk Exp $
-#
 
 DISTNAME=	textile-mode
-PKGNAME=	${DISTNAME}-2006.03.30
+PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}-2006.03.30
 CATEGORIES=	editors
 MASTER_SITES=	http://dev.nozav.org/scripts/
 EXTRACT_SUFX=	.el
diff --git a/transient/Makefile b/transient/Makefile
index 9fb76679ac..842c262050 100644
--- a/transient/Makefile
+++ b/transient/Makefile
@@ -2,9 +2,11 @@
 
 VERSION=	0.8.1
 DISTNAME=	transient-${VERSION}
+PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=magit/}
 GITHUB_TAG=	v${VERSION}
+WRKSRC=		${WRKDIR}/${DISTNAME}
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	https://github.com/magit/
@@ -18,12 +20,13 @@ USE_LANGUAGES=		c c++
 USE_TOOLS+=		gmake makeinfo
 #MAKE_JOBS_SAFE=	no
 
+EMACS_VERSIONS_INCOMPATIBLE=    emacs20 emacs29 emacs29nox xemacs214 xemacs215 xemacs214nox xemacs215nox
 
 #INFO_FILES=		yes
 #UILD_TARGET=		all
 TEST_TARGET=		check
 INSTALL_TARGET=		#
-INSTALLATION_DIRS=	${PREFIX}/share/emacs/site-lisp/transient
+INSTALLATION_DIRS=	${EMACS_LISPPREFIX}/transient
 AUTO_MKDIRS=		yes
 
 SUBST_CLASSES+=		lisp
diff --git a/transient/buildlink3.mk b/transient/buildlink3.mk
index 5e9eb3f771..ebb3a32673 100644
--- a/transient/buildlink3.mk
+++ b/transient/buildlink3.mk
@@ -5,7 +5,7 @@ BUILDLINK_TREE+=	transient
 .if !defined(TRANSIENT_BUILDLINK3_MK)
 TRANSIENT_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.transient+=	transient-[0-9]*
+BUILDLINK_API_DEPENDS.transient+=	${EMACS_PKGNAME_PREFIX}transient-[0-9]*
 BUILDLINK_PKGSRCDIR.transient?=		../../wip/transient
 
 BUILDLINK_CONTENTS_FILTER.transient+=	${EGREP} '.*\.el$$|.*\.elc$$'
diff --git a/tuareg-mode/Makefile b/tuareg-mode/Makefile
index 965debf960..5e04c2fce0 100644
--- a/tuareg-mode/Makefile
+++ b/tuareg-mode/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.12 2012/10/07 17:11:34 asau Exp $
 
-DISTNAME=	tuareg-mode-1.46.2
+DISTNAME=	tuareg-mode-1.45.7
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
 CATEGORIES=	devel editors
 MASTER_SITES=	http://www-rocq.inria.fr/~acohen/tuareg/mode/
diff --git a/tuareg-mode/distinfo b/tuareg-mode/distinfo
index 0791d8535c..c8a54fc6de 100644
--- a/tuareg-mode/distinfo
+++ b/tuareg-mode/distinfo
@@ -1,4 +1,5 @@
 $NetBSD: distinfo,v 1.7 2007/01/15 21:30:48 jtonio Exp $
 
-RMD160 (tuareg-mode-1.46.2.tar.gz) = f9829a3faf56671ea27751a737521f4d8681d5f3
-Size (tuareg-mode-1.46.2.tar.gz) = 54915 bytes
+BLAKE2s (tuareg-mode-1.45.7.tar.gz) = f458eebace5158a355e982ce4a34e9292c328b2efe3bdefafbcd07390a6903de
+SHA512 (tuareg-mode-1.45.7.tar.gz) = 56ed7a0bcb08b58ad4ba300472954f3f863790fce5a8d6ba357ad6281868bbbe006aee6ef70838e269b442e23ee71b2dd5521057d193baef6c6237a26d06d1b7
+Size (tuareg-mode-1.45.7.tar.gz) = 54768 bytes
diff --git a/undo-tree/Makefile b/undo-tree/Makefile
index 5ff2eb6b04..d48049fb06 100644
--- a/undo-tree/Makefile
+++ b/undo-tree/Makefile
@@ -1,8 +1,7 @@
 # $NetBSD: Makefile,v 1.3 2012/10/07 17:41:40 asau Exp $
-#
 
 DISTNAME=	undo-tree
-PKGNAME=	${DISTNAME}-0.3
+PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}-0.3
 CATEGORIES=	editors
 MASTER_SITES=	http://www.dr-qubit.org/${DISTNAME}/
 EXTRACT_SUFX=	.el
@@ -16,6 +15,8 @@ WRKSRC=		${WRKDIR}
 USE_LANGUAGES=	# none
 MESSAGE_SUBST+=	LISPDIR=${EMACS_LISPPREFIX}
 
+EMACS_VERSIONS_ACCEPTED=	# empty
+
 do-build:
 	cd ${WRKSRC} && ${EMACS_BIN} -batch -f batch-byte-compile ${DISTNAME}.el
 
diff --git a/undo-tree/distinfo b/undo-tree/distinfo
index be5e7c9b16..6bc2a3acbf 100644
--- a/undo-tree/distinfo
+++ b/undo-tree/distinfo
@@ -1,4 +1,5 @@
 $NetBSD: distinfo,v 1.2 2011/02/18 04:55:05 phonohawk Exp $
 
-RMD160 (undo-tree.el) = b7b25d93905487a4675ee5a21495bb91b499d888
-Size (undo-tree.el) = 121448 bytes
+BLAKE2s (undo-tree.el) = 91de0690cafc259d57e13871519ff71c1eba3a99b7cf4ad74a0517a626f538d3
+SHA512 (undo-tree.el) = 5f0564c4dedc2b522373d15b3261511f6e96fcbae15447858b49c1e9e3a45b69d22a610629680fe270c18cfd88a18fbe5f361a3f2d0b86baa50155083c8b8d63
+Size (undo-tree.el) = 186487 bytes
diff --git a/vimrc-mode/Makefile b/vimrc-mode/Makefile
index a151bf9144..6898b3d9e8 100644
--- a/vimrc-mode/Makefile
+++ b/vimrc-mode/Makefile
@@ -1,16 +1,18 @@
 # $NetBSD: Makefile,v 1.2 2012/10/07 17:41:42 asau Exp $
-#
 
 DISTNAME=	vimrc-mode-0.2.1
+PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
 CATEGORIES=	editors
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=${PKGBASE}/}
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=vimrc-mode/}
 EXTRACT_SUFX=	.el
 
 MAINTAINER=	pho%cielonegro.org@localhost
-HOMEPAGE=	https://${PKGBASE}.sourceforge.net/
+HOMEPAGE=	https://vimrc-mode.sourceforge.net/
 COMMENT=	Emacs major mode for editing .vimrc configuration files
 LICENSE=	gnu-gpl-v2
 
+EMACS_VERSIONS_INCOMPATIBLE=	emacs20 xemacs214 xemacs214nox xemacs215 xemacs215nox
+
 INSTALLATION_DIRS+=	${EMACS_LISPPREFIX}
 
 WRKSRC=		${WRKDIR}
@@ -19,12 +21,12 @@ NO_CONFIGURE=	YES
 
 do-build:
 	${RUN} cd ${WRKSRC} && \
-		${CP} -f ${DISTNAME}.el ${PKGBASE}.el && \
-		${EMACS_BIN} -batch -f batch-byte-compile ${PKGBASE}.el
+		${CP} -f ${DISTNAME}.el vimrc-mode.el && \
+		${EMACS_BIN} -batch -f batch-byte-compile vimrc-mode.el
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/${PKGBASE}.el  ${DESTDIR}${EMACS_LISPPREFIX}
-	${INSTALL_DATA} ${WRKSRC}/${PKGBASE}.elc ${DESTDIR}${EMACS_LISPPREFIX}
+	${INSTALL_DATA} ${WRKSRC}/vimrc-mode.el  ${DESTDIR}${EMACS_LISPPREFIX}
+	${INSTALL_DATA} ${WRKSRC}/vimrc-mode.elc ${DESTDIR}${EMACS_LISPPREFIX}
 
 .include "../../editors/emacs/modules.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/with-editor/Makefile b/with-editor/Makefile
index 66e3bbd19d..c4e89963e9 100644
--- a/with-editor/Makefile
+++ b/with-editor/Makefile
@@ -2,9 +2,11 @@
 
 VERSION=	3.4.3
 DISTNAME=	with-editor-${VERSION}
+PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=magit/}
 GITHUB_TAG=	v${VERSION}
+WRKSRC=		${WRKDIR}/${DISTNAME}
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	https://github.com/with-editor/
@@ -27,13 +29,15 @@ SUBST_FILES.lisp=       default.mk
 SUBST_STAGE.lisp=       pre-build
 SUBST_SED.lisp=         -e s.@@PREFIX@@.${PREFIX}.
 
+EMACS_VERSIONS_INCOMPATIBLE=    emacs20 emacs29 emacs29nox xemacs214 xemacs215 xemacs214nox xemacs215nox # emacs-compat
+
 .include "../../editors/emacs/modules.mk"
 
 #INFO_FILES=		yes
 #UILD_TARGET=		all
 TEST_TARGET=		check
 INSTALL_TARGET=		#
-INSTALLATION_DIRS=	${PREFIX}/share/emacs/site-lisp/with-editor
+INSTALLATION_DIRS=	${EMACS_LISPPREFIX}/with-editor
 AUTO_MKDIRS=		yes
 
 do-install:
diff --git a/with-editor/buildlink3.mk b/with-editor/buildlink3.mk
index 03cf0ff1da..a1cb14e66f 100644
--- a/with-editor/buildlink3.mk
+++ b/with-editor/buildlink3.mk
@@ -5,7 +5,7 @@ BUILDLINK_TREE+=	with-editor
 .if !defined(WITH_EDITOR_BUILDLINK3_MK)
 WITH_EDITOR_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.with-editor+=	with-editor-[0-9]*
+BUILDLINK_API_DEPENDS.with-editor+=	${EMACS_PKGNAME_PREFIX}with-editor-[0-9]*
 BUILDLINK_PKGSRCDIR.with-editor?=	../../wip/with-editor
 
 BUILDLINK_CONTENTS_FILTER.with-editor+=	${EGREP} '.*\.el$$|.*\.elc$$'
diff --git a/wl-snapshot/Makefile b/wl-snapshot/Makefile
index 880b51ff61..c0717ba8e6 100644
--- a/wl-snapshot/Makefile
+++ b/wl-snapshot/Makefile
@@ -37,6 +37,8 @@ INSTALLATION_DIRS=	${DOCDIR}/en ${DOCDIR}/ja \
 
 EMACS_BUILDLINK=	# empty
 
+EMACS_VERSIONS_INCOMPATIBLE=	emacs20 xemacs214 xemacs215 xemacs214nox xemacs215nox
+
 .include "options.mk"
 
 .include "../../devel/apel/buildlink3.mk"
diff --git a/wl-snapshot/options.mk b/wl-snapshot/options.mk
index 5ed00ab55e..0105b22e20 100644
--- a/wl-snapshot/options.mk
+++ b/wl-snapshot/options.mk
@@ -9,6 +9,7 @@ PKG_SUGGESTED_OPTIONS=	w3m
 PLIST_VARS+=		w3m
 
 .if !empty(PKG_OPTIONS:Mw3m)
+EMACS_VERSIONS_ACCEPTED=	emacs29 emacs29nox
 .include "../../www/emacs-w3m-snapshot/buildlink3.mk"
 PLIST.w3m=	yes
 .endif
Prev by Date: wl-git: includes missing bl3.mk, we have wl-snapshot, use that
Next by Date: magit-git -> magit: not a git package
Previous by Thread: wl-git: includes missing bl3.mk, we have wl-snapshot, use that
Next by Thread: magit-git -> magit: not a git package
Indexes:
Home | Main Index | Thread Index | Old Index