svn commit: r304315 - in head: Mk devel/cross-gcc

[Eitan Adler]

Author: eadler
Date: Sat Sep 15 13:06:26 2012
New Revision: 304315
URL: http://svn.freebsd.org/changeset/ports/304315

Log:
  - Covert to OptionsNG
  - Remove old header lines
  - Add generally useful options to the global list

Modified:
  head/Mk/bsd.options.desc.mk
  head/devel/cross-gcc/Makefile

Modified: head/Mk/bsd.options.desc.mk
==============================================================================
--- head/Mk/bsd.options.desc.mk	Sat Sep 15 11:45:01 2012	(r304314)
+++ head/Mk/bsd.options.desc.mk	Sat Sep 15 13:06:26 2012	(r304315)
@@ -47,6 +47,7 @@ COMPOSITE_DESC?=	X11 Composite extension
 CUE_DESC?=		Embedded CUE sheets support
 CUPS_DESC?=		CUPS printing system support
 CURL_DESC?=		Data transfer support via cURL
+CXX_DESC?=		C++ support
 DAGRAB_DESC?=		CD ripping support (dagrab)
 DATA_DESC?=		Install data files
 DBM_DESC?=		DBM support
@@ -72,6 +73,7 @@ FFMPEG_DESC?=		FFmpeg support (WMA, AIFF
 FFTW_DESC?=		Discrete Fourier Transform support
 FLAC_DESC?=		FLAC lossless audio codec support
 FONTCONFIG_DESC?=	X11 font configuration support
+FORTRAN_DESC?=		Fortran support
 FPECTL_DESC?=		Floating point exception handling
 FPX_DESC?=		FlashPix image format support
 FREETDS_DESC?=		FreeTDS library support
@@ -199,6 +201,7 @@ NUMPY_DESC?=		NumPy mathematical computi
 ODBC_DESC?=		ODBC backend
 ODF_DESC?=		ODF file support
 OGG_DESC?=		OGG format support
+OBJC_DESC?=		Objective C support
 OPENAL_DESC?=		OpenAL support
 OPENCV_DESC?=		OpenCV support
 OPENEXR_DESC?=		HDR support via OpenEXR

Modified: head/devel/cross-gcc/Makefile
==============================================================================
--- head/devel/cross-gcc/Makefile	Sat Sep 15 11:45:01 2012	(r304314)
+++ head/devel/cross-gcc/Makefile	Sat Sep 15 13:06:26 2012	(r304315)
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	cross-gcc
-# Date created:		2006-08-10
-# Whom:			Stanislav Sedov <stas at FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME?=	gcc
 PORTVERSION=	4.5.2
@@ -149,9 +144,8 @@ OURTARGET=	cross	# to generate a correct
 IGNORE=		you should select TGTARCH and TGTABI to build port
 .endif
 
-OPTIONS=	CXX	"Enable C++ language support" on \
-		OBJC	"Enable Objective C support" on \
-		FORTRAN	"Enable Fortran support" off
+OPTIONS_DEFINE=	CXX OBJC FORTRAN
+OPTIONS_DEFAULT=	CXX OBJC
 
 .include <bsd.port.pre.mk>
 
@@ -163,7 +157,7 @@ BROKEN=		Does not link
 
 PKG_ARGS=	-v -c -${COMMENT:Q} -d ${DESCR} -f ${TMPPLIST} -p ${PREFIX} -P "`cd ${PORTSDIR}/devel/cross-binutils && ${MAKE} ${DEPENDS_ARGS} -V PKGNAME`:devel/cross-binutils" ${EXTRA_PKG_ARGS} $${_LATE_PKG_ARGS} -m ${MTREE_FILE} -o ${PKGORIGIN}
 
-.if !defined(WITHOUT_CXX)
+.if ${PORT_OPTIONS:MCXX}
 TGTLANGS:=	"${TGTLANGS},c++"
 PLIST_FILES+=	bin/${OURTARGET}-c++ \
 		bin/${OURTARGET}-g++ \
@@ -171,11 +165,11 @@ PLIST_FILES+=	bin/${OURTARGET}-c++ \
 		${OURTARGET}/bin/g++
 .endif
 
-.if !defined(WITHOUT_OBJC)
+.if ${PORT_OPTIONS:MOBJC}
 TGTLANGS:=	"${TGTLANGS},objc"
 .endif
 
-.if defined(WITH_FORTRAN)
+.if ${PORT_OPTIONS:MFORTRAN}
 TGTLANGS:=	"${TGTLANGS},fortran"
 PLIST_FILES+=	bin/${OURTARGET}-gfortran \
 		${OURTARGET}/bin/gfortran