From owner-svn-ports-head@FreeBSD.ORG Mon Mar 23 16:41:18 2015 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E40E7DCD for ; Mon, 23 Mar 2015 16:41:17 +0000 (UTC) Received: from mail-ob0-f177.google.com (mail-ob0-f177.google.com [209.85.214.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id AA24183E for ; Mon, 23 Mar 2015 16:41:17 +0000 (UTC) Received: by obbgg8 with SMTP id gg8so127338298obb.1 for ; Mon, 23 Mar 2015 09:41:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc:content-type; bh=8xzHBm5JZMsaZ8/Gwsxdimu3PYBL1rRUR+aeT+GkjUY=; b=RTBqEQ36QAcdbhT0DQBexJ5cBWNNcGTj7wBjeDPon6cpZQmZdrTuiGK6l9Ue7t2JpW acdUKxtj/M396HUG5PBCyuKUdrMKRUzrXpfg3DtxztCOuvyc3+x3z6heYQxuWP5CkzHT ESddYsv2UO7x0pQvYS0LRCKDR5rIr6UM6V31YNPpnebq2iIHqF86AoR0ayXCIrJxGBKb id97mtmS5N0RKqK3btzQEohxUHy5ixO+eJd2Ts6/5XFHcHQGBPO7RHPUTp/hCcKgMetQ DA/E1UV23SCoGxDx3dDW5+4mSH/+vpCNQ63QUZbdDKlIABuaBrST00ndLrASpBbHV/s9 Essw== X-Gm-Message-State: ALoCoQknbJLaVZUq4416gLmsZ49xq6WuCx1RQH6se0nEMjLisygq04NREzxqCejV7QOLoN//a/qq X-Received: by 10.182.20.195 with SMTP id p3mr26751obe.1.1427128876292; Mon, 23 Mar 2015 09:41:16 -0700 (PDT) MIME-Version: 1.0 Sender: sunpoet@sunpoet.net Received: by 10.202.61.139 with HTTP; Mon, 23 Mar 2015 09:40:56 -0700 (PDT) In-Reply-To: <201503222311.t2MNBE8d075929@svn.freebsd.org> References: <201503222311.t2MNBE8d075929@svn.freebsd.org> From: Sunpoet Po-Chuan Hsieh Date: Tue, 24 Mar 2015 00:40:56 +0800 X-Google-Sender-Auth: q6dgxZD4hSWHclOUwFOfxaCWF7c Message-ID: Subject: Re: svn commit: r381968 - head/lang/gcc5 To: Gerald Pfeifer Content-Type: text/plain; charset=UTF-8 X-Content-Filtered-By: Mailman/MimeDel 2.1.18-1 Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Mar 2015 16:41:18 -0000 On Mon, Mar 23, 2015 at 7:11 AM, Gerald Pfeifer wrote: > Author: gerald > Date: Sun Mar 22 23:11:13 2015 > New Revision: 381968 > URL: https://svnweb.freebsd.org/changeset/ports/381968 > QAT: https://qat.redports.org/buildarchive/r381968/ > > Log: > 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/gcc5/Makefile > > Modified: head/lang/gcc5/Makefile > > ============================================================================== > --- head/lang/gcc5/Makefile Sun Mar 22 22:35:24 2015 (r381967) > +++ head/lang/gcc5/Makefile Sun Mar 22 23:11:13 2015 (r381968) > @@ -1,12 +1,12 @@ > # Created by: Gerald Pfeifer > # $FreeBSD$ > > -PORTNAME= gcc5 > +PORTNAME= gcc > PORTVERSION= 5.0.s20150315 > 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 5 > @@ -24,6 +24,9 @@ RUN_DEPENDS+= ${LOCALBASE}/bin/as:${PORT > BUILD_DEPENDS+= runtest:${PORTSDIR}/misc/dejagnu > .endif > > +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 > # Y.2.s20140817 results in values of Y-20140817, Y.2.0, and Y > @@ -32,7 +35,7 @@ DISTVERSION= ${PORTVERSION:C/([0-9]+).*\ > GCC_VERSION= ${PORTVERSION:C/(.+)\.s[0-9]{8}/\1.0/} > SUFFIX= ${PORTVERSION:C/([0-9]+).*/\1/} > ONLY_FOR_ARCHS= amd64 i386 powerpc powerpc64 sparc64 arm armv6 > armv6hf > -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 > > Hi Gerald, USE_LDCONFIG stores the directory name to ${LOCALBASE}/libdata/ldconfig/${UNIQUENAME}. Since lang/gcc* now share same PORTNAME (gcc), you need to set UNIQUENAME manually. Otherwise the following error would occurs. ===> Checking if gcc5 already installed ===> Registering installation for gcc5-5.0.s20150322 Installing gcc5-5.0.s20150322... pkg-static: gcc5-5.0.s20150322 conflicts with gcc-4.8.4 (installs files into the same place). Problematic file: /usr/local/libdata/ldconfig/gcc *** Error code 70 Stop. make: stopped in /usr/ports/lang/gcc5 Regards, sunpoet