Attachment #68439 for bug #100614

View | Details | Raw Unified | Return to bug 100614
Collapse All | Expand All




#			(default: on)
# WITHOUT_ZSH_MAILDIR=yes disable support for Maildirs in MAIL and MAILPATH
#			(default: on)
# WITHOUT_ZSH_MULTIBYTE=yes disable multibyte character support
# 			(default: on)
# ZSH_ETCDIR=<dir>	directory for zsh system-wide configuration files:
#			zshenv, zlogin, zprofile, zshrc, zlogout.


PORTNAME=	zsh
PORTVERSION=	4.3.2
PORTREVISION=	1
CATEGORIES=	shells
MASTER_SITES=	\
		http://archive.progeny.com/zsh/ \

	${RM} -f ${WRKSRC}/Functions/MIME/zsh-mime-setup.bak
.if ${OSVERSION} >= 503000
	${RM} -f ${WRKSRC}/Completion/Unix/Type/_tar_archive.orig
	${RM} -f ${WRKSRC}/Completion/X/Command/_acroread.orig
.endif

post-build:




--- Completion/X/Command/_acroread	2005/05/10 12:26:24	1.5
+++ Completion/X/Command/_acroread	2006/03/26 15:15:10	1.6
@@ -4,12 +4,12 @@
 
 # Try extracting the version number directly from the executable.
 # (This will fail if the executable is a wrapper script for acroread.)
-local ver=${${${(f)"$(<$commands[$words[1]])"}:#^ver=*}##ver=}
+local ver=${${${(Mf)"$(<$commands[$words[1]])"}:#ver=*}##ver=}
 [[ -n $ver ]] && _acroread_version=$ver
 
 if (( ! $+_acroread_version )); then
   local acropath=${${(s. .)${${(f)"$($words[1] -help 2>&1)"}[1]}}[2]}
-  _acroread_version=${${${(f)"$(<$acropath)"}:#^ver=*}##ver=}
+  _acroread_version=${${${(Mf)"$(<$acropath)"}:#ver=*}##ver=}
 fi
 
 if [[ $_acroread_version == 7.* ]]; then

Return to bug 100614

Lines 12-18 Link Here

(-)/usr/home/simon/src/ports/shells/zsh/Makefile (-1 / +3 lines)
12	# (default: on)	12	# (default: on)
13	# WITHOUT_ZSH_MAILDIR=yes disable support for Maildirs in MAIL and MAILPATH	13	# WITHOUT_ZSH_MAILDIR=yes disable support for Maildirs in MAIL and MAILPATH
14	# (default: on)	14	# (default: on)
15	# WITHOUT_ZSH_MULTIBYTE=yes disable multibyte character support	15	# WITHOUT_ZSH_MULTIBYTE=yes disable multibyte character support
16	# (default: on)	16	# (default: on)
17	# ZSH_ETCDIR=<dir> directory for zsh system-wide configuration files:	17	# ZSH_ETCDIR=<dir> directory for zsh system-wide configuration files:
18	# zshenv, zlogin, zprofile, zshrc, zlogout.	18	# zshenv, zlogin, zprofile, zshrc, zlogout.
Lines 28-33 Link Here
28		28
29	PORTNAME= zsh	29	PORTNAME= zsh
30	PORTVERSION= 4.3.2	30	PORTVERSION= 4.3.2
		31	PORTREVISION= 1
31	CATEGORIES= shells	32	CATEGORIES= shells
32	MASTER_SITES= \	33	MASTER_SITES= \
33	http://archive.progeny.com/zsh/ \	34	http://archive.progeny.com/zsh/ \
Lines 122-127 Link Here
122	${RM} -f ${WRKSRC}/Functions/MIME/zsh-mime-setup.bak	123	${RM} -f ${WRKSRC}/Functions/MIME/zsh-mime-setup.bak
123	.if ${OSVERSION} >= 503000	124	.if ${OSVERSION} >= 503000
124	${RM} -f ${WRKSRC}/Completion/Unix/Type/_tar_archive.orig	125	${RM} -f ${WRKSRC}/Completion/Unix/Type/_tar_archive.orig
		126	${RM} -f ${WRKSRC}/Completion/X/Command/_acroread.orig
125	.endif	127	.endif
126		128
127	post-build:	129	post-build:

Line 0 Link Here

(-)/usr/home/simon/src/ports/shells/zsh/files/patch-Completion-X-Command-_acroread (+17 lines)
	1	--- Completion/X/Command/_acroread 2005/05/10 12:26:24 1.5
	2	+++ Completion/X/Command/_acroread 2006/03/26 15:15:10 1.6
	3	@@ -4,12 +4,12 @@
	4
	5	# Try extracting the version number directly from the executable.
	6	# (This will fail if the executable is a wrapper script for acroread.)
	7	-local ver=${${${(f)"$(<$commands[$words[1]])"}:#^ver=*}##ver=}
	8	+local ver=${${${(Mf)"$(<$commands[$words[1]])"}:#ver=*}##ver=}
	9	[[ -n $ver ]] && _acroread_version=$ver
	10
	11	if (( ! $+_acroread_version )); then
	12	local acropath=${${(s. .)${${(f)"$($words[1] -help 2>&1)"}[1]}}[2]}
	13	- _acroread_version=${${${(f)"$(<$acropath)"}:#^ver=*}##ver=}
	14	+ _acroread_version=${${${(Mf)"$(<$acropath)"}:#ver=*}##ver=}
	15	fi
	16
	17	if [[ $_acroread_version == 7.* ]]; then