Sun Dec 21 16:53:31 2008 UTC ()
Update zsh to 4.2.7.

Changes are unknown.


(uebayasi)
diff -r1.53 -r1.54 pkgsrc/shells/zsh/Makefile
diff -r1.48 -r1.49 pkgsrc/shells/zsh/Makefile.common
diff -r1.18 -r1.19 pkgsrc/shells/zsh/PLIST
diff -r1.4 -r0 pkgsrc/shells/zsh/PLIST.dynamic
diff -r1.1 -r0 pkgsrc/shells/zsh/PLIST.shlibs
diff -r1.1 -r0 pkgsrc/shells/zsh/PLIST.terminfo
diff -r1.27 -r1.28 pkgsrc/shells/zsh/distinfo
diff -r0 -r1.1 pkgsrc/shells/zsh/hacks.mk
diff -r1.7 -r0 pkgsrc/shells/zsh/patches/patch-aa
diff -r1.11 -r1.12 pkgsrc/shells/zsh/patches/patch-ab
diff -r1.20 -r1.21 pkgsrc/shells/zsh/patches/patch-ac
diff -r1.1 -r1.2 pkgsrc/shells/zsh/patches/patch-ae
cvs diff -r1.53 -r1.54 pkgsrc/shells/zsh/Makefile (expand / switch to unified diff)

--- pkgsrc/shells/zsh/Makefile 2008/07/25 09:14:48 1.53
+++ pkgsrc/shells/zsh/Makefile 2008/12/21 16:53:31 1.54
@@ -1,9 +1,8 @@ @@ -1,9 +1,8 @@
1# $NetBSD: Makefile,v 1.53 2008/07/25 09:14:48 ghen Exp $ 1# $NetBSD: Makefile,v 1.54 2008/12/21 16:53:31 uebayasi Exp $
2 2
3.include "../../shells/zsh/Makefile.common" 3.include "../../shells/zsh/Makefile.common"
4 4
5ZSH_VERSION= 4.2.6 5ZSH_VERSION= 4.2.7
6ZSH_MAINTAINER= uebayasi@NetBSD.org 6ZSH_MAINTAINER= uebayasi@NetBSD.org
7PKGREVISION= 2 
8 7
9.include "../../mk/bsd.pkg.mk" 8.include "../../mk/bsd.pkg.mk"
cvs diff -r1.48 -r1.49 pkgsrc/shells/zsh/Attic/Makefile.common (expand / switch to unified diff)

