Adapt this package to NetBSD.

Update 2.15.6 to 3.0.3.

7 files changed, 161 insertions, 68 deletions

diff --git a/japanese/gawk/Makefile b/japanese/gawk/Makefile
index 61141176868..13506a26e5e 100644
--- a/japanese/gawk/Makefile
+++ b/japanese/gawk/Makefile
@@ -1,47 +1,26 @@
-# New ports collection makefile for:	gawk+mb
-# Version required:	2.15.6+mb1.04
-# Date created:		5 April 1995
-# Whom:			Nobuhiro Yasutomi <nobu@psrc.isac.co.jp>
-#
-# $Id: Makefile,v 1.1.1.1 1999/06/08 09:02:43 sakamoto Exp $
-#
+# $NetBSD: Makefile,v 1.2 1999/06/08 09:19:50 sakamoto Exp $
+# FreeBSD Id: Makefile,v 1.13 1999/01/27 07:41:14 fenner Exp $
 
-DISTNAME=	gawk-2.15.6
-PKGNAME=	ja-gawk-2.15.6
+DISTNAME=	gawk-3.0.3
+PKGNAME=	ja-gawk-3.0.3
 CATEGORIES=	japanese textproc
-MASTER_SITES=	${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	gawk
+MASTER_SITES=	${MASTER_SITE_GNU:=gawk/}
 
-MAINTAINER=	ports@FreeBSD.ORG
+PATCH_SITES=	http://member.nifty.ne.jp/wills/program/
+PATCHFILES=	gawkmb111.diff.gz
+PATCH_DIST_STRIP=	-p1
 
-HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	bsd44
-PATCH_STRIP=	-p1
+MAINTAINER=	teck-pkg-ja@jp.netbsd.org
+HOMEPAGE=	http://www.gnu.org/software/gawk/gawk.html
 
-PATCH_SITES=	ftp://ftp.iij.ad.jp/pub/NetNews/fj.sources/volume95/May/
-PATCHFILES=	gawk-2.15.6-mb1.04.diff.gz
-DISTPATCHES=	950503.01.Z 950503.02.Z 950503.03.Z 950503.04.Z
-# Try this if you can't get into ftp.iij.ad.jp
-# PATCH_SITES=	ftp://isfs.kuis.kyoto-u.ac.jp/News.Archives/fj.sources/1995/
-# DISTPATCHES=	372.gz 373.gz 374.gz 375.gz
-PATCH_DIST_STRIP=	-p1
+INFO_FILES=	gawk.info
+
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	bsd44
 
-.if !defined(MASTER_SITE_OVERRIDE)
-pre-fetch: 
-	@(cd ${DISTDIR}; \
-	 if [ ! -f ${PATCHFILES} ]; then \
-	    ${ECHO_MSG} ">> ${PATCHFILES} doesn't seem to exist on this system."; \
-	    for file in ${DISTPATCHES} ; do \
-		for site in ${PATCH_SITES} ; do \
-		    if ${FETCH_CMD} ${FETCH_BEFORE_ARGS} $${site}$${file} ${FETCH_AFTER_ARGS}; then \
-			break; \
-		    fi \
-		done; \
-	    done; \
-	    for file in ${DISTPATCHES} ; do zcat $${file}; done | \
-		sed -e '1,/-----8</d' -e '/-----8</,/-----8</d' | uudecode; \
-	    rm -f ${DISTPATCHES};\
-	 fi)
-.endif
+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
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/japanese/gawk/files/md5 b/japanese/gawk/files/md5
index 366ec6ba434..b5c9f34aede 100644
--- a/japanese/gawk/files/md5
+++ b/japanese/gawk/files/md5
@@ -1,2 +1,4 @@
-MD5 (gawk-2.15.6.tar.gz) = 62ad283de0ca65365481a9dc05bc367c
-MD5 (gawk-2.15.6-mb1.04.diff.gz) = bcf13277edf459b43269eeba1e70be38
+$NetBSD: md5,v 1.2 1999/06/08 09:19:50 sakamoto Exp $
+
+MD5 (gawk-3.0.3.tar.gz) = 531c1ba966fe072230e75bbad6f4dad8
+MD5 (gawkmb111.diff.gz) = 6c274f832d29521d343417f925f9b56c
diff --git a/japanese/gawk/patches/patch-aa b/japanese/gawk/patches/patch-aa
new file mode 100644
index 00000000000..dfda9fc2c23
--- /dev/null
+++ b/japanese/gawk/patches/patch-aa
@@ -0,0 +1,44 @@
+$NetBSD: patch-aa,v 1.1 1999/06/08 09:19:50 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@
+ exec_suffix = @exec_suffix@
+ prefix = @prefix@
+-binprefix =
++binprefix = j
+ manprefix =
+ 
+ bindir = @bindir@
+@@ -192,14 +192,8 @@
+ mbc.o:	Makefile
+ 
+ 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); \
+-	if [ ! -f awk$(exec_suffix) ]; \
+-	then	$(LN_S) gawk$(exec_suffix) awk$(exec_suffix); \
+-	fi; exit 0)
++	$(INSTALL_PROGRAM) gawk$(exec_suffix) \
++		$(bindir)/$(binprefix)gawk$(exec_suffix)
+ 	cd doc && $(MAKE) install
+ 	cd awklib && $(MAKE) install
+ 
+@@ -208,12 +202,7 @@
+ 		$(libdir) $(infodir) $(mandir) $(libexecdir)
+ 
+ uninstall:
+-	(cd $(bindir); \
+-	if [ -f awk$(exec_suffix) ] && cmp awk$(exec_suffix) gawk$(exec_suffix) > /dev/null; then rm -f awk$(exec_suffix); 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))
+ 	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 8e3f2302343..c600d4ddbca 100644
--- a/japanese/gawk/patches/patch-ab
+++ b/japanese/gawk/patches/patch-ab
@@ -1,21 +1,31 @@
---- gawk-2.15.4/Makefile.bsd44-orig	Wed Apr  5 16:13:10 1995
-+++ gawk-2.15.4/Makefile.bsd44	Wed Apr  5 16:43:45 1995
-@@ -1,4 +1,4 @@
--PROG=	awk
-+PROG=	gawk
- SRCS=	main.c eval.c builtin.c msg.c iop.c io.c field.c getopt1.c \
- 	getopt.c array.c \
- 	node.c version.c missing.c re.c awk.c regex.c dfa.c \
-@@ -6,10 +6,8 @@
- DPADD=	${LIBM}
- LDADD=	-lm
- CFLAGS+=-I${.CURDIR} -DGAWK -DEUC
--BINDIR=	/usr/bin
--MANDIR=	/usr/share/man/cat
-+BINDIR=	/usr/local/bin
-+MANDIR=	/usr/local/man/man
- CLEANFILES+=awk.c y.tab.h awk.0
+$NetBSD: patch-ab,v 1.2 1999/06/08 09:19:50 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@
+ exec_prefix = @exec_prefix@
+ exec_suffix = @exec_suffix@
+-binprefix =
++binprefix = j
+ manprefix =
  
