From b1969ebeed8b62a0ef6ed73dad1ba3bff6235ea2 Mon Sep 17 00:00:00 2001
From: gerald <gerald@FreeBSD.org>
Date: Fri, 31 May 2013 22:52:02 +0000
Subject: Update to the 20130526 snapshot of GCC 4.9.0.  (This requires a small
 adjustment to our Java hierarchy patch, no functional change though.)

---
 lang/gcc49/Makefile              |  2 +-
 lang/gcc49/distinfo              |  4 ++--
 lang/gcc49/files/java-patch-hier | 18 ++++++++----------
 3 files changed, 11 insertions(+), 13 deletions(-)

(limited to 'lang')

diff --git a/lang/gcc49/Makefile b/lang/gcc49/Makefile
index 7eb71576541b..0edf9a0dfd7f 100644
--- a/lang/gcc49/Makefile
+++ b/lang/gcc49/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gcc
-PORTVERSION=	4.9.0.20130505
+PORTVERSION=	4.9.0.20130526
 CATEGORIES=	lang java
 MASTER_SITES=	${MASTER_SITE_GCC}
 MASTER_SITE_SUBDIR=	snapshots/${VERSIONSTRING}
diff --git a/lang/gcc49/distinfo b/lang/gcc49/distinfo
index 9aa6afb5daf1..ee294b815169 100644
--- a/lang/gcc49/distinfo
+++ b/lang/gcc49/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gcc-4.9-20130505.tar.bz2) = 7a2a06a441ebd1f13a0f4226dca46bd445d63c80293a11ad224afb2f13c17314
-SIZE (gcc-4.9-20130505.tar.bz2) = 82930396
+SHA256 (gcc-4.9-20130526.tar.bz2) = 09c477a35d009de22c8dde0ec37e967562a69d9a4f8a2e3e4744a353f35a6b55
+SIZE (gcc-4.9-20130526.tar.bz2) = 82889867
diff --git a/lang/gcc49/files/java-patch-hier b/lang/gcc49/files/java-patch-hier
index edb122b087b8..8dd7f4637f70 100644
--- a/lang/gcc49/files/java-patch-hier
+++ b/lang/gcc49/files/java-patch-hier
@@ -1,13 +1,11 @@
-Index: libjava/Makefile.in
-===================================================================
---- libjava/Makefile.in	(revision 117734)
-+++ libjava/Makefile.in	(working copy)
-@@ -712,7 +712,7 @@
- 	$(am__append_2) $(am__append_3)
- toolexecmainlib_DATA = libgcj.spec
+--- libjava/Makefile.in	2013-05-26 22:33:07.000000000 +0000
++++ libjava/Makefile.in	2013-05-31 21:19:23.000000000 +0000
+@@ -941,7 +941,7 @@
+ @BUILD_SUBLIBS_FALSE@LIBJAVA_CORE_EXTRA = 
+ @BUILD_SUBLIBS_TRUE@LIBJAVA_CORE_EXTRA = @LIBGCJ_SUBLIB_CORE_EXTRA_DEPS@
  dbexec_LTLIBRARIES = libjvm.la
--pkgconfigdir = $(libdir)/pkgconfig
+-pkgconfigdir = $(toolexeclibdir)/pkgconfig
 +pkgconfigdir = $(prefix)/libdata/pkgconfig
  jardir = $(datadir)/java
- jar_DATA = libgcj-$(gcc_version).jar libgcj-tools-$(gcc_version).jar
- @JAVA_HOME_SET_FALSE@JAVA_HOME_DIR = $(prefix)
+ jar_DATA = libgcj-$(gcc_version).jar libgcj-tools-$(gcc_version).jar \
+ 	$(am__append_5)
-- 
cgit