Update to latest version 3.0.6/patch 115, provided by OBATA Akio

in PR 31893.

Patch changes unknown.

5 files changed, 61 insertions, 49 deletions

diff --git a/lang/ja-gawk/Makefile b/lang/ja-gawk/Makefile
index 909d11ed0e7..681bda2d2bc 100644
--- a/lang/ja-gawk/Makefile
+++ b/lang/ja-gawk/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.6 2005/03/24 21:12:55 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2006/03/11 13:04:07 wiz Exp $
 
-DISTNAME=	gawk-3.0.4
-PKGNAME=	ja-gawk-3.0.4
+DISTNAME=	gawk-3.0.6
+PKGNAME=	ja-gawk-3.0.6
 CATEGORIES=	japanese lang
 MASTER_SITES=	${MASTER_SITE_GNU:=gawk/}
 
-PATCH_SITES=	http://member.nifty.ne.jp/wills/program/
-PATCHFILES=	gawkmb112.diff.gz
+PATCH_SITES=	http://www.hinadori.atnifty.com/~wills/program/
+PATCHFILES=	gawkmb115.diff.gz
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	tech-pkg-ja@jp.NetBSD.org
@@ -20,8 +20,8 @@ INFO_FILES=	gawk.info
 GNU_CONFIGURE=	yes
 
 post-install:
