Update lang/nawk to 20050425. Pkgsrc changes include:

	Grab distfile from ${MASTER_SITE_LOCAL} where it's in a
	${PKGNAME}-specific directory since the distfile has no version
	number.

	Use the .shar instead of .tar.gz distfile to remove the need
	for dependencies to build this package.

Changes from nawk-20040207 include:

Apr 24, 2005:
	modified lib.c so that values of $0 et al are preserved in the END
	block, apparently as required by posix.  thanks to havard eidnes
	for the report and code.

Jan 14, 2005:
	fixed infinite loop in parsing, originally found by brian tsang.
	thanks to arnold robbins for a suggestion that started me
	rethinking it.

Dec 31, 2004:
	prevent overflow of -f array in main, head off potential error in
	call of SYNTAX(), test malloc return in lib.c, all with thanks to
	todd miller.

Dec 22, 2004:
	cranked up size of NCHARS; coverity thinks it can be overrun with
	smaller size, and i think that's right.  added some assertions to b.c
	to catch places where it might overrun.  the RE code is still fragile.

Dec 5, 2004:
	fixed a couple of overflow problems with ridiculous field numbers:
	e.g., print $(2^32-1).  thanks to ruslan ermilov, giorgos keramidas
	and david o'brien at freebsd.org for patches.  this really should
	be re-done from scratch.

Nov 21, 2004:
	fixed another 25-year-old RE bug, in split.  it's another failure
	to (re-)initialize.  thanks to steve fisher for spotting this and
	providing a good test case.

4 files changed, 35 insertions, 18 deletions

diff --git a/doc/CHANGES b/doc/CHANGES
index bc38e561df4..86479e6308b 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.10106 2005/05/18 04:50:25 dmcmahill Exp $
+$NetBSD: CHANGES,v 1.10107 2005/05/18 05:22:46 jlam Exp $
 
 Changes to the packages collection and infrastructure in 2005:
 
@@ -2401,3 +2401,4 @@ Changes to the packages collection and infrastructure in 2005:
 	Updated rdesktop to 1.4.1 [xtraeme 2005-05-18]
 	Updated clamav to 0.85 [xtraeme 2005-05-18]
 	Added prereq-readme-20050518 [dmcmahill 2005-05-18]
+	Updated nawk to 20050424 [jlam 2005-05-18]
diff --git a/lang/nawk/DESCR b/lang/nawk/DESCR
index db80762a0b2..2cc1af9f6d2 100644
--- a/lang/nawk/DESCR
+++ b/lang/nawk/DESCR
@@ -1,6 +1,5 @@
 The one, true implementation of the AWK pattern-directed scanning and
-processing language, by one of the language's creators, Brian
-Kernighan.  This is the version of awk described in "The AWK
-Programming Language", by Al Aho, Brian Kernighan, and Peter
-Weinberger (Addison-Wesley, 1988, ISBN 0-201-07981-X).
-It is also known as new awk, or nawk.
+processing language, by one of the language's creators, Brian Kernighan.
+This is the version of awk described in "The AWK Programming Language",
+by Al Aho, Brian Kernighan, and Peter Weinberger (Addison-Wesley,
+1988, ISBN 0-201-07981-X).  It is also known as new awk, or nawk.
diff --git a/lang/nawk/Makefile b/lang/nawk/Makefile
index 4ca46b91514..c076b543474 100644
--- a/lang/nawk/Makefile
+++ b/lang/nawk/Makefile
@@ -1,28 +1,45 @@
-# $NetBSD: Makefile,v 1.22 2005/04/11 21:46:14 tv Exp $
+# $NetBSD: Makefile,v 1.23 2005/05/18 05:22:43 jlam Exp $
 #
 
 DISTNAME=       awk
-PKGNAME=        nawk-20040207
+PKGNAME=        nawk-20050424
 CATEGORIES=	lang
-MASTER_SITES=   http://cm.bell-labs.com/who/bwk/
+#MASTER_SITES=   http://cm.bell-labs.com/who/bwk/
+MASTER_SITES=	${MASTER_SITE_LOCAL:=${PKGNAME_NOREV}/}
+DIST_SUBDIR=	${PKGNAME}
+
+# We use the .shar file instead of the .tar.gz file to avoid needing
+# build dependencies.
+#
+EXTRACT_SUFX=	.shar
 
 MAINTAINER=	cjep@NetBSD.org
 HOMEPAGE=	http://cm.bell-labs.com/who/bwk/
 COMMENT=	Brian Kernighan's pattern-directed scanning and processing language
 
-DIST_SUBDIR=	${PKGNAME}
-WRKSRC=		${WRKDIR}
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
+.include "../../mk/bsd.prefs.mk"
+.if empty(_USE_NEW_TOOLS:M[yY][eE][sS])
 USE_GNU_TOOLS+=	yacc
+.else
+USE_TOOLS+=	yacc
+.endif
 
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-
-MAKEFILE=	makefile
+WRKSRC=		${WRKDIR}
+CFLAGS+=	${CPPFLAGS}
 MAKE_FLAGS+=	CC=${CC:Q} YACC=${YACC:Q} CFLAGS=${CFLAGS:Q}
 BUILD_TARGET=	a.out
 
 INSTALLATION_DIRS=	bin man/man1
 
+# Fix bug in distributed makefile with respect to improper makefile
+# comments -- we simply just strip out all comments from the file.
+#
+do-configure:
+	${SED} "s|^[ 	]*#.*||" ${WRKSRC}/makefile > ${WRKSRC}/${MAKEFILE}
+
+# We want to install the man page as "nawk.1".
 post-build:
 	${SED} -e 's|awk|nawk|g' -e 's/Awk/Nawk/g' \
 		${WRKSRC}/awk.1 > ${WRKSRC}/nawk.1
diff --git a/lang/nawk/distinfo b/lang/nawk/distinfo
index be619d727b7..94ad01a1673 100644
--- a/lang/nawk/distinfo
+++ b/lang/nawk/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.9 2005/02/24 09:03:09 agc Exp $
+$NetBSD: distinfo,v 1.10 2005/05/18 05:22:43 jlam Exp $
 
-SHA1 (nawk-20040207/awk.tar.gz) = 4586c56e0dd37b0499f1eb6b7274c7ba5e1813da
-RMD160 (nawk-20040207/awk.tar.gz) = 8884857e282a798704e69730f813fc2af285846a
-Size (nawk-20040207/awk.tar.gz) = 85779 bytes
+SHA1 (nawk-20050424/awk.shar) = 8150a0a4c143b71a4cc5ec8dc67bccb98f472721
+RMD160 (nawk-20050424/awk.shar) = 49c6b6b0071a7c1bc5531974c8a5787684035b63
+Size (nawk-20050424/awk.shar) = 512192 bytes