From owner-svn-ports-all@FreeBSD.ORG  Thu Jun 26 12:52:48 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id A72A46E3;
 Thu, 26 Jun 2014 12:52:48 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 94C3E25E0;
 Thu, 26 Jun 2014 12:52:48 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5QCqmKL077606;
 Thu, 26 Jun 2014 12:52:48 GMT (envelope-from demon@svn.freebsd.org)
Received: (from demon@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5QCqm9C077605;
 Thu, 26 Jun 2014 12:52:48 GMT (envelope-from demon@svn.freebsd.org)
Message-Id: <201406261252.s5QCqm9C077605@svn.freebsd.org>
From: Dmitry Sivachenko <demon@FreeBSD.org>
Date: Thu, 26 Jun 2014 12:52:48 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r359349 - head/net/haproxy
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.18
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, 26 Jun 2014 12:52:48 -0000

Author: demon
Date: Thu Jun 26 12:52:48 2014
New Revision: 359349
URL: http://svnweb.freebsd.org/changeset/ports/359349
QAT: https://qat.redports.org/buildarchive/r359349/

Log:
  Correct OPTIONs usage.

Modified:
  head/net/haproxy/Makefile

Modified: head/net/haproxy/Makefile
==============================================================================
--- head/net/haproxy/Makefile	Thu Jun 26 12:38:57 2014	(r359348)
+++ head/net/haproxy/Makefile	Thu Jun 26 12:52:48 2014	(r359349)
@@ -18,12 +18,12 @@ USES=		gmake
 USE_RC_SUBR=	haproxy
 SUB_FILES=	pkg-message
 
-OPTIONS_DEFINE=		PCRE OPENSSL
-OPTIONS_SINGLE=		PCRE
-OPTIONS_SINGLE_PCRE=	DPCRE SPCRE
+OPTIONS_DEFINE=		OPENSSL
+OPTIONS_RADIO=		PCRE
+OPTIONS_RADIO_PCRE=	DPCRE SPCRE
 DPCRE_DESC=		Link dynamically
 SPCRE_DESC=		Link statically
-OPTIONS_DEFAULT=	PCRE DPCRE OPENSSL
+OPTIONS_DEFAULT=	SPCRE OPENSSL
 
 .include <bsd.port.options.mk>
 
@@ -32,11 +32,11 @@ MAKE_ARGS=	TARGET=freebsd DEFINE=-DFREEB
 
 .if ${PORT_OPTIONS:MDPCRE}
 LIB_DEPENDS+=	libpcre.so:${PORTSDIR}/devel/pcre
-MAKE_ARGS+=	"USE_PCRE=1"
+MAKE_ARGS+=	USE_PCRE=1 USE_PCRE_JIT=1
 .endif
 .if ${PORT_OPTIONS:MSPCRE}
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libpcre.a:${PORTSDIR}/devel/pcre
-MAKE_ARGS+=	"USE_STATIC_PCRE=1"
+MAKE_ARGS+=	USE_STATIC_PCRE=1 USE_PCRE_JIT=1
 .endif
 
 .if ${PORT_OPTIONS:MOPENSSL}