diff options
| -rw-r--r-- | shells/zsh/Makefile | 5 | ||||
| -rw-r--r-- | shells/zsh/Makefile.common | 107 | ||||
| -rw-r--r-- | shells/zsh/PLIST | 85 | ||||
| -rw-r--r-- | shells/zsh/PLIST.dynamic | 82 | ||||
| -rw-r--r-- | shells/zsh/PLIST.shlibs | 2 | ||||
| -rw-r--r-- | shells/zsh/PLIST.terminfo | 2 | ||||
| -rw-r--r-- | shells/zsh/distinfo | 15 | ||||
| -rw-r--r-- | shells/zsh/hacks.mk | 22 | ||||
| -rw-r--r-- | shells/zsh/patches/patch-aa | 20 | ||||
| -rw-r--r-- | shells/zsh/patches/patch-ab | 10 | ||||
| -rw-r--r-- | shells/zsh/patches/patch-ac | 20 | ||||
| -rw-r--r-- | shells/zsh/patches/patch-ae | 13 |
12 files changed, 194 insertions, 189 deletions
diff --git a/shells/zsh/Makefile b/shells/zsh/Makefile index 4e3dc8ac55f..5e6f5a67c11 100644 --- a/shells/zsh/Makefile +++ b/shells/zsh/Makefile @@ -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 -PKGREVISION= 2 .include "../../mk/bsd.pkg.mk" diff --git a/shells/zsh/Makefile.common b/shells/zsh/Makefile.common index ea22205c968..54f76c180e5 100644 --- a/shells/zsh/Makefile.common +++ b/shells/zsh/Makefile.common @@ -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,61 +32,68 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews 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} - -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 - -. 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 - -PLIST_SRC+= ${PKGDIR}/PLIST.dynamic ${PKGDIR}/PLIST -. endif -.endif - -.if ${OPSYS} == "Interix" -CONFIGURE_ARGS+=--without-tcsetpgrp -.else -CONFIGURE_ARGS+=--with-tcsetpgrp -.endif +_ZSH_OPSYS.${OPSYS}?= dynamic - shlibs ldflags tcsetpgrp -.undef MANZ +################################################################################ -PKG_SHELL= bin/zsh +### static -INSTALL_TARGET= install install.info +# 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} + +### 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} + +### + +_ZSH_OPSYS_VARS.tcsetpgrp= --with-tcsetpgrp +_ZSH_OPSYS_VARS.notcsetpgrp= --without-tcsetpgrp + +################################################################################ + +_ZSH_LINKAGE= ${ZSH_STATIC:M[Yy][Ee][Ss]:?static:dynamic} # static / dynamic + +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} + +################################################################################ + +.undef MANZ pre-install: @cd ${WRKSRC}/Completion; ${FIND} . -name \*.orig -exec ${RM} \{\} \; diff --git a/shells/zsh/PLIST b/shells/zsh/PLIST index a776eae7612..712971096ea 100644 --- a/shells/zsh/PLIST +++ b/shells/zsh/PLIST @@ -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/zrecompile 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 --git a/shells/zsh/PLIST.dynamic b/shells/zsh/PLIST.dynamic deleted file mode 100644 index f354e5124c0..00000000000 --- a/shells/zsh/PLIST.dynamic +++ /dev/null @@ -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 -share/zsh/${PKGVERSION}/functions/zfcget -share/zsh/${PKGVERSION}/functions/zfclose -share/zsh/${PKGVERSION}/functions/zfcput -share/zsh/${PKGVERSION}/functions/zfdir -share/zsh/${PKGVERSION}/functions/zffcache -share/zsh/${PKGVERSION}/functions/zfgcp -share/zsh/${PKGVERSION}/functions/zfget -share/zsh/${PKGVERSION}/functions/zfget_match -share/zsh/${PKGVERSION}/functions/zfgoto -share/zsh/${PKGVERSION}/functions/zfhere -share/zsh/${PKGVERSION}/functions/zfinit -share/zsh/${PKGVERSION}/functions/zfls -share/zsh/${PKGVERSION}/functions/zfmark -share/zsh/${PKGVERSION}/functions/zfopen -share/zsh/${PKGVERSION}/functions/zfparams -share/zsh/${PKGVERSION}/functions/zfpcp -share/zsh/${PKGVERSION}/functions/zfput -share/zsh/${PKGVERSION}/functions/zfrglob -share/zsh/${PKGVERSION}/functions/zfrtime -share/zsh/${PKGVERSION}/functions/zfsession -share/zsh/${PKGVERSION}/functions/zfstat -share/zsh/${PKGVERSION}/functions/zftp_chpwd -share/zsh/${PKGVERSION}/functions/zftp_progress -share/zsh/${PKGVERSION}/functions/zftransfer -share/zsh/${PKGVERSION}/functions/zftype -share/zsh/${PKGVERSION}/functions/zfuget -share/zsh/${PKGVERSION}/functions/zfuput -@dirrm lib/zsh/${PKGVERSION}/zsh/net -@dirrm lib/zsh/${PKGVERSION}/zsh -@dirrm lib/zsh/${PKGVERSION} -@dirrm lib/zsh diff --git a/shells/zsh/PLIST.shlibs b/shells/zsh/PLIST.shlibs deleted file mode 100644 index 9f302ce93e5..00000000000 --- a/shells/zsh/PLIST.shlibs +++ /dev/null @@ -1,2 +0,0 @@ -@comment $NetBSD: PLIST.shlibs,v 1.1 2001/10/31 22:27:52 zuntum Exp $ -lib/zsh/libzsh-${PKGVERSION}.so diff --git a/shells/zsh/PLIST.terminfo b/shells/zsh/PLIST.terminfo deleted file mode 100644 index 157b0c54721..00000000000 --- a/shells/zsh/PLIST.terminfo +++ /dev/null @@ -1,2 +0,0 @@ -@comment $NetBSD: PLIST.terminfo,v 1.1 2005/08/07 20:18:07 hiramatsu Exp $ -lib/zsh/${PKGVERSION}/zsh/terminfo.so diff --git a/shells/zsh/distinfo b/shells/zsh/distinfo index f01105b58dc..0cc57ff2d21 100644 --- a/shells/zsh/distinfo +++ b/shells/zsh/distinfo @@ -1,9 +1,8 @@ -$NetBSD: distinfo,v 1.27 2008/07/13 18:22:01 tonnerre Exp $ +$NetBSD: distinfo,v 1.28 2008/12/21 16:53:31 uebayasi Exp $ -SHA1 (zsh-4.2.6.tar.bz2) = e00c3eda3f52c9514bb625bb56e4480358170d39 -RMD160 (zsh-4.2.6.tar.bz2) = e4400fc6311bf6996128ecf7899592d6d8cdb310 -Size (zsh-4.2.6.tar.bz2) = 2098671 bytes -SHA1 (patch-aa) = 15f9d45ea98f89945ca274fc5b0298fa9397f89d -SHA1 (patch-ab) = 815de90c379035dbc02b251cee148f6df47f9a65 -SHA1 (patch-ac) = 965b56e5ae39d6523416752c1390f01315c5d758 -SHA1 (patch-ae) = 7d4514d0bad6553d3c0cf115874bf50ed0da3d48 +SHA1 (zsh-4.2.7.tar.bz2) = 64c598cd48b78dff9d29341ea0cd904e7aa49541 +RMD160 (zsh-4.2.7.tar.bz2) = 454339205c78393cbb9460aa10f37fa341a40b59 +Size (zsh-4.2.7.tar.bz2) = 2303693 bytes +SHA1 (patch-ab) = b446fd8138f18113c17cee43cd11a5f458b1db40 +SHA1 (patch-ac) = c80876a222ff9584bc53ec807ee2a8bc2b003cd1 +SHA1 (patch-ae) = ac77147eebfebcd042f93a71bb13f9c0be8de211 diff --git a/shells/zsh/hacks.mk b/shells/zsh/hacks.mk new file mode 100644 index 00000000000..110e21fcacb --- /dev/null +++ b/shells/zsh/hacks.mk @@ -0,0 +1,22 @@ +.if !defined(ZSH_HACKS_MK) +ZSH_HACKS_MK= defined + +### [Sun Dec 21 02:00:19 JST 2008 : uebayasi] +### 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. +NETBSD_SHLINKER= /libexec/ld.elf_so # XXX move elsewhere +NETBSD_SHLIBDIR= /lib # XXX move elsewhere +.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}) +PKG_HACKS+= static-dynamic +_ZSH_STATIC.BUILDLINK_PASSTHRU_RPATHDIRS= ${NETBSD_SHLIBDIR} +_ZSH_STATIC.LDFLAGS= -Wl,-dynamic-linker=${NETBSD_SHLINKER} -Wl,-R${NETBSD_SHLIBDIR} +.endif + +.endif # ZSH_HACKS_MK diff --git a/shells/zsh/patches/patch-aa b/shells/zsh/patches/patch-aa deleted file mode 100644 index 40ed01d4823..00000000000 --- a/shells/zsh/patches/patch-aa +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-aa,v 1.7 2008/07/13 18:22:01 tonnerre Exp $ - ---- Util/difflog.pl.orig 2002-04-18 16:35:17.000000000 +0200 -+++ Util/difflog.pl -@@ -2,10 +2,13 @@ - - use strict; - use IO::File; -+use File::Temp; - - my @differ = qw(diff -bw); --my $oldtmp = "/tmp/difflog$$.old"; --my $newtmp = "/tmp/difflog$$.new"; -+my $oldf = new File::Temp(TEMPLATE => 'difflogXXXXX', DIR => '/tmp/', SUFFIX => '.old'); -+my $newf = new File::Temp(TEMPLATE => 'difflogXXXXX', DIR => '/tmp/', SUFFIX => '.new'); -+my $oldtmp = $oldf->filename; -+my $newtmp = $newf->filename; - - my $newfn = pop(@ARGV); - my $oldfn = pop(@ARGV); diff --git a/shells/zsh/patches/patch-ab b/shells/zsh/patches/patch-ab index 2f5b8ef2dea..c7afd56a5b9 100644 --- a/shells/zsh/patches/patch-ab +++ b/shells/zsh/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.11 2005/02/21 11:07:37 adam Exp $ +$NetBSD: patch-ab,v 1.12 2008/12/21 16:53:31 uebayasi Exp $ ---- Src/zsh.h.orig 2005-01-12 12:19:06.000000000 +0000 +--- Src/zsh.h.orig 2007-11-26 18:38:49.000000000 +0900 +++ Src/zsh.h -@@ -1625,6 +1625,7 @@ struct ttyinfo { +@@ -1678,6 +1678,7 @@ struct ttyinfo { #endif }; @@ -10,8 +10,8 @@ $NetBSD: patch-ab,v 1.11 2005/02/21 11:07:37 adam Exp $ /* defines for whether tabs expand to spaces */ #if defined(HAVE_TERMIOS_H) || defined(HAVE_TERMIO_H) #define SGTTYFLAG shttyinfo.tio.c_oflag -@@ -1640,6 +1641,7 @@ struct ttyinfo { - #define SGTABTYPE XTABS +@@ -1695,6 +1696,7 @@ struct ttyinfo { + # endif # endif # endif +#endif diff --git a/shells/zsh/patches/patch-ac b/shells/zsh/patches/patch-ac index cb4e338291c..0b791252172 100644 --- a/shells/zsh/patches/patch-ac +++ b/shells/zsh/patches/patch-ac @@ -1,19 +1,19 @@ -$NetBSD: patch-ac,v 1.20 2005/12/07 03:00:50 uebayasi Exp $ +$NetBSD: patch-ac,v 1.21 2008/12/21 16:53:31 uebayasi Exp $ ---- configure.orig 2005-04-04 11:49:26.000000000 +0200 -+++ configure 2005-05-10 00:02:26.000000000 +0200 -@@ -15724,6 +15724,10 @@ +--- configure.orig 2007-11-29 19:17:19.000000000 +0900 ++++ configure +@@ -16619,6 +16619,10 @@ echo "${ECHO_T}$zsh_cv_sys_elf" >&6; } DLLD="${DLLD=$CC}" DLLDARG="" ;; + *interix*) -+ DLLD="${DLLD=$CC}" -+ DLLDARG="" ++ DLLD="${DLLD=$CC}" ++ DLLDARG="" + ;; * ) DLLD="${DLLD=ld}" DLLDARG="" -@@ -15734,6 +15738,7 @@ +@@ -16629,6 +16633,7 @@ echo "${ECHO_T}$zsh_cv_sys_elf" >&6; } case "$host_os" in hpux*) DLLDFLAGS="${DLLDFLAGS=-shared}" ;; darwin*) DLCFLAGS="${DLCFLAGS=-fno-common}" ;; @@ -21,12 +21,12 @@ $NetBSD: patch-ac,v 1.20 2005/12/07 03:00:50 uebayasi Exp $ *) DLCFLAGS="${DLCFLAGS=-fPIC}" ;; esac else -@@ -15747,7 +15752,7 @@ +@@ -16642,7 +16647,7 @@ echo "${ECHO_T}$zsh_cv_sys_elf" >&6; } esac fi case "$host_os" in -- freebsd*|linux*|irix*|osf*|gnu*|dragonfly*) DLLDFLAGS="${DLLDFLAGS=-shared}" ;; -+ freebsd*|linux*|irix*|osf*|gnu*|interix*|dragonfly*) DLLDFLAGS="${DLLDFLAGS=-shared}" ;; +- *freebsd*|linux*|irix*|osf*|gnu*|dragonfly*) DLLDFLAGS="${DLLDFLAGS=-shared}" ;; ++ *freebsd*|linux*|irix*|osf*|gnu*|interix*|dragonfly*) DLLDFLAGS="${DLLDFLAGS=-shared}" ;; sunos*) DLLDFLAGS="${DLLDFLAGS=-assert nodefinitions}" ;; sysv4*|esix*) DLLDFLAGS="${DLLDFLAGS=-G $ldflags}" ;; netbsd*) DLLDFLAGS="${DLLDFLAGS=${DLLDARG}-x -shared --whole-archive}" ;; diff --git a/shells/zsh/patches/patch-ae b/shells/zsh/patches/patch-ae index 1633ef03c5f..a34aa2ab938 100644 --- a/shells/zsh/patches/patch-ae +++ b/shells/zsh/patches/patch-ae @@ -1,13 +1,14 @@ -$NetBSD: patch-ae,v 1.1 2004/03/28 18:35:45 recht Exp $ +$NetBSD: patch-ae,v 1.2 2008/12/21 16:53:31 uebayasi Exp $ ---- Src/mkmakemod.sh.org 2004-02-15 05:50:17.000000000 +1100 -+++ Src/mkmakemod.sh 2004-03-26 14:18:45.000000000 +1100 -@@ -112,8 +112,7 @@ +--- Src/mkmakemod.sh.orig 2007-10-25 17:40:46.000000000 +0900 ++++ Src/mkmakemod.sh +@@ -112,9 +112,7 @@ if $first_stage; then module_list="${bin_mods}${dyn_mods}" - # check both 2.13 and 2.50 syntax + # check 2.13, 2.50, and 2.60 syntaxes - if grep '%@D@%D%' config.status >/dev/null || -- grep ',@D@,D,' config.status >/dev/null; then +- grep ',@D@,D,' config.status >/dev/null || +- grep ',@D@,|#_!!_#|D,' config.status >/dev/null; then + if grep '^#[ \t]*define[ \t][ \t]*DYNAMIC[ \t]' config.h >/dev/null; then is_dynamic=true else |