--- pkgsrc/shells/zsh/Attic/Makefile.common 2008/07/25 09:14:48 1.48
+++ pkgsrc/shells/zsh/Attic/Makefile.common 2008/12/21 16:53:31 1.49
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.48 2008/07/25 09:14:48 ghen Exp $ 1# $NetBSD: Makefile.common,v 1.49 2008/12/21 16:53:31 uebayasi Exp $
2 2
3DISTNAME= zsh-${ZSH_VERSION} 3DISTNAME= zsh-${ZSH_VERSION}
4CATEGORIES= shells 4CATEGORIES= shells
5MASTER_SITES= ftp://mirrors.dotsrc.org/zsh/ \ 5MASTER_SITES= ftp://mirrors.dotsrc.org/zsh/ \
6 ftp://ftp.fu-berlin.de/pub/unix/shells/zsh/ \ 6 ftp://ftp.fu-berlin.de/pub/unix/shells/zsh/ \
7 ftp://ftp.funet.fi/pub/unix/shells/zsh/ \ 7 ftp://ftp.funet.fi/pub/unix/shells/zsh/ \
8 http://www.math.technion.ac.il/pub/zsh/ \ 8 http://www.math.technion.ac.il/pub/zsh/ \
9 ftp://ftp.zsh.org/zsh/ 9 ftp://ftp.zsh.org/zsh/
10EXTRACT_SUFX= .tar.bz2 10EXTRACT_SUFX= .tar.bz2
11 11
12MAINTAINER= ${ZSH_MAINTAINER} 12MAINTAINER= ${ZSH_MAINTAINER}
13HOMEPAGE= http://zsh.dotsrc.org/ 13HOMEPAGE= http://zsh.dotsrc.org/
14COMMENT= The Z shell 14COMMENT= The Z shell
@@ -22,81 +22,88 @@ CONFIGURE_ARGS+= --enable-etcdir=${PKG_S @@ -22,81 +22,88 @@ CONFIGURE_ARGS+= --enable-etcdir=${PKG_S
22USE_TOOLS+= makeinfo 22USE_TOOLS+= makeinfo
23INFO_FILES= # PLIST 23INFO_FILES= # PLIST
24TEXINFO_REQD= 4.0 24TEXINFO_REQD= 4.0
25 25
26PKG_INSTALLATION_TYPES= overwrite pkgviews 26PKG_INSTALLATION_TYPES= overwrite pkgviews
27 27
28.include "../../mk/bsd.prefs.mk" 28.include "../../mk/bsd.prefs.mk"
29 29
30# Handle any PKG_OPTIONS that this package might have. 30# Handle any PKG_OPTIONS that this package might have.
31.sinclude "options.mk" 31.sinclude "options.mk"
32 32
33BUILD_DEFS+= ZSH_STATIC 33BUILD_DEFS+= ZSH_STATIC
34MAKE_JOBS_SAFE= no 34MAKE_JOBS_SAFE= no
 35INSTALL_TARGET= install install.info
 36PKG_SHELL= bin/zsh
 37PLIST_VARS= dynamic terminfo shlibs
35 38
36.if defined(ZSH_STATIC) && !empty(ZSH_STATIC:M[Yy][Ee][Ss]) 39################################################################################
37CONFIGURE_ARGS+= --disable-dynamic 
38 40
39NETBSD_SHLINKER= /libexec/ld.elf_so 41_ZSH_OPSYS.OpenBSD= dynamic terminfo - ldflags tcsetpgrp
40NETBSD_SHLIBDIR= /lib 42_ZSH_OPSYS.Linux= dynamic terminfo - ldflags tcsetpgrp
 43_ZSH_OPSYS.IRIX= dynamic terminfo - ldflags tcsetpgrp
 44_ZSH_OPSYS.Interix= dynamic terminfo shlibs ldflags notcsetpgrp
 45_ZSH_OPSYS.DragonFly= dynamic terminfo shlibs ldflags tcsetpgrp
 46_ZSH_OPSYS.FreeBSD= dynamic terminfo shlibs ldflags tcsetpgrp
 47_ZSH_OPSYS.SunOS= dynamic - - - tcsetpgrp
41 48
42. if ${OPSYS} == "NetBSD" && \ 49_ZSH_OPSYS.${OPSYS}?= dynamic - shlibs ldflags tcsetpgrp
43 defined(OBJECT_FMT) && ${OBJECT_FMT} == "ELF" && \ 
44 defined(MKDYNAMICROOT) && ${MKDYNAMICROOT} != "no" && \ 
45 defined(NETBSD_SHLINKER) && exists(${NETBSD_SHLINKER}) && \ 
46 defined(NETBSD_SHLIBDIR) && exists(${NETBSD_SHLIBDIR}) 
47# 
48# Built a dynamically linked "zsh" binary on NetBSD systems which use 
49# dynamically linked binaries on the root filesystem. The binary will 
50# only depend on the run-time link-editor and shared libraries on the 
51# root filesystem. We use "-rpath" below by purpose because the 
52# buildlink 3 framework won't filter it out. 
53# 
54BUILDLINK_PASSTHRU_RPATHDIRS+= ${NETBSD_SHLIBDIR} 
55 50
56LDFLAGS+= -Wl,-dynamic-linker=${NETBSD_SHLINKER} -Wl,-R${NETBSD_SHLIBDIR} 51################################################################################
57. else 
58LDFLAGS+= -static 
59. endif 
60.else 
61. if ${OPSYS} == "SunOS" 
62PLIST_SRC= ${PKGDIR}/PLIST.dynamic ${PKGDIR}/PLIST 
63. else 
64LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/zsh 
65 
66. if ${OPSYS} == "Linux" || ${OPSYS} == "IRIX" || ${OPSYS} == "OpenBSD" 
67PLIST_SRC+= ${PKGDIR}/PLIST.terminfo 
68. elif ${OPSYS} == "Interix" || ${OPSYS} == "DragonFly" || \ 
69 ${OPSYS} == "FreeBSD" 
70PLIST_SRC+= ${PKGDIR}/PLIST.terminfo ${PKGDIR}/PLIST.shlibs 
71. else 
72PLIST_SRC+= ${PKGDIR}/PLIST.shlibs 
73. endif 
74 
75PLIST_SRC+= ${PKGDIR}/PLIST.dynamic ${PKGDIR}/PLIST 
76. endif 
77.endif 
78 
79.if ${OPSYS} == "Interix" 
80CONFIGURE_ARGS+=--without-tcsetpgrp 
81.else 
82CONFIGURE_ARGS+=--with-tcsetpgrp 
83.endif 
84 52
85.undef MANZ 53### static
86 54
87PKG_SHELL= bin/zsh 55# Might be overwritten by hacks.mk.
 56_ZSH_STATIC.BUILDLINK_PASSTHRU_RPATHDIRS= # nothing
 57_ZSH_STATIC.LDFLAGS= -static
88 58
89INSTALL_TARGET= install install.info 59_ZSH_LINKAGE.static.CONFIGURE_ARGS= --disable-dynamic
 60_ZSH_LINKAGE.static.BUILDLINK_PASSTHRU_RPATHDIRS= \
 61 ${_ZSH_STATIC.BUILDLINK_PASSTHRU_RPATHDIRS}
 62_ZSH_LINKAGE.static.LDFLAGS= ${_ZSH_STATIC.LDFLAGS}
 63
 64### dynamic
 65
 66_ZSH_DYNAMIC_VARS.ldflags= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/zsh
 67
 68_ZSH_LINKAGE.dynamic.CONFIGURE_ARGS=
 69_ZSH_LINKAGE.dynamic.BUILDLINK_PASSTHRU_RPATHDIRS=
 70_ZSH_LINKAGE.dynamic.LDFLAGS= ${_ZSH_DYNAMIC_VARS.${_ZSH_OPSYS.${OPSYS}:Mldflags}}
 71
 72_ZSH_LINKAGE.dynamic.PLIST.dynamic= ${_ZSH_OPSYS.${OPSYS}:Mdynamic:?yes:no}
 73_ZSH_LINKAGE.dynamic.PLIST.terminfo= ${_ZSH_OPSYS.${OPSYS}:Mterminfo:?yes:no}
 74_ZSH_LINKAGE.dynamic.PLIST.shlibs= ${_ZSH_OPSYS.${OPSYS}:Mshlibs:?yes:no}
 75
 76###
 77
 78_ZSH_OPSYS_VARS.tcsetpgrp= --with-tcsetpgrp
 79_ZSH_OPSYS_VARS.notcsetpgrp= --without-tcsetpgrp
 80
 81################################################################################
 82
 83_ZSH_LINKAGE= ${ZSH_STATIC:M[Yy][Ee][Ss]:?static:dynamic} # static / dynamic
 84
 85CONFIGURE_ARGS+= ${_ZSH_LINKAGE.${_ZSH_LINKAGE}.CONFIGURE_ARGS} \
 86 ${_ZSH_OPSYS_VARS.${_ZSH_OPSYS.${OPSYS}:Mtcsetpgrp}} \
 87 ${_ZSH_OPSYS_VARS.${_ZSH_OPSYS.${OPSYS}:Mnotcsetpgrp}}
 88BUILDLINK_PASSTHRU_RPATHDIRS+= ${_ZSH_LINKAGE.${_ZSH_LINKAGE}.BUILDLINK_PASSTHRU_RPATHDIRS}
 89LDFLAGS+= ${_ZSH_LINKAGE.${_ZSH_LINKAGE}.LDFLAGS}
 90PLIST.dynamic= ${_ZSH_LINKAGE.${_ZSH_LINKAGE}.PLIST.dynamic}
 91PLIST.terminfo= ${_ZSH_LINKAGE.${_ZSH_LINKAGE}.PLIST.terminfo}
 92PLIST.shlibs= ${_ZSH_LINKAGE.${_ZSH_LINKAGE}.PLIST.shlibs}
 93
 94################################################################################
 95
 96.undef MANZ
90 97
91pre-install: 98pre-install:
92 @cd ${WRKSRC}/Completion; ${FIND} . -name \*.orig -exec ${RM} \{\} \; 99 @cd ${WRKSRC}/Completion; ${FIND} . -name \*.orig -exec ${RM} \{\} \;
93 100
94post-install: 101post-install:
95 ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/zsh 102 ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/zsh
96 cd ${WRKSRC}/Etc && ${INSTALL_DATA} BUGS FAQ \ 103 cd ${WRKSRC}/Etc && ${INSTALL_DATA} BUGS FAQ \
97 ${DESTDIR}${PREFIX}/share/doc/zsh 104 ${DESTDIR}${PREFIX}/share/doc/zsh
98 cd ${WRKSRC} && ${INSTALL_DATA} FEATURES NEWS \ 105 cd ${WRKSRC} && ${INSTALL_DATA} FEATURES NEWS \
99 ${DESTDIR}${PREFIX}/share/doc/zsh 106 ${DESTDIR}${PREFIX}/share/doc/zsh
100 107
101# Utilize Zsh's test framework. 108# Utilize Zsh's test framework.
102# Testing of dynamic shell only works after install has been done 109# Testing of dynamic shell only works after install has been done
cvs diff -r1.18 -r1.19 pkgsrc/shells/zsh/PLIST (expand / switch to unified diff)

--- pkgsrc/shells/zsh/PLIST 2006/04/07 15:28:49 1.18
+++ pkgsrc/shells/zsh/PLIST 2008/12/21 16:53:31 1.19
@@ -1,17 +1,45 @@ @@ -1,17 +1,45 @@
1@comment $NetBSD: PLIST,v 1.18 2006/04/07 15:28:49 jlam Exp $ 1@comment $NetBSD: PLIST,v 1.19 2008/12/21 16:53:31 uebayasi Exp $
2bin/${PKGNAME} 2bin/${PKGNAME}
3bin/zsh 3bin/zsh
4info/zsh.info 4info/zsh.info
 5${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/cap.so
 6${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/clone.so
 7${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/compctl.so
 8${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/complete.so
 9${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/complist.so
 10${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/computil.so
 11${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/datetime.so
 12${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/deltochar.so
 13${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/example.so
 14${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/files.so
 15${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/langinfo.so
 16${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/mapfile.so
 17${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/mathfunc.so
 18${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/net/socket.so
 19${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/net/tcp.so
 20${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/parameter.so
 21${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/rlimits.so
 22${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/sched.so
 23${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/stat.so
 24${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/system.so
 25${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/termcap.so
 26${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/zftp.so
 27${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/zle.so
 28${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/zleparameter.so
 29${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/zprof.so
 30${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/zpty.so
 31${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/zselect.so
 32${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/zutil.so
5man/man1/zsh.1 33man/man1/zsh.1
6man/man1/zshall.1 34man/man1/zshall.1
7man/man1/zshbuiltins.1 35man/man1/zshbuiltins.1
8man/man1/zshcompctl.1 36man/man1/zshcompctl.1
9man/man1/zshcompsys.1 37man/man1/zshcompsys.1
10man/man1/zshcompwid.1 38man/man1/zshcompwid.1
11man/man1/zshcontrib.1 39man/man1/zshcontrib.1
12man/man1/zshexpn.1 40man/man1/zshexpn.1
13man/man1/zshmisc.1 41man/man1/zshmisc.1
14man/man1/zshmodules.1 42man/man1/zshmodules.1
15man/man1/zshoptions.1 43man/man1/zshoptions.1
16man/man1/zshparam.1 44man/man1/zshparam.1
17man/man1/zshtcpsys.1 45man/man1/zshtcpsys.1
@@ -525,19 +553,74 @@ share/zsh/${PKGVERSION}/functions/transp @@ -525,19 +553,74 @@ share/zsh/${PKGVERSION}/functions/transp
525share/zsh/${PKGVERSION}/functions/up-case-word-match 553share/zsh/${PKGVERSION}/functions/up-case-word-match
526share/zsh/${PKGVERSION}/functions/up-line-or-beginning-search 554share/zsh/${PKGVERSION}/functions/up-line-or-beginning-search
527share/zsh/${PKGVERSION}/functions/url-quote-magic 555share/zsh/${PKGVERSION}/functions/url-quote-magic
528share/zsh/${PKGVERSION}/functions/zargs 556share/zsh/${PKGVERSION}/functions/zargs
529share/zsh/${PKGVERSION}/functions/zcalc 557share/zsh/${PKGVERSION}/functions/zcalc
530share/zsh/${PKGVERSION}/functions/zed 558share/zsh/${PKGVERSION}/functions/zed
531share/zsh/${PKGVERSION}/functions/zed-set-file-name 559share/zsh/${PKGVERSION}/functions/zed-set-file-name
532share/zsh/${PKGVERSION}/functions/zkbd 560share/zsh/${PKGVERSION}/functions/zkbd
533share/zsh/${PKGVERSION}/functions/zmv 561share/zsh/${PKGVERSION}/functions/zmv
534share/zsh/${PKGVERSION}/functions/zrecompile 562share/zsh/${PKGVERSION}/functions/zrecompile
535share/zsh/${PKGVERSION}/functions/zsh-mime-handler 563share/zsh/${PKGVERSION}/functions/zsh-mime-handler
536share/zsh/${PKGVERSION}/functions/zsh-mime-setup 564share/zsh/${PKGVERSION}/functions/zsh-mime-setup
537share/zsh/${PKGVERSION}/functions/zstyle+ 565share/zsh/${PKGVERSION}/functions/zstyle+
 566${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/tcp_alias
 567${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/tcp_close
 568${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/tcp_command
 569${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/tcp_expect
 570${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/tcp_fd_handler
 571${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/tcp_log
 572${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/tcp_open
 573${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/tcp_output
 574${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/tcp_point
 575${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/tcp_proxy
 576${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/tcp_read
 577${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/tcp_rename
 578${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/tcp_send
 579${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/tcp_sess
 580${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/tcp_shoot
 581${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/tcp_spam
 582${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/tcp_talk
 583${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/tcp_wait
 584${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/zfanon
 585${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/zfautocheck
 586${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/zfcd
 587${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/zfcd_match
 588${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/zfcget
 589${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/zfclose
 590${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/zfcput
 591${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/zfdir
 592${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/zffcache
 593${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/zfgcp
 594${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/zfget
 595${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/zfget_match
 596${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/zfgoto
 597${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/zfhere
 598${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/zfinit
 599${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/zfls
 600${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/zfmark
 601${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/zfopen
 602${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/zfparams
 603${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/zfpcp
 604${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/zfput
 605${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/zfrglob
 606${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/zfrtime
 607${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/zfsession
 608${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/zfstat
 609${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/zftp_chpwd
 610${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/zftp_progress
 611${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/zftransfer
 612${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/zftype
 613${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/zfuget
 614${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/zfuput
 615@comment ${PLIST.terminfo}lib/zsh/${PKGVERSION}/zsh/terminfo.so
 616@comment ${PLIST.shlibs}lib/zsh/libzsh-${PKGVERSION}.so
538@exec ${MKDIR} %D/share/zsh/site-functions 617@exec ${MKDIR} %D/share/zsh/site-functions
539@dirrm share/zsh/site-functions 618@dirrm share/zsh/site-functions
540@dirrm share/zsh/${PKGVERSION}/functions 619@dirrm share/zsh/${PKGVERSION}/functions
541@dirrm share/zsh/${PKGVERSION} 620@dirrm share/zsh/${PKGVERSION}
542@dirrm share/zsh 621@dirrm share/zsh
543@dirrm share/doc/zsh 622@dirrm share/doc/zsh
 623${PLIST.dynamic}@dirrm lib/zsh/${PKGVERSION}/zsh/net
 624${PLIST.dynamic}@dirrm lib/zsh/${PKGVERSION}/zsh
 625${PLIST.dynamic}@dirrm lib/zsh/${PKGVERSION}
 626${PLIST.dynamic}@dirrm lib/zsh
File Deleted: pkgsrc/shells/zsh/Attic/PLIST.dynamic
File Deleted: pkgsrc/shells/zsh/Attic/PLIST.shlibs
File Deleted: pkgsrc/shells/zsh/Attic/PLIST.terminfo
cvs diff -r1.27 -r1.28 pkgsrc/shells/zsh/distinfo (expand / switch to unified diff)

--- pkgsrc/shells/zsh/distinfo 2008/07/13 18:22:01 1.27
+++ pkgsrc/shells/zsh/distinfo 2008/12/21 16:53:31 1.28
@@ -1,9 +1,8 @@ @@ -1,9 +1,8 @@
1$NetBSD: distinfo,v 1.27 2008/07/13 18:22:01 tonnerre Exp $ 1$NetBSD: distinfo,v 1.28 2008/12/21 16:53:31 uebayasi Exp $
2 2
3SHA1 (zsh-4.2.6.tar.bz2) = e00c3eda3f52c9514bb625bb56e4480358170d39 3SHA1 (zsh-4.2.7.tar.bz2) = 64c598cd48b78dff9d29341ea0cd904e7aa49541
4RMD160 (zsh-4.2.6.tar.bz2) = e4400fc6311bf6996128ecf7899592d6d8cdb310 4RMD160 (zsh-4.2.7.tar.bz2) = 454339205c78393cbb9460aa10f37fa341a40b59
5Size (zsh-4.2.6.tar.bz2) = 2098671 bytes 5Size (zsh-4.2.7.tar.bz2) = 2303693 bytes
6SHA1 (patch-aa) = 15f9d45ea98f89945ca274fc5b0298fa9397f89d 6SHA1 (patch-ab) = b446fd8138f18113c17cee43cd11a5f458b1db40
7SHA1 (patch-ab) = 815de90c379035dbc02b251cee148f6df47f9a65 7SHA1 (patch-ac) = c80876a222ff9584bc53ec807ee2a8bc2b003cd1
8SHA1 (patch-ac) = 965b56e5ae39d6523416752c1390f01315c5d758 8SHA1 (patch-ae) = ac77147eebfebcd042f93a71bb13f9c0be8de211
9SHA1 (patch-ae) = 7d4514d0bad6553d3c0cf115874bf50ed0da3d48 
File Added: pkgsrc/shells/zsh/Attic/hacks.mk
.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
File Deleted: pkgsrc/shells/zsh/patches/Attic/patch-aa
cvs diff -r1.11 -r1.12 pkgsrc/shells/zsh/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/shells/zsh/patches/Attic/patch-ab 2005/02/21 11:07:37 1.11
+++ pkgsrc/shells/zsh/patches/Attic/patch-ab 2008/12/21 16:53:31 1.12
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1$NetBSD: patch-ab,v 1.11 2005/02/21 11:07:37 adam Exp $ 1$NetBSD: patch-ab,v 1.12 2008/12/21 16:53:31 uebayasi Exp $
2 2
3--- Src/zsh.h.orig 2005-01-12 12:19:06.000000000 +0000 3--- Src/zsh.h.orig 2007-11-26 18:38:49.000000000 +0900
4+++ Src/zsh.h 4+++ Src/zsh.h
5@@ -1625,6 +1625,7 @@ struct ttyinfo { 5@@ -1678,6 +1678,7 @@ struct ttyinfo {
6 #endif 6 #endif
7 }; 7 };
8  8
9+#ifndef __INTERIX 9+#ifndef __INTERIX
10 /* defines for whether tabs expand to spaces */ 10 /* defines for whether tabs expand to spaces */
11 #if defined(HAVE_TERMIOS_H) || defined(HAVE_TERMIO_H) 11 #if defined(HAVE_TERMIOS_H) || defined(HAVE_TERMIO_H)
12 #define SGTTYFLAG shttyinfo.tio.c_oflag 12 #define SGTTYFLAG shttyinfo.tio.c_oflag
13@@ -1640,6 +1641,7 @@ struct ttyinfo { 13@@ -1695,6 +1696,7 @@ struct ttyinfo {
14 #define SGTABTYPE XTABS 14 # endif
15 # endif 15 # endif
16 # endif 16 # endif
17+#endif 17+#endif
18  18
19 /* flags for termflags */ 19 /* flags for termflags */
20  20
cvs diff -r1.20 -r1.21 pkgsrc/shells/zsh/patches/Attic/patch-ac (expand / switch to unified diff)

--- pkgsrc/shells/zsh/patches/Attic/patch-ac 2005/12/07 03:00:50 1.20
+++ pkgsrc/shells/zsh/patches/Attic/patch-ac 2008/12/21 16:53:31 1.21
@@ -1,32 +1,32 @@ @@ -1,32 +1,32 @@
1$NetBSD: patch-ac,v 1.20 2005/12/07 03:00:50 uebayasi Exp $ 1$NetBSD: patch-ac,v 1.21 2008/12/21 16:53:31 uebayasi Exp $
2 2
3--- configure.orig 2005-04-04 11:49:26.000000000 +0200 3--- configure.orig 2007-11-29 19:17:19.000000000 +0900
4+++ configure 2005-05-10 00:02:26.000000000 +0200 4+++ configure
5@@ -15724,6 +15724,10 @@ 5@@ -16619,6 +16619,10 @@ echo "${ECHO_T}$zsh_cv_sys_elf" >&6; }
6 DLLD="${DLLD=$CC}" 6 DLLD="${DLLD=$CC}"
7 DLLDARG="" 7 DLLDARG=""
8 ;; 8 ;;
9+ *interix*) 9+ *interix*)
10+ DLLD="${DLLD=$CC}" 10+ DLLD="${DLLD=$CC}"
11+ DLLDARG="" 11+ DLLDARG=""
12+ ;; 12+ ;;
13 * ) 13 * )
14 DLLD="${DLLD=ld}" 14 DLLD="${DLLD=ld}"
15 DLLDARG="" 15 DLLDARG=""
16@@ -15734,6 +15738,7 @@ 16@@ -16629,6 +16633,7 @@ echo "${ECHO_T}$zsh_cv_sys_elf" >&6; }
17 case "$host_os" in 17 case "$host_os" in
18 hpux*) DLLDFLAGS="${DLLDFLAGS=-shared}" ;; 18 hpux*) DLLDFLAGS="${DLLDFLAGS=-shared}" ;;
19 darwin*) DLCFLAGS="${DLCFLAGS=-fno-common}" ;; 19 darwin*) DLCFLAGS="${DLCFLAGS=-fno-common}" ;;
20+ interix*) DLCFLAGS="${DLCFLAGS=}" ;; 20+ interix*) DLCFLAGS="${DLCFLAGS=}" ;;
21 *) DLCFLAGS="${DLCFLAGS=-fPIC}" ;; 21 *) DLCFLAGS="${DLCFLAGS=-fPIC}" ;;
22 esac 22 esac
23 else 23 else
24@@ -15747,7 +15752,7 @@ 24@@ -16642,7 +16647,7 @@ echo "${ECHO_T}$zsh_cv_sys_elf" >&6; }
25 esac 25 esac
26 fi 26 fi
27 case "$host_os" in 27 case "$host_os" in
28- freebsd*|linux*|irix*|osf*|gnu*|dragonfly*) DLLDFLAGS="${DLLDFLAGS=-shared}" ;; 28- *freebsd*|linux*|irix*|osf*|gnu*|dragonfly*) DLLDFLAGS="${DLLDFLAGS=-shared}" ;;
29+ freebsd*|linux*|irix*|osf*|gnu*|interix*|dragonfly*) DLLDFLAGS="${DLLDFLAGS=-shared}" ;; 29+ *freebsd*|linux*|irix*|osf*|gnu*|interix*|dragonfly*) DLLDFLAGS="${DLLDFLAGS=-shared}" ;;
30 sunos*) DLLDFLAGS="${DLLDFLAGS=-assert nodefinitions}" ;; 30 sunos*) DLLDFLAGS="${DLLDFLAGS=-assert nodefinitions}" ;;
31 sysv4*|esix*) DLLDFLAGS="${DLLDFLAGS=-G $ldflags}" ;; 31 sysv4*|esix*) DLLDFLAGS="${DLLDFLAGS=-G $ldflags}" ;;
32 netbsd*) DLLDFLAGS="${DLLDFLAGS=${DLLDARG}-x -shared --whole-archive}" ;; 32 netbsd*) DLLDFLAGS="${DLLDFLAGS=${DLLDARG}-x -shared --whole-archive}" ;;
cvs diff -r1.1 -r1.2 pkgsrc/shells/zsh/patches/Attic/patch-ae (expand / switch to unified diff)

--- pkgsrc/shells/zsh/patches/Attic/patch-ae 2004/03/28 18:35:45 1.1
+++ pkgsrc/shells/zsh/patches/Attic/patch-ae 2008/12/21 16:53:31 1.2
@@ -1,14 +1,15 @@ @@ -1,14 +1,15 @@
1$NetBSD: patch-ae,v 1.1 2004/03/28 18:35:45 recht Exp $ 1$NetBSD: patch-ae,v 1.2 2008/12/21 16:53:31 uebayasi Exp $
2 2
3--- Src/mkmakemod.sh.org 2004-02-15 05:50:17.000000000 +1100 3--- Src/mkmakemod.sh.orig 2007-10-25 17:40:46.000000000 +0900
4+++ Src/mkmakemod.sh 2004-03-26 14:18:45.000000000 +1100 4+++ Src/mkmakemod.sh
5@@ -112,8 +112,7 @@ 5@@ -112,9 +112,7 @@ if $first_stage; then
6 module_list="${bin_mods}${dyn_mods}" 6 module_list="${bin_mods}${dyn_mods}"
7  7
8 # check both 2.13 and 2.50 syntax 8 # check 2.13, 2.50, and 2.60 syntaxes
9- if grep '%@D@%D%' config.status >/dev/null || 9- if grep '%@D@%D%' config.status >/dev/null ||
10- grep ',@D@,D,' config.status >/dev/null; then 10- grep ',@D@,D,' config.status >/dev/null ||
 11- grep ',@D@,|#_!!_#|D,' config.status >/dev/null; then
11+ if grep '^#[ \t]*define[ \t][ \t]*DYNAMIC[ \t]' config.h >/dev/null; then 12+ if grep '^#[ \t]*define[ \t][ \t]*DYNAMIC[ \t]' config.h >/dev/null; then
12 is_dynamic=true 13 is_dynamic=true
13 else 14 else
14 is_dynamic=false 15 is_dynamic=false