Index: Doc/Makefile.in =================================================================== --- Doc/Makefile.in.orig 2006-12-17 17:02:02.000000000 +0100 +++ Doc/Makefile.in 2007-04-19 18:29:43.692468133 +0200 @@ -285,26 +285,9 @@ install.man: man # install info pages, creating install directory if necessary install.info: texi ${SHELL} $(sdir_top)/mkinstalldirs $(DESTDIR)$(infodir) - rm -rf infodir - mkdir infodir - if ( \ - sed '/^@setfilename/s|zsh|$(tzsh)|' \ - < $(sdir)/zsh.texi > infodir/tzsh.texi && \ - (cd infodir && $(MAKEINFO) tzsh.texi) && \ - for file in infodir/$(tzsh).info*; do \ + for file in zsh.info*; do \ $(INSTALL_DATA) $$file $(DESTDIR)$(infodir) || exit 1; \ - done \ - ); then \ - if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \ - install-info --info-dir=$(DESTDIR)$(infodir) \ - $(DESTDIR)$(infodir)/$(tzsh).info; \ - else true; fi; \ - rm -rf infodir; \ - exit 0; \ - else \ - rm -rf infodir; \ - exit 1; \ - fi + done .PHONY: install.info # uninstall man pages @@ -323,7 +306,7 @@ uninstall.info: # install HTML manual install.html: html ${SHELL} $(sdir_top)/mkinstalldirs $(DESTDIR)$(htmldir) - for file in zsh*.html; do \ + for file in zsh/zsh*.html; do \ $(INSTALL_DATA) $$file $(DESTDIR)$(htmldir) || exit 1; \ done .PHONY: install.html Index: Doc/intro.ms =================================================================== --- Doc/intro.ms.orig 1999-08-01 16:48:54.000000000 +0200 +++ Doc/intro.ms 2007-04-19 18:28:22.179586786 +0200 @@ -336,7 +336,7 @@ functions. For example: >\0\0\0\0\0\0\0ypmatch\0$1\0passwd.byname >\0} %\0yp\0pfalstad -pfalstad:*:3564:35:Paul\0John\0Falstad:/u/pfalstad:/usr/princeton/bin/zsh +pfalstad:*:3564:35:Paul\0John\0Falstad:/u/pfalstad:/usr/bin/zsh .De This function looks up a user in the NIS password map. The \fC$1\fP expands to the first argument to \fCyp\fP. @@ -356,7 +356,7 @@ parsed, not when the function is execute .Ds %\0alias\0ypmatch=echo %\0yp\0pfalstad -pfalstad:*:3564:35:Paul\0John\0Falstad:/u/pfalstad:/usr/princeton/bin/zsh +pfalstad:*:3564:35:Paul\0John\0Falstad:/u/pfalstad:/usr/bin/zsh .De Since the alias was defined after the function was parsed, it has no effect on the function's execution. @@ -379,9 +379,9 @@ We can make the function take multiple a >\0\0\0\0\0\0\0done >\0} %\0yp\0pfalstad\0subbarao\0sukthnkr -pfalstad:*:3564:35:Paul\0John\0Falstad:/u/pfalstad:/usr/princeton/bin/zsh -subbarao:*:3338:35:Kartik\0Subbarao:/u/subbarao:/usr/princeton/bin/zsh -sukthnkr:*:1267:35:Rahul\0Sukthankar:/u/sukthnkr:/usr/princeton/bin/tcsh +pfalstad:*:3564:35:Paul\0John\0Falstad:/u/pfalstad:/usr/bin/zsh +subbarao:*:3338:35:Kartik\0Subbarao:/u/subbarao:/usr/bin/zsh +sukthnkr:*:1267:35:Rahul\0Sukthankar:/u/sukthnkr:/usr/bin/tcsh .De The \fCfor i\fP loops through each of the function's arguments, setting \fCi\fP equal to each of them in turn. @@ -396,8 +396,8 @@ if no arguments are given: %\0yp usage:\0yp\0name\0... %\0yp\0pfalstad\0sukthnkr -pfalstad:*:3564:35:Paul\0John\0Falstad:/u/pfalstad:/usr/princeton/bin/zsh -sukthnkr:*:1267:35:Rahul\0Sukthankar:/u/sukthnkr:/usr/princeton/bin/tcsh +pfalstad:*:3564:35:Paul\0John\0Falstad:/u/pfalstad:/usr/bin/zsh +sukthnkr:*:1267:35:Rahul\0Sukthankar:/u/sukthnkr:/usr/bin/tcsh .De \fC$#\fP is the number of arguments supplied to the function. If it is equal to zero, we print a usage message; otherwise, @@ -516,16 +516,16 @@ separate process is not created.) %\0ed\0/tmp/funs/yp 25 i -#!\0/usr/local/bin/zsh +#!\0/usr/bin/zsh . w 42 q %\0>!$ +%\0/usr/bin/!:0\0!-2*:s/foo/bar/\0>>!$ .De If you don't want to use this, you can turn it off by typing \fCsetopt nobanghist\fP. If you are afraid of accidentally @@ -1191,9 +1191,9 @@ bar In this example, no event designator was used, which tells \fBzsh\fP to use the previous command. A \fC$\fP specifies the last argument .Ds -%\0mkdir\0/usr/local/lib/emacs/site-lisp/calc +%\0mkdir\0/usr/share/emacs/site-lisp/calc %\0cd\0!:$ -cd\0/usr/local/lib/emacs/site-lisp/calc +cd\0/usr/share/emacs/site-lisp/calc .De If you use more words of the same command, only the first \fC!\fP needs an event designator. @@ -1474,7 +1474,7 @@ the \fCvared\fP command: .Ds %\0vared\0PATH >\0/u/pfalstad/scr:/u/pfalstad/bin/sun4:/u/maruchck/scr:/u/subbarao/bin:/u/maruc -hck/bin:/u/subbarao/scripts:/usr/princeton/bin:/usr/ucb:/usr/bin:/bin:/usr/host +hck/bin:/u/subbarao/scripts:/usr/princeton/bin:/usr/bin/X11:/usr/bin:/bin:/usr/host s:/usr/princeton/bin/X11:/./usr/lang:/./usr/etc:/./etc .De You can now edit the path. When you press return, the contents @@ -2267,9 +2267,9 @@ changes \fBpath\fP as well, and vice ver %\0PATH=/bin:/usr/bin:/tmp:. %\0echo\0$path /bin\0/usr/bin\0/tmp\0. -%\0path=(\0/usr/bin\0.\0/usr/local/bin\0/usr/ucb\0) +%\0path=(\0/usr/bin\0.\0/usr/local/bin\0/usr/bin/X11\0) %\0echo\0$PATH -/usr/bin:.:/usr/local/bin:/usr/ucb +/usr/bin:.:/usr/local/bin:/usr/bin/X11 .De The same is true of \fBCDPATH\fP and \fBcdpath\fP: .Ds Index: Src/Makefile.in =================================================================== --- Src/Makefile.in.orig 2005-07-24 06:47:57.000000000 +0200 +++ Src/Makefile.in 2007-04-19 18:28:22.339596368 +0200 @@ -148,14 +148,7 @@ uninstall.bin: uninstall.bin-here # install binary, creating install directory if necessary install.bin-here: zsh$(EXEEXT) $(INSTLIB) ${SHELL} $(sdir_top)/mkinstalldirs $(DESTDIR)$(bindir) - $(INSTALL_PROGRAM) $(STRIPFLAGS) zsh$(EXEEXT) $(DESTDIR)$(bindir)/$(tzsh)-$(VERSION)$(EXEEXT) - if test -f $(DESTDIR)$(bindir)/$(tzsh)$(EXEEXT); then \ - rm -f $(DESTDIR)$(bindir)/$(tzsh).old; \ - $(LN) $(DESTDIR)$(bindir)/$(tzsh)$(EXEEXT) $(DESTDIR)$(bindir)/$(tzsh).old; \ - else :; fi - rm -f $(DESTDIR)$(bindir)/$(tzsh).new - $(LN) $(DESTDIR)$(bindir)/$(tzsh)-$(VERSION)$(EXEEXT) $(DESTDIR)$(bindir)/$(tzsh).new - mv $(DESTDIR)$(bindir)/$(tzsh).new $(DESTDIR)$(bindir)/$(tzsh)$(EXEEXT) + $(INSTALL_PROGRAM) $(STRIPFLAGS) zsh $(DESTDIR)$(bindir)/zsh .PHONY: install.bin-here install.bin-N: Index: Src/Modules/terminfo.c =================================================================== --- Src/Modules/terminfo.c.orig 2006-05-31 00:35:03.000000000 +0200 +++ Src/Modules/terminfo.c 2007-04-19 18:28:22.379598764 +0200 @@ -28,6 +28,7 @@ */ #define USES_TERM_H 1 +#include #include "terminfo.mdh" #if defined(HAVE_TIGETFLAG) && defined(HAVE_CURSES_H) Index: Src/init.c =================================================================== --- Src/init.c.orig 2007-01-30 19:42:55.000000000 +0100 +++ Src/init.c 2007-04-19 18:28:22.431601878 +0200 @@ -730,7 +730,7 @@ setupvals(void) path = (char **) zalloc(sizeof(*path) * 5); path[0] = ztrdup("/bin"); path[1] = ztrdup("/usr/bin"); - path[2] = ztrdup("/usr/ucb"); + path[2] = ztrdup("/usr/bin/X11"); path[3] = ztrdup("/usr/local/bin"); path[4] = NULL; Index: Util/check_exports =================================================================== --- Util/check_exports.orig 2004-03-12 19:56:48.000000000 +0100 +++ Util/check_exports 2007-04-19 18:28:22.487605232 +0200 @@ -1,4 +1,4 @@ -#!/usr/local/bin/perl -w +#!/usr/bin/perl -w # Attempt to scan executable, libraries, and .export files after # a zsh build to see if all necessary symbols appear in the .export file Index: Util/helpfiles =================================================================== --- Util/helpfiles.orig 2006-03-13 20:03:55.000000000 +0100 +++ Util/helpfiles 2007-04-19 18:28:22.507606430 +0200 @@ -1,4 +1,4 @@ -#!/usr/local/bin/perl -- -*-perl-*- +#!/usr/bin/perl -- -*-perl-*- # helpfiles: make help files for Z-shell builtins from the manual entries. Index: Util/reporter =================================================================== --- Util/reporter.orig 2000-09-02 23:17:41.000000000 +0200 +++ Util/reporter 2007-04-19 18:28:22.535608107 +0200 @@ -1,4 +1,4 @@ -#!/usr/local/bin/zsh +#!/usr/bin/zsh # # NAME: # reporter