Attachment 189694 Details for Bug 225149 – svn diff for net/haproxy

[patch] svn diff for net/haproxy

patch-net_haproxy-fix-linking (text/plain), 2.23 KB, created by Bernard Spil on 2018-01-13 22:30:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bernard Spil

Created: 2018-01-13 22:30:35 UTC

Size: 2.23 KB

patch

obsolete

>Index: net/haproxy/Makefile
>===================================================================
>--- net/haproxy/Makefile	(revision 458929)
>+++ net/haproxy/Makefile	(working copy)
>@@ -30,33 +30,27 @@
> 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}
> 
>@@ -69,14 +63,4 @@
> 	${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>

Actions: View | Diff

Attachments on bug 225149: 189694