aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--net/haproxy-devel/Makefile17
-rw-r--r--net/haproxy/Makefile17
2 files changed, 22 insertions, 12 deletions
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 <bsd.port.options.mk>
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 <bsd.port.options.mk>
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/