3 files changed, 46 insertions, 7 deletions

diff --git a/japanese/gawk/Makefile b/japanese/gawk/Makefile
index 3998ccb42722..63ea663b5bd3 100644
--- a/japanese/gawk/Makefile
+++ b/japanese/gawk/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	gawk
 PORTVERSION=	3.0.6
+PORTREVISION=	1
 CATEGORIES=	japanese lang
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,13 +17,10 @@ COMMENT=	GNU awk + multi-byte extension
 
 LICENSE=	GPLv2
 
-USES=		makeinfo
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-bitops --enable-non-decimal-data
 MAKE_JOBS_UNSAFE=	yes
 
-INFO=		gawk
-
 DOCSDIR=	${PREFIX}/share/doc/${PKGBASE}
 
 OPTIONS_DEFINE=	DOCS
diff --git a/japanese/gawk/files/patch-Makefile.in b/japanese/gawk/files/patch-Makefile.in
index 45cb43c5d494..28698fd54800 100644
--- a/japanese/gawk/files/patch-Makefile.in
+++ b/japanese/gawk/files/patch-Makefile.in
@@ -1,9 +1,19 @@
---- Makefile.in.orig	Mon Jul 16 20:42:58 2001
-+++ Makefile.in	Mon Jul 16 20:48:25 2001
-@@ -194,14 +194,8 @@
+--- Makefile.in.orig	2015-04-18 06:35:02 UTC
++++ Makefile.in
+@@ -102,7 +102,7 @@ COPIES = missing/system.c missing/tzset.
+ 	missing/strerror.c missing/strtod.c \
+ 	missing/strftime.c missing/strftime.3 
+ 
+-DOCS= doc/gawk.1 doc/gawk.texi doc/texinfo.tex
++DOCS= doc/gawk.1
+ 
+ TEXFILES= doc/gawk.aux doc/gawk.cp doc/gawk.cps doc/gawk.fn doc/gawk.fns \
+ 	  doc/gawk.ky doc/gawk.kys doc/gawk.pg doc/gawk.pgs doc/gawk.toc \
+@@ -193,21 +193,15 @@ alloca.o:	alloca.c
+ 
  mbc.o: Makefile
  
- install:	gawk info installdirs
+-install:	gawk info installdirs
 -	-rm -f $(bindir)/gawk
 -	fullname=gawk-$(REL).`./gawk '{print $$3}' $(srcdir)/patchlevel.h`+mb$(MBREL) ; \
 -	$(INSTALL_PROGRAM) gawk $(bindir)/$$fullname ; \
@@ -12,8 +22,16 @@
 -	if [ ! -f awk ]; \
 -	then	$(LN_S) gawk awk; \
 -	fi; exit 0)
++install:	gawk installdirs
 +	$(INSTALL_PROGRAM) gawk \
 +		$(bindir)/$(binprefix)gawk$(exec_suffix)
  	cd doc && $(MAKE) install
  	cd awklib && $(MAKE) install
  
+ installdirs: mkinstalldirs
+ 	$(srcdir)/mkinstalldirs $(bindir) $(datadir) \
+-		$(libdir) $(infodir) $(mandir) $(libexecdir)
++		$(libdir) $(mandir) $(libexecdir)
+ 
+ install-strip:
+ 	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install
diff --git a/japanese/gawk/files/patch-doc_Makefile.in b/japanese/gawk/files/patch-doc_Makefile.in
new file mode 100644
index 000000000000..5382cfe3a318
--- /dev/null
+++ b/japanese/gawk/files/patch-doc_Makefile.in
@@ -0,0 +1,23 @@
+--- doc/Makefile.in.orig	2000-06-07 08:48:18 UTC
++++ doc/Makefile.in
+@@ -47,7 +47,7 @@ TROFF = groff -t -Tps
+ SEDME = sed -e "s/^level0 restore/level0 restore flashme 100 72 moveto (Copyright `date '+%m-%d-%y %T'`, FSF, Inc. (all)) show/" \
+ 		-e "s/^\/level0 save def/\/level0 save def 30 -48 translate/"
+ 
+-DOCS= gawk.1 igawk.1 gawk.texi
++DOCS= gawk.1 igawk.1 
+ 
+ TEXFILES= gawk.aux gawk.cp gawk.cps gawk.fn gawk.fns gawk.ky gawk.kys \
+ 	   gawk.pg gawk.pgs gawk.toc gawk.tp gawk.tps gawk.vr gawk.vrs
+@@ -67,9 +67,9 @@ AWKCARD = awkcard.ps
+ # to ensure that awkcard.tr is processed by tbl.
+ #AWKCARD = awkcard.nc
+ 
+-all: $(DOCS) info
++all: $(DOCS)
+ 
+-install: $(mandir)/gawk$(manext) $(mandir)/igawk$(manext) $(infodir)/gawk.info
++install: $(mandir)/gawk$(manext) $(mandir)/igawk$(manext)
+ 
+ $(infodir)/gawk.info::
+ 	-if test -f gawk.info; then d=.; \