Index: Mk/bsd.default-versions.mk =================================================================== --- Mk/bsd.default-versions.mk (revision 400118) +++ Mk/bsd.default-versions.mk (working copy) @@ -20,7 +20,7 @@ APACHE_DEFAULT?= 2.4 FPC_DEFAULT?= 2.6.4 -GCC_DEFAULT?= 4.8 +GCC_DEFAULT?= 4.9 LUA_DEFAULT?= 5.2 MYSQL_DEFAULT?= 5.6 .if !exists(${LOCALBASE}/bin/perl) || (!defined(_PORTS_ENV_CHECK) && \ @@ -48,6 +48,6 @@ GHOSTSCRIPT_DEFAULT?= 9 # Version of lang/gcc. Do not override! -LANG_GCC_IS= 4.8 +LANG_GCC_IS= 4.9 .endif Index: lang/gcc/Makefile =================================================================== --- lang/gcc/Makefile (revision 400118) +++ lang/gcc/Makefile (working copy) @@ -2,12 +2,12 @@ # $FreeBSD$ PORTNAME= gcc -PORTVERSION= 4.8.5 +PORTVERSION= 4.9.3 CATEGORIES= lang java MASTER_SITES= GCC/releases/gcc-${DISTVERSION} MAINTAINER= gerald@FreeBSD.org -COMMENT= GNU Compiler Collection 4.8 +COMMENT= GNU Compiler Collection 4.9 LICENSE= GPLv3 GPLv3RLE LICENSE_COMB= multi @@ -22,7 +22,7 @@ BUILD_DEPENDS+= runtest:${PORTSDIR}/misc/dejagnu .endif -CONFLICTS= gcc48* +CONFLICTS= gcc49* CPE_VENDOR= gnu # DISTVERSION relates to downloads, GCC_VERSION and SUFFIX to names Index: lang/gcc/distinfo =================================================================== --- lang/gcc/distinfo (revision 400118) +++ lang/gcc/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (gcc-4.8.5.tar.bz2) = 22fb1e7e0f68a63cee631d85b20461d1ea6bda162f03096350e38c8d427ecf23 -SIZE (gcc-4.8.5.tar.bz2) = 86165587 +SHA256 (gcc-4.9.3.tar.bz2) = 2332b2a5a321b57508b9031354a8503af6fdfb868b8c1748d33028d100a8b67e +SIZE (gcc-4.9.3.tar.bz2) = 90006707 Index: lang/gcc/files/java-patch-hier =================================================================== --- lang/gcc/files/java-patch-hier (revision 400118) +++ lang/gcc/files/java-patch-hier (working copy) @@ -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) Index: lang/gcc/files/patch-arm-libcpp =================================================================== --- lang/gcc/files/patch-arm-libcpp (revision 400118) +++ lang/gcc/files/patch-arm-libcpp (nonexistent) @@ -1,24 +0,0 @@ -Index: libcpp/configure -=================================================================== ---- libcpp/configure (revision 218760) -+++ libcpp/configure (working copy) -@@ -7153,6 +7153,7 @@ - aarch64*-*-* | \ - alpha*-*-* | \ - arm*-*-*eabi* | \ -+ arm*-*-freebsd* | \ - arm*-*-rtems* | \ - arm*-*-symbianelf* | \ - x86_64-*-* | \ -Index: libcpp/configure.ac -=================================================================== ---- libcpp/configure.ac (revision 218760) -+++ libcpp/configure.ac (working copy) -@@ -185,6 +185,7 @@ - aarch64*-*-* | \ - alpha*-*-* | \ - arm*-*-*eabi* | \ -+ arm*-*-freebsd* | \ - arm*-*-rtems* | \ - arm*-*-symbianelf* | \ - x86_64-*-* | \ Property changes on: lang/gcc/files/patch-arm-libcpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: lang/gcc/files/patch-pr63740-arm =================================================================== --- lang/gcc/files/patch-pr63740-arm (nonexistent) +++ lang/gcc/files/patch-pr63740-arm (working copy) @@ -0,0 +1,14 @@ +--- gcc/lra-lives.c 2014/06/16 09:25:26 211700 ++++ gcc/lra-lives.c 2014/06/16 09:58:34 211701 +@@ -558,7 +558,11 @@ + /* It might be 'inheritance pseudo <- reload pseudo'. */ + || (src_regno >= lra_constraint_new_regno_start + && ((int) REGNO (SET_DEST (set)) +- >= lra_constraint_new_regno_start)))) ++ >= lra_constraint_new_regno_start) ++ /* Remember to skip special cases where src/dest regnos are ++ the same, e.g. insn SET pattern has matching constraints ++ like =r,0. */ ++ && src_regno != (int) REGNO (SET_DEST (set))))) + { + int hard_regno = -1, regno = -1; Property changes on: lang/gcc/files/patch-pr63740-arm ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: lang/gcc/pkg-descr =================================================================== --- lang/gcc/pkg-descr (revision 400118) +++ lang/gcc/pkg-descr (working copy) @@ -1,11 +1,11 @@ GCC, the GNU Compiler Collection, supports a number of languages. This -port installs the C, C++, Fortran and Java front ends as gcc48, g++48, -gfortran48, and gcj48, respectively. +port installs the C, C++, Fortran and Java front ends as gcc49, g++49, +gfortran49, and gcj49, respectively. -It can be used interchangibly with the lang/gcc48 port which tracks +It can be used interchangibly with the lang/gcc49 port which tracks weekly upstream snapshots whereas this port will be updated less frequently, mostly in sync with upstream releases, and will move to -lang/gcc49 and later over time. +lang/gcc5 and later over time. WWW: http://gcc.gnu.org/ Index: lang/gcc/pkg-plist =================================================================== --- lang/gcc/pkg-plist (revision 400118) +++ lang/gcc/pkg-plist (working copy) @@ -47,7 +47,7 @@ %%JAVA%%bin/gtnameserv%%SUFFIX%% %%JAVA%%bin/jcf-dump%%SUFFIX%% %%JAVA%%bin/jv-convert%%SUFFIX%% -%%JAVA%%libdata/pkgconfig/libgcj-4.8.pc +%%JAVA%%libdata/pkgconfig/libgcj-4.9.pc %%JAVA%%man/man1/aot-compile%%SUFFIX%%.1.gz %%JAVA%%man/man1/gappletviewer%%SUFFIX%%.1.gz %%JAVA%%man/man1/gc-analyze%%SUFFIX%%.1.gz