From cd6ecc89c1fc97b2f999c397ffd6eb2a630144ca Mon Sep 17 00:00:00 2001
From: wiz <wiz>
Date: Thu, 2 Dec 2010 14:44:04 +0000
Subject: Update to 3.1.8:

Changes from 3.1.7 to 3.1.8
---------------------------
1. The zero flag no longer applies to %c and %s; apparently the standards
   changed at some point.

2. Updated to latest infrastructure: Autoconf 2.65, Automake 1.11.1,
   libtool 2.2.6b, Bison 2.4.2.

3. Failure to open a socket is no longer a fatal error.

4. dfa.h and dfa.c are now more-or-less in sync with GNU grep, for the first
   time in many years.

5. Gawk no longer includes its own copy of libsigsegv but it will use it if
   installed on the build system. The --disable-libsigsegv configure option
   is now gone.

6. The ' flag (%'d) is now just ignored on systems that can't support it.

7. Lots of bug fixes, see the ChangeLog.
---
 lang/gawk/Makefile         |  4 ++--
 lang/gawk/PLIST            |  3 ++-
 lang/gawk/distinfo         | 11 +++++------
 lang/gawk/patches/patch-ab | 16 ++++++++--------
 lang/gawk/patches/patch-ad | 12 ------------
 5 files changed, 17 insertions(+), 29 deletions(-)
 delete mode 100644 lang/gawk/patches/patch-ad

(limited to 'lang/gawk')

diff --git a/lang/gawk/Makefile b/lang/gawk/Makefile
index 7c382eccdba..0e0d25cd06e 100644
--- a/lang/gawk/Makefile
+++ b/lang/gawk/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.43 2009/12/20 23:03:15 tnn Exp $
+# $NetBSD: Makefile,v 1.44 2010/12/02 14:44:04 wiz Exp $
 
-DISTNAME=	gawk-3.1.7
+DISTNAME=	gawk-3.1.8
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GNU:=gawk/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/lang/gawk/PLIST b/lang/gawk/PLIST
index 7c92d04fc1e..5c967a66a96 100644
--- a/lang/gawk/PLIST
+++ b/lang/gawk/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2009/08/08 16:23:48 wiz Exp $
+@comment $NetBSD: PLIST,v 1.15 2010/12/02 14:44:04 wiz Exp $
 bin/gawk
 bin/${PKGNAME}
 bin/igawk
@@ -30,6 +30,7 @@ share/awk/rewind.awk
 share/awk/round.awk
 share/awk/strtonum.awk
 share/awk/zerofile.awk
+share/locale/ast/LC_MESSAGES/gawk.mo
 share/locale/ca/LC_MESSAGES/gawk.mo
 share/locale/da/LC_MESSAGES/gawk.mo
 share/locale/de/LC_MESSAGES/gawk.mo
diff --git a/lang/gawk/distinfo b/lang/gawk/distinfo
index e08f834dab2..26a75a8a3b5 100644
--- a/lang/gawk/distinfo
+++ b/lang/gawk/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.19 2009/08/08 16:23:48 wiz Exp $
+$NetBSD: distinfo,v 1.20 2010/12/02 14:44:04 wiz Exp $
 
-SHA1 (gawk-3.1.7.tar.bz2) = 77dfacb793d579fa6830152d943096bc4362a465
-RMD160 (gawk-3.1.7.tar.bz2) = f35c04e947357404d410d62df87df9d6a88079de
-Size (gawk-3.1.7.tar.bz2) = 2365837 bytes
-SHA1 (patch-ab) = b021ffe202d4dec931fb78b28b9af459d66c73bd
-SHA1 (patch-ad) = 68910553cf495b7b177c96479ceb2c549fe5350f
+SHA1 (gawk-3.1.8.tar.bz2) = da1091cc39089c320f53d21fd2112bd7ce407de5
+RMD160 (gawk-3.1.8.tar.bz2) = bd753345fec4773fe2faa45239b4f1cba4efcf82
+Size (gawk-3.1.8.tar.bz2) = 1984129 bytes
+SHA1 (patch-ab) = 4df1997be8720dfc8302cce5b6bd344ec1544a7e
diff --git a/lang/gawk/patches/patch-ab b/lang/gawk/patches/patch-ab
index 64923e9f3d9..1a9a46c30e4 100644
--- a/lang/gawk/patches/patch-ab
+++ b/lang/gawk/patches/patch-ab
@@ -1,17 +1,17 @@
-$NetBSD: patch-ab,v 1.12 2009/08/08 16:23:48 wiz Exp $
+$NetBSD: patch-ab,v 1.13 2010/12/02 14:44:04 wiz Exp $
 
---- Makefile.in.orig	2009-07-21 19:29:59.000000000 +0000
+--- Makefile.in.orig	2010-05-06 17:55:45.000000000 +0000
 +++ Makefile.in
-@@ -191,7 +191,7 @@ CFLAGS = @CFLAGS@
+@@ -181,7 +181,7 @@ CFLAGS = @CFLAGS@
  CPP = @CPP@
  CPPFLAGS = @CPPFLAGS@
  CYGPATH_W = @CYGPATH_W@
--DEFS = -DDEFPATH=$(DEFPATH) -DHAVE_CONFIG_H -DGAWK -DLOCALEDIR="\"$(datadir)/locale\""
-+DEFS = -DDEFPATH=$(DEFPATH) -DHAVE_CONFIG_H -DGAWK -DLOCALEDIR="\"$(prefix)/$(PKGLOCALEDIR)/locale\""
+-DEFS = -DDEFPATH=$(DEFPATH) -DHAVE_CONFIG_H -DGAWK -DLOCALEDIR='"$(datadir)/locale"'
++DEFS = -DDEFPATH=$(DEFPATH) -DHAVE_CONFIG_H -DGAWK -DLOCALEDIR='"$(prefix)/$(PKGLOCALEDIR)/locale"'
  DEPDIR = @DEPDIR@
- DSYMUTIL = @DSYMUTIL@
- DUMPBIN = @DUMPBIN@
-@@ -1044,9 +1044,7 @@ install-exec-hook:
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -996,9 +996,7 @@ install-exec-hook:
  	(cd $(DESTDIR)$(bindir); \
  	$(LN) gawk$(EXEEXT) gawk-$(VERSION)$(EXEEXT) 2>/dev/null ; \
  	$(LN) pgawk$(EXEEXT) pgawk-$(VERSION)$(EXEEXT) 2>/dev/null ; \
diff --git a/lang/gawk/patches/patch-ad b/lang/gawk/patches/patch-ad
deleted file mode 100644
index adc75f3b482..00000000000
--- a/lang/gawk/patches/patch-ad
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ad,v 1.4 2007/11/02 07:18:00 adam Exp $
-
---- dfa.c.orig	2007-09-03 05:30:12.000000000 +0200
-+++ dfa.c
-@@ -124,7 +124,6 @@ extern void free();
- static void dfamust PARAMS ((struct dfa *dfa));
- 
- static ptr_t xcalloc PARAMS ((size_t n, size_t s));
--static ptr_t xmalloc PARAMS ((size_t n));
- static ptr_t xrealloc PARAMS ((ptr_t p, size_t n));
- #ifdef DEBUG
- static void prtok PARAMS ((token t));
-- 
cgit v1.2.3