From 50859ff8bb2f771f334c7caf9bbdf69c75c766f9 Mon Sep 17 00:00:00 2001 From: demon Date: Tue, 19 Jun 2012 05:31:13 +0000 Subject: Convert to new OPTIONS framework. --- net/haproxy-devel/Makefile | 17 +++++++++++------ net/haproxy/Makefile | 17 +++++++++++------ 2 files changed, 22 insertions(+), 12 deletions(-) (limited to 'net') diff --git a/net/haproxy-devel/Makefile b/net/haproxy-devel/Makefile index 868d3dc59dcc..b36907af956b 100644 --- a/net/haproxy-devel/Makefile +++ b/net/haproxy-devel/Makefile @@ -23,23 +23,28 @@ USE_GMAKE= YES SUB_FILES= pkg-message MAN1= haproxy.1 -OPTIONS= PCRE "Use PCRE regex library" On\ - STATIC_PCRE "Use static PCRE regex library" Off +OPTIONS_DEFINE= PCRE +OPTIONS_SINGLE= PCRE +OPTIONS_SINGLE_PCRE= DPCRE SPCRE +DPCRE_DESC= Link dynamically +SPCRE_DESC= Link statically +OPTIONS_DEFAULT=PCRE DPCRE .include MAKE_ARGS= TARGET=freebsd DEFINE=-DFREEBSD_PORTS \ CC="${CC}" CFLAGS="${CFLAGS}" -.if defined(WITH_PCRE) +.if ${PORT_OPTIONS:MPCRE} LIB_DEPENDS+= pcre.1:${PORTSDIR}/devel/pcre + +.if ${PORT_OPTIONS:MDPCRE} MAKE_ARGS+= "USE_PCRE=1" .endif - -.if defined(WITH_STATIC_PCRE) -LIB_DEPENDS+= pcre.1:${PORTSDIR}/devel/pcre +.if ${PORT_OPTIONS:MSPCRE} MAKE_ARGS+= "USE_STATIC_PCRE=1" .endif +.endif do-install: @${INSTALL_PROGRAM} ${WRKSRC}/haproxy ${PREFIX}/sbin/ diff --git a/net/haproxy/Makefile b/net/haproxy/Makefile index 118b4e482e7b..fe918953db05 100644 --- a/net/haproxy/Makefile +++ b/net/haproxy/Makefile @@ -23,22 +23,27 @@ USE_GMAKE= YES SUB_FILES= pkg-message MAN1= haproxy.1 -OPTIONS= PCRE "Use PCRE regex library" On\ - STATIC_PCRE "Use static PCRE regex library" Off +OPTIONS_DEFINE= PCRE +OPTIONS_SINGLE= PCRE +OPTIONS_SINGLE_PCRE= DPCRE SPCRE +DPCRE_DESC= Link dynamically +SPCRE_DESC= Link statically +OPTIONS_DEFAULT=PCRE DPCRE .include MAKE_ARGS= TARGET=freebsd DEFINE=-DFREEBSD_PORTS CC=${CC} -.if defined(WITH_PCRE) +.if ${PORT_OPTIONS:MPCRE} LIB_DEPENDS+= pcre.1:${PORTSDIR}/devel/pcre + +.if ${PORT_OPTIONS:MDPCRE} MAKE_ARGS+= "USE_PCRE=1" .endif - -.if defined(WITH_STATIC_PCRE) -LIB_DEPENDS+= pcre.1:${PORTSDIR}/devel/pcre +.if ${PORT_OPTIONS:MSPCRE} MAKE_ARGS+= "USE_STATIC_PCRE=1" .endif +.endif do-install: @${INSTALL_PROGRAM} ${WRKSRC}/haproxy ${PREFIX}/sbin/ -- cgit