svn commit: r324583 - head/lang/gcc47

[Gerald Pfeifer]

Author: gerald
Date: Sun Aug 11 12:02:10 2013
New Revision: 324583
URL: http://svnweb.freebsd.org/changeset/ports/324583

Log:
  Update to the 20130810 snapshot of GCC 4.7.4.
  
  Rename VERSIONSTRING to the standard DISTVERSION. [1]
  
  Add more notes on the various variables carrying version information.
  
  Suggested by:	crees [1]
  ~

Modified:
  head/lang/gcc47/Makefile
  head/lang/gcc47/distinfo

Modified: head/lang/gcc47/Makefile
==============================================================================
--- head/lang/gcc47/Makefile	Sun Aug 11 11:07:12 2013	(r324582)
+++ head/lang/gcc47/Makefile	Sun Aug 11 12:02:10 2013	(r324583)
@@ -2,11 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	gcc
-PORTVERSION=	4.7.4.20130803
+PORTVERSION=	4.7.4.20130810
 CATEGORIES=	lang java
 MASTER_SITES=	${MASTER_SITE_GCC}
-MASTER_SITE_SUBDIR=	snapshots/${VERSIONSTRING}
-DISTNAME=	gcc-${VERSIONSTRING}
+MASTER_SITE_SUBDIR=	snapshots/${DISTVERSION}
 
 MAINTAINER=	gerald at FreeBSD.org
 COMMENT=	GNU Compiler Collection 4.7
@@ -21,9 +20,11 @@ RUN_DEPENDS+=	${LOCALBASE}/bin/as:${PORT
 BUILD_DEPENDS+=	runtest:${PORTSDIR}/misc/dejagnu
 .endif
 
-# VERSIONSTRING relates to downloads, GCC_VERSION and SUFFIX to names
-# of executables and directories once installed.
-VERSIONSTRING=	${PORTVERSION:C/([0-9]+\.[0-9]+).*\.([0-9]+)/\1-\2/}
+# 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/}
 GCC_VERSION=	${PORTVERSION:C/(.+)\.[0-9]{8}/\1/}
 SUFFIX=		${PORTVERSION:C/([0-9]+).([0-9]+).*/\1\2/}
 LATEST_LINK=	gcc${SUFFIX}${PKGNAMESUFFIX}
@@ -59,7 +60,7 @@ CONFIGURE_ENV+=	UNAME_m="powerpc64"
 .endif
 
 LANGUAGES:=	c,c++,objc,fortran
-SRCDIR=		${WRKDIR}/gcc-${VERSIONSTRING}
+SRCDIR=		${WRKDIR}/gcc-${DISTVERSION}
 WRKSRC=		${WRKDIR}/build
 TARGLIB=	${PREFIX}/lib/gcc${SUFFIX}
 LIBEXEC=	${PREFIX}/libexec/gcc${SUFFIX}

Modified: head/lang/gcc47/distinfo
==============================================================================
--- head/lang/gcc47/distinfo	Sun Aug 11 11:07:12 2013	(r324582)
+++ head/lang/gcc47/distinfo	Sun Aug 11 12:02:10 2013	(r324583)
@@ -1,2 +1,2 @@
-SHA256 (gcc-4.7-20130803.tar.bz2) = 6c09d5d218266469c1bb78e8e4210248e28987840ca2130027307087b087c9ad
-SIZE (gcc-4.7-20130803.tar.bz2) = 78800709
+SHA256 (gcc-4.7-20130810.tar.bz2) = e7e5a88e7ed24a2c10c02439381d523415d379e5e7dd0f6f66e930803d27220b
+SIZE (gcc-4.7-20130810.tar.bz2) = 78797393