From owner-svn-ports-all@FreeBSD.ORG  Thu Oct  4 07:37:10 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 142551065679;
	Thu,  4 Oct 2012 07:37:10 +0000 (UTC)
	(envelope-from bapt@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 91CC98FCFB;
	Thu,  4 Oct 2012 07:21:06 +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 q947L63r093020;
	Thu, 4 Oct 2012 07:21:06 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q947L6qB093018;
	Thu, 4 Oct 2012 07:21:06 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201210040721.q947L6qB093018@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Thu, 4 Oct 2012 07:21:06 +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: r305238 - head/lang/libobjc2
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: Thu, 04 Oct 2012 07:37:10 -0000

Author: bapt
Date: Thu Oct  4 07:21:06 2012
New Revision: 305238
URL: http://svn.freebsd.org/changeset/ports/305238

Log:
  Convert to new options framework

Modified:
  head/lang/libobjc2/Makefile

Modified: head/lang/libobjc2/Makefile
==============================================================================
--- head/lang/libobjc2/Makefile	Thu Oct  4 07:18:39 2012	(r305237)
+++ head/lang/libobjc2/Makefile	Thu Oct  4 07:21:06 2012	(r305238)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	libobjc2
-# Date created:		7 October 2010
-# Whom:			Pete French <pete@twisted.org.uk>
-#
+# Created by: Pete French <pete@twisted.org.uk>
 # $FreeBSD$
-#
 
 PORTNAME=	libobjc2
 PORTVERSION=	1.6
@@ -21,14 +17,16 @@ MAKE_ENV+=	LD=${LOCALBASE}/bin/ld
 MAKE_ENV+=	SHLIB_VERSION="${SHLIB_VERSION}"
 PLIST_SUB=	SHLIB=${SHLIB_VERSION}
 
-OPTIONS=	NSOBJECT_ROOT	"Root class is NSObject not Object" On \
-		LIBDISPATCH	"Build with libdispatch from ports" Off
+OPTIONS_DEFINE=	NSOBJECT_ROOT LIBDISPATCH
+OPTIONS_DEFAULT=	NSOBJECT_ROOT
+NSOBJECT_ROOT_DESC=	Root class is NSObject not Object
+LIBDISPATCH_DESC=	Build with libdispatch from ports
 
 SHLIB_VERSION?=	16
 
 .include <bsd.port.options.mk>
 
-.if defined(WITH_LIBDISPATCH)
+.if ${PORT_OPTIONS:MLIBDISPATCH}
 LIB_DEPENDS+=	dispatch.0:${PORTSDIR}/devel/libdispatch
 MAKE_ARGS+=	-DWITHOUT_TOYDISPATCH
 PLIST_SUB+=	WITH_TOYDISPATCH="@comment "
@@ -36,7 +34,7 @@ PLIST_SUB+=	WITH_TOYDISPATCH="@comment "
 PLIST_SUB+=	WITH_TOYDISPATCH=""
 .endif
 
-.if !defined(WITHOUT_NSOBJECT_ROOT)
+.if ${PORT_OPTIONS:MNSOBJECT_ROOT}
 CPPFLAGS+=	-DGNUSTEP
 .endif
 
@@ -64,7 +62,7 @@ post-patch:
 	${RM} ${WRKSRC}/GNUmakefile
 
 post-install:
-.if defined(WITH_LIBDISPATCH)
+.if ${PORT_OPTIONS:MLIBDISPATCH}
 	${RM} ${PREFIX}/include/objc/toydispatch.h
 .endif