Updated to 3.0.4+mb1.12 (mb = multi-byte)

PR:		13566
Submitted by:	KATO Tsuguru <tkato@prontomail.ne.jp>

6 files changed, 71 insertions, 35 deletions

diff --git a/japanese/gawk/Makefile b/japanese/gawk/Makefile
index a8185006d39e..ff3fe855c762 100644
--- a/japanese/gawk/Makefile
+++ b/japanese/gawk/Makefile
@@ -1,47 +1,32 @@
 # New ports collection makefile for:	gawk+mb
-# Version required:	2.15.6+mb1.04
+# Version required:	3.0.4+mb1.12
 # Date created:		5 April 1995
 # Whom:			Nobuhiro Yasutomi <nobu@psrc.isac.co.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	gawk-2.15.6
-PKGNAME=	ja-gawk-2.15.6
+DISTNAME=	gawk-3.0.4
+PKGNAME=	ja-gawk-3.0.4
 CATEGORIES=	japanese textproc
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	gawk
 
 MAINTAINER=	ports@FreeBSD.org
 
-HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	bsd44
-PATCH_STRIP=	-p1
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--program-prefix=g
 
-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_SITES=	http://member.nifty.ne.jp/wills/program/
+PATCHFILES=	gawkmb112.diff.gz
 PATCH_DIST_STRIP=	-p1
+FETCH_BEFORE_ARGS=	-b
 
-.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)
+post-install:
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${PREFIX}/share/doc/ja/awk
+	${INSTALL_DATA} ${WRKSRC}/OREADME.MB ${PREFIX}/share/doc/ja/awk
+	${INSTALL_DATA} ${WRKSRC}/README.MB ${PREFIX}/share/doc/ja/awk
 .endif
 
 .include <bsd.port.mk>
diff --git a/japanese/gawk/distinfo b/japanese/gawk/distinfo
index 366ec6ba4341..938ff6b36add 100644
--- a/japanese/gawk/distinfo
+++ b/japanese/gawk/distinfo
@@ -1,2 +1,2 @@
-MD5 (gawk-2.15.6.tar.gz) = 62ad283de0ca65365481a9dc05bc367c
-MD5 (gawk-2.15.6-mb1.04.diff.gz) = bcf13277edf459b43269eeba1e70be38
+MD5 (gawk-3.0.4.tar.gz) = 58f904f256b3026c3fe27cf80e6291af
+MD5 (gawkmb112.diff.gz) = 154d48aa42fd4f46d0b6ed824d2e775a
diff --git a/japanese/gawk/files/patch-ac b/japanese/gawk/files/patch-ac
new file mode 100644
index 000000000000..72dc1fa4acd2
--- /dev/null
+++ b/japanese/gawk/files/patch-ac
@@ -0,0 +1,19 @@
+--- Makefile.in.orig	Sat Sep  4 06:27:22 1999
++++ Makefile.in	Sat Sep  4 06:31:43 1999
+@@ -194,14 +194,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
+ 
diff --git a/japanese/gawk/files/patch-ad b/japanese/gawk/files/patch-ad
new file mode 100644
index 000000000000..4a16077e52cc
--- /dev/null
+++ b/japanese/gawk/files/patch-ad
@@ -0,0 +1,11 @@
+--- awklib/Makefile.in.orig	Sat Sep  4 06:27:32 1999
++++ awklib/Makefile.in	Sat Sep  4 06:33:11 1999
+@@ -75,7 +75,7 @@
+ 	sed 's;/usr/local/libexec/awk;$(libexecdir);' < groupawk.in) > group.awk
+ 
+ install: igawk $(AUXPROGS) $(AUXAWK)
+-	$(INSTALL_PROGRAM) igawk $(bindir)/igawk
++	cp igawk $(bindir)/igawk
+ 	for i in $(AUXPROGS) ; do \
+ 		$(INSTALL_PROGRAM) $$i $(libexecdir)/$$i ; \
+ 	done
diff --git a/japanese/gawk/pkg-descr b/japanese/gawk/pkg-descr
index 86825ea65dbd..b237e5cf3d4b 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-JP/Shift_JIS/UTF-8 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 e1f4b914dd32..6ea1137fce8b 100644
--- a/japanese/gawk/pkg-plist
+++ b/japanese/gawk/pkg-plist
@@ -1,2 +1,23 @@
 bin/gawk
-man/man1/gawk.1.gz
+bin/igawk
+libexec/awk/grcat
+libexec/awk/pwcat
+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/awk/OREADME.MB
+share/doc/ja/awk/README.MB
+@unexec install-info --delete %D/info/gawk.info %D/info/dir
+info/gawk.info
+@dirrm libexec/awk
+@dirrm share/doc/ja/awk
+@dirrm share/awk