svn commit: r459116 - head/net/haproxy
Bernard Spil
brnrd at FreeBSD.org
Mon Jan 15 21:12:59 UTC 2018
Author: brnrd
Date: Mon Jan 15 21:12:58 2018
New Revision: 459116
URL: https://svnweb.freebsd.org/changeset/ports/459116
Log:
net/haproxy: Fix linking SSL libs
- Pass lib and include paths to make
- Optionsify
PR: 225149
Approved by: demon (maintainer)
Modified:
head/net/haproxy/Makefile
Modified: head/net/haproxy/Makefile
==============================================================================
--- head/net/haproxy/Makefile Mon Jan 15 21:10:53 2018 (r459115)
+++ head/net/haproxy/Makefile Mon Jan 15 21:12:58 2018 (r459116)
@@ -30,33 +30,27 @@ SPCRE_DESC= Link statically
DEVICEATLAS_DESC= DeviceAtlas Device Detection support
OPTIONS_DEFAULT= SPCRE OPENSSL
-.include <bsd.port.options.mk>
+DPCRE_LIB_DEPENDS= libpcre.so:devel/pcre
+DPCRE_MAKE_ARGS= USE_PCRE=1 USE_PCRE_JIT=1
+SPCRE_LIB_DEPENDS= libpcre.so:devel/pcre
+SPCRE_MAKE_ARGS= USE_PCRE=1 USE_STATIC_PCRE=1 USE_PCRE_JIT=1
+DEVICEATLAS_LIB_DEPENDS= libda.so:net/deviceatlas-enterprise-c
+DEVICEATLAS_MAKE_ARGS= USE_DEVICEATLAS=1 DEVICEATLAS_LIB=${LOCALBASE}/lib DEVICEATLAS_INC=${LOCALBASE}/include
+OPENSSL_USES= ssl
+OPENSSL_MAKE_ARGS= USE_OPENSSL=1 SSL_LIB=${OPENSSLLIB} SSL_INC=${OPENSSLINC}
+LUA_USES= lua:53
+LUA_MAKE_ARGS= USE_LUA=1 LUA_INC=${LUA_INCDIR} LUA_LIB=${LUA_LIBDIR} LUA_LIB_NAME=lua-${LUA_VER}
-.if ${PORT_OPTIONS:MDPCRE}
-LIB_DEPENDS+= libpcre.so:devel/pcre
-MAKE_ARGS+= USE_PCRE=1 USE_PCRE_JIT=1
-.endif
+.include <bsd.port.pre.mk>
-.if ${PORT_OPTIONS:MSPCRE}
-BUILD_DEPENDS+= ${LOCALBASE}/lib/libpcre.a:devel/pcre
-MAKE_ARGS+= USE_PCRE=1 USE_STATIC_PCRE=1 USE_PCRE_JIT=1
+.if ${ARCH} == "amd64" || ${ARCH} == "i386"
+MAKE_ARGS+= USE_REGPARM=1
.endif
-.if ${PORT_OPTIONS:MDEVICEATLAS}
-LIB_DEPENDS+= libda.so:net/deviceatlas-enterprise-c
-MAKE_ARGS+= USE_DEVICEATLAS=1 DEVICEATLAS_LIB=${LOCALBASE}/lib DEVICEATLAS_INC=${LOCALBASE}/include
+.if ${PORT_OPTIONS:MOPENSSL} && ${SSL_DEFAULT:Mopenssl-devel}
+BROKEN= Does not build with openssl-devel
.endif
-.if ${PORT_OPTIONS:MOPENSSL}
-USES+= ssl
-MAKE_ARGS+= USE_OPENSSL=1
-.endif
-
-.if ${PORT_OPTIONS:MLUA}
-USES+= lua:53
-MAKE_ARGS+= USE_LUA=1 LUA_INC=${LUA_INCDIR} LUA_LIB=${LUA_LIBDIR} LUA_LIB_NAME=lua-${LUA_VER}
-.endif
-
post-build:
cd ${WRKSRC}/contrib/halog && ${MAKE_CMD} ${MAKE_ENV}
@@ -68,15 +62,5 @@ do-install:
(cd ${WRKSRC}/doc/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR})
${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
(cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR})
-
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "amd64" || ${ARCH} == "i386"
-MAKE_ARGS+= USE_REGPARM=1
-.endif
-
-.if ${PORT_OPTIONS:MOPENSSL} && ${SSL_DEFAULT:Mopenssl-devel}
-BROKEN= Does not build with openssl-devel
-.endif
.include <bsd.port.post.mk>
More information about the svn-ports-all
mailing list