Update gcc5 to 5.4.0 and gcc5-libs to 5.4.0nb1

Changelog:
* Many bugs are fixed

5 files changed, 11 insertions, 28 deletions

diff --git a/lang/gcc5-libs/Makefile b/lang/gcc5-libs/Makefile
index ca78043ce13..84f920c8f91 100644
--- a/lang/gcc5-libs/Makefile
+++ b/lang/gcc5-libs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2016/02/06 22:19:55 ryoon Exp $
+# $NetBSD: Makefile,v 1.6 2016/07/05 18:55:08 ryoon Exp $
 
 GCC_PKGNAME=	gcc5
 .include	"../../lang/${GCC_PKGNAME}/version.mk"
@@ -9,7 +9,7 @@ PKGNAME=	${GCC_PKGNAME}-libs-${GCC5_DIST_VERSION}
 ## The PKGREVISION of this package needs to be at least 1 more than the
 ## PKGREVISION of the lang/gcc5 package so that with the dependence pattern
 ## '{gcc5,gcc5-libs}>=5.1.*' pkg_add will choose gcc5-libs over gcc5.
-PKGREVISION=	2
+PKGREVISION=	1
 
 CATEGORIES=	lang
 MASTER_SITES=	# empty
diff --git a/lang/gcc5/Makefile b/lang/gcc5/Makefile
index 6bf09b57ad8..d38fdcab402 100644
--- a/lang/gcc5/Makefile
+++ b/lang/gcc5/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2016/02/25 14:42:56 jperkin Exp $
+# $NetBSD: Makefile,v 1.10 2016/07/05 18:55:08 ryoon Exp $
 
 GCC_PKGNAME=		gcc5
 .include		"version.mk"
-PKGREVISION=	1
 
 DISTNAME=	gcc-${GCC5_DIST_VERSION}
 PKGNAME=	${GCC_PKGNAME}-${GCC5_DIST_VERSION}
@@ -90,7 +89,7 @@ CONFIGURE_ARGS+=	--enable-languages=${LANGS:Q}
 CONFIGURE_ARGS+=	--enable-shared
 CONFIGURE_ARGS+=	--enable-long-long
 CONFIGURE_ARGS+=	--with-local-prefix=${GCC_PREFIX:Q}
-.if !empty(MACHINE_PLATFORM:MNetBSD-*-*) && ${PKGSRC_USE_SSP:Uno} != "no"
+.if !empty(MACHINE_PLATFORM:MNetBSD-*-*) && ${PKGSRC_USE_SSP:Uno} == "no"
 # on NetBSD with stack protector, use the native SSP code in libc
 CONFIGURE_ARGS+=	--disable-libssp
 .else
diff --git a/lang/gcc5/distinfo b/lang/gcc5/distinfo
index 898540ac3af..8558147a6f0 100644
--- a/lang/gcc5/distinfo
+++ b/lang/gcc5/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.9 2015/12/11 12:31:03 ryoon Exp $
+$NetBSD: distinfo,v 1.10 2016/07/05 18:55:08 ryoon Exp $
 
-SHA1 (gcc-5.3.0.tar.bz2) = 0612270b103941da08376df4d0ef4e5662a2e9eb
-RMD160 (gcc-5.3.0.tar.bz2) = b06fec59ceb37aeb042bdb9e1703e53d0834d085
-SHA512 (gcc-5.3.0.tar.bz2) = d619847383405fd389f5a2d7225f97fedb01f81478dbb8339047ccba7561a5c20045ab500a8744bffd19ea51892ce09fc37f862f2cfcb42de0f0f8cd8f8da37a
-Size (gcc-5.3.0.tar.bz2) = 95441837 bytes
+SHA1 (gcc-5.4.0.tar.bz2) = 07524df2b4ab9070bad9c49ab668da72237b8115
+RMD160 (gcc-5.4.0.tar.bz2) = 7ae3413ca7e90bb21e65e637c02ddf2b675b45f4
+SHA512 (gcc-5.4.0.tar.bz2) = 2941cc950c8f2409a314df497631f9b0266211aa74746c1839c46e04f1c7c299afe2528d1ef16ea39def408a644ba48f97519ec7a7dd37d260c3e9423514265b
+Size (gcc-5.4.0.tar.bz2) = 95661481 bytes
 SHA1 (isl-0.14.tar.bz2) = b09e25df265c97ed54002cd811d227a9a26c5f9c
 RMD160 (isl-0.14.tar.bz2) = 4c69d026b51561bc1948cb7db79331b78a9d2c39
 SHA512 (isl-0.14.tar.bz2) = 117c0c6f31d91a9284a8f54a748df6494ca2ac21507a45611e911403e9610579b9323ce624aea1de0b8089b3194e59d4364f01bdb71ddcf8f6c24c749d11c4b7
@@ -31,7 +31,6 @@ SHA1 (patch-libgcc_crtstuff.c) = d22dd1fb4a79aed2e7c2864f0bb00bcc338b3ab8
 SHA1 (patch-libgcc_unwind-dw2-fde-dip.c) = 9c5e1823226521d11900b4d3b92c050d3941a1f6
 SHA1 (patch-libgfortran_configure) = f80dd6f3bb8093d071a71001c62c7b6d563e4055
 SHA1 (patch-libgo_Makefile.in) = 612987541f745c7be6835ce7fb7119884db294c3
-SHA1 (patch-libgo_mksysinfo.sh) = 5cf81d8403df9cc63adea22c2dbc24fac90767cd
 SHA1 (patch-libjava_boehm.cc) = bf5564261b02523927685340f59ce8faf7f84ace
 SHA1 (patch-libjava_configure) = 48ea2baffe87e09dda8133d286bd9b1bfe4c3f8a
 SHA1 (patch-libjava_contrib_rebuild-gcj-db.in) = bb01d738fc7db05046ae37e8ade32574de1d8297
diff --git a/lang/gcc5/patches/patch-libgo_mksysinfo.sh b/lang/gcc5/patches/patch-libgo_mksysinfo.sh
deleted file mode 100644
index a38e96b0f1f..00000000000
--- a/lang/gcc5/patches/patch-libgo_mksysinfo.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-libgo_mksysinfo.sh,v 1.2 2015/09/28 16:39:13 ryoon Exp $
-
-https://gcc.gnu.org/bugzilla/show_bug.cgi?id=67695
-
---- libgo/mksysinfo.sh.orig	2014-11-12 07:15:40.000000000 +0000
-+++ libgo/mksysinfo.sh
-@@ -470,7 +470,7 @@ upcase_fields () {
- # GNU/Linux specific; it should do no harm if there is no
- # _user_regs_struct.
- regs=`grep '^type _user_regs_struct struct' gen-sysinfo.go || true`
--if test "$regs" == ""; then
-+if test "$regs" = ""; then
-   # s390
-   regs=`grep '^type __user_regs_struct struct' gen-sysinfo.go || true`
-   if test "$regs" != ""; then
diff --git a/lang/gcc5/version.mk b/lang/gcc5/version.mk
index 47073c400c4..4b9041434b3 100644
--- a/lang/gcc5/version.mk
+++ b/lang/gcc5/version.mk
@@ -1,2 +1,2 @@
-# $NetBSD: version.mk,v 1.3 2015/12/11 12:31:03 ryoon Exp $
-GCC5_DIST_VERSION:=5.3.0
+# $NetBSD: version.mk,v 1.4 2016/07/05 18:55:08 ryoon Exp $
+GCC5_DIST_VERSION:=5.4.0