From owner-svn-ports-head@FreeBSD.ORG  Fri Jul 20 22:16:39 2012
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:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 39DD2106564A;
	Fri, 20 Jul 2012 22:16:39 +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 250FC8FC17;
	Fri, 20 Jul 2012 22:16:39 +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 q6KMGdGA044787;
	Fri, 20 Jul 2012 22:16:39 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6KMGc4U044785;
	Fri, 20 Jul 2012 22:16:38 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201207202216.q6KMGc4U044785@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Fri, 20 Jul 2012 22:16:38 +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: r301258 - head/shells/v7sh
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Fri, 20 Jul 2012 22:16:39 -0000

Author: bapt
Date: Fri Jul 20 22:16:38 2012
New Revision: 301258
URL: http://svn.freebsd.org/changeset/ports/301258

Log:
  Convert to new options framework

Modified:
  head/shells/v7sh/Makefile

Modified: head/shells/v7sh/Makefile
==============================================================================
--- head/shells/v7sh/Makefile	Fri Jul 20 22:14:15 2012	(r301257)
+++ head/shells/v7sh/Makefile	Fri Jul 20 22:16:38 2012	(r301258)
@@ -31,19 +31,21 @@ NO_WRKSUBDIR=	yes
 MAN1=		${PORTNAME}.1
 MANCOMPRESSED=	yes
 
-OPTIONS=	V7SH_SYSIII	"System III enhancements"	on \
-		V7SH_RENO	"4.3BSD-Reno enhancements"	on \
-		V7SH_ULTRIX	"Ultrix 3.1 enhancements"	on
+OPTIONS_DEFINE=	SYSIII RENO ULTRIX
+OPTIONS_DEFAULT=	SYSIII RENO ULTRIX
+SYSIII_DESC=	System III enhancements
+RENO_DESC=	4.3BSD-Reno enhancements
+ULTRIX_DESC=	Ultrix 3.1 enhancements
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_V7SH_SYSIII)
+.if ${PORT_OPTIONS:MSYSIII}
 CFLAGS+=	-DSYSIII
 .endif
-.if !defined(WITHOUT_V7SH_RENO)
+.if ${PORT_OPTIONS:MRENO}
 CFLAGS+=	-DRENO
 .endif
-.if !defined(WITHOUT_V7SH_ULTRIX)
+.if ${PORT_OPTIONS:MULTRIX}
 CFLAGS+=	-DULTRIX
 .endif
 
@@ -60,4 +62,4 @@ post-install:
 	 ${ECHO_CMD} ${PREFIX}/bin/${PORTNAME}) > /etc/shells
 	@${RM} /etc/shells.bak
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>