CVS commit: pkgsrc/editors

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/editors
From: "Mark Davies" <markd%netbsd.org@localhost>
Date: Wed, 14 Oct 2026 19:32:14 +0000

Module Name:    pkgsrc
Committed By:   markd
Date:           Wed Oct 14 19:32:14 UTC 2026

Modified Files:
        pkgsrc/editors/emacs20: Makefile
        pkgsrc/editors/emacs29: Makefile Makefile.common
        pkgsrc/editors/emacs29-nox11: Makefile
        pkgsrc/editors/emacs30: Makefile Makefile.common
        pkgsrc/editors/emacs30-nox11: Makefile
        pkgsrc/editors/emacs31: Makefile Makefile.common
        pkgsrc/editors/emacs31-nox11: Makefile

Log Message:
emacs*: load local-site-start from site-start.el

Since we now use site-start.el allow it to load a local-site-start.el
for those users who had their own use for it.


To generate a diff of this commit:
cvs rdiff -u -r1.69 -r1.70 pkgsrc/editors/emacs20/Makefile
cvs rdiff -u -r1.52 -r1.53 pkgsrc/editors/emacs29/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/editors/emacs29/Makefile.common
cvs rdiff -u -r1.6 -r1.7 pkgsrc/editors/emacs29-nox11/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/editors/emacs30/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/editors/emacs30/Makefile.common
cvs rdiff -u -r1.4 -r1.5 pkgsrc/editors/emacs30-nox11/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/editors/emacs31/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/editors/emacs31/Makefile.common
cvs rdiff -u -r1.2 -r1.3 pkgsrc/editors/emacs31-nox11/Makefile

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

Modified files:

Index: pkgsrc/editors/emacs20/Makefile
diff -u pkgsrc/editors/emacs20/Makefile:1.69 pkgsrc/editors/emacs20/Makefile:1.70
--- pkgsrc/editors/emacs20/Makefile:1.69        Fri Sep 25 09:48:07 2026
+++ pkgsrc/editors/emacs20/Makefile     Wed Oct 14 19:32:13 2026
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.69 2026/09/25 09:48:07 wiz Exp $
+# $NetBSD: Makefile,v 1.70 2026/10/14 19:32:13 markd Exp $
 
 DISTNAME=      emacs-20.7
 PKGNAME=       ${DISTNAME:S/emacs/emacs20/}
-PKGREVISION=   26
+PKGREVISION=   27
 CATEGORIES=    editors
 MASTER_SITES=  http://ftp.gnu.org/pub/old-gnu/emacs/
 MASTER_SITES+= ftp://ftp.gnu.org/pub/old-gnu/emacs
@@ -117,9 +117,13 @@ post-install:
 # 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.
+# Since we are using site-start.el allow it to load a local-site-start.el
+# if it exists.
 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
+       ${ECHO} '  (load "local-site-start" t)' \
+               >> ${DESTDIR}${PREFIX}/share/emacs/${PKGVERSION_NOREV}/site-lisp/site-start.el

Index: pkgsrc/editors/emacs29/Makefile
diff -u pkgsrc/editors/emacs29/Makefile:1.52 pkgsrc/editors/emacs29/Makefile:1.53
--- pkgsrc/editors/emacs29/Makefile:1.52        Tue Sep 29 06:04:46 2026
+++ pkgsrc/editors/emacs29/Makefile     Wed Oct 14 19:32:13 2026
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.52 2026/09/29 06:04:46 wiz Exp $
+# $NetBSD: Makefile,v 1.53 2026/10/14 19:32:13 markd Exp $
 
 CONFLICTS+=    emacs29-nox11-[0-9]*
 
-PKGREVISION=   34
+PKGREVISION=   35
 
 .include "../../editors/emacs29/Makefile.common"
 

Index: pkgsrc/editors/emacs29/Makefile.common
diff -u pkgsrc/editors/emacs29/Makefile.common:1.4 pkgsrc/editors/emacs29/Makefile.common:1.5
--- pkgsrc/editors/emacs29/Makefile.common:1.4  Fri Sep 25 09:48:07 2026
+++ pkgsrc/editors/emacs29/Makefile.common      Wed Oct 14 19:32:13 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.4 2026/09/25 09:48:07 wiz Exp $
+# $NetBSD: Makefile.common,v 1.5 2026/10/14 19:32:13 markd Exp $
 #
 # used by editors/emacs29/Makefile
 # used by editors/emacs29-nox11/Makefile
@@ -91,9 +91,13 @@ post-extract:
 # 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.
+# Since we are using site-start.el allow it to load a local-site-start.el
+# if it exists.
 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
+       ${ECHO} '  (load "local-site-start" t)' \
+               >> ${DESTDIR}${PREFIX}/share/emacs/${PKGVERSION_NOREV}/site-lisp/site-start.el

Index: pkgsrc/editors/emacs29-nox11/Makefile
diff -u pkgsrc/editors/emacs29-nox11/Makefile:1.6 pkgsrc/editors/emacs29-nox11/Makefile:1.7
--- pkgsrc/editors/emacs29-nox11/Makefile:1.6   Sun Oct 11 19:27:41 2026
+++ pkgsrc/editors/emacs29-nox11/Makefile       Wed Oct 14 19:32:13 2026
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2026/10/11 19:27:41 spz Exp $
+# $NetBSD: Makefile,v 1.7 2026/10/14 19:32:13 markd Exp $
 
 PKGNAME=       ${DISTNAME:S/emacs/emacs29/:S/-/-nox11-/}
-PKGREVISION=   1
+PKGREVISION=   2
 
 CONFLICTS+=    emacs29-[0-9]*
 

