svn commit: r450929 - head/lang/gcc6

[Gerald Pfeifer]

Author: gerald
Date: Fri Sep 29 19:11:07 2017
New Revision: 450929
URL: https://svnweb.freebsd.org/changeset/ports/450929

Log:
  Add a conflict with the lang/gcc6-devel port as we've had it in lang/gcc5
  (for lang/gcc5-devel) for a fair while.  This mirrors what we did for the
  lang/gcc5-devel port earlier this week.
  
  Also make Python a build-only dependency when building Java
  (via JAVA_USES=python:build) which makes the installed port/package
  quite a bit more lightweight.
  
  Bump PORTREVISION for those two changes.

Modified:
  head/lang/gcc6/Makefile

Modified: head/lang/gcc6/Makefile
==============================================================================
--- head/lang/gcc6/Makefile	Fri Sep 29 18:13:20 2017	(r450928)
+++ head/lang/gcc6/Makefile	Fri Sep 29 19:11:07 2017	(r450929)
@@ -3,7 +3,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	6.4.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang java
 MASTER_SITES=	GCC/releases/gcc-${DISTVERSION}
 PKGNAMESUFFIX=	${SUFFIX}
@@ -27,6 +27,8 @@ RUN_DEPENDS+=	${LOCALBASE}/bin/as:devel/binutils
 BUILD_DEPENDS+=	runtest:misc/dejagnu
 .endif
 
+CONFLICTS=	gcc6-devel-6.*
+
 CPE_VENDOR=	gnu
 
 GCC_VERSION=	${PORTVERSION}
@@ -48,7 +50,7 @@ OPTIONS_EXCLUDE_DragonFly=	JAVA
 BOOTSTRAP_DESC=		Build using a full bootstrap
 GRAPHITE_DESC=		Support for Graphite loop optimizations
 
-JAVA_USES=		python shebangfix
+JAVA_USES=	python:build shebangfix
 SHEBANG_FILES=	libjava/contrib/aot-compile.in
 
 .if exists(/usr/lib32/libc.so)