svn commit: r317986 - head/lang/gcc46

[Gerald Pfeifer]

On Mon, 13 May 2013, Chris Rees wrote:
>> You can avoid this by putting a letter before the date,
>> e.g. 4.6.4.s20130215 < 4.6.4
> And if you do that, please use DISTVERSION :)

Like this?

Thanks for the hint.  Originally this wasn't as immediate, but
with some changes in the download structure upstream a year or 
two ago this is now totally natural.

I'll be updating other lang/gcc4* ports as well.

Gerald


Author: gerald
Date: Sun Aug 11 10:21:41 2013
New Revision: 324580
URL: http://svnweb.freebsd.org/changeset/ports/324580

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

Modified:
  head/lang/gcc49/Makefile
  head/lang/gcc49/distinfo

Modified: head/lang/gcc49/Makefile
==============================================================================
--- head/lang/gcc49/Makefile	Sun Aug 11 10:05:35 2013	(r324579)
+++ head/lang/gcc49/Makefile	Sun Aug 11 10:21:41 2013	(r324580)
@@ -2,11 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	gcc
-PORTVERSION=	4.9.0.20130728
+PORTVERSION=	4.9.0.20130804
 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.9
@@ -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/gcc49/distinfo
==============================================================================
--- head/lang/gcc49/distinfo	Sun Aug 11 10:05:35 2013	(r324579)
+++ head/lang/gcc49/distinfo	Sun Aug 11 10:21:41 2013	(r324580)
@@ -1,2 +1,2 @@
-SHA256 (gcc-4.9-20130728.tar.bz2) = f8630957ef498ec79594f5a0e35b6afed62ffa38331055388d0fc91d60773d19
-SIZE (gcc-4.9-20130728.tar.bz2) = 82415272
+SHA256 (gcc-4.9-20130804.tar.bz2) = dada5d1994541b7685d1808210554d52ecf70003082458e3700b31b0d68171b3
+SIZE (gcc-4.9-20130804.tar.bz2) = 82407792