Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 26 Jun 2014 12:52:48 +0000 (UTC)
From:      Dmitry Sivachenko <demon@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r359349 - head/net/haproxy
Message-ID:  <201406261252.s5QCqm9C077605@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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}



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406261252.s5QCqm9C077605>