From owner-svn-ports-all@FreeBSD.ORG  Mon Jul 30 14:39:59 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 57EFC106564A;
	Mon, 30 Jul 2012 14:39:59 +0000 (UTC)
	(envelope-from gerald@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 2962F8FC0C;
	Mon, 30 Jul 2012 14:39:59 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6UEdxQN003079;
	Mon, 30 Jul 2012 14:39:59 GMT (envelope-from gerald@svn.freebsd.org)
Received: (from gerald@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6UEdwwY003076;
	Mon, 30 Jul 2012 14:39:58 GMT (envelope-from gerald@svn.freebsd.org)
Message-Id: <201207301439.q6UEdwwY003076@svn.freebsd.org>
From: Gerald Pfeifer <gerald@FreeBSD.org>
Date: Mon, 30 Jul 2012 14:39:58 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
	svn-ports-head@freebsd.org
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r301718 - head/lang/gcc47
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
	<mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
	<mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 30 Jul 2012 14:39:59 -0000

Author: gerald
Date: Mon Jul 30 14:39:58 2012
New Revision: 301718
URL: http://svn.freebsd.org/changeset/ports/301718

Log:
  Convert to the new options framework.
  
  On the way update to the 20120728 snapshot of GCC 4.7.2.

Modified:
  head/lang/gcc47/Makefile
  head/lang/gcc47/distinfo

Modified: head/lang/gcc47/Makefile
==============================================================================
--- head/lang/gcc47/Makefile	Mon Jul 30 12:47:27 2012	(r301717)
+++ head/lang/gcc47/Makefile	Mon Jul 30 14:39:58 2012	(r301718)
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	gcc
-PORTVERSION=	4.7.2.20120721
+PORTVERSION=	4.7.2.20120728
 CATEGORIES=	lang java
 MASTER_SITES=	${MASTER_SITE_GCC}
 MASTER_SITE_SUBDIR=	snapshots/${VERSIONSTRING}
@@ -40,14 +40,13 @@ MAKE_JOBS_SAFE=	yes
 PATCH_WRKSRC=	${SRCDIR}
 CONFIGURE_SCRIPT=	../${SRCDIR:S/${WRKDIR}\///}/configure
 
-OPTIONS=	JAVA	"Enable the Java frontend (i386 and amd64 only)"	on
+OPTIONS_DEFINE_i386=	JAVA
+OPTIONS_DEFINE_amd64=	JAVA
+OPTIONS_DEFAULT_i386=	JAVA
+OPTIONS_DEFAULT_amd64=	JAVA
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} != i386 && ${ARCH} != amd64
-WITHOUT_JAVA=	yes
-.endif
-
 .if ${ARCH} == "amd64"
 CONFIGURE_TARGET=	x86_64-portbld-freebsd${OSREL}
 .else
@@ -99,7 +98,7 @@ INFO+=		gcc${SUFFIX}/libquadmath	\
 		gcc${SUFFIX}/libitm
 .endif
 
-.if ! defined(WITHOUT_JAVA)
+.if ${PORT_OPTIONS:MJAVA}
 BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip
 EXTRA_PATCHES+=	${FILESDIR}/java-patch-hier
 CONFIGURE_ARGS+=--enable-languages=c,c++,objc,fortran,java

Modified: head/lang/gcc47/distinfo
==============================================================================
--- head/lang/gcc47/distinfo	Mon Jul 30 12:47:27 2012	(r301717)
+++ head/lang/gcc47/distinfo	Mon Jul 30 14:39:58 2012	(r301718)
@@ -1,2 +1,2 @@
-SHA256 (gcc-4.7-20120721.tar.bz2) = 28381983f3b46c843bc3282700ca73f18f6479ae1f88c9c3c2ba2cc0141ba087
-SIZE (gcc-4.7-20120721.tar.bz2) = 78864123
+SHA256 (gcc-4.7-20120728.tar.bz2) = fa9a11c8b6d9b69b9597ef8dd0f59291202d261873df040443adae97ed8d21d6
+SIZE (gcc-4.7-20120728.tar.bz2) = 78858257