diff options
| author | Sergei Kolobov <sergei@FreeBSD.org> | 2006-04-30 23:41:54 +0000 |
|---|---|---|
| committer | Sergei Kolobov <sergei@FreeBSD.org> | 2006-04-30 23:41:54 +0000 |
| commit | 1951f825707fe9bec7731587010eae0a8bb49f48 (patch) | |
| tree | ad625282404c1e30daddea4733187d551d21a9c4 /shells/zsh/Makefile | |
| parent | 2970e8d09671d71a76ba9bcbd11ce7bfd0b5148d (diff) | |
| download | ports-1951f825707fe9bec7731587010eae0a8bb49f48.tar.gz ports-1951f825707fe9bec7731587010eae0a8bb49f48.zip | |
- Update to 4.3.2 [1], [3]
- Enable multibyte character support in Zsh by default [3], [4]
- Added new knob (WITHOUT_ZSH_MULTIBYTE) to disable multibyte support
- Fix zsh.info installation that was previously attempted before "su"
(and thus could fail when running "make install" under a regular user) [2] -
apply a different fix, though - move zsh.info generation from pre-install
to post-build phase
PR: ports/95970 [1], ports/94205 [2]
Submitted by: Martin Wilke <freebsd@unixfreunde.de> [1],
Michael Kuhn <mkuhn.nw@web.de> [2]
umei [3] (in private e-mail),
"J.R. Oldroyd" <jr@opal.com> [4] (in private e-mail)
Notes
Notes:
svn path=/head/; revision=160987
Diffstat (limited to 'shells/zsh/Makefile')
| -rw-r--r-- | shells/zsh/Makefile | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/shells/zsh/Makefile b/shells/zsh/Makefile index b510c08f9afe..2aed89b83747 100644 --- a/shells/zsh/Makefile +++ b/shells/zsh/Makefile @@ -12,6 +12,8 @@ # (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. # e.g. use this to put config files inside ${PREFIX} @@ -25,7 +27,7 @@ # NOTE: does NOT have to be inside ${PREFIX} tree PORTNAME= zsh -PORTVERSION= 4.2.6 +PORTVERSION= 4.3.2 CATEGORIES= shells MASTER_SITES= \ http://archive.progeny.com/zsh/ \ @@ -61,7 +63,6 @@ CONFLICTS= zsh-devel-[0-9]* zsh-4.1.* USE_BZIP2= yes GNU_CONFIGURE= yes -USE_REINPLACE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --with-curses-terminfo --with-tcsetpgrp \ @@ -77,6 +78,10 @@ CONFIGURE_ARGS+= --enable-zsh-mem --enable-zsh-secure-free CONFIGURE_ARGS+= --enable-maildir-support .endif +.if !defined(WITHOUT_ZSH_MULTIBYTE) +CONFIGURE_ARGS+= --enable-multibyte +.endif + .if defined(NOSHARED) CONFIGURE_ENV= LDFLAGS="${LDFLAGS} -static" CONFIGURE_ARGS+= --disable-dynamic @@ -97,10 +102,10 @@ PLIST_SUB+= ZSH_VER="${ZSH_VER}" ZSHETCDIR="${ZSH_ETCDIR}" \ MAN1= zsh.1 zshbuiltins.1 zshcompctl.1 zshcompwid.1 zshcompsys.1 \ zshcontrib.1 zshexpn.1 zshmisc.1 zshmodules.1 zshoptions.1 \ - zshparam.1 zshtcpsys.1 zshzftpsys.1 zshzle.1 zshall.1 + zshparam.1 zshroadmap.1 zshtcpsys.1 zshzftpsys.1 zshzle.1 \ + zshall.1 DOCS= LICENCE META-FAQ README Etc/BUGS Etc/CONTRIBUTORS Etc/FAQ \ - Etc/completion-style-guide \ - Doc/zsh*.html Doc/zsh.dvi Doc/zsh_a4.ps Doc/zsh_us.ps + Etc/completion-style-guide Doc/zsh*.html Doc/zsh.dvi EXAMPLES= zlogin zshenv zshrc .include <bsd.port.pre.mk> @@ -125,14 +130,12 @@ post-build: ${MV} ${WRKSRC}/Doc/zshall.1 ${WRKSRC}/Doc/zshall.1.source cd ${WRKSRC} && /usr/bin/soelim ${WRKSRC}/Doc/zshall.1.source > \ ${WRKSRC}/Doc/zshall.1 - .if !defined(NOPORTDOCS) -INFO= zsh - -pre-install: @${MKDIR} ${PREFIX}/info - makeinfo --no-split --output=${PREFIX}/info/zsh.info \ + makeinfo --no-split --output=${WRKSRC}/Doc/zsh.info \ ${WRKSRC}/Doc/zsh.texi + +INFO= zsh .endif post-install: @@ -144,6 +147,7 @@ post-install: .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/Doc/zsh.info ${PREFIX}/info/zsh.info .endif @${ECHO_MSG} "Updating /etc/shells" @${CP} /etc/shells /etc/shells.bak |