diff options
| -rw-r--r-- | lang/gawk/Makefile | 8 | ||||
| -rw-r--r-- | lang/gawk/PLIST | 3 | ||||
| -rw-r--r-- | lang/gawk/distinfo | 13 | ||||
| -rw-r--r-- | lang/gawk/patches/patch-ab | 8 | ||||
| -rw-r--r-- | lang/gawk/patches/patch-ac | 22 | ||||
| -rw-r--r-- | lang/gawk/patches/patch-ad | 6 |
6 files changed, 18 insertions, 42 deletions
diff --git a/lang/gawk/Makefile b/lang/gawk/Makefile index 208a0a28b14..5a94341e4df 100644 --- a/lang/gawk/Makefile +++ b/lang/gawk/Makefile @@ -1,8 +1,6 @@ -# $NetBSD: Makefile,v 1.37 2007/09/06 19:56:16 joerg Exp $ -# +# $NetBSD: Makefile,v 1.38 2007/11/02 07:17:59 adam Exp $ -DISTNAME= gawk-3.1.5 -PKGREVISION= 1 +DISTNAME= gawk-3.1.6 CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_GNU:=gawk/} EXTRACT_SUFX= .tar.bz2 @@ -20,7 +18,7 @@ GNU_CONFIGURE= yes USE_PKGLOCALEDIR= yes USE_TOOLS+= msgfmt TEST_TARGET= check -INFO_FILES= # PLIST +INFO_FILES= yes MAKE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR:Q} diff --git a/lang/gawk/PLIST b/lang/gawk/PLIST index 5c1ca80344c..2bb9c5715da 100644 --- a/lang/gawk/PLIST +++ b/lang/gawk/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.11 2006/04/17 07:07:23 jlam Exp $ +@comment $NetBSD: PLIST,v 1.12 2007/11/02 07:17:59 adam Exp $ bin/gawk bin/${PKGNAME} bin/igawk @@ -47,5 +47,6 @@ share/locale/rw/LC_MESSAGES/gawk.mo share/locale/sv/LC_MESSAGES/gawk.mo share/locale/tr/LC_MESSAGES/gawk.mo share/locale/vi/LC_MESSAGES/gawk.mo +share/locale/zh_CN/LC_MESSAGES/gawk.mo @dirrm share/awk @dirrm libexec/awk diff --git a/lang/gawk/distinfo b/lang/gawk/distinfo index e5406f28f5a..c44c680cda9 100644 --- a/lang/gawk/distinfo +++ b/lang/gawk/distinfo @@ -1,8 +1,7 @@ -$NetBSD: distinfo,v 1.17 2005/09/06 14:29:17 tonio Exp $ +$NetBSD: distinfo,v 1.18 2007/11/02 07:18:00 adam Exp $ -SHA1 (gawk-3.1.5.tar.bz2) = 0d5694461f1c32f1eae41a1c0d7ba0939b47e369 -RMD160 (gawk-3.1.5.tar.bz2) = 8eae0f173fcb344f97d811fa5bb5fd390a76b886 -Size (gawk-3.1.5.tar.bz2) = 1756783 bytes -SHA1 (patch-ab) = 39a98bd71349e2eb7ac7c6bb67cb2b8617fda6bd -SHA1 (patch-ac) = 0880bfab2202fd9cdca64f2082af1d7741e5a9a1 -SHA1 (patch-ad) = 9f0eda730720deefaba2f0a62362997dc95e003f +SHA1 (gawk-3.1.6.tar.bz2) = fb45bded207af6a8e46cd63fcbb6fb064ecee607 +RMD160 (gawk-3.1.6.tar.bz2) = e2639935d87d5c9fdb115a58ab1f598b69a76216 +Size (gawk-3.1.6.tar.bz2) = 1861630 bytes +SHA1 (patch-ab) = b754cc6df0bd00d5b4e6bbd6bd2706703872489f +SHA1 (patch-ad) = 68910553cf495b7b177c96479ceb2c549fe5350f diff --git a/lang/gawk/patches/patch-ab b/lang/gawk/patches/patch-ab index d144afadc49..5013b9ea7d6 100644 --- a/lang/gawk/patches/patch-ab +++ b/lang/gawk/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.10 2005/09/05 16:58:22 wiz Exp $ +$NetBSD: patch-ab,v 1.11 2007/11/02 07:18:00 adam Exp $ ---- Makefile.in.orig 2005-07-26 20:44:03.000000000 +0200 +--- Makefile.in.orig 2007-10-22 08:52:01.000000000 +0200 +++ Makefile.in -@@ -156,7 +156,7 @@ CFLAGS = @CFLAGS@ +@@ -148,7 +148,7 @@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.10 2005/09/05 16:58:22 wiz Exp $ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ -@@ -936,9 +936,7 @@ install-exec-hook: +@@ -890,9 +890,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-ac b/lang/gawk/patches/patch-ac deleted file mode 100644 index 629f574136c..00000000000 --- a/lang/gawk/patches/patch-ac +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ac,v 1.8 2005/09/06 14:29:17 tonio Exp $ - ---- hard-locale.h.orig 2005-05-11 17:28:16.000000000 +0200 -+++ hard-locale.h -@@ -22,6 +22,8 @@ - Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ - - -+static ptr_t xmalloc PARAMS ((size_t n)); -+ - /* Return nonzero if the current CATEGORY locale is hard, i.e. if you - can't get away with assuming traditional C or POSIX behavior. */ - static int -@@ -40,8 +42,6 @@ hard_locale (int category) - if (strcmp (p, "C") == 0 || strcmp (p, "POSIX") == 0) - hard = 0; - # else -- static ptr_t xmalloc PARAMS ((size_t n)); -- - char *locale = xmalloc (strlen (p) + 1); - strcpy (locale, p); - diff --git a/lang/gawk/patches/patch-ad b/lang/gawk/patches/patch-ad index 22bd14d248e..adc75f3b482 100644 --- a/lang/gawk/patches/patch-ad +++ b/lang/gawk/patches/patch-ad @@ -1,8 +1,8 @@ -$NetBSD: patch-ad,v 1.3 2005/09/06 14:29:17 tonio Exp $ +$NetBSD: patch-ad,v 1.4 2007/11/02 07:18:00 adam Exp $ ---- dfa.c.orig 2005-07-26 20:07:43.000000000 +0200 +--- dfa.c.orig 2007-09-03 05:30:12.000000000 +0200 +++ dfa.c -@@ -122,7 +122,6 @@ extern void free(); +@@ -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)); |