Index: pkgsrc/editors/emacs30/Makefile
diff -u pkgsrc/editors/emacs30/Makefile:1.21 pkgsrc/editors/emacs30/Makefile:1.22
--- pkgsrc/editors/emacs30/Makefile:1.21        Tue Sep 29 06:04:46 2026
+++ pkgsrc/editors/emacs30/Makefile     Wed Oct 14 19:32:13 2026
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2026/09/29 06:04:46 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2026/10/14 19:32:13 markd Exp $
 
 CONFLICTS+=    emacs30-nox11-[0-9]*
 
-PKGREVISION= 17
+PKGREVISION= 18
 .include "../../editors/emacs30/Makefile.common"
 
 .include "options.mk"

Index: pkgsrc/editors/emacs30/Makefile.common
diff -u pkgsrc/editors/emacs30/Makefile.common:1.5 pkgsrc/editors/emacs30/Makefile.common:1.6
--- pkgsrc/editors/emacs30/Makefile.common:1.5  Fri Sep 25 09:48:08 2026
+++ pkgsrc/editors/emacs30/Makefile.common      Wed Oct 14 19:32:13 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.5 2026/09/25 09:48:08 wiz Exp $
+# $NetBSD: Makefile.common,v 1.6 2026/10/14 19:32:13 markd Exp $
 #
 # used by editors/emacs30/Makefile
 # used by editors/emacs30-nox11/Makefile
@@ -95,9 +95,13 @@ post-install:
 # 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.
+# Since we are using site-start.el allow it to load a local-site-start.el
+# if it exists.
 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
+       ${ECHO} '  (load "local-site-start" t))' \
+               >> ${DESTDIR}${PREFIX}/share/emacs/${PKGVERSION_NOREV}/site-lisp/site-start.el

Index: pkgsrc/editors/emacs30-nox11/Makefile
diff -u pkgsrc/editors/emacs30-nox11/Makefile:1.4 pkgsrc/editors/emacs30-nox11/Makefile:1.5
--- pkgsrc/editors/emacs30-nox11/Makefile:1.4   Mon Oct 12 12:29:16 2026
+++ pkgsrc/editors/emacs30-nox11/Makefile       Wed Oct 14 19:32:13 2026
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2026/10/12 12:29:16 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2026/10/14 19:32:13 markd Exp $
 
 PKGNAME=       ${DISTNAME:S/emacs/emacs30/:S/-/-nox11-/}
-PKGREVISION=   2
+PKGREVISION=   3
 
 CONFLICTS+=    emacs30-[0-9]*
 

Index: pkgsrc/editors/emacs31/Makefile
diff -u pkgsrc/editors/emacs31/Makefile:1.7 pkgsrc/editors/emacs31/Makefile:1.8
--- pkgsrc/editors/emacs31/Makefile:1.7 Wed Sep 30 12:16:41 2026
+++ pkgsrc/editors/emacs31/Makefile     Wed Oct 14 19:32:13 2026
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2026/09/30 12:16:41 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2026/10/14 19:32:13 markd Exp $
 
 CONFLICTS+=    emacs31-nox11-[0-9]*
 
 .include "../../editors/emacs31/Makefile.common"
 
-PKGREVISION=   6
+PKGREVISION=   7
 
 .include "options.mk"
 

Index: pkgsrc/editors/emacs31/Makefile.common
diff -u pkgsrc/editors/emacs31/Makefile.common:1.3 pkgsrc/editors/emacs31/Makefile.common:1.4
--- pkgsrc/editors/emacs31/Makefile.common:1.3  Wed Sep 30 12:16:41 2026
+++ pkgsrc/editors/emacs31/Makefile.common      Wed Oct 14 19:32:13 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.3 2026/09/30 12:16:41 wiz Exp $
+# $NetBSD: Makefile.common,v 1.4 2026/10/14 19:32:13 markd Exp $
 #
 # used by editors/emacs31/Makefile
 # used by editors/emacs31-nox11/Makefile
@@ -95,6 +95,8 @@ post-install:
 # 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.
+# Since we are using site-start.el allow it to load a local-site-start.el
+# if it exists.
 post-install: emacs-info-path
 emacs-info-path:
        ${ECHO} ';;; -*- lexical-binding: nil -*-' \
@@ -103,3 +105,5 @@ emacs-info-path:
                >> ${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
+       ${ECHO} '  (load "local-site-start" t)' \
+               >> ${DESTDIR}${PREFIX}/share/emacs/${PKGVERSION_NOREV}/site-lisp/site-start.el

Index: pkgsrc/editors/emacs31-nox11/Makefile
diff -u pkgsrc/editors/emacs31-nox11/Makefile:1.2 pkgsrc/editors/emacs31-nox11/Makefile:1.3
--- pkgsrc/editors/emacs31-nox11/Makefile:1.2   Mon Oct 12 12:29:16 2026
+++ pkgsrc/editors/emacs31-nox11/Makefile       Wed Oct 14 19:32:14 2026
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2026/10/12 12:29:16 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2026/10/14 19:32:14 markd Exp $
 
 PKGNAME=       ${DISTNAME:S/emacs/emacs31/:S/-/-nox11-/}
-PKGREVISION=   1
+PKGREVISION=   2
 
 CONFLICTS+=    emacs31-[0-9]*

Prev by Date: CVS commit: pkgsrc/devel/subversion-base
Next by Date: CVS commit: pkgsrc/devel/rt5
Previous by Thread: CVS commit: pkgsrc/devel/subversion-base
Next by Thread: CVS commit: pkgsrc/devel/rt5
Indexes:

Home | Main Index | Thread Index | Old Index