From owner-svn-ports-all@FreeBSD.ORG Sun Aug 11 15:02:09 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 8F5531FA; Sun, 11 Aug 2013 15:02:09 +0000 (UTC) (envelope-from gerald@pfeifer.com) Received: from ainaz.pair.com (ainaz.pair.com [209.68.2.66]) by mx1.freebsd.org (Postfix) with ESMTP id 48E1C28B6; Sun, 11 Aug 2013 15:02:09 +0000 (UTC) Received: from [192.168.0.131] (vie-188-118-245-189.dsl.sil.at [188.118.245.189]) by ainaz.pair.com (Postfix) with ESMTPSA id E0D063F410; Sun, 11 Aug 2013 11:02:04 -0400 (EDT) Date: Sun, 11 Aug 2013 17:02:03 +0200 (CEST) From: Gerald Pfeifer To: Tijl Coosemans Subject: Re: svn commit: r317986 - head/lang/gcc46 In-Reply-To: <5190A540.3020404@coosemans.org> Message-ID: References: <201305130023.r4D0N3qa045774@svn.freebsd.org> <5190A540.3020404@coosemans.org> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 Aug 2013 15:02:09 -0000 On Mon, 13 May 2013, Tijl Coosemans wrote: >> (This requires an EPOCH bump due to how snapshots are labeled.) > You can avoid this by putting a letter before the date, > e.g. 4.6.4.s20130215 < 4.6.4 Thanks for the hint, Tijl! In the update below I implemented just that for lang/gcc48. When lang/gcc47 and lang/gcc49 next move to a new minor release, I will make the same change there. Gerald Author: gerald Date: Sun Aug 11 14:58:18 2013 New Revision: 324592 URL: http://svnweb.freebsd.org/changeset/ports/324592 Log: Upgrade to the 20130808 snapshot of GCC 4.8.2. Adjust the scheme used for PORTVERSION such that snapshots compare less than the actual release (and no EPOCH bump becomes necessary at end of life of a release series). [1] Rename VERSIONSTRING to the standard DISTVERSION. [2] Add more notes on the various variables carrying version information. Suggested by: tijl [1], crees [2] Modified: head/lang/gcc48/Makefile head/lang/gcc48/distinfo Modified: head/lang/gcc48/Makefile ============================================================================== --- head/lang/gcc48/Makefile Sun Aug 11 14:45:59 2013 (r324591) +++ head/lang/gcc48/Makefile Sun Aug 11 14:58:18 2013 (r324592) @@ -2,11 +2,10 @@ # $FreeBSD$ PORTNAME= gcc -PORTVERSION= 4.8.1.20130418 +PORTVERSION= 4.8.2.s20130808 CATEGORIES= lang java MASTER_SITES= ${MASTER_SITE_GCC} -MASTER_SITE_SUBDIR= snapshots/${VERSIONSTRING} -DISTNAME= gcc-${VERSIONSTRING} +MASTER_SITE_SUBDIR= snapshots/${DISTVERSION} MAINTAINER= gerald@FreeBSD.org COMMENT= GNU Compiler Collection 4.8 @@ -21,10 +20,12 @@ 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/} -GCC_VERSION= ${PORTVERSION:C/(.+)\.[0-9]{8}/\1/} +# 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]+).*\.s([0-9]+)/\1-\2/} +GCC_VERSION= ${PORTVERSION:C/(.+)\.s[0-9]{8}/\1/} SUFFIX= ${PORTVERSION:C/([0-9]+).([0-9]+).*/\1\2/} LATEST_LINK= gcc${SUFFIX}${PKGNAMESUFFIX} ONLY_FOR_ARCHS= amd64 i386 powerpc powerpc64 sparc64 @@ -56,7 +57,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/gcc48/distinfo ============================================================================== --- head/lang/gcc48/distinfo Sun Aug 11 14:45:59 2013 (r324591) +++ head/lang/gcc48/distinfo Sun Aug 11 14:58:18 2013 (r324592) @@ -1,2 +1,2 @@ -SHA256 (gcc-4.8-20130418.tar.bz2) = f1148307d1ef0ab731dda8b6e5e90fd778f37bf62f46ad455e0a1cb8d948dc05 -SIZE (gcc-4.8-20130418.tar.bz2) = 82573341 +SHA256 (gcc-4.8-20130808.tar.bz2) = 97940f3d3ba9ed5e173d30ee0f36cbbd072a9b39f4294e8ed3511b8ee05b1ca8 +SIZE (gcc-4.8-20130808.tar.bz2) = 81696111