update cook from 2.22 to 2.26. besides fixing GCC4 builds, many of the

changes since 2.22 include:

       * A bug has been fixed in the tell-position flag. It wasn't actually
       giving the file name and line number when executing commands if you
       used the "set tell-position" variants, only the -tell-position command
       line option.

       * A bug has been fixed in the cook -fp-update command, it would
       segfault in some cases.
       * A bug has been fixed in the cookbook include file processing.

       * A bug has been fixed in the negative flag setting (comamnd line
       options and "set" clauses).

       * The find_command command now copes better with directories it is not
       allowed to access.

       * A Java cookbook has been added to to the distribution.

       * A bug has been fixed in the execution of some commands.  If any words
       of the command had spaces in them, it did not pass it to a shell to be
       executed, but instead constructed a command of a different shape than
       the user expected.

       * A bug has been fixed on Linux (and it only ever ocurred on Linux)
       where cook would suddenly stop for no reason with exit status 1.  Turns
       out that sometimes fflush(stderr) returns an EAGAIN error.

       * A bug has been fixed which caused the cook -script option to produce
       invalid shell scripts when a recipe body contained no statements.

       * A bug has been fixed in the graph file pair generation, used to
       generate warnings about dangerous #include-cooked contents.

       * There is a new tell-position setting, so that when Cook prints a
       command it is about to run, it includes the file name and line nunmber
       of the command.  This can be useful when debugging cookbooks.

       * A bug has been fixed in the output line wrapping.  Once again it
       adapts to the window width.

       * A major problem with parallel execution and hangs has been fixed.
       The table indexed by process ID was now growing correctly.

3 files changed, 8 insertions, 21 deletions

diff --git a/devel/cook/Makefile b/devel/cook/Makefile
index c780796ab53..862960ada5b 100644
--- a/devel/cook/Makefile
+++ b/devel/cook/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.15 2006/06/20 22:09:16 minskim Exp $
+# $NetBSD: Makefile,v 1.16 2006/08/09 23:29:15 mrg Exp $
 
-DISTNAME=	cook-2.22
-PKGREVISION=	3
+DISTNAME=	cook-2.26
 CATEGORIES=	devel
 MASTER_SITES=	http://www.canb.auug.org.au/~millerp/cook/
 
diff --git a/devel/cook/PLIST b/devel/cook/PLIST
index 3110cf8b605..fe6810c48cf 100644
--- a/devel/cook/PLIST
+++ b/devel/cook/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2003/03/04 17:36:16 wiz Exp $
+@comment $NetBSD: PLIST,v 1.4 2006/08/09 23:29:15 mrg Exp $
 bin/c_incl
 bin/cook
 bin/cook_bom
@@ -15,7 +15,6 @@ lib/cook/en/LC_MESSAGES/cookfp.mo
 lib/cook/en/LC_MESSAGES/cooktime.mo
 lib/cook/en/LC_MESSAGES/file_check.mo
 lib/cook/en/LC_MESSAGES/find_libs.mo
-lib/cook/en/LC_MESSAGES/fstrcmp.mo
 lib/cook/en/LC_MESSAGES/make2cook.mo
 lib/cook/en/LC_MESSAGES/roffpp.mo
 man/man1/c_incl.1
@@ -32,12 +31,6 @@ share/cook/as
 share/cook/bison
 share/cook/c
 share/cook/c++
-share/cook/en/building.dvi
-share/cook/en/building.ps
-share/cook/en/building.txt
-share/cook/en/lsm.dvi
-share/cook/en/lsm.ps
-share/cook/en/lsm.txt
 share/cook/en/man1/c_incl.1
 share/cook/en/man1/cook.1
 share/cook/en/man1/cook_bom.1
@@ -48,15 +41,9 @@ share/cook/en/man1/cooktime.1
 share/cook/en/man1/find_libs.1
 share/cook/en/man1/make2cook.1
 share/cook/en/man1/roffpp.1
-share/cook/en/readme.dvi
-share/cook/en/readme.ps
-share/cook/en/readme.txt
 share/cook/en/refman.dvi
 share/cook/en/refman.ps
 share/cook/en/refman.txt
-share/cook/en/release.dvi
-share/cook/en/release.ps
-share/cook/en/release.txt
 share/cook/en/tutorial.dvi
 share/cook/en/tutorial.ps
 share/cook/en/tutorial.txt
@@ -69,6 +56,7 @@ share/cook/g77
 share/cook/gcc
 share/cook/home
 share/cook/host_lists.pl
+share/cook/java
 share/cook/lex
 share/cook/library
 share/cook/print
diff --git a/devel/cook/distinfo b/devel/cook/distinfo
index 773e7133b31..aec0e65202a 100644
--- a/devel/cook/distinfo
+++ b/devel/cook/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2005/02/23 22:24:11 agc Exp $
+$NetBSD: distinfo,v 1.5 2006/08/09 23:29:15 mrg Exp $
 
-SHA1 (cook-2.22.tar.gz) = ade3818f8b0a719a5e715cd80c470d1f57b15ec9
-RMD160 (cook-2.22.tar.gz) = 15626036d57c14985b05728f26a1f8a55ddab8aa
-Size (cook-2.22.tar.gz) = 861591 bytes
+SHA1 (cook-2.26.tar.gz) = 0bea5873313e2cac73b2f1e9a7222fda985892c7
+RMD160 (cook-2.26.tar.gz) = 8d7839f0ec484585c1db0a4763a5717d792d6513
+Size (cook-2.26.tar.gz) = 881301 bytes