--awk.0: gawk.1
--      nroff -man gawk.1 > awk.0
- .include <bsd.prog.mk>
+ bindir = @bindir@
+@@ -75,7 +75,7 @@
+ 	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 ; \
+ 	done
+@@ -87,7 +87,7 @@
+ # 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/japanese/gawk/patches/patch-ac b/japanese/gawk/patches/patch-ac
new file mode 100644
index 00000000000..b72cb001e0c
--- /dev/null
+++ b/japanese/gawk/patches/patch-ac
@@ -0,0 +1,35 @@
+$NetBSD: patch-ac,v 1.1 1999/06/08 09:19:50 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 @@
+ 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 ; \
+ 	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
+-	$(INSTALL_DATA) $(srcdir)/gawk.1 $(mandir)/gawk$(manext)
++	$(INSTALL_DATA) $(srcdir)/gawk.1 $(mandir)/$(manprefix)gawk$(manext)
+ 
+ $(mandir)/igawk$(manext): igawk.1
+-	$(INSTALL_DATA) $(srcdir)/igawk.1 $(mandir)/igawk$(manext)
++	$(INSTALL_DATA) $(srcdir)/igawk.1 $(mandir)/$(manprefix)igawk$(manext)
+ 
+ uninstall:
+-	rm -f $(mandir)/gawk$(manext) $(mandir)/igawk$(manext) $(infodir)/gawk.info*
++	rm -f $(mandir)/$(manprefix)gawk$(manext) $(mandir)/$(manprefix)igawk$(manext) $(infodir)/gawk.info*
+ 
+ dvi:	gawk.dvi
+ 
diff --git a/japanese/gawk/pkg/DESCR b/japanese/gawk/pkg/DESCR
index 86825ea65db..e944f89089d 100644
--- a/japanese/gawk/pkg/DESCR
+++ b/japanese/gawk/pkg/DESCR
@@ -1,5 +1,5 @@
-This package is multi-byte extented GNU AWK. It accepts text which
-includes multi-byte character codes.  Supported multi-byte codes are
-2 byte EUC code and/or Shift-JIS code.
+This package is multi-byte extented GNU AWK.
+Supported multi-byte codes are EUC/Shift-JIS/UTF8 code.
 
-Multi-byte code by t^2(Takahiro Tanimoto, NBC02362@niftyserve.or.jp).
+Multi-byte code by WILLs(Katsuyuki Okabe, hgc02147@nifty.ne.jp)
+and t^2(Takahiro Tanimoto, NBC02362@niftyserve.or.jp).
diff --git a/japanese/gawk/pkg/PLIST b/japanese/gawk/pkg/PLIST
index e1f4b914dd3..04471136be0 100644
--- a/japanese/gawk/pkg/PLIST
+++ b/japanese/gawk/pkg/PLIST
@@ -1,2 +1,25 @@
-bin/gawk
-man/man1/gawk.1.gz
+@comment $NetBSD: PLIST,v 1.2 1999/06/08 09:19:50 sakamoto Exp $
+bin/jgawk
+bin/jigawk
+info/gawk.info
+libexec/awk/grcat
+libexec/awk/pwcat
+man/man1/jgawk.1
+man/man1/jigawk.1
+share/awk/assert.awk
+share/awk/ctime.awk
+share/awk/ftrans.awk
+share/awk/getopt.awk
+share/awk/gettime.awk
+share/awk/group.awk
+share/awk/join.awk
+share/awk/mktime.awk
+share/awk/nextfile.awk
+share/awk/ord.awk
+share/awk/passwd.awk
+share/awk/round.awk
+share/doc/ja-gawk/OREADME.MB
+share/doc/ja-gawk/README.MB
+@dirrm share/doc/ja-gawk
+@dirrm share/awk
+@dirrm libexec/awk