From owner-svn-ports-all@FreeBSD.ORG  Thu Oct  4 06:47:06 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 CC5111065689;
	Thu,  4 Oct 2012 06:47:06 +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 3DD9D8FC83;
	Thu,  4 Oct 2012 06:28:22 +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 q946SM4L082856;
	Thu, 4 Oct 2012 06:28:22 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q946SMNv082854;
	Thu, 4 Oct 2012 06:28:22 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201210040628.q946SMNv082854@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Thu, 4 Oct 2012 06:28:22 +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: r305231 - head/x11/kdebase3
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 06:47:06 -0000

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

Log:
  Convert to new options framework

Modified:
  head/x11/kdebase3/Makefile

Modified: head/x11/kdebase3/Makefile
==============================================================================
--- head/x11/kdebase3/Makefile	Thu Oct  4 06:07:43 2012	(r305230)
+++ head/x11/kdebase3/Makefile	Thu Oct  4 06:28:21 2012	(r305231)
@@ -45,9 +45,10 @@ CONFIGURE_ARGS+=--without-java			\
 		--with-xdmdir=${LOCALBASE}/lib/X11/xdm \
 		--with-ssl-dir=${OPENSSLBASE}
 
-OPTIONS=	ARTSWRAPPER "Suid wrapper for aRts, req'd for realtime prio" on \
-		HAL "Use HAL backend for media:/" on \
-		HTDIG "Depend on htdig, used to build manual indices" off
+OPTIONS_DEFINE=	ARTSWRAPPER HAL HTDIG
+OPTIONS_DEFAULT=	ARTSWRAPPER HAL
+ARTSWRAPPER_DESC=	Suid wrapper for aRts, req'd for realtime prio
+HTDIG_DESC=		Use htdig to build manual indices
 
 .include "${.CURDIR}/../../x11/kde3/Makefile.kde"
 .include <bsd.port.pre.mk>
@@ -58,15 +59,15 @@ LIB_DEPENDS+=	usb-0.1:${PORTSDIR}/devel/
 EXTRA_PATCHES+=	${FILESDIR}/extrapatch-libusb20
 .endif
 
-.if !defined(WITHOUT_ARTSWRAPPER)
+.if ${PORT_OPTIONS:MDOCS}
 RUN_DEPENDS+=	artswrapper:${PORTSDIR}/audio/artswrapper
 .endif
 
-.if defined(WITH_HTDIG)
+.if ${PORT_OPTIONS:MDOCS}
 RUN_DEPENDS+=	htdig:${PORTSDIR}/textproc/htdig
 .endif
 
-.if !defined(WITHOUT_HAL)
+.if ${PORT_OPTIONS:MHAL}
 EXTRA_PATCHES+=	${FILESDIR}/extrapatch-kioslave_media_mediamanager-halbackend.cpp \
 		${FILESDIR}/extrapatch-kioslave_media_mediamanager-halbackend.h
 LIB_DEPENDS+=	dbus-qt-1.1:${PORTSDIR}/devel/dbus-qt3 \