mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-28 01:06:17 +00:00
Code Issues Releases Activity

Update to 5.0.6

Browse Source 
Only build with multibyte (disabling leads to weird bugs) [1]

Reported by:	adamw [1]
This commit is contained in:
Baptiste Daroussin 2014-08-28 19:44:35 +00:00
parent 33af62c573
commit 58d97dbf35
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=366450
4 changed files with 23 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
shells/zsh/Makefile
View File

@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= zsh
PORTVERSION= 5.0.5
PORTREVISION= 1
PORTVERSION= 5.0.6
CATEGORIES= shells
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION} \
SF/${PORTNAME}/${PORTNAME}-doc/${PORTVERSION}:doc
@ -28,15 +27,15 @@ CPPFLAGS+= -I${LOCALBASE}/include -DBOOL_DEFINED
LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ENV+= zsh_cv_sys_path_dev_fd=no
CONFIGURE_ARGS= --with-term-lib="ncursesw ncurses" --with-tcsetpgrp \
--enable-function-subdirs
--enable-function-subdirs --enable-multibyte
EXTRA_PATCHES= ${FILESDIR}/extra-patch-bsdtar
#EXTRA_COMPLETION_FILES= _sockstat
#EXTRA_COMPLETION_DIR= Completion/BSD/Command
OPTIONS_DEFINE= GDBM MEM SECURE_FREE MAILDIR MULTIBYTE PCRE STATIC DOCS DEBUG \
OPTIONS_DEFINE= GDBM MEM SECURE_FREE MAILDIR PCRE STATIC DOCS DEBUG \
EXAMPLES
OPTIONS_DEFAULT= SECURE_FREE MAILDIR MULTIBYTE
OPTIONS_DEFAULT= SECURE_FREE MAILDIR
GDBM_DESC= Enable GDBM support (GPL)
MEM_DESC= Enable zsh-mem options
@ -64,7 +63,6 @@ STATIC_LDFLAGS= -static
STATIC_CONFIGURE_ON= --disable-dynamic
STATIC_CONFIGURE_OFF= --enable-dynamic
DEBUG_CONFIGURE_ENABLE= zsh-debug
MULTIBYTE_CONFIGURE_ENABLE= multibyte
DOCS_USES= makeinfo
.include <bsd.port.pre.mk>

8
shells/zsh/distinfo
View File

@ -1,4 +1,4 @@
SHA256 (zsh-5.0.5.tar.bz2) = 6624d2fb6c8fa4e044d2b009f86ed1617fe8583c83acfceba7ec82826cfa8eaf
SIZE (zsh-5.0.5.tar.bz2) = 3104375
SHA256 (zsh-5.0.5-doc.tar.bz2) = e4f22bafaa8410bbc2d83f2d748ca4764365752c46f7e1099be54f2a62c492f2
SIZE (zsh-5.0.5-doc.tar.bz2) = 2940018
SHA256 (zsh-5.0.6.tar.bz2) = 84ca509b141533a3b695e314fbce1200b86ff337ab7dd9e3414da05d86378845
SIZE (zsh-5.0.6.tar.bz2) = 3174858
SHA256 (zsh-5.0.6-doc.tar.bz2) = b273a568682682cc1f00885aba118c7400cacfdbc0ecdf32fd5f9b820b8acfd6
SIZE (zsh-5.0.6-doc.tar.bz2) = 2999237

45
shells/zsh/files/patch-Src_jobs.c
View File

@ -1,45 +0,0 @@
--- Src/jobs.c.orig 2011-11-06 19:20:13.978321106 +0100
+++ Src/jobs.c 2011-11-07 07:45:47.012600236 +0100
@@ -583,7 +583,6 @@
}
/**/
-#ifndef HAVE_GETRUSAGE
static long clktck = 0;
/**/
@@ -613,7 +612,6 @@
#endif
}
/**/
-#endif
/**/
static void
@@ -656,14 +654,14 @@
/* go ahead and compute these, since almost every TIMEFMT will have them */
elapsed_time = real->tv_sec + real->tv_usec / 1000000.0;
+ set_clktck();
#ifdef HAVE_GETRUSAGE
user_time = ti->ru_utime.tv_sec + ti->ru_utime.tv_usec / 1000000.0;
system_time = ti->ru_stime.tv_sec + ti->ru_stime.tv_usec / 1000000.0;
total_time = user_time + system_time;
- percent = 100.0 * total_time
- / (real->tv_sec + real->tv_usec / 1000000.0);
+ percent = 100.0 * total_time / elapsed_time;
+ total_time *= (double) clktck;
#else
- set_clktck();
user_time = ti->ut / (double) clktck;
system_time = ti->st / (double) clktck;
percent = 100.0 * (ti->ut + ti->st)
@@ -749,7 +747,7 @@
#endif
#ifdef HAVE_STRUCT_RUSAGE_RU_MAXRSS
case 'M':
- fprintf(stderr, "%ld", ti->ru_maxrss / 1024);
+ fprintf(stderr, "%ld", ti->ru_maxrss);
break;
#endif
#ifdef HAVE_STRUCT_RUSAGE_RU_MAJFLT

16
shells/zsh/pkg-plist
View File

@ -118,6 +118,7 @@ bin/zsh-%%ZSH_VER%%
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Base/_expand
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Base/_expand_alias
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Base/_expand_word
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Base/_extensions
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Base/_generic
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Base/_guard
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Base/_history
@ -143,6 +144,7 @@ bin/zsh-%%ZSH_VER%%
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Base/_requested
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Base/_retrieve_cache
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Base/_sep_parts
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Base/_sequence
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Base/_set_command
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Base/_setup
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Base/_store_cache
@ -174,6 +176,7 @@ bin/zsh-%%ZSH_VER%%
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Darwin/_qtplay
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Darwin/_retrieve_mac_apps
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Darwin/_softwareupdate
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Darwin/_system_profiler
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Debian.zwc
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Debian/_a2utils
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Debian/_apt
@ -234,6 +237,7 @@ bin/zsh-%%ZSH_VER%%
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Linux/_btrfs
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Linux/_chrt
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Linux/_cryptsetup
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Linux/_docker
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Linux/_ethtool
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Linux/_fuse_arguments
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Linux/_fuse_values
@ -252,8 +256,10 @@ bin/zsh-%%ZSH_VER%%
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Linux/_pkgtool
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Linux/_rpmbuild
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Linux/_schedtool
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Linux/_ss
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Linux/_sshfs
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Linux/_strace
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Linux/_sysstat
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Linux/_tpb
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Linux/_tpconfig
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Linux/_tune2fs
@ -318,6 +324,7 @@ bin/zsh-%%ZSH_VER%%
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_bison
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_bittorrent
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_bogofilter
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_bpython
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_bzip2
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_bzr
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_cal
@ -331,6 +338,7 @@ bin/zsh-%%ZSH_VER%%
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_chkconfig
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_chmod
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_chown
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_chsh
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_clay
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_comm
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_compress
@ -360,6 +368,7 @@ bin/zsh-%%ZSH_VER%%
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_django
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_dmidecode
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_domains
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_dsh
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_du
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_dvi
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_ecasound
@ -459,6 +468,7 @@ bin/zsh-%%ZSH_VER%%
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_mkdir
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_module
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_monotone
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_moosic
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_mosh
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_mount
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_mpc
@ -480,6 +490,7 @@ bin/zsh-%%ZSH_VER%%
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_notmuch
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_npm
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_nslookup
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_od
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_other_accounts
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_pack
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_patch
@ -776,7 +787,7 @@ bin/zsh-%%ZSH_VER%%
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/compinit
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/compinstall
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/openSUSE.zwc
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/openSUSE/_SuSEconfig
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/openSUSE/_SUSEconfig
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/openSUSE/_hwinfo
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/openSUSE/_osc
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/openSUSE/_yast2
@ -948,6 +959,7 @@ bin/zsh-%%ZSH_VER%%
%%DATADIR%%/%%ZSH_VER%%/functions/Zle/down-case-word-match
%%DATADIR%%/%%ZSH_VER%%/functions/Zle/down-line-or-beginning-search
%%DATADIR%%/%%ZSH_VER%%/functions/Zle/edit-command-line
%%DATADIR%%/%%ZSH_VER%%/functions/Zle/expand-absolute-path
%%DATADIR%%/%%ZSH_VER%%/functions/Zle/forward-word-match
%%DATADIR%%/%%ZSH_VER%%/functions/Zle/history-beginning-search-menu
%%DATADIR%%/%%ZSH_VER%%/functions/Zle/history-pattern-search
@ -969,6 +981,7 @@ bin/zsh-%%ZSH_VER%%
%%DATADIR%%/%%ZSH_VER%%/functions/Zle/predict-on
%%DATADIR%%/%%ZSH_VER%%/functions/Zle/quote-and-complete-word
%%DATADIR%%/%%ZSH_VER%%/functions/Zle/read-from-minibuffer
%%DATADIR%%/%%ZSH_VER%%/functions/Zle/replace-argument
%%DATADIR%%/%%ZSH_VER%%/functions/Zle/replace-string
%%DATADIR%%/%%ZSH_VER%%/functions/Zle/replace-string-again
%%DATADIR%%/%%ZSH_VER%%/functions/Zle/select-word-style
@ -981,6 +994,7 @@ bin/zsh-%%ZSH_VER%%
%%DATADIR%%/%%ZSH_VER%%/functions/Zle/up-line-or-beginning-search
%%DATADIR%%/%%ZSH_VER%%/functions/Zle/url-quote-magic
%%DATADIR%%/%%ZSH_VER%%/functions/Zle/which-command
%%DATADIR%%/%%ZSH_VER%%/functions/Zle/zcalc-auto-insert
%%DATADIR%%/%%ZSH_VER%%/functions/Zle/zed-set-file-name
%%DATADIR%%/%%ZSH_VER%%/help/alias
%%DATADIR%%/%%ZSH_VER%%/help/autoload