11 files changed, 104 insertions, 17 deletions

diff --git a/devel/mingw32-gcc/Makefile b/devel/mingw32-gcc/Makefile
index a2ebea0fbfe2..93372c52e7d6 100644
--- a/devel/mingw32-gcc/Makefile
+++ b/devel/mingw32-gcc/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	${GCCVERSION}
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	devel
 MASTER_SITES=	GCC
diff --git a/devel/mingw32-gcc/files/patch-gcc-doc-gcc.texi b/devel/mingw32-gcc/files/patch-gcc-doc-gcc.texi
new file mode 100644
index 000000000000..626e2cb52dc8
--- /dev/null
+++ b/devel/mingw32-gcc/files/patch-gcc-doc-gcc.texi
@@ -0,0 +1,20 @@
+--- gcc/doc/gcc.texi.orig	2013-03-01 19:01:57 UTC
++++ gcc/doc/gcc.texi
+@@ -85,9 +85,15 @@ Published by:
+ @item GNU Press
+ @tab Website: www.gnupress.org
+ @item a division of the
+-@tab General: @tex press@@gnu.org @end tex
++@tab General:
++@tex
++press@@gnu.org
++@end tex
+ @item Free Software Foundation
+-@tab Orders:  @tex sales@@gnu.org @end tex
++@tab Orders:
++@tex
++sales@@gnu.org
++@end tex
+ @item 51 Franklin Street, Fifth Floor
+ @tab Tel 617-542-5942
+ @item Boston, MA 02110-1301 USA
diff --git a/lang/gcc46/Makefile b/lang/gcc46/Makefile
index a07cd6057d38..b7746bde3f8c 100644
--- a/lang/gcc46/Makefile
+++ b/lang/gcc46/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.6.4
-PORTREVISION=	7
+PORTREVISION=	8
 PORTEPOCH=	1
 CATEGORIES=	lang
 MASTER_SITES=	GCC/releases/gcc-${PORTVERSION}
diff --git a/lang/gcc46/files/patch-gcc-doc-gcc.texi b/lang/gcc46/files/patch-gcc-doc-gcc.texi
new file mode 100644
index 000000000000..1da4af7e8109
--- /dev/null
+++ b/lang/gcc46/files/patch-gcc-doc-gcc.texi
@@ -0,0 +1,20 @@
+--- gcc/doc/gcc.texi.orig	2010-06-09 23:46:33 UTC
++++ gcc/doc/gcc.texi
+@@ -86,9 +86,15 @@ Published by:
+ @item GNU Press
+ @tab Website: www.gnupress.org
+ @item a division of the
+-@tab General: @tex press@@gnu.org @end tex
++@tab General:
++@tex
++press@@gnu.org
++@end tex
+ @item Free Software Foundation
+-@tab Orders:  @tex sales@@gnu.org @end tex
++@tab Orders:
++@tex
++sales@@gnu.org
++@end tex
+ @item 51 Franklin Street, Fifth Floor
+ @tab Tel 617-542-5942
+ @item Boston, MA 02110-1301 USA
diff --git a/lang/gcc47/Makefile b/lang/gcc47/Makefile
index 13128f850ae6..882b8f55bef5 100644
--- a/lang/gcc47/Makefile
+++ b/lang/gcc47/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.7.4
-PORTREVISION=	4
+PORTREVISION=	5
 PORTEPOCH=	1
 CATEGORIES=	lang
 MASTER_SITES=	GCC/releases/gcc-${PORTVERSION}
