Index | Thread | Search

From:
aisha <openbsd.ports@aisha.cc>
Subject:
editors/emacs - allow loading site-start.el from /etc/emacs
To:
ports@openbsd.org
Cc:
jca@wxcvbn.org
Date:
Thu, 4 Jul 2024 18:06:23 -0400

Download raw body.

Thread
Hi,

  I've attached a patch for editors/emacs, which adds `/etc/emacs` as an additional directory from which to load the site-start.el.
I think it's more intuitive to have custom configurations in `/etc/` as opposed to modifying files in `/usr/local/share`, which are generally meant to be examples or fallback configs.
The patch is small and is backwards compatible, so nothing should break.

OK? comments?

Aisha


diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile
index 7c58942338b..e5143431077 100644
--- a/editors/emacs/Makefile
+++ b/editors/emacs/Makefile
@@ -4,6 +4,7 @@ COMMENT=		GNU editor: extensible, customizable, self-documenting
 # Zap post-extract when updating
 VERSION=		29.4
 DISTNAME=		emacs-${VERSION}
+REVISION=		0
 
 CATEGORIES=		editors
 
@@ -30,7 +31,8 @@ GCCARCH=		${MACHINE_ARCH}-unknown-openbsd
 CONFIGURE_STYLE=	gnu
 MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/build-aux
 CONFIGURE_ARGS=		--build="${GCCARCH}" \
-			--without-sound
+			--without-sound \
+			--enable-locallisppath="${SYSCONFDIR}/emacs:${LOCALBASE}/share/emacs/site-lisp"
 
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib ${LDFLAGS}"
diff --git a/editors/emacs/pkg/PLIST b/editors/emacs/pkg/PLIST
index 4eb2f4b0179..e9b9f5ca7a8 100644
--- a/editors/emacs/pkg/PLIST
+++ b/editors/emacs/pkg/PLIST
@@ -4309,3 +4309,4 @@ share/emacs/site-lisp/
 share/emacs/site-lisp/subdirs.el
 share/metainfo/
 share/metainfo/emacs.metainfo.xml
+@sample ${SYSCONFDIR}/emacs/