pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/shells/zsh Update zsh to 4.2.7.
details: https://anonhg.NetBSD.org/pkgsrc/rev/c2856288ca90
branches: trunk
changeset: 551973:c2856288ca90
user: uebayasi <uebayasi%pkgsrc.org@localhost>
date: Sun Dec 21 16:53:31 2008 +0000
description:
Update zsh to 4.2.7.
Changes are unknown.
diffstat:
shells/zsh/Makefile | 5 +-
shells/zsh/Makefile.common | 101 +++++++++++++++++++++++--------------------
shells/zsh/PLIST | 85 ++++++++++++++++++++++++++++++++++++-
shells/zsh/PLIST.dynamic | 82 -----------------------------------
shells/zsh/PLIST.shlibs | 2 -
shells/zsh/PLIST.terminfo | 2 -
shells/zsh/distinfo | 15 +++---
shells/zsh/hacks.mk | 22 +++++++++
shells/zsh/patches/patch-aa | 20 --------
shells/zsh/patches/patch-ab | 10 ++--
shells/zsh/patches/patch-ac | 20 ++++----
shells/zsh/patches/patch-ae | 13 +++--
12 files changed, 191 insertions(+), 186 deletions(-)
diffs (truncated from 509 to 300 lines):
diff -r b68c41581acc -r c2856288ca90 shells/zsh/Makefile
--- a/shells/zsh/Makefile Sun Dec 21 16:15:40 2008 +0000
+++ b/shells/zsh/Makefile Sun Dec 21 16:53:31 2008 +0000
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.53 2008/07/25 09:14:48 ghen Exp $
+# $NetBSD: Makefile,v 1.54 2008/12/21 16:53:31 uebayasi Exp $
.include "../../shells/zsh/Makefile.common"
-ZSH_VERSION= 4.2.6
+ZSH_VERSION= 4.2.7
ZSH_MAINTAINER= uebayasi%NetBSD.org@localhost
-PKGREVISION= 2
.include "../../mk/bsd.pkg.mk"
diff -r b68c41581acc -r c2856288ca90 shells/zsh/Makefile.common
--- a/shells/zsh/Makefile.common Sun Dec 21 16:15:40 2008 +0000
+++ b/shells/zsh/Makefile.common Sun Dec 21 16:53:31 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.48 2008/07/25 09:14:48 ghen Exp $
+# $NetBSD: Makefile.common,v 1.49 2008/12/21 16:53:31 uebayasi Exp $
DISTNAME= zsh-${ZSH_VERSION}
CATEGORIES= shells
@@ -32,62 +32,69 @@
BUILD_DEFS+= ZSH_STATIC
MAKE_JOBS_SAFE= no
+INSTALL_TARGET= install install.info
+PKG_SHELL= bin/zsh
+PLIST_VARS= dynamic terminfo shlibs
-.if defined(ZSH_STATIC) && !empty(ZSH_STATIC:M[Yy][Ee][Ss])
-CONFIGURE_ARGS+= --disable-dynamic
+################################################################################
-NETBSD_SHLINKER= /libexec/ld.elf_so
-NETBSD_SHLIBDIR= /lib
+_ZSH_OPSYS.OpenBSD= dynamic terminfo - ldflags tcsetpgrp
+_ZSH_OPSYS.Linux= dynamic terminfo - ldflags tcsetpgrp
+_ZSH_OPSYS.IRIX= dynamic terminfo - ldflags tcsetpgrp
+_ZSH_OPSYS.Interix= dynamic terminfo shlibs ldflags notcsetpgrp
+_ZSH_OPSYS.DragonFly= dynamic terminfo shlibs ldflags tcsetpgrp
+_ZSH_OPSYS.FreeBSD= dynamic terminfo shlibs ldflags tcsetpgrp
+_ZSH_OPSYS.SunOS= dynamic - - - tcsetpgrp
-. if ${OPSYS} == "NetBSD" && \
- defined(OBJECT_FMT) && ${OBJECT_FMT} == "ELF" && \
- defined(MKDYNAMICROOT) && ${MKDYNAMICROOT} != "no" && \
- defined(NETBSD_SHLINKER) && exists(${NETBSD_SHLINKER}) && \
- defined(NETBSD_SHLIBDIR) && exists(${NETBSD_SHLIBDIR})
-#
-# Built a dynamically linked "zsh" binary on NetBSD systems which use
-# dynamically linked binaries on the root filesystem. The binary will
-# only depend on the run-time link-editor and shared libraries on the
-# root filesystem. We use "-rpath" below by purpose because the
-# buildlink 3 framework won't filter it out.
-#
-BUILDLINK_PASSTHRU_RPATHDIRS+= ${NETBSD_SHLIBDIR}
+_ZSH_OPSYS.${OPSYS}?= dynamic - shlibs ldflags tcsetpgrp
+
+################################################################################
+
+### static
+
+# Might be overwritten by hacks.mk.
+_ZSH_STATIC.BUILDLINK_PASSTHRU_RPATHDIRS= # nothing
+_ZSH_STATIC.LDFLAGS= -static
+
+_ZSH_LINKAGE.static.CONFIGURE_ARGS= --disable-dynamic
+_ZSH_LINKAGE.static.BUILDLINK_PASSTHRU_RPATHDIRS= \
+ ${_ZSH_STATIC.BUILDLINK_PASSTHRU_RPATHDIRS}
+_ZSH_LINKAGE.static.LDFLAGS= ${_ZSH_STATIC.LDFLAGS}
-LDFLAGS+= -Wl,-dynamic-linker=${NETBSD_SHLINKER} -Wl,-R${NETBSD_SHLIBDIR}
-. else
-LDFLAGS+= -static
-. endif
-.else
-. if ${OPSYS} == "SunOS"
-PLIST_SRC= ${PKGDIR}/PLIST.dynamic ${PKGDIR}/PLIST
-. else
-LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/zsh
+### dynamic
+
+_ZSH_DYNAMIC_VARS.ldflags= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/zsh
+
+_ZSH_LINKAGE.dynamic.CONFIGURE_ARGS=
+_ZSH_LINKAGE.dynamic.BUILDLINK_PASSTHRU_RPATHDIRS=
+_ZSH_LINKAGE.dynamic.LDFLAGS= ${_ZSH_DYNAMIC_VARS.${_ZSH_OPSYS.${OPSYS}:Mldflags}}
+
+_ZSH_LINKAGE.dynamic.PLIST.dynamic= ${_ZSH_OPSYS.${OPSYS}:Mdynamic:?yes:no}
+_ZSH_LINKAGE.dynamic.PLIST.terminfo= ${_ZSH_OPSYS.${OPSYS}:Mterminfo:?yes:no}
+_ZSH_LINKAGE.dynamic.PLIST.shlibs= ${_ZSH_OPSYS.${OPSYS}:Mshlibs:?yes:no}
+
+###
-. if ${OPSYS} == "Linux" || ${OPSYS} == "IRIX" || ${OPSYS} == "OpenBSD"
-PLIST_SRC+= ${PKGDIR}/PLIST.terminfo
-. elif ${OPSYS} == "Interix" || ${OPSYS} == "DragonFly" || \
- ${OPSYS} == "FreeBSD"
-PLIST_SRC+= ${PKGDIR}/PLIST.terminfo ${PKGDIR}/PLIST.shlibs
-. else
-PLIST_SRC+= ${PKGDIR}/PLIST.shlibs
-. endif
+_ZSH_OPSYS_VARS.tcsetpgrp= --with-tcsetpgrp
+_ZSH_OPSYS_VARS.notcsetpgrp= --without-tcsetpgrp
+
+################################################################################
+
+_ZSH_LINKAGE= ${ZSH_STATIC:M[Yy][Ee][Ss]:?static:dynamic} # static / dynamic
-PLIST_SRC+= ${PKGDIR}/PLIST.dynamic ${PKGDIR}/PLIST
-. endif
-.endif
+CONFIGURE_ARGS+= ${_ZSH_LINKAGE.${_ZSH_LINKAGE}.CONFIGURE_ARGS} \
+ ${_ZSH_OPSYS_VARS.${_ZSH_OPSYS.${OPSYS}:Mtcsetpgrp}} \
+ ${_ZSH_OPSYS_VARS.${_ZSH_OPSYS.${OPSYS}:Mnotcsetpgrp}}
+BUILDLINK_PASSTHRU_RPATHDIRS+= ${_ZSH_LINKAGE.${_ZSH_LINKAGE}.BUILDLINK_PASSTHRU_RPATHDIRS}
+LDFLAGS+= ${_ZSH_LINKAGE.${_ZSH_LINKAGE}.LDFLAGS}
+PLIST.dynamic= ${_ZSH_LINKAGE.${_ZSH_LINKAGE}.PLIST.dynamic}
+PLIST.terminfo= ${_ZSH_LINKAGE.${_ZSH_LINKAGE}.PLIST.terminfo}
+PLIST.shlibs= ${_ZSH_LINKAGE.${_ZSH_LINKAGE}.PLIST.shlibs}
-.if ${OPSYS} == "Interix"
-CONFIGURE_ARGS+=--without-tcsetpgrp
-.else
-CONFIGURE_ARGS+=--with-tcsetpgrp
-.endif
+################################################################################
.undef MANZ
-PKG_SHELL= bin/zsh
-
-INSTALL_TARGET= install install.info
-
pre-install:
@cd ${WRKSRC}/Completion; ${FIND} . -name \*.orig -exec ${RM} \{\} \;
diff -r b68c41581acc -r c2856288ca90 shells/zsh/PLIST
--- a/shells/zsh/PLIST Sun Dec 21 16:15:40 2008 +0000
+++ b/shells/zsh/PLIST Sun Dec 21 16:53:31 2008 +0000
@@ -1,7 +1,35 @@
-@comment $NetBSD: PLIST,v 1.18 2006/04/07 15:28:49 jlam Exp $
+@comment $NetBSD: PLIST,v 1.19 2008/12/21 16:53:31 uebayasi Exp $
bin/${PKGNAME}
bin/zsh
info/zsh.info
+${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/cap.so
+${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/clone.so
+${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/compctl.so
+${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/complete.so
+${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/complist.so
+${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/computil.so
+${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/datetime.so
+${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/deltochar.so
+${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/example.so
+${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/files.so
+${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/langinfo.so
+${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/mapfile.so
+${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/mathfunc.so
+${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/net/socket.so
+${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/net/tcp.so
+${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/parameter.so
+${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/rlimits.so
+${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/sched.so
+${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/stat.so
+${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/system.so
+${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/termcap.so
+${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/zftp.so
+${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/zle.so
+${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/zleparameter.so
+${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/zprof.so
+${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/zpty.so
+${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/zselect.so
+${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/zutil.so
man/man1/zsh.1
man/man1/zshall.1
man/man1/zshbuiltins.1
@@ -535,9 +563,64 @@
share/zsh/${PKGVERSION}/functions/zsh-mime-handler
share/zsh/${PKGVERSION}/functions/zsh-mime-setup
share/zsh/${PKGVERSION}/functions/zstyle+
+${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/tcp_alias
+${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/tcp_close
+${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/tcp_command
+${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/tcp_expect
+${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/tcp_fd_handler
+${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/tcp_log
+${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/tcp_open
+${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/tcp_output
+${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/tcp_point
+${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/tcp_proxy
+${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/tcp_read
+${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/tcp_rename
+${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/tcp_send
+${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/tcp_sess
+${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/tcp_shoot
+${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/tcp_spam
+${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/tcp_talk
+${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/tcp_wait
+${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/zfanon
+${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/zfautocheck
+${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/zfcd
+${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/zfcd_match
+${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/zfcget
+${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/zfclose
+${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/zfcput
+${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/zfdir
+${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/zffcache
+${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/zfgcp
+${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/zfget
+${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/zfget_match
+${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/zfgoto
+${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/zfhere
+${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/zfinit
+${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/zfls
+${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/zfmark
+${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/zfopen
+${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/zfparams
+${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/zfpcp
+${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/zfput
+${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/zfrglob
+${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/zfrtime
+${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/zfsession
+${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/zfstat
+${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/zftp_chpwd
+${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/zftp_progress
+${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/zftransfer
+${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/zftype
+${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/zfuget
+${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/zfuput
+@comment ${PLIST.terminfo}lib/zsh/${PKGVERSION}/zsh/terminfo.so
+@comment ${PLIST.shlibs}lib/zsh/libzsh-${PKGVERSION}.so
@exec ${MKDIR} %D/share/zsh/site-functions
@dirrm share/zsh/site-functions
@dirrm share/zsh/${PKGVERSION}/functions
@dirrm share/zsh/${PKGVERSION}
@dirrm share/zsh
@dirrm share/doc/zsh
+${PLIST.dynamic}@dirrm lib/zsh/${PKGVERSION}/zsh/net
+${PLIST.dynamic}@dirrm lib/zsh/${PKGVERSION}/zsh
+${PLIST.dynamic}@dirrm lib/zsh/${PKGVERSION}
+${PLIST.dynamic}@dirrm lib/zsh
diff -r b68c41581acc -r c2856288ca90 shells/zsh/PLIST.dynamic
--- a/shells/zsh/PLIST.dynamic Sun Dec 21 16:15:40 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,82 +0,0 @@
-@comment $NetBSD: PLIST.dynamic,v 1.4 2004/08/16 16:17:39 recht Exp $
-lib/zsh/${PKGVERSION}/zsh/cap.so
-lib/zsh/${PKGVERSION}/zsh/clone.so
-lib/zsh/${PKGVERSION}/zsh/compctl.so
-lib/zsh/${PKGVERSION}/zsh/complete.so
-lib/zsh/${PKGVERSION}/zsh/complist.so
-lib/zsh/${PKGVERSION}/zsh/computil.so
-lib/zsh/${PKGVERSION}/zsh/datetime.so
-lib/zsh/${PKGVERSION}/zsh/deltochar.so
-lib/zsh/${PKGVERSION}/zsh/example.so
-lib/zsh/${PKGVERSION}/zsh/files.so
-lib/zsh/${PKGVERSION}/zsh/langinfo.so
-lib/zsh/${PKGVERSION}/zsh/mapfile.so
-lib/zsh/${PKGVERSION}/zsh/mathfunc.so
-lib/zsh/${PKGVERSION}/zsh/net/socket.so
-lib/zsh/${PKGVERSION}/zsh/net/tcp.so
-lib/zsh/${PKGVERSION}/zsh/parameter.so
-lib/zsh/${PKGVERSION}/zsh/rlimits.so
-lib/zsh/${PKGVERSION}/zsh/sched.so
-lib/zsh/${PKGVERSION}/zsh/stat.so
-lib/zsh/${PKGVERSION}/zsh/system.so
-lib/zsh/${PKGVERSION}/zsh/termcap.so
-lib/zsh/${PKGVERSION}/zsh/zftp.so
-lib/zsh/${PKGVERSION}/zsh/zle.so
-lib/zsh/${PKGVERSION}/zsh/zleparameter.so
-lib/zsh/${PKGVERSION}/zsh/zprof.so
-lib/zsh/${PKGVERSION}/zsh/zpty.so
-lib/zsh/${PKGVERSION}/zsh/zselect.so
-lib/zsh/${PKGVERSION}/zsh/zutil.so
-share/zsh/${PKGVERSION}/functions/tcp_alias
-share/zsh/${PKGVERSION}/functions/tcp_close
-share/zsh/${PKGVERSION}/functions/tcp_command
-share/zsh/${PKGVERSION}/functions/tcp_expect
-share/zsh/${PKGVERSION}/functions/tcp_fd_handler
-share/zsh/${PKGVERSION}/functions/tcp_log
-share/zsh/${PKGVERSION}/functions/tcp_open
-share/zsh/${PKGVERSION}/functions/tcp_output
-share/zsh/${PKGVERSION}/functions/tcp_point
-share/zsh/${PKGVERSION}/functions/tcp_proxy
-share/zsh/${PKGVERSION}/functions/tcp_read
-share/zsh/${PKGVERSION}/functions/tcp_rename
-share/zsh/${PKGVERSION}/functions/tcp_send
-share/zsh/${PKGVERSION}/functions/tcp_sess
-share/zsh/${PKGVERSION}/functions/tcp_shoot
-share/zsh/${PKGVERSION}/functions/tcp_spam
-share/zsh/${PKGVERSION}/functions/tcp_talk
-share/zsh/${PKGVERSION}/functions/tcp_wait
-share/zsh/${PKGVERSION}/functions/zfanon
-share/zsh/${PKGVERSION}/functions/zfautocheck
-share/zsh/${PKGVERSION}/functions/zfcd
-share/zsh/${PKGVERSION}/functions/zfcd_match
Home |
Main Index |
Thread Index |
Old Index