diff --git a/lang/gcc47/files/patch-gcc-doc-gcc.texi b/lang/gcc47/files/patch-gcc-doc-gcc.texi
new file mode 100644
index 000000000000..1da4af7e8109
--- /dev/null
+++ b/lang/gcc47/files/patch-gcc-doc-gcc.texi
@@ -0,0 +1,20 @@
+--- gcc/doc/gcc.texi.orig	2010-06-09 23:46:33 UTC
++++ gcc/doc/gcc.texi
+@@ -86,9 +86,15 @@ Published by:
+ @item GNU Press
+ @tab Website: www.gnupress.org
+ @item a division of the
+-@tab General: @tex press@@gnu.org @end tex
++@tab General:
++@tex
++press@@gnu.org
++@end tex
+ @item Free Software Foundation
+-@tab Orders:  @tex sales@@gnu.org @end tex
++@tab Orders:
++@tex
++sales@@gnu.org
++@end tex
+ @item 51 Franklin Street, Fifth Floor
+ @tab Tel 617-542-5942
+ @item Boston, MA 02110-1301 USA
diff --git a/lang/gcc48/Makefile b/lang/gcc48/Makefile
index 7ca0a9b3ecca..505c33999229 100644
--- a/lang/gcc48/Makefile
+++ b/lang/gcc48/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.8.5
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	lang
 MASTER_SITES=	GCC/releases/gcc-${PORTVERSION}
 PKGNAMESUFFIX=	${SUFFIX}
diff --git a/lang/gcc48/files/patch-gcc-doc-gcc.texi b/lang/gcc48/files/patch-gcc-doc-gcc.texi
new file mode 100644
index 000000000000..01b8c980a7eb
--- /dev/null
+++ b/lang/gcc48/files/patch-gcc-doc-gcc.texi
@@ -0,0 +1,20 @@
+--- gcc/doc/gcc.texi.orig	2015-06-23 07:35:08 UTC
++++ gcc/doc/gcc.texi
+@@ -85,9 +85,15 @@ Published by:
+ @item GNU Press
+ @tab Website: www.gnupress.org
+ @item a division of the
+-@tab General: @tex press@@gnu.org @end tex
++@tab General:
++@tex
++press@@gnu.org
++@end tex
+ @item Free Software Foundation
+-@tab Orders:  @tex sales@@gnu.org @end tex
++@tab Orders:
++@tex
++sales@@gnu.org
++@end tex
+ @item 51 Franklin Street, Fifth Floor
+ @tab Tel 617-542-5942
+ @item Boston, MA 02110-1301 USA
diff --git a/print/texinfo/Makefile b/print/texinfo/Makefile
index f752649f2e25..8d33c356fb36 100644
--- a/print/texinfo/Makefile
+++ b/print/texinfo/Makefile
@@ -2,14 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	texinfo
-PORTVERSION=	6.1.20160425
-PORTREVISION=	1
+PORTVERSION=	6.3
 PORTEPOCH=	1
 CATEGORIES=	print
-MASTER_SITES=	ftp://ftp.stack.nl/pub/users/johans/texinfo/${PORTVERSION:E}/ \
-		http://ftp.stack.nl/pub/users/johans/texinfo/${PORTVERSION:E}/ \
-		GNU
-DISTNAME=	${PORTNAME}-${PORTVERSION:R}
+MASTER_SITES=	GNU \
+		LOCAL/sunpoet/${DIST_SUBDIR}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} htmlxref.cnf texinfo.tex texi2dvi
 DIST_SUBDIR=	${PORTNAME}/${PORTVERSION}
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
diff --git a/print/texinfo/distinfo b/print/texinfo/distinfo
index dc89192dd81d..5ac0d179506a 100644
--- a/print/texinfo/distinfo
+++ b/print/texinfo/distinfo
@@ -1,8 +1,9 @@
-SHA256 (texinfo/6.1.20160425/texinfo-6.1.tar.xz) = ac68394ce21b2420ba7ed7cec65d84aacf308cc88e9bf4716fcfff88286883d2
-SIZE (texinfo/6.1.20160425/texinfo-6.1.tar.xz) = 4520376
-SHA256 (texinfo/6.1.20160425/htmlxref.cnf) = b94aace151102c0e5cc49be570b79b513fcfbb54aaff55bd640c6d00fa56968c
-SIZE (texinfo/6.1.20160425/htmlxref.cnf) = 20137
-SHA256 (texinfo/6.1.20160425/texinfo.tex) = e829e69d206bfccd1842940e7d3482750b4be975218b2989d15fa355ab544cec
-SIZE (texinfo/6.1.20160425/texinfo.tex) = 379272
-SHA256 (texinfo/6.1.20160425/texi2dvi) = 08dee9983848f02fa259413225abce63ec5d70efc8813daeeb15d14287598269
-SIZE (texinfo/6.1.20160425/texi2dvi) = 61068
+TIMESTAMP = 1491403469
+SHA256 (texinfo/6.3/texinfo-6.3.tar.xz) = 246cf3ffa54985118ec2eea2b8d0c71b92114efe6282c2ae90d65029db4cf93a
+SIZE (texinfo/6.3/texinfo-6.3.tar.xz) = 4468048
+SHA256 (texinfo/6.3/htmlxref.cnf) = d77343dfec47d38a3f029bd42df6ca08e2701f8925be9dffdb07c53a9a0b292d
+SIZE (texinfo/6.3/htmlxref.cnf) = 20137
+SHA256 (texinfo/6.3/texinfo.tex) = 244875530e3c8c1c70d71d69c867b3a23e57813511e576e85e600284c505f973
+SIZE (texinfo/6.3/texinfo.tex) = 380351
+SHA256 (texinfo/6.3/texi2dvi) = ee5da7408c4f0d52b710639f4188ed99ff2f0e0716dde452eab771ba5ec4103b
+SIZE (texinfo/6.3/texi2dvi) = 61181
diff --git a/print/texinfo/pkg-plist b/print/texinfo/pkg-plist
index 4e8f2506ea4b..767619ea5f77 100644
--- a/print/texinfo/pkg-plist
+++ b/print/texinfo/pkg-plist
@@ -20,11 +20,15 @@ man/man5/info.5.gz
 man/man5/texinfo.5.gz
 %%NLS%%share/locale/ca.us-ascii/LC_MESSAGES/texinfo_document.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/texinfo.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/texinfo_document.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/texinfo.mo
 %%NLS%%share/locale/da/LC_MESSAGES/texinfo.mo
 %%NLS%%share/locale/de.us-ascii/LC_MESSAGES/texinfo_document.mo
 %%NLS%%share/locale/de/LC_MESSAGES/texinfo.mo