-	@${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ja-gawk
-	@${INSTALL_DATA} ${WRKSRC}/OREADME.MB ${PREFIX}/share/doc/ja-gawk
-	@${INSTALL_DATA} ${WRKSRC}/README.MB ${PREFIX}/share/doc/ja-gawk
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ja-gawk
+	${INSTALL_DATA} ${WRKSRC}/OREADME.MB ${PREFIX}/share/doc/ja-gawk
+	${INSTALL_DATA} ${WRKSRC}/README.MB ${PREFIX}/share/doc/ja-gawk
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/ja-gawk/distinfo b/lang/ja-gawk/distinfo
index 3e645e538b1..541d2c87c6b 100644
--- a/lang/ja-gawk/distinfo
+++ b/lang/ja-gawk/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.4 2006/01/13 21:51:06 joerg Exp $
+$NetBSD: distinfo,v 1.5 2006/03/11 13:04:07 wiz Exp $
 
-SHA1 (gawk-3.0.4.tar.gz) = c22ab0ef08d80b6a4af821c8baffb9941b7f5e87
-RMD160 (gawk-3.0.4.tar.gz) = 57fb10dced133236922aa70530e09bd22b5b69bc
-Size (gawk-3.0.4.tar.gz) = 1027134 bytes
-SHA1 (gawkmb112.diff.gz) = 7498a14ab254195931adb7b085376997c168b864
-RMD160 (gawkmb112.diff.gz) = 42da71544a971a0a18b612c5d52915f5c5567cf0
-Size (gawkmb112.diff.gz) = 94799 bytes
-SHA1 (patch-aa) = da52f4b7afc6597750ebf8e77d395d41e57d74a7
-SHA1 (patch-ab) = bae2a88656dee140972e283770e1864c6d78b672
-SHA1 (patch-ac) = 72a7fa6e616e441a6cd7b52f79359c534fd4f452
+SHA1 (gawk-3.0.6.tar.gz) = 01543b1832a604ebd1510b39b4bd44be0aea0c62
+RMD160 (gawk-3.0.6.tar.gz) = 67f52f9a2a1c168c5480c66df7b955adc9907329
+Size (gawk-3.0.6.tar.gz) = 1047328 bytes
+SHA1 (gawkmb115.diff.gz) = ba4637157766440f097b6252c1f127a8b7e26591
+RMD160 (gawkmb115.diff.gz) = 1a9c337e2ef7f5f0e4dc6705941bef1870b434d5
+Size (gawkmb115.diff.gz) = 86858 bytes
+SHA1 (patch-aa) = b9132f65b5cfbb26b3278585f7edeefca0537169
+SHA1 (patch-ab) = a9afa0d46b6412f5a77e578a6b1eeb66fe2af50c
+SHA1 (patch-ac) = 22e49c3d295e8f5f8217f35b12cbb0120c11c13c
 SHA1 (patch-ad) = d604f0af916307fc6f1e7f647cbcae0b6cdcfec9
diff --git a/lang/ja-gawk/patches/patch-aa b/lang/ja-gawk/patches/patch-aa
index 7d699b71601..01f7c98176e 100644
--- a/lang/ja-gawk/patches/patch-aa
+++ b/lang/ja-gawk/patches/patch-aa
@@ -1,38 +1,44 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/05/31 13:00:45 seb Exp $
+$NetBSD: patch-aa,v 1.2 2006/03/11 13:04:07 wiz Exp $
 
---- Makefile.in.orig	Mon Oct 11 21:30:42 1999
-+++ Makefile.in	Mon Oct 11 21:35:44 1999
-@@ -48,5 +48,5 @@
- exec_suffix = @exec_suffix@
+--- Makefile.in.orig	2005-10-23 20:59:29.000000000 +0900
++++ Makefile.in
+@@ -46,7 +46,7 @@ LN_S = @LN_S@
+ 
+ exec_prefix = @exec_prefix@
  prefix = @prefix@
 -binprefix =
 +binprefix = j
  manprefix =
  
-@@ -195,12 +195,6 @@
+ bindir = @bindir@
+@@ -194,14 +194,8 @@ alloca.o:	alloca.c
+ mbc.o: Makefile
  
- install:	gawk$(exec_suffix) info installdirs
--	-rm -f $(bindir)/gawk$(exec_suffix)
+ install:	gawk info installdirs
+-	-rm -f $(bindir)/gawk
 -	fullname=gawk-$(REL).`./gawk '{print $$3}' $(srcdir)/patchlevel.h`+mb$(MBREL) ; \
--	$(INSTALL_PROGRAM) gawk$(exec_suffix) $(bindir)/$${fullname}$(exec_suffix) ; \
--	(cd $(bindir); $(LN) $${fullname}$(exec_suffix) gawk$(exec_suffix))
--	(cd $(bindir);\
--	if [ ! -f awk$(exec_suffix) ]; \
--	then	$(LN_S) gawk$(exec_suffix) awk$(exec_suffix); \
+-	$(INSTALL_PROGRAM) gawk $(bindir)/$$fullname ; \
+-	(cd $(bindir); $(LN) $$fullname gawk)
+-	(cd $(bindir); \
+-	if [ ! -f awk ]; \
+-	then	$(LN_S) gawk awk; \
 -	fi; exit 0)
 +	$(INSTALL_PROGRAM) gawk$(exec_suffix) \
 +		$(bindir)/$(binprefix)gawk$(exec_suffix)
  	cd doc && $(MAKE) install
  	cd awklib && $(MAKE) install
-@@ -211,10 +205,5 @@
+ 
+@@ -213,12 +207,7 @@ install-strip:
+ 	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install
  
  uninstall:
 -	(cd $(bindir); \
--	if [ -f awk$(exec_suffix) ] && cmp awk$(exec_suffix) gawk$(exec_suffix) > /dev/null; then rm -f awk$(exec_suffix); fi)
+-	if [ -f awk ] && cmp awk gawk > /dev/null; then rm -f awk; fi)
 -	(fullname=gawk-$(REL).`gawk '{print $$3}' $(srcdir)/patchlevel.h`+mb$(MBREL) ; \
 -	cd $(bindir); \
--	if cmp gawk$(exec_suffix) $${fullname}$(exec_suffix); then rm -f gawk$(exec_suffix); fi ; \
--	rm -f $(bindir)/$${fullname}$(exec_suffix))
-+	rm -f $(bindir)/$(binprefix)gawk$(exec_suffix))
+-	if cmp gawk $$fullname; then rm -f gawk; fi ; \
+-	rm -f $(bindir)/$$fullname)
++	rm -f $(bindir)/$(binprefix)gawk$(exec_suffix)
  	cd doc && $(MAKE) uninstall
  	cd awklib && $(MAKE) uninstall
