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

6 files changed, 12 insertions, 2 deletions

diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile
index 2681cabbb5ee..7ed2e8579223 100644
--- a/lang/gcc/Makefile
+++ b/lang/gcc/Makefile
@@ -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/dejagnu
 
 CONFLICTS=	gcc48*
 CPE_VENDOR=	gnu
+UNIQUENAME=	${PORTNAME}${PKGNAMESUFFIX}
 
 # DISTVERSION relates to downloads, GCC_VERSION and SUFFIX to names
 # of executables and directories once installed.
diff --git a/lang/gcc46/Makefile b/lang/gcc46/Makefile
index 579525724a56..a4e4ee6fdb5c 100644
--- a/lang/gcc46/Makefile
+++ b/lang/gcc46/Makefile
@@ -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/dejagnu
 .endif
 
 CPE_VENDOR=	gnu
+UNIQUENAME=	${PORTNAME}${PKGNAMESUFFIX}
 
 # DISTVERSION relates to downloads, GCC_VERSION and SUFFIX to names
 # of executables and directories once installed.
diff --git a/lang/gcc47/Makefile b/lang/gcc47/Makefile
index 4eb391fa2fae..6870d6844449 100644
--- a/lang/gcc47/Makefile
+++ b/lang/gcc47/Makefile
@@ -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/dejagnu
 
 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.
diff --git a/lang/gcc48/Makefile b/lang/gcc48/Makefile
index a09ddc699662..310477efd17f 100644
--- a/lang/gcc48/Makefile
+++ b/lang/gcc48/Makefile
@@ -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/dejagnu
 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
diff --git a/lang/gcc49/Makefile b/lang/gcc49/Makefile
index a65710fe000f..3c171e77ac57 100644
--- a/lang/gcc49/Makefile
+++ b/lang/gcc49/Makefile
@@ -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/dejagnu
 .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
diff --git a/lang/gcc5/Makefile b/lang/gcc5/Makefile
index 43405572f24f..0adde13c2a71 100644
--- a/lang/gcc5/Makefile
+++ b/lang/gcc5/Makefile
@@ -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/dejagnu
 
 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