+%%NLS%%share/locale/de/LC_MESSAGES/texinfo_document.mo
 %%NLS%%share/locale/de_AT/LC_MESSAGES/texinfo.mo
+%%NLS%%share/locale/el/LC_MESSAGES/texinfo.mo
+%%NLS%%share/locale/el/LC_MESSAGES/texinfo_document.mo
 %%NLS%%share/locale/eo/LC_MESSAGES/texinfo.mo
 %%NLS%%share/locale/eo/LC_MESSAGES/texinfo_document.mo
 %%NLS%%share/locale/es/LC_MESSAGES/texinfo.mo
@@ -33,6 +37,7 @@ man/man5/texinfo.5.gz
 %%NLS%%share/locale/fr/LC_MESSAGES/texinfo_document.mo
 %%NLS%%share/locale/he/LC_MESSAGES/texinfo.mo
 %%NLS%%share/locale/hr/LC_MESSAGES/texinfo.mo
+%%NLS%%share/locale/hr/LC_MESSAGES/texinfo_document.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/texinfo.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/texinfo_document.mo
 %%NLS%%share/locale/id/LC_MESSAGES/texinfo.mo
@@ -46,8 +51,10 @@ man/man5/texinfo.5.gz
 %%NLS%%share/locale/pl/LC_MESSAGES/texinfo.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/texinfo_document.mo
 %%NLS%%share/locale/pt.us-ascii/LC_MESSAGES/texinfo_document.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/texinfo_document.mo
 %%NLS%%share/locale/pt_BR.us-ascii/LC_MESSAGES/texinfo_document.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/texinfo.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/texinfo_document.mo
 %%NLS%%share/locale/ro/LC_MESSAGES/texinfo.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/texinfo.mo
 %%NLS%%share/locale/rw/LC_MESSAGES/texinfo.mo
@@ -436,6 +443,7 @@ man/man5/texinfo.5.gz
 %%TEXMFDIR%%/tex/texinfo/txi-hu.tex
 %%TEXMFDIR%%/tex/texinfo/txi-is.tex
 %%TEXMFDIR%%/tex/texinfo/txi-it.tex
+%%TEXMFDIR%%/tex/texinfo/txi-ja.tex
 %%TEXMFDIR%%/tex/texinfo/txi-nb.tex
 %%TEXMFDIR%%/tex/texinfo/txi-nl.tex
 %%TEXMFDIR%%/tex/texinfo/txi-nn.tex