Attachment 224313 Details for Bug 255052 – add Lua flavor to haproxy ports

[patch] add Lua flavor to haproxy ports

0001-add-lua-flavor-to-haproxy-ports.patch (text/plain), 11.46 KB, created by Mark Deneen on 2021-04-20 21:04:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mark Deneen

Created: 2021-04-20 21:04:04 UTC

Size: 11.46 KB

patch

obsolete

>From 5e2565537efc45d62bc9df9f65a1a80a1f1a7d3c Mon Sep 17 00:00:00 2001
>From: Mark Deneen <mdeneen@protonmail.com>
>Date: Tue, 20 Apr 2021 17:01:24 -0400
>Subject: [PATCH] add lua flavor to haproxy ports
>
>---
> net/haproxy-devel/Makefile | 16 ++++++++++++++--
> net/haproxy/Makefile       | 13 ++++++++++++-
> net/haproxy17/Makefile     | 16 ++++++++++++++--
> net/haproxy18/Makefile     | 14 +++++++++++++-
> net/haproxy19/Makefile     | 16 ++++++++++++++--
> net/haproxy20/Makefile     | 16 ++++++++++++++--
> net/haproxy21/Makefile     | 16 ++++++++++++++--
> net/haproxy23/Makefile     | 16 ++++++++++++++--
> 8 files changed, 109 insertions(+), 14 deletions(-)
>
>diff --git a/net/haproxy-devel/Makefile b/net/haproxy-devel/Makefile
>index 3ff7d4608c43..65d78b5b0e11 100644
>--- a/net/haproxy-devel/Makefile
>+++ b/net/haproxy-devel/Makefile
>@@ -4,7 +4,7 @@ PORTNAME=	haproxy
> DISTVERSION=	2.4-dev16
> CATEGORIES=	net www
> MASTER_SITES=	http://www.haproxy.org/download/2.4/src/devel/
>-PKGNAMESUFFIX=	-devel
>+VERSIONSUFFIX=	-devel
> DISTFILES=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}
> 
> MAINTAINER=	demon@FreeBSD.org
>@@ -13,7 +13,15 @@ COMMENT=	Reliable, high performance TCP/HTTP load balancer
> LICENSE=	GPLv2 LGPL21
> LICENSE_COMB=	multi
> 
>-CONFLICTS_INSTALL=	haproxy-[0-9]* haproxy17-[0-9]* haproxy18-[0-9]* haproxy19-[0-9]* haproxy20-[0-9]* haproxy21-[0-9]*
>+FLAVORS=	default lua
>+FLAVOR?=	${FLAVORS:[1]}
>+
>+default_PKGNAMESUFFIX=		${VERSIONSUFFIX}
>+default_CONFLICTS_INSTALL=	haproxy${VERSIONSUFFIX}-lua
>+lua_PKGNAMESUFFIX=		${VERSIONSUFFIX}-lua
>+lua_CONFLICTS_INSTALL=		haproxy${VERSIONSUFFIX}
>+
>+CONFLICTS_INSTALL+=	haproxy(-.*)?-[0-9]* haproxy17(-.*)?-[0-9]* haproxy18(-.*)?-[0-9]* haproxy19(-.*)?-[0-9]* haproxy20(-.*)?-[0-9]* haproxy21(-.*)?-[0-9]* haproxy23(-.*)?-[0-9]*
> 
> USES=		compiler:c++11-lang cpe gmake
> USE_RC_SUBR=	haproxy
>@@ -32,6 +40,10 @@ DEVICEATLAS_DESC=	DeviceAtlas Device Detection support
> PROMEX_DESC=		Enable Prometheus exporter
> OPTIONS_DEFAULT=	SPCRE OPENSSL
> 
>+.if ${FLAVOR} == lua
>+OPTIONS_DEFAULT+=	LUA
>+.endif
>+
> DPCRE_LIB_DEPENDS=	libpcre.so:devel/pcre
> DPCRE_MAKE_ARGS=	USE_PCRE=1 USE_PCRE_JIT=1
> SPCRE_LIB_DEPENDS=	libpcre.so:devel/pcre
>diff --git a/net/haproxy/Makefile b/net/haproxy/Makefile
>index 58f8448526fa..11540bba753d 100644
>--- a/net/haproxy/Makefile
>+++ b/net/haproxy/Makefile
>@@ -11,7 +11,14 @@ COMMENT=	Reliable, high performance TCP/HTTP load balancer
> LICENSE=	GPLv2 LGPL21
> LICENSE_COMB=	multi
> 
>-CONFLICTS_INSTALL=	haproxy-devel-[0-9]* haproxy17-[0-9]* haproxy18-[0-9]* haproxy19-[0-9]* haproxy20-[0-9]* haproxy21-[0-9]*
>+FLAVORS=	default lua
>+FLAVOR?=	${FLAVORS:[1]}
>+
>+default_CONFLICTS_INSTALL=	haproxy-lua
>+lua_PKGNAMESUFFIX=		-lua
>+lua_CONFLICTS_INSTALL=		haproxy
>+
>+CONFLICTS_INSTALL+=	haproxy-devel(-.*)?-[0-9]* haproxy17(-.*)?-[0-9]* haproxy18(-.*)?-[0-9]* haproxy19(-.*)?-[0-9]* haproxy20(-.*)?-[0-9]* haproxy21(-.*)?-[0-9]* haproxy23(-.*)?-[0-9]*
> 
> USES=		compiler:c++11-lang cpe gmake
> USE_RC_SUBR=	haproxy
>@@ -29,6 +36,10 @@ DEVICEATLAS_DESC=	DeviceAtlas Device Detection support
> PROMEX_DESC=		Enable Prometheus exporter
> OPTIONS_DEFAULT=	SPCRE OPENSSL
> 
>+.if ${FLAVOR} == lua
>+OPTIONS_DEFAULT+=	LUA
>+.endif
>+
> DPCRE_LIB_DEPENDS=	libpcre.so:devel/pcre
> DPCRE_MAKE_ARGS=	USE_PCRE=1 USE_PCRE_JIT=1
> SPCRE_LIB_DEPENDS=	libpcre.so:devel/pcre
>diff --git a/net/haproxy17/Makefile b/net/haproxy17/Makefile
>index 044b96a7ffab..40e2445fbf28 100644
>--- a/net/haproxy17/Makefile
>+++ b/net/haproxy17/Makefile
>@@ -4,7 +4,7 @@ PORTNAME=	haproxy
> PORTVERSION=	1.7.14
> CATEGORIES=	net www
> MASTER_SITES=	http://www.haproxy.org/download/1.7/src/
>-PKGNAMESUFFIX=	17
>+VERSIONSUFFIX=	17
> 
> MAINTAINER=	demon@FreeBSD.org
> COMMENT=	Reliable, high performance TCP/HTTP load balancer
>@@ -15,7 +15,15 @@ LICENSE_COMB=	multi
> BROKEN_mips=		fails to build: undefined reference to '__sync_sub_and_fetch_4'
> BROKEN_mips64=		fails to build: undefined reference to '__sync_sub_and_fetch_4'
> 
>-CONFLICTS_INSTALL=	haproxy-[0-9]* haproxy-devel-[0-9]* haproxy18-[0-9]* haproxy19-[0-9]* haproxy20-[0-9]* haproxy21-[0-9]*
>+FLAVORS=	default lua
>+FLAVOR?=	${FLAVORS:[1]}
>+
>+default_PKGNAMESUFFIX=		${VERSIONSUFFIX}
>+default_CONFLICTS_INSTALL=	haproxy${VERSIONSUFFIX}-lua
>+lua_PKGNAMESUFFIX=		${VERSIONSUFFIX}-lua
>+lua_CONFLICTS_INSTALL=		haproxy${VERSIONSUFFIX}
>+
>+CONFLICTS_INSTALL+=	haproxy(-.*)?-[0-9]* haproxy(-.*)?-devel-[0-9]* haproxy18(-.*)?-[0-9]* haproxy19(-.*)?-[0-9]* haproxy20(-.*)?-[0-9]* haproxy21(-.*)?-[0-9]* haproxy23(-.*)?-[0-9]*
> 
> USES=		cpe gmake
> USE_RC_SUBR=	haproxy
>@@ -32,6 +40,10 @@ SPCRE_DESC=		Link statically
> DEVICEATLAS_DESC=	DeviceAtlas Device Detection support
> OPTIONS_DEFAULT=	SPCRE OPENSSL
> 
>+.if ${FLAVOR} == lua
>+OPTIONS_DEFAULT+=	LUA
>+.endif
>+
> DPCRE_LIB_DEPENDS=	libpcre.so:devel/pcre
> DPCRE_MAKE_ARGS=	USE_PCRE=1 USE_PCRE_JIT=1
> SPCRE_LIB_DEPENDS=	libpcre.so:devel/pcre
>diff --git a/net/haproxy18/Makefile b/net/haproxy18/Makefile
>index 5d444f001797..6fd168b4b3c5 100644
>--- a/net/haproxy18/Makefile
>+++ b/net/haproxy18/Makefile
>@@ -12,7 +12,15 @@ COMMENT=	Reliable, high performance TCP/HTTP load balancer
> LICENSE=	GPLv2 LGPL21
> LICENSE_COMB=	multi
> 
>-CONFLICTS_INSTALL=	haproxy-[0-9]* haproxy-devel-[0-9]* haproxy17-[0-9]* haproxy19-[0-9]* haproxy20-[0-9]* haproxy21-[0-9]*
>+FLAVORS=	default lua
>+FLAVOR?=	${FLAVORS:[1]}
>+
>+default_PKGNAMESUFFIX=		${VERSIONSUFFIX}
>+default_CONFLICTS_INSTALL=	haproxy${VERSIONSUFFIX}-lua
>+lua_PKGNAMESUFFIX=		${VERSIONSUFFIX}-lua
>+lua_CONFLICTS_INSTALL=		haproxy${VERSIONSUFFIX}
>+
>+CONFLICTS_INSTALL+=	haproxy(-.*)?-[0-9]* haproxy-devel(-.*)?-[0-9]* haproxy17(-.*)?-[0-9]* haproxy19(-.*)?-[0-9]* haproxy20(-.*)?-[0-9]* haproxy21(-.*)?-[0-9]* haproxy23(-.*)?-[0-9]*
> 
> USES=		cpe gmake
> USE_RC_SUBR=	haproxy
>@@ -29,6 +37,10 @@ SPCRE_DESC=		Link statically
> DEVICEATLAS_DESC=	DeviceAtlas Device Detection support
> OPTIONS_DEFAULT=	SPCRE OPENSSL
> 
>+.if ${FLAVOR} == lua
>+OPTIONS_DEFAULT+=	LUA
>+.endif
>+
> DPCRE_LIB_DEPENDS=	libpcre.so:devel/pcre
> DPCRE_MAKE_ARGS=	USE_PCRE=1 USE_PCRE_JIT=1
> SPCRE_LIB_DEPENDS=	libpcre.so:devel/pcre
>diff --git a/net/haproxy19/Makefile b/net/haproxy19/Makefile
>index 67f22562acf6..d4ac911a5335 100644
>--- a/net/haproxy19/Makefile
>+++ b/net/haproxy19/Makefile
>@@ -3,7 +3,7 @@
> PORTNAME=	haproxy
> DISTVERSION=	1.9.16
> CATEGORIES=	net www
>-PKGNAMESUFFIX=	19
>+VERSIONSUFFIX=	19
> MASTER_SITES=	http://www.haproxy.org/download/1.9/src/
> 
> MAINTAINER=	demon@FreeBSD.org
>@@ -12,7 +12,15 @@ COMMENT=	Reliable, high performance TCP/HTTP load balancer
> LICENSE=	GPLv2 LGPL21
> LICENSE_COMB=	multi
> 
>-CONFLICTS_INSTALL=	haproxy-[0-9]* haproxy-devel-[0-9]* haproxy17-[0-9]* haproxy18-[0-9]* haproxy20-[0-9]* haproxy21-[0-9]*
>+FLAVORS=	default lua
>+FLAVOR?=	${FLAVORS:[1]}
>+
>+default_PKGNAMESUFFIX=		${VERSIONSUFFIX}
>+default_CONFLICTS_INSTALL=	haproxy${VERSIONSUFFIX}-lua
>+lua_PKGNAMESUFFIX=		${VERSIONSUFFIX}-lua
>+lua_CONFLICTS_INSTALL=		haproxy${VERSIONSUFFIX}
>+
>+CONFLICTS_INSTALL+=	haproxy(-.*)?-[0-9]* haproxy-devel(-.*)?-[0-9]* haproxy17(-.*)?-[0-9]* haproxy18(-.*)?-[0-9]* haproxy20(-.*)?-[0-9]* haproxy21(-.*)?-[0-9]* haproxy23(-.*)?-[0-9]*
> 
> USES=		compiler:c++11-lang cpe gmake
> USE_RC_SUBR=	haproxy
>@@ -29,6 +37,10 @@ SPCRE_DESC=		Link statically
> DEVICEATLAS_DESC=	DeviceAtlas Device Detection support
> OPTIONS_DEFAULT=	SPCRE OPENSSL
> 
>+.if ${FLAVOR} == lua
>+OPTIONS_DEFAULT+=	LUA
>+.endif
>+
> DPCRE_LIB_DEPENDS=	libpcre.so:devel/pcre
> DPCRE_MAKE_ARGS=	USE_PCRE=1 USE_PCRE_JIT=1
> SPCRE_LIB_DEPENDS=	libpcre.so:devel/pcre
>diff --git a/net/haproxy20/Makefile b/net/haproxy20/Makefile
>index 4b0cec685ecf..1f358e343296 100644
>--- a/net/haproxy20/Makefile
>+++ b/net/haproxy20/Makefile
>@@ -3,7 +3,7 @@
> PORTNAME=	haproxy
> DISTVERSION=	2.0.22
> CATEGORIES=	net www
>-PKGNAMESUFFIX=	20
>+VERSIONSUFFIX=	20
> MASTER_SITES=	http://www.haproxy.org/download/2.0/src/
> 
> MAINTAINER=	demon@FreeBSD.org
>@@ -12,7 +12,15 @@ COMMENT=	Reliable, high performance TCP/HTTP load balancer
> LICENSE=	GPLv2 LGPL21
> LICENSE_COMB=	multi
> 
>-CONFLICTS_INSTALL=	haproxy-[0-9]* haproxy-devel-[0-9]* haproxy17-[0-9]* haproxy18-[0-9]* haproxy19-[0-9]* haproxy21-[0-9]*
>+FLAVORS=	default lua
>+FLAVOR?=	${FLAVORS:[1]}
>+
>+default_PKGNAMESUFFIX=		${VERSIONSUFFIX}
>+default_CONFLICTS_INSTALL=	haproxy${VERSIONSUFFIX}-lua
>+lua_PKGNAMESUFFIX=		${VERSIONSUFFIX}-lua
>+lua_CONFLICTS_INSTALL=		haproxy${VERSIONSUFFIX}
>+
>+CONFLICTS_INSTALL+=	haproxy(-.*)?-[0-9]* haproxy-devel(-.*)?-[0-9]* haproxy17(-.*)?-[0-9]* haproxy18(-.*)?-[0-9]* haproxy19(-.*)?-[0-9]* haproxy21(-.*)?-[0-9]* haproxy23(-.*)?-[0-9]*
> 
> USES=		compiler:c++11-lang cpe gmake
> USE_RC_SUBR=	haproxy
>@@ -30,6 +38,10 @@ DEVICEATLAS_DESC=	DeviceAtlas Device Detection support
> PROMEX_DESC=		Enable Prometheus exporter
> OPTIONS_DEFAULT=	SPCRE OPENSSL
> 
>+.if ${FLAVOR} == lua
>+OPTIONS_DEFAULT+=	LUA
>+.endif
>+
> DPCRE_LIB_DEPENDS=	libpcre.so:devel/pcre
> DPCRE_MAKE_ARGS=	USE_PCRE=1 USE_PCRE_JIT=1
> SPCRE_LIB_DEPENDS=	libpcre.so:devel/pcre
>diff --git a/net/haproxy21/Makefile b/net/haproxy21/Makefile
>index bd43f64d3a25..07286c7f852e 100644
>--- a/net/haproxy21/Makefile
>+++ b/net/haproxy21/Makefile
>@@ -3,7 +3,7 @@
> PORTNAME=	haproxy
> DISTVERSION=	2.1.12
> CATEGORIES=	net www
>-PKGNAMESUFFIX=	21
>+VERSIONSUFFIX=	21
> MASTER_SITES=	http://www.haproxy.org/download/2.1/src/
> 
> MAINTAINER=	demon@FreeBSD.org
>@@ -12,7 +12,15 @@ COMMENT=	Reliable, high performance TCP/HTTP load balancer
> LICENSE=	GPLv2 LGPL21
> LICENSE_COMB=	multi
> 
>-CONFLICTS_INSTALL=	haproxy-[0-9]* haproxy-devel-[0-9]* haproxy17-[0-9]* haproxy18-[0-9]* haproxy19-[0-9]* haproxy20-[0-9]*
>+FLAVORS=	default lua
>+FLAVOR?=	${FLAVORS:[1]}
>+
>+default_PKGNAMESUFFIX=		${VERSIONSUFFIX}
>+default_CONFLICTS_INSTALL=	haproxy${VERSIONSUFFIX}-lua
>+lua_PKGNAMESUFFIX=		${VERSIONSUFFIX}-lua
>+lua_CONFLICTS_INSTALL=		haproxy${VERSIONSUFFIX}
>+
>+CONFLICTS_INSTALL+=	haproxy(-.*)?-[0-9]* haproxy-devel(-.*)?-[0-9]* haproxy17(-.*)?-[0-9]* haproxy18(-.*)?-[0-9]* haproxy19(-.*)?-[0-9]* haproxy20(-.*)?-[0-9]* haproxy23(-.*)?-[0-9]*
> 
> USES=		compiler:c++11-lang cpe gmake
> USE_RC_SUBR=	haproxy
>@@ -30,6 +38,10 @@ DEVICEATLAS_DESC=	DeviceAtlas Device Detection support
> PROMEX_DESC=		Enable Prometheus exporter
> OPTIONS_DEFAULT=	SPCRE OPENSSL
> 
>+.if ${FLAVOR} == lua
>+OPTIONS_DEFAULT+=	LUA
>+.endif
>+
> DPCRE_LIB_DEPENDS=	libpcre.so:devel/pcre
> DPCRE_MAKE_ARGS=	USE_PCRE=1 USE_PCRE_JIT=1
> SPCRE_LIB_DEPENDS=	libpcre.so:devel/pcre
>diff --git a/net/haproxy23/Makefile b/net/haproxy23/Makefile
>index 3a8afccc7546..9a8e572c0fae 100644
>--- a/net/haproxy23/Makefile
>+++ b/net/haproxy23/Makefile
>@@ -3,7 +3,7 @@
> PORTNAME=	haproxy
> DISTVERSION=	2.3.9
> CATEGORIES=	net www
>-PKGNAMESUFFIX=	23
>+VERSIONSUFFIX=	23
> MASTER_SITES=	http://www.haproxy.org/download/2.3/src/
> 
> MAINTAINER=	demon@FreeBSD.org
>@@ -12,7 +12,15 @@ COMMENT=	Reliable, high performance TCP/HTTP load balancer
> LICENSE=	GPLv2 LGPL21
> LICENSE_COMB=	multi
> 
>-CONFLICTS_INSTALL=	haproxy-[0-9]* haproxy17-[0-9]* haproxy18-[0-9]* haproxy19-[0-9]* haproxy20-[0-9]* haproxy21-[0-9]*
>+FLAVORS=	default lua
>+FLAVOR?=	${FLAVORS:[1]}
>+
>+default_PKGNAMESUFFIX=		${VERSIONSUFFIX}
>+default_CONFLICTS_INSTALL=	haproxy${VERSIONSUFFIX}-lua
>+lua_PKGNAMESUFFIX=		${VERSIONSUFFIX}-lua
>+lua_CONFLICTS_INSTALL=		haproxy${VERSIONSUFFIX}
>+
>+CONFLICTS_INSTALL+=	haproxy(-.*)?-[0-9]* haproxy-devel(-.*)?-[0-9]* haproxy17(-.*)?-[0-9]* haproxy18(-.*)?-[0-9]* haproxy19(-.*)?-[0-9]* haproxy20(-.*)?-[0-9]* haproxy21(-.*)?-[0-9]*
> 
> USES=		compiler:c++11-lang cpe gmake
> USE_RC_SUBR=	haproxy
>@@ -30,6 +38,10 @@ DEVICEATLAS_DESC=	DeviceAtlas Device Detection support
> PROMEX_DESC=		Enable Prometheus exporter
> OPTIONS_DEFAULT=	SPCRE OPENSSL
> 
>+.if ${FLAVOR} == lua
>+OPTIONS_DEFAULT+=	LUA
>+.endif
>+
> DPCRE_LIB_DEPENDS=	libpcre.so:devel/pcre
> DPCRE_MAKE_ARGS=	USE_PCRE=1 USE_PCRE_JIT=1
> SPCRE_LIB_DEPENDS=	libpcre.so:devel/pcre
>-- 
>2.27.0
>

Actions: View | Diff

Attachments on bug 255052: 224106 | 224313 | 224331