svn commit: r334934 - in head/lang: gcc gcc46

[Gerald Pfeifer]

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 <gerald at FreeBSD.org>
 # $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 at 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