svn commit: r382022 - in head/lang: gcc gcc46 gcc47 gcc48 gcc49 gcc5

[Bryan Drewery]

Author: bdrewery
Date: Mon Mar 23 18:56:10 2015
New Revision: 382022
URL: https://svnweb.freebsd.org/changeset/ports/382022
QAT: https://qat.redports.org/buildarchive/r382022/

Log:
  Fix UNIQUENAME not being unique after recent PORTNAME shuffle.
  
  This was causing the gcc packages to be generated with a
  /usr/local/libdata/ldconfig/gcc file. All were conflicting. Bump
  PORTREVISION to fix packages built during this time.
  
  With hat:	portmgr
  Reported by:	sunpoet

Modified:
  head/lang/gcc/Makefile
  head/lang/gcc46/Makefile
  head/lang/gcc47/Makefile
  head/lang/gcc48/Makefile
  head/lang/gcc49/Makefile
  head/lang/gcc5/Makefile

Modified: head/lang/gcc/Makefile
==============================================================================
--- head/lang/gcc/Makefile	Mon Mar 23 18:35:45 2015	(r382021)
+++ head/lang/gcc/Makefile	Mon Mar 23 18:56:10 2015	(r382022)
@@ -3,6 +3,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.8.4
+PORTREVISION=	1
 CATEGORIES=	lang java
 MASTER_SITES=	${MASTER_SITE_GCC}
 MASTER_SITE_SUBDIR=	releases/gcc-${DISTVERSION}
@@ -25,6 +26,7 @@ BUILD_DEPENDS+=	runtest:${PORTSDIR}/misc
 
 CONFLICTS=	gcc48*
 CPE_VENDOR=	gnu
+UNIQUENAME=	${PORTNAME}${PKGNAMESUFFIX}
 
 # 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	Mon Mar 23 18:35:45 2015	(r382021)
+++ head/lang/gcc46/Makefile	Mon Mar 23 18:56:10 2015	(r382022)
@@ -3,7 +3,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.6.4
-PORTREVISION=	4
+PORTREVISION=	5
 PORTEPOCH=	1
 CATEGORIES=	lang java
 MASTER_SITES=	${MASTER_SITE_GCC}
@@ -27,6 +27,7 @@ BUILD_DEPENDS+=	runtest:${PORTSDIR}/misc
 .endif
 
 CPE_VENDOR=	gnu
+UNIQUENAME=	${PORTNAME}${PKGNAMESUFFIX}
 
 # DISTVERSION relates to downloads, GCC_VERSION and SUFFIX to names
 # of executables and directories once installed.

Modified: head/lang/gcc47/Makefile
==============================================================================
--- head/lang/gcc47/Makefile	Mon Mar 23 18:35:45 2015	(r382021)
+++ head/lang/gcc47/Makefile	Mon Mar 23 18:56:10 2015	(r382022)
@@ -3,7 +3,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.7.4
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	lang java
 MASTER_SITES=	${MASTER_SITE_GCC}
@@ -28,6 +28,7 @@ BUILD_DEPENDS+=	runtest:${PORTSDIR}/misc
 
 CONFLICTS=	gcc-4.7.*
 CPE_VENDOR=	gnu
+UNIQUENAME=	${PORTNAME}${PKGNAMESUFFIX}
 
 # DISTVERSION relates to downloads, GCC_VERSION and SUFFIX to names
 # of executables and directories once installed.

Modified: head/lang/gcc48/Makefile
==============================================================================
--- head/lang/gcc48/Makefile	Mon Mar 23 18:35:45 2015	(r382021)
+++ head/lang/gcc48/Makefile	Mon Mar 23 18:56:10 2015	(r382022)
@@ -3,6 +3,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.8.5.s20150319
+PORTREVISION=	1
 CATEGORIES=	lang java
 MASTER_SITES=	${MASTER_SITE_GCC}
 MASTER_SITE_SUBDIR=	snapshots/${DISTVERSION}
@@ -27,6 +28,7 @@ BUILD_DEPENDS+=	runtest:${PORTSDIR}/misc
 CONFLICTS=	gcc-4.8.*
 CPE_VENDOR=	gnu
 CPE_VERSION=	${GCC_VERSION}
+UNIQUENAME=	${PORTNAME}${PKGNAMESUFFIX}
 
 # DISTVERSION relates to downloads, GCC_VERSION and SUFFIX to names
 # of executables and directories once installed.  A PORTVERSION of

Modified: head/lang/gcc49/Makefile
==============================================================================
--- head/lang/gcc49/Makefile	Mon Mar 23 18:35:45 2015	(r382021)
+++ head/lang/gcc49/Makefile	Mon Mar 23 18:56:10 2015	(r382022)
@@ -3,6 +3,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.9.3.s20150318
+PORTREVISION=	1
 CATEGORIES=	lang java
 MASTER_SITES=	${MASTER_SITE_GCC}
 MASTER_SITE_SUBDIR=	snapshots/${DISTVERSION}
@@ -25,6 +26,7 @@ BUILD_DEPENDS+=	runtest:${PORTSDIR}/misc
 .endif
 
 CPE_VENDOR=	gnu
+UNIQUENAME=	${PORTNAME}${PKGNAMESUFFIX}
 
 # DISTVERSION relates to downloads, GCC_VERSION and SUFFIX to names
 # of executables and directories once installed.  A PORTVERSION of

Modified: head/lang/gcc5/Makefile
==============================================================================
--- head/lang/gcc5/Makefile	Mon Mar 23 18:35:45 2015	(r382021)
+++ head/lang/gcc5/Makefile	Mon Mar 23 18:56:10 2015	(r382022)
@@ -3,6 +3,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	5.0.s20150322
+PORTREVISION=	1
 CATEGORIES=	lang java
 MASTER_SITES=	${MASTER_SITE_GCC}
 MASTER_SITE_SUBDIR=	snapshots/${DISTVERSION}
@@ -26,6 +27,7 @@ BUILD_DEPENDS+=	runtest:${PORTSDIR}/misc
 
 CPE_VENDOR=	gnu
 CPE_VERSION=	${GCC_VERSION}
+UNIQUENAME=	${PORTNAME}${PKGNAMESUFFIX}
 
 # DISTVERSION relates to downloads, GCC_VERSION and SUFFIX to names
 # of executables and directories once installed.  A PORTVERSION of