Attachment 228632 Details for Bug 259109 – Patch file

[patch] Patch file

shells_zsh.patch (text/plain), 2.45 KB, created by Yasuhiro Kimura on 2021-10-12 17:26:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yasuhiro Kimura

Created: 2021-10-12 17:26:12 UTC

Size: 2.45 KB

patch

obsolete

>From c63ac43aa78bf8f407d9c78dc3fc47334c8c4a0b Mon Sep 17 00:00:00 2001
>From: Yasuhiro Kimura <yasu@FreeBSD.org>
>Date: Wed, 13 Oct 2021 01:47:27 +0900
>Subject: [PATCH] shells/zsh: Add BIN_ZSH option
>
>Add new option BIN_ZSH that makes zsh and rzsh also available as
>/bin/zsh and /bin/rzsh.
>
>Under ports flamework everything is installed under /usr/local unless
>custom prefix is used. And according to it zsh is installed as
>/usr/local/bin/zsh. But on most Linux based OSes zsh is installed as
>/bin/zsh. And it causes problem if user's account information is
>shared between FreeBSD and Linux by using such tools as LDAP or NIS as
>account information also includes absolute path of user's login shell.
>To work around it I have created /bin/zsh as symbolic link referencing
>/usr/local/bin/zsh and also edited /etc/shells to add /bin/zsh to it
>every time I set up new FreeBSD system. But it's quite bothersome and
>I decided to create patch to add new option that makes this port do
>these jobs automatically by enabling it.
>---
> shells/zsh/Makefile  | 9 ++++++++-
> shells/zsh/pkg-plist | 2 ++
> 2 files changed, 10 insertions(+), 1 deletion(-)
>
>diff --git a/shells/zsh/Makefile b/shells/zsh/Makefile
>index 2298ee440644..7629f19712e3 100644
>--- a/shells/zsh/Makefile
>+++ b/shells/zsh/Makefile
>@@ -45,10 +45,11 @@ CPPFLAGS+=	-DBOOL_DEFINED
> LDFLAGS+=	-Wl,--as-needed
> TEST_TARGET=	test
> 
>-OPTIONS_DEFINE=	DEBUG ETCDIR GDBM MEM PCRE STATIC \
>+OPTIONS_DEFINE=	BIN_ZSH DEBUG ETCDIR GDBM MEM PCRE STATIC \
> 		DOCS EXAMPLES
> OPTIONS_SUB=	yes
> 
>+BIN_ZSH_DESC=	Make zsh and rzsh also available as /bin/zsh and /bin/rzsh
> ETCDIR_DESC=	System-wide defaults in /etc (instead of $${PREFIX}/etc)
> GDBM_DESC=	Enable GDBM support (GPL)
> MEM_DESC=	Enable zsh-mem options
>@@ -123,6 +124,12 @@ post-install:
> 			${CHMOD} 644 $$i.zwc ; \
> 		done')
> 
>+post-install-BIN_ZSH-on:
>+	@${MKDIR} ${STAGEDIR}/bin
>+.for f in zsh rzsh
>+	${RLN} ${STAGEDIR}${PREFIX}/bin/${f} ${STAGEDIR}/bin/${f}
>+.endfor
>+
> post-install-EXAMPLES-on:
> 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
> 	(cd ${WRKSRC}/StartupFiles && ${INSTALL_DATA} ${PORTEXAMPLES} ${STAGEDIR}${EXAMPLESDIR})
>diff --git a/shells/zsh/pkg-plist b/shells/zsh/pkg-plist
>index e51f7e5c411b..7b0baf51d9ee 100644
>--- a/shells/zsh/pkg-plist
>+++ b/shells/zsh/pkg-plist
>@@ -1,5 +1,7 @@
> @shell bin/zsh
> @shell bin/rzsh
>+%%BIN_ZSH%%@shell /bin/zsh
>+%%BIN_ZSH%%@shell /bin/rzsh
> bin/zsh-%%ZSH_VER%%
> %%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/cap.so
> %%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/clone.so
>-- 
>2.33.0
>

Actions: View | Diff

Attachments on bug 259109: 228632 | 229309