diff options
| -rw-r--r-- | shells/zsh/Makefile | 4 | ||||
| -rw-r--r-- | shells/zsh/Makefile.common | 7 | ||||
| -rw-r--r-- | shells/zsh/PLIST | 10 | ||||
| -rw-r--r-- | shells/zsh/PLIST.dynamic | 6 | ||||
| -rw-r--r-- | shells/zsh/distinfo | 10 | ||||
| -rw-r--r-- | shells/zsh/patches/patch-ab | 10 | ||||
| -rw-r--r-- | shells/zsh/patches/patch-ac | 10 |
7 files changed, 32 insertions, 25 deletions
diff --git a/shells/zsh/Makefile b/shells/zsh/Makefile index 2460b70dfa7..fa3fadf17c0 100644 --- a/shells/zsh/Makefile +++ b/shells/zsh/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.45 2004/03/28 10:30:13 recht Exp $ +# $NetBSD: Makefile,v 1.46 2004/08/16 16:17:39 recht Exp $ # .include "../../shells/zsh/Makefile.common" -ZSH_VERSION= 4.2.0 +ZSH_VERSION= 4.2.1 ZSH_MAINTAINER= uebayasi@NetBSD.org .include "../../mk/bsd.pkg.mk" diff --git a/shells/zsh/Makefile.common b/shells/zsh/Makefile.common index 8d79aa11aae..6958ee37fcb 100644 --- a/shells/zsh/Makefile.common +++ b/shells/zsh/Makefile.common @@ -1,7 +1,6 @@ -# $NetBSD: Makefile.common,v 1.12 2004/07/11 01:23:29 salo Exp $ +# $NetBSD: Makefile.common,v 1.13 2004/08/16 16:17:39 recht Exp $ DISTNAME= zsh-${ZSH_VERSION} -PKGREVISION= 1 CATEGORIES= shells MASTER_SITES= ftp://sunsite.dk/pub/unix/shells/zsh/ \ ftp://ftp.fu-berlin.de/pub/unix/shells/zsh/ \ @@ -48,7 +47,9 @@ INSTALL_TARGET= install install.info post-install: @${INSTALL_DATA_DIR} ${PREFIX}/share/doc/zsh - @cd ${WRKSRC}/Etc; ${INSTALL_DATA} BUGS FAQ FEATURES NEWS \ + @cd ${WRKSRC}/Etc; ${INSTALL_DATA} BUGS FAQ \ + ${PREFIX}/share/doc/zsh + @cd ${WRKSRC}; ${INSTALL_DATA} FEATURES NEWS \ ${PREFIX}/share/doc/zsh # Utilize Zsh's test framework. diff --git a/shells/zsh/PLIST b/shells/zsh/PLIST index 36d96a900ed..db0a25297c9 100644 --- a/shells/zsh/PLIST +++ b/shells/zsh/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.13 2004/03/30 16:09:56 minskim Exp $ +@comment $NetBSD: PLIST,v 1.14 2004/08/16 16:17:39 recht Exp $ bin/zsh bin/${PKGNAME} man/man1/zsh.1 @@ -34,6 +34,7 @@ share/zsh/${PKGVERSION}/functions/_apachectl share/zsh/${PKGVERSION}/functions/_apm share/zsh/${PKGVERSION}/functions/_approximate share/zsh/${PKGVERSION}/functions/_apt +share/zsh/${PKGVERSION}/functions/_apt-move share/zsh/${PKGVERSION}/functions/_apt-show-versions share/zsh/${PKGVERSION}/functions/_aptitude share/zsh/${PKGVERSION}/functions/_arg_compile @@ -45,10 +46,10 @@ share/zsh/${PKGVERSION}/functions/_assign share/zsh/${PKGVERSION}/functions/_attr share/zsh/${PKGVERSION}/functions/_auto-apt share/zsh/${PKGVERSION}/functions/_autocd -share/zsh/${PKGVERSION}/functions/_autoload share/zsh/${PKGVERSION}/functions/_bash_completions share/zsh/${PKGVERSION}/functions/_bindkey share/zsh/${PKGVERSION}/functions/_bison +share/zsh/${PKGVERSION}/functions/_bogofilter share/zsh/${PKGVERSION}/functions/_brace_parameter share/zsh/${PKGVERSION}/functions/_bsd_pkg share/zsh/${PKGVERSION}/functions/_bts @@ -181,6 +182,7 @@ share/zsh/${PKGVERSION}/functions/_jobs_bg share/zsh/${PKGVERSION}/functions/_jobs_builtin share/zsh/${PKGVERSION}/functions/_jobs_fg share/zsh/${PKGVERSION}/functions/_joe +share/zsh/${PKGVERSION}/functions/_kfmclient share/zsh/${PKGVERSION}/functions/_kill share/zsh/${PKGVERSION}/functions/_killall share/zsh/${PKGVERSION}/functions/_kld @@ -218,6 +220,7 @@ share/zsh/${PKGVERSION}/functions/_menu share/zsh/${PKGVERSION}/functions/_mere share/zsh/${PKGVERSION}/functions/_message share/zsh/${PKGVERSION}/functions/_mh +share/zsh/${PKGVERSION}/functions/_mime_types share/zsh/${PKGVERSION}/functions/_mkshortcut share/zsh/${PKGVERSION}/functions/_mkzsh share/zsh/${PKGVERSION}/functions/_modutils @@ -265,6 +268,7 @@ share/zsh/${PKGVERSION}/functions/_perl share/zsh/${PKGVERSION}/functions/_perl_basepods share/zsh/${PKGVERSION}/functions/_perl_modules share/zsh/${PKGVERSION}/functions/_perldoc +share/zsh/${PKGVERSION}/functions/_php share/zsh/${PKGVERSION}/functions/_physical_volumes share/zsh/${PKGVERSION}/functions/_pick_variant share/zsh/${PKGVERSION}/functions/_pids @@ -444,6 +448,7 @@ share/zsh/${PKGVERSION}/functions/edit-command-line share/zsh/${PKGVERSION}/functions/forward-word-match share/zsh/${PKGVERSION}/functions/getjobs share/zsh/${PKGVERSION}/functions/harden +share/zsh/${PKGVERSION}/functions/history-pattern-search share/zsh/${PKGVERSION}/functions/history-search-end share/zsh/${PKGVERSION}/functions/incarg share/zsh/${PKGVERSION}/functions/incremental-complete-word @@ -489,6 +494,7 @@ share/zsh/${PKGVERSION}/functions/url-quote-magic share/zsh/${PKGVERSION}/functions/zargs share/zsh/${PKGVERSION}/functions/zcalc share/zsh/${PKGVERSION}/functions/zed +share/zsh/${PKGVERSION}/functions/zed-set-file-name share/zsh/${PKGVERSION}/functions/zkbd share/zsh/${PKGVERSION}/functions/zmv share/zsh/${PKGVERSION}/functions/zrecompile diff --git a/shells/zsh/PLIST.dynamic b/shells/zsh/PLIST.dynamic index d88dd546b81..f354e5124c0 100644 --- a/shells/zsh/PLIST.dynamic +++ b/shells/zsh/PLIST.dynamic @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.dynamic,v 1.3 2004/03/28 10:30:13 recht Exp $ +@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 @@ -12,6 +12,8 @@ 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 @@ -25,8 +27,6 @@ lib/zsh/${PKGVERSION}/zsh/zprof.so lib/zsh/${PKGVERSION}/zsh/zpty.so lib/zsh/${PKGVERSION}/zsh/zselect.so lib/zsh/${PKGVERSION}/zsh/zutil.so -lib/zsh/${PKGVERSION}/zsh/net/socket.so -lib/zsh/${PKGVERSION}/zsh/net/tcp.so share/zsh/${PKGVERSION}/functions/tcp_alias share/zsh/${PKGVERSION}/functions/tcp_close share/zsh/${PKGVERSION}/functions/tcp_command diff --git a/shells/zsh/distinfo b/shells/zsh/distinfo index 96be7864c0b..7957016283d 100644 --- a/shells/zsh/distinfo +++ b/shells/zsh/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.16 2004/08/04 03:33:40 minskim Exp $ +$NetBSD: distinfo,v 1.17 2004/08/16 16:17:39 recht Exp $ -SHA1 (zsh-4.2.0.tar.bz2) = 944786bec07470aa4fbe58249dba2e345296165e -Size (zsh-4.2.0.tar.bz2) = 1990884 bytes +SHA1 (zsh-4.2.1.tar.bz2) = fadf64908fbb62572b11ec79f7c42960c4e71292 +Size (zsh-4.2.1.tar.bz2) = 2039188 bytes SHA1 (patch-aa) = 5e5fde0f21a64c2e0579958868b05737ef0c6afb -SHA1 (patch-ab) = 1a4ec86b93aae128d81d494f437063ee06dd5dd8 -SHA1 (patch-ac) = f563837ccc4370d43598d49b329d69cebbd88c01 +SHA1 (patch-ab) = 65e7343fcea23aa516975521d0b92a67c06d1bda +SHA1 (patch-ac) = 45edc3320e6347e170173966e38008767c7f374c SHA1 (patch-ae) = 7d4514d0bad6553d3c0cf115874bf50ed0da3d48 diff --git a/shells/zsh/patches/patch-ab b/shells/zsh/patches/patch-ab index 15c4390eb2e..0075cf423ad 100644 --- a/shells/zsh/patches/patch-ab +++ b/shells/zsh/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.9 2004/08/04 03:33:40 minskim Exp $ +$NetBSD: patch-ab,v 1.10 2004/08/16 16:17:39 recht Exp $ ---- Src/zsh.h.orig Thu Mar 11 13:20:10 2004 -+++ Src/zsh.h -@@ -1565,6 +1565,7 @@ struct ttyinfo { +--- Src/zsh.h.orig 2004-08-13 12:22:47.000000000 +0200 ++++ Src/zsh.h 2004-08-16 11:54:07.000000000 +0200 +@@ -1576,6 +1576,7 @@ #endif }; @@ -10,7 +10,7 @@ $NetBSD: patch-ab,v 1.9 2004/08/04 03:33:40 minskim Exp $ /* defines for whether tabs expand to spaces */ #if defined(HAVE_TERMIOS_H) || defined(HAVE_TERMIO_H) #define SGTTYFLAG shttyinfo.tio.c_oflag -@@ -1580,6 +1581,7 @@ struct ttyinfo { +@@ -1591,6 +1592,7 @@ #define SGTABTYPE XTABS # endif # endif diff --git a/shells/zsh/patches/patch-ac b/shells/zsh/patches/patch-ac index 4e2fa1bb827..a68556c7dc3 100644 --- a/shells/zsh/patches/patch-ac +++ b/shells/zsh/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.13 2004/08/04 03:33:40 minskim Exp $ +$NetBSD: patch-ac,v 1.14 2004/08/16 16:17:39 recht Exp $ ---- configure.orig Mon Mar 15 13:10:03 2004 -+++ configure -@@ -13630,6 +13630,10 @@ echo "${ECHO_T}$zsh_cv_sys_elf" >&6 +--- configure.orig 2004-08-13 12:24:24.000000000 +0200 ++++ configure 2004-08-16 11:54:09.000000000 +0200 +@@ -13691,6 +13691,10 @@ DLLD="${DLLD=/usr/ccs/bin/cc}" DLLDARG="${LDARG}" ;; @@ -13,7 +13,7 @@ $NetBSD: patch-ac,v 1.13 2004/08/04 03:33:40 minskim Exp $ * ) DLLD="${DLLD=$CC}" DLLDARG="${LDARG}" -@@ -13675,7 +13679,7 @@ echo "${ECHO_T}$zsh_cv_sys_elf" >&6 +@@ -13736,7 +13740,7 @@ esac fi case "$host_os" in |