From owner-svn-ports-all@FreeBSD.ORG Sun Mar 22 23:29:53 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 81C9554D; Sun, 22 Mar 2015 23:29:53 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 52057788; Sun, 22 Mar 2015 23:29:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2MNTrqh083686; Sun, 22 Mar 2015 23:29:53 GMT (envelope-from gerald@FreeBSD.org) Received: (from gerald@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2MNTqiL083684; Sun, 22 Mar 2015 23:29:52 GMT (envelope-from gerald@FreeBSD.org) Message-Id: <201503222329.t2MNTqiL083684@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gerald set sender to gerald@FreeBSD.org using -f From: Gerald Pfeifer Date: Sun, 22 Mar 2015 23:29:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r381969 - head/lang/gcc48 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 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, 22 Mar 2015 23:29:53 -0000 Author: gerald Date: Sun Mar 22 23:29:51 2015 New Revision: 381969 URL: https://svnweb.freebsd.org/changeset/ports/381969 QAT: https://qat.redports.org/buildarchive/r381969/ Log: Add CONFLICTS with lang/gcc which is also GCC 4.8-based right now. Add CPE information. [1] Use PKGNAMESUFFIX so that PORTNAME falls back to plain gcc and we can avoid setting DISTNAME and CPE_PRODUCT. [2] PR: 198260 [1] Submitted by: shun.fbsd.pr@dropcut.net [1] Suggested by: mat [2] Modified: head/lang/gcc48/Makefile head/lang/gcc48/distinfo Modified: head/lang/gcc48/Makefile ============================================================================== --- head/lang/gcc48/Makefile Sun Mar 22 23:11:13 2015 (r381968) +++ head/lang/gcc48/Makefile Sun Mar 22 23:29:51 2015 (r381969) @@ -1,12 +1,12 @@ # Created by: Gerald Pfeifer # $FreeBSD$ -PORTNAME= gcc48 -PORTVERSION= 4.8.5.s20150212 +PORTNAME= gcc +PORTVERSION= 4.8.5.s20150319 CATEGORIES= lang java MASTER_SITES= ${MASTER_SITE_GCC} MASTER_SITE_SUBDIR= snapshots/${DISTVERSION} -DISTNAME= gcc-${DISTVERSION} +PKGNAMESUFFIX= ${SUFFIX} MAINTAINER= gerald@FreeBSD.org COMMENT= GNU Compiler Collection 4.8 @@ -24,6 +24,10 @@ RUN_DEPENDS+= ${LOCALBASE}/bin/as:${PORT BUILD_DEPENDS+= runtest:${PORTSDIR}/misc/dejagnu .endif +CONFLICTS= gcc-4.8.* +CPE_VENDOR= gnu +CPE_VERSION= ${GCC_VERSION} + # 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 @@ -32,7 +36,7 @@ DISTVERSION= ${PORTVERSION:C/([0-9]+\.[0 GCC_VERSION= ${PORTVERSION:C/(.+)\.s[0-9]{8}/\1/} SUFFIX= ${PORTVERSION:C/([0-9]+).([0-9]+).*/\1\2/} ONLY_FOR_ARCHS= amd64 i386 powerpc powerpc64 sparc64 -USES= gmake iconv libtool makeinfo perl5 tar:bzip2 +USES= cpe gmake iconv libtool makeinfo perl5 tar:bzip2 USE_BINUTILS= yes USE_PERL5= build SSP_UNSAFE= yes Modified: head/lang/gcc48/distinfo ============================================================================== --- head/lang/gcc48/distinfo Sun Mar 22 23:11:13 2015 (r381968) +++ head/lang/gcc48/distinfo Sun Mar 22 23:29:51 2015 (r381969) @@ -1,2 +1,2 @@ -SHA256 (gcc-4.8-20150212.tar.bz2) = 889a01edf24ac14a2652e3c0615391414d0166af07aa34e4e5245a9b398cfda8 -SIZE (gcc-4.8-20150212.tar.bz2) = 82107833 +SHA256 (gcc-4.8-20150319.tar.bz2) = e069e5927d5db573294aa76fecb0d36e20cf7b6db5d866c2215806ce0c8836fc +SIZE (gcc-4.8-20150319.tar.bz2) = 82111008