diff --git a/srcpkgs/zsh/files/zprofile b/srcpkgs/zsh/files/zprofile new file mode 100644 index 00000000000..6bfcdf7cb3b --- /dev/null +++ b/srcpkgs/zsh/files/zprofile @@ -0,0 +1 @@ +emulate sh -c 'source /etc/profile' diff --git a/srcpkgs/zsh/template b/srcpkgs/zsh/template index 85ff5ba279c..a7aea22e18d 100644 --- a/srcpkgs/zsh/template +++ b/srcpkgs/zsh/template @@ -1,13 +1,13 @@ # Template file for 'zsh' pkgname=zsh version=5.8 -revision=1 +revision=2 build_style=gnu-configure make_build_target="all info" make_install_args="install.info" configure_args="--enable-etcdir=/etc/zsh --enable-zshenv=/etc/zsh/zshenv --enable-zlogin=/etc/zsh/zlogin --enable-zlogout=/etc/zsh/zlogout - --enable-zprofile=/etc/profile --enable-zshrc=/etc/zsh/zshrc + --enable-zprofile=/etc/zsh/zprofile --enable-zshrc=/etc/zsh/zshrc --enable-maildir-support --enable-function-subdirs --enable-fndir=/usr/share/zsh/functions --with-term-lib=ncursesw --enable-scriptdir=/usr/share/zsh/scripts --enable-pcre @@ -25,8 +25,9 @@ distfiles="http://www.zsh.org/pub/zsh-${version}.tar.xz" checksum=dcc4b54cc5565670a65581760261c163d720991f0d06486da61f8d839b52de27 register_shell="/bin/zsh /usr/bin/zsh" lib32disabled=yes +conf_files="/etc/zsh/*" -pre_configure() { +post_patch() { # Set correct keymap path sed -i 's#/usr/share/keymaps#/usr/share/kbd/keymaps#g' \ Completion/Unix/Command/_loadkeys @@ -36,9 +37,15 @@ pre_configure() { rm -rf Completion/$_fpath sed "s#\s*Completion/$_fpath/\*/\*##g" -i Src/Zle/complete.mdd done + rm -f Completion/Linux/Command/_{pkgtool,rpmbuild,yast} rm -f Completion/Unix/Command/_{notmuch,osc,systemd} + + vsed -i -e 's,/etc/z,/etc/zsh/z,g' \ + Doc/zsh.texi Doc/{zsh,zshall,zshoptions,zshmodules}.1 } + post_install() { vlicense LICENCE + vinstall "${FILESDIR}/zprofile" 644 etc/zsh }