Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 1 Sep 2012 20:46:58 +0000 (UTC)
From:      Gerald Pfeifer <gerald@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r303522 - head/lang/gcc
Message-ID:  <201209012046.q81Kkwki076941@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: gerald
Date: Sat Sep  1 20:46:57 2012
New Revision: 303522
URL: http://svn.freebsd.org/changeset/ports/303522

Log:
  Convert to the new options framework.
  
  Remove now deprecated comments at the top of Makefile.

Modified:
  head/lang/gcc/Makefile

Modified: head/lang/gcc/Makefile
==============================================================================
--- head/lang/gcc/Makefile	Sat Sep  1 20:21:43 2012	(r303521)
+++ head/lang/gcc/Makefile	Sat Sep  1 20:46:57 2012	(r303522)
@@ -1,10 +1,4 @@
-# ex:ts=8
-# Ports collection makefile for:	gcc
-# Date created:				2011-09-25
-# Whom:					Gerald Pfeifer <gerald@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	gcc
 PORTVERSION=	4.6.3
@@ -44,14 +38,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
@@ -98,7 +91,7 @@ INFO=		gcc${SUFFIX}/cpp \
 INFO+=		gcc${SUFFIX}/libquadmath
 .endif
 
-.if ! defined(WITHOUT_JAVA)
+.if ${PORT_OPTIONS:MJAVA}
 ECJ_JAR=	ecj-4.5.jar
 MASTER_SITES+=	${MASTER_SITE_SOURCEWARE:S|$|:ecj|}
 MASTER_SITE_SUBDIR+=	java/:ecj



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201209012046.q81Kkwki076941>