From 97f0c54991098d68272fc036a9e5b252a283b600 Mon Sep 17 00:00:00 2001
From: ryoon <ryoon@pkgsrc.org>
Date: Sun, 7 Dec 2014 10:45:32 +0000
Subject: Bump PKGREVISION.

* Switch to GCC 4.9.2 based.
* binutils of NetBSD 7.99 is modern enough, and use binutils in base.
  Fix build under NetBSD/amd64 7.99.1 with this workaround.
---
 lang/gcc-aux/Makefile         | 10 +++++++---
 lang/gcc-aux/Makefile.version |  4 ++--
 lang/gcc-aux/distinfo         |  8 ++++----
 3 files changed, 13 insertions(+), 9 deletions(-)

(limited to 'lang/gcc-aux')

diff --git a/lang/gcc-aux/Makefile b/lang/gcc-aux/Makefile
index 16600aa791f..080f0f6edac 100644
--- a/lang/gcc-aux/Makefile
+++ b/lang/gcc-aux/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.21 2014/05/29 23:36:42 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2014/12/07 10:45:32 ryoon Exp $
 #
 
 PKGNAME=	gcc-aux-${SNAPSHOT}
 DISTNAME=	gcc-${GCC_VERSION}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GNU:=gcc/gcc-${GCC_VERSION}/}
 DISTFILES=	${DISTNAME}.tar.bz2
@@ -57,6 +57,8 @@ BOOTSTRAP_COMPILER=	ada-bootstrap.${GARCH}.freebsd.100B.tar.bz2
 .if ${OPSYS} == NetBSD
 .if !empty(OS_VERSION:M6.99.*)
    NSUFF=	7.0_DEV
+.elif !empty(OS_VERSION:M7.99.*)
+   NSUFF=	8.0_DEV
 .else
    NSUFF=	${OS_VERSION}
 .endif
@@ -64,7 +66,9 @@ BOOTSTRAP_COMPILER=	ada-bootstrap.${GARCH}.freebsd.100B.tar.bz2
    NELF=	elf
 .endif
 XLDF=			-lm
+.if empty(OS_VERSION:M7.99.*)
 MODERN_BINUTILS=	yes
+.endif
 BOOTSTRAP_COMPILER=	ada-bootstrap.${GARCH}.netbsd.614.tar.bz2
 BLD_TARGET=		${MACHINE_ARCH}-aux-netbsd${NELF}${NSUFF}
 .endif
@@ -79,7 +83,7 @@ EXTRA_CONFARGS+=	--enable-multilib
 COMPILER_ABI_SWITCH=	-m32
 .  endif
 MY_CONFIGURE_ENV+=	OBJDUMP=${PREFIX}/bin/gobjdump
-MODERN_BINUTILS=x	yes
+MODERN_BINUTILS=	yes
 NATIVE_LINKER!=		which ld
 .endif
 
diff --git a/lang/gcc-aux/Makefile.version b/lang/gcc-aux/Makefile.version
index 883d6a911a5..da0959bfb83 100644
--- a/lang/gcc-aux/Makefile.version
+++ b/lang/gcc-aux/Makefile.version
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.version,v 1.1 2014/04/30 16:24:39 marino Exp $
+# $NetBSD: Makefile.version,v 1.2 2014/12/07 10:45:32 ryoon Exp $
 #
 
 SNAPSHOT=	20140422
 GCC_BRANCH=	4.9
-GCC_POINT=	0
+GCC_POINT=	2
 GCC_VERSION=	${GCC_BRANCH}.${GCC_POINT}
diff --git a/lang/gcc-aux/distinfo b/lang/gcc-aux/distinfo
index 46836f8309c..27dfbbcb297 100644
--- a/lang/gcc-aux/distinfo
+++ b/lang/gcc-aux/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2014/05/09 09:50:47 marino Exp $
+$NetBSD: distinfo,v 1.9 2014/12/07 10:45:32 ryoon Exp $
 
 SHA1 (ada-bootstrap.i386.dragonfly.36A.tar.bz2) = 7e0725889ae752e6a9fdbac5b1d2ef0e3f62822e
 RMD160 (ada-bootstrap.i386.dragonfly.36A.tar.bz2) = f62c00515588804ce69368507822f30380d7e48d
@@ -30,6 +30,6 @@ Size (ada-bootstrap.x86_64.openbsd.55.tar.bz2) = 38753186 bytes
 SHA1 (ada-bootstrap.x86_64.solaris.511.tar.bz2) = abb16c1582e2a6ffe37df4afd96d04c44f2eea7b
 RMD160 (ada-bootstrap.x86_64.solaris.511.tar.bz2) = 41677e2fd0cb02c89f200fb97b112ad3be7f19cd
 Size (ada-bootstrap.x86_64.solaris.511.tar.bz2) = 60110383 bytes
-SHA1 (gcc-4.9.0.tar.bz2) = fbde8eb49f2b9e6961a870887cf7337d31cd4917
-RMD160 (gcc-4.9.0.tar.bz2) = ac561660744127fa009ae75202d1ac81ac8d7668
-Size (gcc-4.9.0.tar.bz2) = 89677407 bytes
+SHA1 (gcc-4.9.2.tar.bz2) = 79dbcb09f44232822460d80b033c962c0237c6d8
+RMD160 (gcc-4.9.2.tar.bz2) = bc6454e7c67c6f5fd2c98cdd1364ebb1739e1347
+Size (gcc-4.9.2.tar.bz2) = 89939747 bytes
-- 
cgit v1.2.3