From owner-svn-ports-head@FreeBSD.ORG  Wed Feb 20 20:11:09 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 833D86AE;
 Wed, 20 Feb 2013 20:11:09 +0000 (UTC)
 (envelope-from bapt@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 70F03173;
 Wed, 20 Feb 2013 20:11:09 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1KKB9bE012382;
 Wed, 20 Feb 2013 20:11:09 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1KKB9oZ012381;
 Wed, 20 Feb 2013 20:11:09 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201302202011.r1KKB9oZ012381@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Wed, 20 Feb 2013 20:11:09 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r312658 - head/mail/heirloom-mailx
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: Wed, 20 Feb 2013 20:11:09 -0000

Author: bapt
Date: Wed Feb 20 20:11:08 2013
New Revision: 312658
URL: http://svnweb.freebsd.org/changeset/ports/312658

Log:
  Convert to new options framework

Modified:
  head/mail/heirloom-mailx/Makefile

Modified: head/mail/heirloom-mailx/Makefile
==============================================================================
--- head/mail/heirloom-mailx/Makefile	Wed Feb 20 19:55:32 2013	(r312657)
+++ head/mail/heirloom-mailx/Makefile	Wed Feb 20 20:11:08 2013	(r312658)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	nail
-# Date created:				20 October 2000
-# Whom:					Kris Kennaway <kris@FreeBSD.org>
-#
+# Created by: Kris Kennaway <kris@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	mailx
 PORTVERSION=	12.4
@@ -15,7 +11,7 @@ PKGNAMEPREFIX=	heirloom-
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	BSD mail utility with MIME, IMAP, POP3, SMTP, and S/MIME extensions
 
-OPTIONS=	IPV6	"Enable IPv6 Support"	On
+OPTIONS_DEFINE=	IPV6 DOCS
 
 CONFLICTS=	mailx-[0-9]*
 
@@ -40,9 +36,9 @@ PLIST_FILES=	bin/${PORTNAME} \
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_IPV6)
+.if ${PORT_OPTIONS:MIPV6}
 MAKE_ARGS+=	IPv6="-DHAVE_IPv6_FUNCS"
 .endif
 
@@ -53,11 +49,11 @@ do-install:
 .if !exists(${PREFIX}/etc/nail.rc)
 	${INSTALL_DATA} ${WRKSRC}/nail.rc ${PREFIX}/etc
 .endif
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 .for i in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
 .endfor
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>