From owner-svn-ports-all@FreeBSD.ORG  Thu Nov 22 03:25:09 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 58E92F24;
 Thu, 22 Nov 2012 03:25:09 +0000 (UTC)
 (envelope-from stephen@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 3E6FC8FC08;
 Thu, 22 Nov 2012 03:25:09 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAM3P9Ya083515;
 Thu, 22 Nov 2012 03:25:09 GMT (envelope-from stephen@svn.freebsd.org)
Received: (from stephen@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAM3P9h2083514;
 Thu, 22 Nov 2012 03:25:09 GMT (envelope-from stephen@svn.freebsd.org)
Message-Id: <201211220325.qAM3P9h2083514@svn.freebsd.org>
From: Stephen Montgomery-Smith <stephen@FreeBSD.org>
Date: Thu, 22 Nov 2012 03:25:09 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r307633 - head/x11/xkbset
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/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, 22 Nov 2012 03:25:09 -0000

Author: stephen
Date: Thu Nov 22 03:25:08 2012
New Revision: 307633
URL: http://svnweb.freebsd.org/changeset/ports/307633

Log:
  - Use new options framework.
  
  Feature safe:	yes

Modified:
  head/x11/xkbset/Makefile

Modified: head/x11/xkbset/Makefile
==============================================================================
--- head/x11/xkbset/Makefile	Thu Nov 22 02:13:14 2012	(r307632)
+++ head/x11/xkbset/Makefile	Thu Nov 22 03:25:08 2012	(r307633)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	xkbset
-# Date created:		12 May 2001
-# Whom:			Stephen Montgomery-Smith <stephen@math.missouri.edu>
-#
+# Created by: Stephen Montgomery-Smith <stephen@math.missouri.edu>
 # $FreeBSD$
-#
 
 PORTNAME=	xkbset
 PORTVERSION=	0.5
@@ -22,11 +18,12 @@ MAKE_ARGS=	X11BASE="${LOCALBASE}" X11PRE
 		INSTALL_DATA="${INSTALL_DATA}" \
 		INSTALL_PROGRAM="${INSTALL_PROGRAM}"
 
-OPTIONS=	GUI "Install Tk GUI" off
+OPTIONS_DEFINE=	GUI
+GUI_DESC=	Install Tk GUI
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_GUI)
+.if ${PORT_OPTIONS:MGUI}
 RUN_DEPENDS+=	p5-Tk>=0:${PORTSDIR}/x11-toolkits/p5-Tk
 PLIST_SUB=	GUI=""
 MAKE_ARGS+=	INSTALL_SCRIPT="${INSTALL_SCRIPT}"
@@ -38,4 +35,4 @@ MAKE_ARGS+=	INSTALL_SCRIPT=:
 post-build:
 	@${REINPLACE_CMD} "s%#!/usr/bin/perl%#!${PERL}%" ${WRKSRC}/xkbset-gui
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>