From 57364644d420fe9bd699286bf462aeb200e5b3aa Mon Sep 17 00:00:00 2001
From: gerald <gerald@FreeBSD.org>
Date: Mon, 30 Jul 2012 14:39:58 +0000
Subject: Convert to the new options framework.

On the way update to the 20120728 snapshot of GCC 4.7.2.
---
 lang/gcc47/Makefile | 13 ++++++-------
 lang/gcc47/distinfo |  4 ++--
 2 files changed, 8 insertions(+), 9 deletions(-)

(limited to 'lang/gcc47')

diff --git a/lang/gcc47/Makefile b/lang/gcc47/Makefile
index a765bf55aa2f..6896a1730e5d 100644
--- a/lang/gcc47/Makefile
+++ b/lang/gcc47/Makefile
@@ -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
diff --git a/lang/gcc47/distinfo b/lang/gcc47/distinfo
index 87f729ebaeab..99fc27d7c576 100644
--- a/lang/gcc47/distinfo
+++ b/lang/gcc47/distinfo
@@ -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
-- 
cgit