From owner-svn-ports-head@freebsd.org  Fri Sep 29 19:11:08 2017
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7A819E331D7;
 Fri, 29 Sep 2017 19:11:08 +0000 (UTC)
 (envelope-from gerald@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 4178671D30;
 Fri, 29 Sep 2017 19:11:08 +0000 (UTC)
 (envelope-from gerald@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v8TJB77O003935;
 Fri, 29 Sep 2017 19:11:07 GMT (envelope-from gerald@FreeBSD.org)
Received: (from gerald@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8TJB7XM003934;
 Fri, 29 Sep 2017 19:11:07 GMT (envelope-from gerald@FreeBSD.org)
Message-Id: <201709291911.v8TJB7XM003934@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gerald set sender to
 gerald@FreeBSD.org using -f
From: Gerald Pfeifer <gerald@FreeBSD.org>
Date: Fri, 29 Sep 2017 19:11:07 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r450929 - head/lang/gcc6
X-SVN-Group: ports-head
X-SVN-Commit-Author: gerald
X-SVN-Commit-Paths: head/lang/gcc6
X-SVN-Commit-Revision: 450929
X-SVN-Commit-Repository: ports
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.23
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 29 Sep 2017 19:11:08 -0000

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)