+ 	-rmdir $(datadir) $(libexecdir)
diff --git a/lang/ja-gawk/patches/patch-ab b/lang/ja-gawk/patches/patch-ab
index a8c7163f67d..62bd7a04123 100644
--- a/lang/ja-gawk/patches/patch-ab
+++ b/lang/ja-gawk/patches/patch-ab
@@ -1,25 +1,31 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/05/31 13:00:45 seb Exp $
+$NetBSD: patch-ab,v 1.2 2006/03/11 13:04:07 wiz Exp $
 
---- awklib/Makefile.in.orig	Mon Oct 11 21:30:42 1999
-+++ awklib/Makefile.in	Mon Oct 11 21:36:58 1999
-@@ -35,5 +35,5 @@
+--- awklib/Makefile.in.orig	2005-10-23 20:59:29.000000000 +0900
++++ awklib/Makefile.in
+@@ -33,7 +33,7 @@ CFLAGS = @CFLAGS@
+ 
+ prefix = @prefix@
  exec_prefix = @exec_prefix@
- exec_suffix = @exec_suffix@
 -binprefix =
 +binprefix = j
  manprefix =
  
-@@ -76,5 +76,5 @@
+ bindir = @bindir@
+@@ -74,7 +74,7 @@ group.awk: $(srcdir)/eg/lib/groupawk.in
+ 	sed 's;/usr/local/libexec/awk;$(libexecdir);' < groupawk.in) > group.awk
  
  install: igawk $(AUXPROGS) $(AUXAWK)
 -	$(INSTALL_PROGRAM) igawk $(bindir)/igawk
 +	$(INSTALL_PROGRAM:-s=) igawk $(bindir)/$(binprefix)igawk
  	for i in $(AUXPROGS) ; do \
  		$(INSTALL_PROGRAM) $$i $(libexecdir)/$$i ; \
-@@ -88,5 +88,5 @@
+ 	done
+@@ -86,7 +86,7 @@ install: igawk $(AUXPROGS) $(AUXAWK)
+ # libexecdir and datadir are removed in the top level Makefile's uninstall
  uninstall:
  	rm -fr $(libexecdir)/* $(datadir)/*
 -	rm -f $(bindir)/igawk
 +	rm -f $(bindir)/$(binprefix)igawk
  
  clean:
+ 	rm -f $(AUXPROGS) $(AUXAWK) igawk *~
diff --git a/lang/ja-gawk/patches/patch-ac b/lang/ja-gawk/patches/patch-ac
index 8f6bc5db768..b12050ffed1 100644
--- a/lang/ja-gawk/patches/patch-ac
+++ b/lang/ja-gawk/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.2 2004/06/17 13:07:45 grant Exp $
+$NetBSD: patch-ac,v 1.3 2006/03/11 13:04:07 wiz Exp $
 
---- doc/Makefile.in.orig	1999-04-29 00:21:56.000000000 +1000
+--- doc/Makefile.in.orig	2000-06-07 17:48:18.000000000 +0900
 +++ doc/Makefile.in
 @@ -31,7 +31,7 @@ INSTALL_DATA = @INSTALL_DATA@
  prefix = @prefix@
@@ -11,10 +11,10 @@ $NetBSD: patch-ac,v 1.2 2004/06/17 13:07:45 grant Exp $
  
  bindir = @bindir@
  libdir = @libdir@
-@@ -82,18 +82,15 @@ $(infodir)/gawk.info::
- 	for i in $$d/gawk.info*; do \
- 		$(INSTALL_DATA) $$i $(infodir)/$$i ; \
- 	done; \
+@@ -80,18 +80,15 @@ $(infodir)/gawk.info::
+ 		exit 0; \
+ 	fi; \
+ 	$(INSTALL_DATA) $$d/gawk.info $(infodir)/gawk.info ; \
 -	if $(SHELL) -c 'install-info --version' > /dev/null 2>&1 ; \
 -	then install-info --info-dir=$(infodir) gawk.info ; \
 -	else true ; fi; exit 0