From 99bd68b255638fe641f9ec35135154cc01545b3c Mon Sep 17 00:00:00 2001
From: Gerald Pfeifer <gerald@FreeBSD.org>
Date: Tue, 24 Jun 2014 14:48:52 +0000
Subject: Update to the GCC 4.7.4 release which closes the GCC 4.7 release
 branch.

Due to the way we have been handling PORTREVISION before lang/gcc48 this
requires PORTEPOCH.

Also, since this is now final and stable, no longer bootstrap this port.
---
 lang/gcc47/Makefile | 17 ++++++++---------
 lang/gcc47/distinfo |  4 ++--
 2 files changed, 10 insertions(+), 11 deletions(-)

(limited to 'lang')

diff --git a/lang/gcc47/Makefile b/lang/gcc47/Makefile
index 15a653ef26e6..5ceaef2d91fd 100644
--- a/lang/gcc47/Makefile
+++ b/lang/gcc47/Makefile
@@ -2,10 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	gcc47
-PORTVERSION=	4.7.4.20140419
+PORTVERSION=	4.7.4
+PORTEPOCH=	1
 CATEGORIES=	lang java
 MASTER_SITES=	${MASTER_SITE_GCC}
-MASTER_SITE_SUBDIR=	snapshots/${DISTVERSION}
+MASTER_SITE_SUBDIR=	releases/gcc-${DISTVERSION}
 DISTNAME=	gcc-${DISTVERSION}
 
 MAINTAINER=	gerald@FreeBSD.org
@@ -27,10 +28,8 @@ BUILD_DEPENDS+=	runtest:${PORTSDIR}/misc/dejagnu
 CONFLICTS=	gcc-4.7.*
 
 # DISTVERSION relates to downloads, GCC_VERSION and SUFFIX to names
-# of executables and directories once installed.  A PORTVERSION of
-# 4.Y.2.s20130808 results in values of 4.Y-20130808, 4.Y.2, and 4Y
-# for these three.
-DISTVERSION=	${PORTVERSION:C/([0-9]+\.[0-9]+).*\.([0-9]+)/\1-\2/}
+# of executables and directories once installed.
+DISTVERSION=	${PORTVERSION}
 GCC_VERSION=	${PORTVERSION:C/(.+)\.[0-9]{8}/\1/}
 SUFFIX=		${PORTVERSION:C/([0-9]+).([0-9]+).*/\1\2/}
 ONLY_FOR_ARCHS=	amd64 i386 powerpc powerpc64 sparc64
@@ -45,7 +44,6 @@ CONFIGURE_SCRIPT=	../${SRCDIR:S/${WRKDIR}\///}/configure
 OPTIONS_DEFINE=		BOOTSTRAP
 OPTIONS_DEFINE_i386=	JAVA
 OPTIONS_DEFINE_amd64=	JAVA
-OPTIONS_DEFAULT=	BOOTSTRAP
 OPTIONS_DEFAULT_i386=	JAVA
 OPTIONS_DEFAULT_amd64=	JAVA
 BOOTSTRAP_DESC=		Build using a full bootstrap
@@ -97,10 +95,11 @@ INFO=		gcc${SUFFIX}/cpp \
 		gcc${SUFFIX}/gccint \
 		gcc${SUFFIX}/gfortran \
 		gcc${SUFFIX}/libgomp
-.if ${ARCH} == "i386" || ${ARCH} == "amd64"
+# Release tarballs (as opposed to snapshots) always carry this.
+#.if ${ARCH} == "i386" || ${ARCH} == "amd64"
 INFO+=		gcc${SUFFIX}/libquadmath \
 		gcc${SUFFIX}/libitm
-.endif
+#.endif
 SUB_FILES=	pkg-message
 SUB_LIST+=	TARGLIB=${TARGLIB}
 
diff --git a/lang/gcc47/distinfo b/lang/gcc47/distinfo
index 6a4aaaf21915..1bcb0223baf5 100644
--- a/lang/gcc47/distinfo
+++ b/lang/gcc47/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gcc-4.7-20140419.tar.bz2) = a3678fc0d5d61fed33e84a9bcb5be700115009bb5e5dff8ce76ef9d501c8be72
-SIZE (gcc-4.7-20140419.tar.bz2) = 78907262
+SHA256 (gcc-4.7.4.tar.bz2) = 92e61c6dc3a0a449e62d72a38185fda550168a86702dea07125ebd3ec3996282
+SIZE (gcc-4.7.4.tar.bz2) = 82935453
-- 
cgit v1.2.3