diff --git a/japanese/gawk/Makefile b/japanese/gawk/Makefile index d58dc5817790..d448c1b10164 100644 --- a/japanese/gawk/Makefile +++ b/japanese/gawk/Makefile @@ -1,13 +1,13 @@ -# $NetBSD: Makefile,v 1.3 1999/06/29 04:16:11 sakamoto Exp $ +# $NetBSD: Makefile,v 1.4 1999/10/11 13:00:42 sakamoto Exp $ # FreeBSD Id: Makefile,v 1.13 1999/01/27 07:41:14 fenner Exp $ -DISTNAME= gawk-3.0.3 -PKGNAME= ja-gawk-3.0.3 +DISTNAME= gawk-3.0.4 +PKGNAME= ja-gawk-3.0.4 CATEGORIES= japanese textproc MASTER_SITES= ${MASTER_SITE_GNU:=gawk/} PATCH_SITES= http://member.nifty.ne.jp/wills/program/ -PATCHFILES= gawkmb111.diff.gz +PATCHFILES= gawkmb112.diff.gz PATCH_DIST_STRIP= -p1 MAINTAINER= tech-pkg-ja@jp.netbsd.org diff --git a/japanese/gawk/files/md5 b/japanese/gawk/files/md5 index b5c9f34aede2..f1c26af2308a 100644 --- a/japanese/gawk/files/md5 +++ b/japanese/gawk/files/md5 @@ -1,4 +1,4 @@ -$NetBSD: md5,v 1.2 1999/06/08 09:19:50 sakamoto Exp $ +$NetBSD: md5,v 1.3 1999/10/11 13:00:42 sakamoto Exp $ -MD5 (gawk-3.0.3.tar.gz) = 531c1ba966fe072230e75bbad6f4dad8 -MD5 (gawkmb111.diff.gz) = 6c274f832d29521d343417f925f9b56c +MD5 (gawk-3.0.4.tar.gz) = 58f904f256b3026c3fe27cf80e6291af +MD5 (gawkmb112.diff.gz) = f1464efdcacb1088dfe20eae9b338911 diff --git a/japanese/gawk/files/patch-sum b/japanese/gawk/files/patch-sum index 759d8bc314c2..2e342663d2ad 100644 --- a/japanese/gawk/files/patch-sum +++ b/japanese/gawk/files/patch-sum @@ -1,5 +1,5 @@ -$NetBSD: patch-sum,v 1.1 1999/07/09 13:51:17 agc Exp $ +$NetBSD: patch-sum,v 1.2 1999/10/11 13:00:42 sakamoto Exp $ -MD5 (patch-aa) = e6ae8c4e234cf06f756b48680b351231 -MD5 (patch-ab) = 109d8df4031701a26517eaf8e034c982 -MD5 (patch-ac) = 99556d30af4e73a42d1184999e399ae7 +MD5 (patch-aa) = ec2a477fa8b4fe46b8741001aff47979 +MD5 (patch-ab) = 55a1575ffcfd7d57384cabc95366885b +MD5 (patch-ac) = 27331d249844663276bc0c53baca45b6 diff --git a/japanese/gawk/patches/patch-aa b/japanese/gawk/patches/patch-aa index dfda9fc2c234..a64b8fd1fd73 100644 --- a/japanese/gawk/patches/patch-aa +++ b/japanese/gawk/patches/patch-aa @@ -1,25 +1,22 @@ -$NetBSD: patch-aa,v 1.1 1999/06/08 09:19:50 sakamoto Exp $ +$NetBSD: patch-aa,v 1.2 1999/10/11 13:00:43 sakamoto Exp $ ---- Makefile.in.orig Tue Jun 8 10:31:12 1999 -+++ Makefile.in Tue Jun 8 10:40:30 1999 -@@ -46,7 +46,7 @@ - exec_prefix = @exec_prefix@ +--- 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@ prefix = @prefix@ -binprefix = +binprefix = j manprefix = - bindir = @bindir@ -@@ -192,14 +192,8 @@ - mbc.o: Makefile +@@ -195,12 +195,6 @@ install: gawk$(exec_suffix) info installdirs - -rm -f $(bindir)/gawk$(exec_suffix) - 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); \ +- (cd $(bindir);\ - if [ ! -f awk$(exec_suffix) ]; \ - then $(LN_S) gawk$(exec_suffix) awk$(exec_suffix); \ - fi; exit 0) @@ -27,9 +24,7 @@ $NetBSD: patch-aa,v 1.1 1999/06/08 09:19:50 sakamoto Exp $ + $(bindir)/$(binprefix)gawk$(exec_suffix) cd doc && $(MAKE) install cd awklib && $(MAKE) install - -@@ -208,12 +202,7 @@ - $(libdir) $(infodir) $(mandir) $(libexecdir) +@@ -211,10 +205,5 @@ uninstall: - (cd $(bindir); \ @@ -41,4 +36,3 @@ $NetBSD: patch-aa,v 1.1 1999/06/08 09:19:50 sakamoto Exp $ + rm -f $(bindir)/$(binprefix)gawk$(exec_suffix)) cd doc && $(MAKE) uninstall cd awklib && $(MAKE) uninstall - -rmdir $(datadir) $(libexecdir) diff --git a/japanese/gawk/patches/patch-ab b/japanese/gawk/patches/patch-ab index c600d4ddbcaf..00bd885d1e83 100644 --- a/japanese/gawk/patches/patch-ab +++ b/japanese/gawk/patches/patch-ab @@ -1,31 +1,25 @@ -$NetBSD: patch-ab,v 1.2 1999/06/08 09:19:50 sakamoto Exp $ +$NetBSD: patch-ab,v 1.3 1999/10/11 13:00:43 sakamoto Exp $ ---- awklib/Makefile.in.orig Tue Jun 8 10:31:14 1999 -+++ awklib/Makefile.in Tue Jun 8 10:38:52 1999 -@@ -34,7 +34,7 @@ - prefix = @prefix@ +--- 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 @@ exec_prefix = @exec_prefix@ exec_suffix = @exec_suffix@ -binprefix = +binprefix = j manprefix = - bindir = @bindir@ -@@ -75,7 +75,7 @@ - sed 's;/usr/local/libexec/awk;$(libexecdir);' < groupawk.in) > group.awk +@@ -76,5 +76,5 @@ 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 ; \ - done -@@ -87,7 +87,7 @@ - # libexecdir and datadir are removed in the top level Makefile's uninstall +@@ -88,5 +88,5 @@ uninstall: rm -fr $(libexecdir)/* $(datadir)/* - rm -f $(bindir)/igawk + rm -f $(bindir)/$(binprefix)igawk clean: - rm -f $(AUXPROGS) $(AUXAWK) igawk *~ diff --git a/japanese/gawk/patches/patch-ac b/japanese/gawk/patches/patch-ac index b72cb001e0cc..a043e5a02a6a 100644 --- a/japanese/gawk/patches/patch-ac +++ b/japanese/gawk/patches/patch-ac @@ -1,29 +1,26 @@ -$NetBSD: patch-ac,v 1.1 1999/06/08 09:19:50 sakamoto Exp $ +$NetBSD: patch-ac,v 1.2 1999/10/11 13:00:43 sakamoto Exp $ ---- doc/Makefile.in.orig Thu May 15 10:36:15 1997 -+++ doc/Makefile.in Tue Jun 8 10:48:22 1999 -@@ -31,7 +31,7 @@ +--- doc/Makefile.in.orig Wed Apr 28 23:21:56 1999 ++++ doc/Makefile.in Mon Oct 11 21:38:08 1999 +@@ -31,5 +31,5 @@ prefix = @prefix@ exec_prefix = @exec_prefix@ binprefix = -manprefix = +manprefix = j - bindir = @bindir@ - libdir = @libdir@ -@@ -77,18 +77,15 @@ - for i in $$d/gawk.info*; do \ - $(INSTALL_DATA) $$i $(infodir)/$i ; \ +@@ -83,16 +83,13 @@ + $(INSTALL_DATA) $$i $(infodir)/$$i ; \ done; \ - if $(SHELL) -c 'install-info --version' > /dev/null 2>&1 ; \ - then install-info --info-dir=$(infodir) gawk.info ; \ - else true ; fi; exit 0 - $(mandir)/gawk$(manext): gawk.1 + $(mandir)/gawk$(manext):: gawk.1 - $(INSTALL_DATA) $(srcdir)/gawk.1 $(mandir)/gawk$(manext) + $(INSTALL_DATA) $(srcdir)/gawk.1 $(mandir)/$(manprefix)gawk$(manext) - $(mandir)/igawk$(manext): igawk.1 + $(mandir)/igawk$(manext):: igawk.1 - $(INSTALL_DATA) $(srcdir)/igawk.1 $(mandir)/igawk$(manext) + $(INSTALL_DATA) $(srcdir)/igawk.1 $(mandir)/$(manprefix)igawk$(manext) @@ -32,4 +29,3 @@ $NetBSD: patch-ac,v 1.1 1999/06/08 09:19:50 sakamoto Exp $ + rm -f $(mandir)/$(manprefix)gawk$(manext) $(mandir)/$(manprefix)igawk$(manext) $(infodir)/gawk.info* dvi: gawk.dvi -