From owner-svn-ports-head@FreeBSD.ORG Tue Nov 26 14:13:16 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B79B82D9; Tue, 26 Nov 2013 14:13:16 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 8D71C21A5; Tue, 26 Nov 2013 14:13:16 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAQEDGok092937; Tue, 26 Nov 2013 14:13:16 GMT (envelope-from gerald@svn.freebsd.org) Received: (from gerald@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAQEDGjh092935; Tue, 26 Nov 2013 14:13:16 GMT (envelope-from gerald@svn.freebsd.org) Message-Id: <201311261413.rAQEDGjh092935@svn.freebsd.org> From: Gerald Pfeifer Date: Tue, 26 Nov 2013 14:13:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r334934 - in head/lang: gcc gcc46 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.16 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: Tue, 26 Nov 2013 14:13:16 -0000 Author: gerald Date: Tue Nov 26 14:13:15 2013 New Revision: 334934 URL: http://svnweb.freebsd.org/changeset/ports/334934 Log: Change PORTNAME for lang/gcc46 from gcc to gcc46 to match the actual name of this port and avoid a package name collision with other GCC ports. This also allows us to remove LATEST_LINK. And it finally allows for a simple and proper CONFLICTS between lang/gcc and lang/gcc46. Modified: head/lang/gcc/Makefile head/lang/gcc46/Makefile Modified: head/lang/gcc/Makefile ============================================================================== --- head/lang/gcc/Makefile Tue Nov 26 14:02:43 2013 (r334933) +++ head/lang/gcc/Makefile Tue Nov 26 14:13:15 2013 (r334934) @@ -20,7 +20,7 @@ RUN_DEPENDS+= ${LOCALBASE}/bin/as:${PORT BUILD_DEPENDS+= runtest:${PORTSDIR}/misc/dejagnu .endif -CONFLICTS= gcc-4.6.4*,1 +CONFLICTS= gcc46* # DISTVERSION relates to downloads, GCC_VERSION and SUFFIX to names # of executables and directories once installed. Modified: head/lang/gcc46/Makefile ============================================================================== --- head/lang/gcc46/Makefile Tue Nov 26 14:02:43 2013 (r334933) +++ head/lang/gcc46/Makefile Tue Nov 26 14:13:15 2013 (r334934) @@ -1,13 +1,14 @@ # Created by: Gerald Pfeifer # $FreeBSD$ -PORTNAME= gcc +PORTNAME= gcc46 PORTVERSION= 4.6.4 PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= lang java MASTER_SITES= ${MASTER_SITE_GCC} MASTER_SITE_SUBDIR= releases/gcc-${DISTVERSION} +DISTNAME= gcc-${DISTVERSION} MAINTAINER= gerald@FreeBSD.org COMMENT= GNU Compiler Collection 4.6 @@ -22,14 +23,13 @@ RUN_DEPENDS+= ${LOCALBASE}/bin/as:${PORT BUILD_DEPENDS+= runtest:${PORTSDIR}/misc/dejagnu .endif -CONFLICTS= gcc-4.6.[123]* +CONFLICTS= gcc-4.6.* # DISTVERSION relates to downloads, GCC_VERSION and SUFFIX to names # of executables and directories once installed. DISTVERSION= ${PORTVERSION} GCC_VERSION= ${PORTVERSION:C/(.+)\.[0-9]{8}/\1/} SUFFIX= ${PORTVERSION:C/([0-9]+).([0-9]+).*/\1\2/} -LATEST_LINK= gcc${SUFFIX}${PKGNAMESUFFIX} ONLY_FOR_ARCHS= amd64 i386 ia64 powerpc sparc64 USES= gmake iconv perl5 USE_BINUTILS= yes