From owner-svn-ports-head@FreeBSD.ORG  Tue Mar 26 14:48:18 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 3B8F918B;
 Tue, 26 Mar 2013 14:48:18 +0000 (UTC)
 (envelope-from skreuzer@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 2E3BD1B9;
 Tue, 26 Mar 2013 14:48:18 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2QEmIWG092870;
 Tue, 26 Mar 2013 14:48:18 GMT
 (envelope-from skreuzer@svn.freebsd.org)
Received: (from skreuzer@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2QEmIfB092869;
 Tue, 26 Mar 2013 14:48:18 GMT
 (envelope-from skreuzer@svn.freebsd.org)
Message-Id: <201303261448.r2QEmIfB092869@svn.freebsd.org>
From: Steven Kreuzer <skreuzer@FreeBSD.org>
Date: Tue, 26 Mar 2013 14:48:18 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r315304 - head/emulators/mtools
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 26 Mar 2013 14:48:18 -0000

Author: skreuzer
Date: Tue Mar 26 14:48:17 2013
New Revision: 315304
URL: http://svnweb.freebsd.org/changeset/ports/315304

Log:
  Convert to options ng
  
  PR:		ports/177209
  Submitted by:	William Grzybowski <william88@gmail.com>

Modified:
  head/emulators/mtools/Makefile

Modified: head/emulators/mtools/Makefile
==============================================================================
--- head/emulators/mtools/Makefile	Tue Mar 26 14:47:40 2013	(r315303)
+++ head/emulators/mtools/Makefile	Tue Mar 26 14:48:17 2013	(r315304)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    mtools
-# Date created:         5 October 1994
-# Whom:                 jmz
-#
+# Created by: jmz
 # $FreeBSD$
-#
 
 PORTNAME=	mtools
 PORTVERSION=	4.0.10
@@ -33,22 +29,27 @@ MAN1=		mattrib.1 mbadblocks.1 mcat.1 mcd
 MAN5=		mtools.5
 INFO=		mtools
 
-.if defined(WITHOUT_ICONV)
-CONFIGURE_ENV+=	ac_cv_header_iconv_h=no
-.else
+OPTIONS_DEFINE=	ICONV X11
+OPTIONS_DEFAULT=ICONV X11
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MICONV}
 USE_ICONV=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -liconv
+.else
+CONFIGURE_ENV+=	ac_cv_header_iconv_h=no
 .endif
 
-.if defined(WITHOUT_X11)
-CONFIGURE_ARGS+=	--without-x
-PLIST_SUB=	X11="@comment "
-MAKE_ENV+=	WITHOUT_X11=${WITHOUT_X11}
-.else
+.if ${PORT_OPTIONS:MX11}
 USE_XORG=	x11 sm ice xau
 PLIST_SUB=	X11=""
 MAN1+=		floppyd.1 floppyd_installtest.1
+.else
+CONFIGURE_ARGS+=	--without-x
+PLIST_SUB=	X11="@comment "
+MAKE_ENV+=	WITHOUT_X11=${WITHOUT_X11}
 .endif
 
 post-patch: