From owner-svn-ports-head@FreeBSD.ORG  Thu Mar 21 00:14: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 C2B924C4;
 Thu, 21 Mar 2013 00:14:09 +0000 (UTC) (envelope-from jgh@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 B4079CF1;
 Thu, 21 Mar 2013 00:14:09 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2L0E9mt042562;
 Thu, 21 Mar 2013 00:14:09 GMT (envelope-from jgh@svn.freebsd.org)
Received: (from jgh@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2L0E99h042561;
 Thu, 21 Mar 2013 00:14:09 GMT (envelope-from jgh@svn.freebsd.org)
Message-Id: <201303210014.r2L0E99h042561@svn.freebsd.org>
From: Jason Helfman <jgh@FreeBSD.org>
Date: Thu, 21 Mar 2013 00:14:09 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r314784 - head/textproc/ocaml-text
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: Thu, 21 Mar 2013 00:14:09 -0000

Author: jgh
Date: Thu Mar 21 00:14:09 2013
New Revision: 314784
URL: http://svnweb.freebsd.org/changeset/ports/314784

Log:
  - adopt optionsNG
  - trim historical header
  
  Approved by:	portmgr (miwi)

Modified:
  head/textproc/ocaml-text/Makefile

Modified: head/textproc/ocaml-text/Makefile
==============================================================================
--- head/textproc/ocaml-text/Makefile	Thu Mar 21 00:13:07 2013	(r314783)
+++ head/textproc/ocaml-text/Makefile	Thu Mar 21 00:14:09 2013	(r314784)
@@ -1,7 +1,4 @@
-# New ports collection makefile for:	ocaml-text
-# Date created:				April 18, 2011
-# Whom:					Jaap Boender <jaapb@kerguelen.org>
-#
+# Created by: Jaap Boender <jaapb@kerguelen.org>
 # $FreeBSD$
 
 PORTNAME=	text
@@ -25,18 +22,20 @@ USE_OCAML_FINDLIB=	yes
 USE_OCAML_LDCONFIG=	yes
 USE_OCAMLFIND_PLIST=	yes
 
-OPTIONS=	PCRE "Compile with PCRE support" ON
+OPTIONS_DEFINE=	PCRE
+OPTIONS_DEFAULT=	PCRE
 
 SA_DIR=			${LOCALBASE}/${OCAML_SITELIBDIR}
 
 .include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITHOUT_PCRE)
-CONFIGURE_ARGS+=	--disable-pcre
-.else
+.if ${PORT_OPTIONS:MPCRE}
 CONFIGURE_ARGS+=	--enable-pcre
 BUILD_DEPENDS+=		${SA_DIR}/pcre/pcre.a:${PORTSDIR}/devel/ocaml-pcre
 RUN_DEPENDS+=		${SA_DIR}/pcre/pcre.a:${PORTSDIR}/devel/ocaml-pcre
+.else
+CONFIGURE_ARGS+=	--disable-pcre
 .endif
 
 post-extract: