Index: head/shells/ohmyzsh/Makefile =================================================================== --- head/shells/ohmyzsh/Makefile (revision 542889) +++ head/shells/ohmyzsh/Makefile (revision 542890) @@ -1,37 +1,37 @@ # Created by: Serhii (Sergey) Kozlov # $FreeBSD$ PORTNAME= ohmyzsh -PORTVERSION= 20200706 +PORTVERSION= 20200722 CATEGORIES= shells MAINTAINER= skozlov@FreeBSD.org COMMENT= Community-driven framework for managing your zsh configuration LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt RUN_DEPENDS= zsh:shells/zsh USE_GITHUB= yes -GH_TAGNAME= 1c58a746af7a67f311ee47f97285a855eaf18b5e +GH_TAGNAME= db3d05f NO_ARCH= yes NO_BUILD= yes SUB_FILES= pkg-message post-extract: ${RM} -r ${WRKSRC}/log ${WRKSRC}/cache .for f in install upgrade uninstall check_for_upgrade ${RM} ${WRKSRC}/tools/${f}.sh .endfor post-patch: ${REINPLACE_CMD} -e "s|%%DATADIR%%|${DATADIR}|g" ${WRKSRC}/templates/zshrc.zsh-template do-install: ${MKDIR} ${STAGEDIR}${DATADIR} cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR} "! -path \./\.* ! -name *\.bak ! -name *\.orig" .include Index: head/shells/ohmyzsh/distinfo =================================================================== --- head/shells/ohmyzsh/distinfo (revision 542889) +++ head/shells/ohmyzsh/distinfo (revision 542890) @@ -1,3 +1,3 @@ -TIMESTAMP = 1594050806 -SHA256 (ohmyzsh-ohmyzsh-20200706-1c58a746af7a67f311ee47f97285a855eaf18b5e_GH0.tar.gz) = cc9ce90a0543798715aa972c898d8ef017e131937d28271c9e053fc9360290c1 -SIZE (ohmyzsh-ohmyzsh-20200706-1c58a746af7a67f311ee47f97285a855eaf18b5e_GH0.tar.gz) = 648364 +TIMESTAMP = 1595444062 +SHA256 (ohmyzsh-ohmyzsh-20200722-db3d05f_GH0.tar.gz) = 0991e6576d4253565db47ad27453a61cad52dca69a3b06a6cfe142fa46528ce2 +SIZE (ohmyzsh-ohmyzsh-20200722-db3d05f_GH0.tar.gz) = 648935 Index: head/shells/ohmyzsh/files/patch-oh-my-zsh.sh =================================================================== --- head/shells/ohmyzsh/files/patch-oh-my-zsh.sh (revision 542889) +++ head/shells/ohmyzsh/files/patch-oh-my-zsh.sh (revision 542890) @@ -1,16 +1,20 @@ ---- oh-my-zsh.sh.orig 2020-07-06 15:31:40 UTC +Disable auto update +Respect XDG cache directory if present. +--- oh-my-zsh.sh.orig 2020-07-18 17:06:08 UTC +++ oh-my-zsh.sh -@@ -1,12 +1,7 @@ +@@ -1,12 +1,8 @@ # Set ZSH_CACHE_DIR to the path where cache files should be created - # or else we will use the default cache/ +-# or else we will use the default cache/ ++# or else we will use the default .cache/ if [[ -z "$ZSH_CACHE_DIR" ]]; then - ZSH_CACHE_DIR="$ZSH/cache" -fi - -# Check for updates on initial load... -if [ "$DISABLE_AUTO_UPDATE" != "true" ]; then - source $ZSH/tools/check_for_upgrade.sh -+ ZSH_CACHE_DIR="$HOME/.oh-my-zsh/cache" ++ ZSH_CACHE_DIR="${XDG_CACHE_HOME:-$HOME/.cache}/oh-my-zsh" ++ mkdir -p ${ZSH_CACHE_DIR} fi # Initializes Oh My Zsh Index: head/shells/ohmyzsh/files/patch-templates_zshrc.zsh-template =================================================================== --- head/shells/ohmyzsh/files/patch-templates_zshrc.zsh-template (revision 542889) +++ head/shells/ohmyzsh/files/patch-templates_zshrc.zsh-template (revision 542890) @@ -1,27 +1,29 @@ +Correct installation path +Disable auto update bits --- templates/zshrc.zsh-template.orig 2020-07-06 15:31:40 UTC +++ templates/zshrc.zsh-template @@ -2,7 +2,7 @@ # export PATH=$HOME/bin:/usr/local/bin:$PATH # Path to your oh-my-zsh installation. -export ZSH=$HOME/.oh-my-zsh +export ZSH=%%DATADIR%% # Set name of the theme to load --- if set to "random", it will # load a random theme each time oh-my-zsh is loaded, in which case, @@ -22,15 +22,6 @@ ZSH_THEME="robbyrussell" # Uncomment the following line to use hyphen-insensitive completion. # Case-sensitive completion must be off. _ and - will be interchangeable. # HYPHEN_INSENSITIVE="true" - -# Uncomment the following line to disable bi-weekly auto-update checks. -# DISABLE_AUTO_UPDATE="true" - -# Uncomment the following line to automatically update without prompting. -# DISABLE_UPDATE_PROMPT="true" - -# Uncomment the following line to change how often to auto-update (in days). -# export UPDATE_ZSH_DAYS=13 # Uncomment the following line if pasting URLs and other text is messed up. # DISABLE_MAGIC_FUNCTIONS="true" Index: head/shells/ohmyzsh/files/pkg-message.in =================================================================== --- head/shells/ohmyzsh/files/pkg-message.in (revision 542889) +++ head/shells/ohmyzsh/files/pkg-message.in (revision 542890) @@ -1,16 +1,13 @@ [ { type: install message: <