git: 5005d85d5ff0 - main - databases/redis*: Properly reference _ADDFLAGS set by some opt_VARS

[Tobias Kortkamp]

The branch main has been updated by tobik:

URL: https://cgit.FreeBSD.org/ports/commit/?id=5005d85d5ff056a74750d86e7837ebd0ae0c7719

commit 5005d85d5ff056a74750d86e7837ebd0ae0c7719
Author:     Tobias Kortkamp <tobik at FreeBSD.org>
AuthorDate: 2021-09-03 13:01:59 +0000
Commit:     Tobias Kortkamp <tobik at FreeBSD.org>
CommitDate: 2021-09-03 13:01:59 +0000

    databases/redis*: Properly reference _ADDFLAGS set by some opt_VARS
    
    opt_VARS always upcases its argument, so the defined(_addflags)
    check will never be true.
    
    The _ADDFLAGS block overwrites the global CFLAGS and LDFLAGS which
    is also suspicous and probably not quite right.
    
    Reported by:    portscan
---
 databases/redis-devel/Makefile | 3 ++-
 databases/redis/Makefile       | 3 ++-
 databases/redis6/Makefile      | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/databases/redis-devel/Makefile b/databases/redis-devel/Makefile
index de6b6483b6bb..76603da4786f 100644
--- a/databases/redis-devel/Makefile
+++ b/databases/redis-devel/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	redis
 PORTVERSION=	6.2.5
+PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	https://download.redis.io/releases/
 PKGNAMESUFFIX=	-devel
@@ -62,7 +63,7 @@ USE_GCC=	yes
 CFLAGS+=	-march=i586
 .endif
 
-.if defined(_addflags)
+.if defined(_ADDFLAGS)
 CFLAGS=		-fPIC
 LDFLAGS=	-Wl,-E
 .endif
diff --git a/databases/redis/Makefile b/databases/redis/Makefile
index 0bca2eb92d51..442a56640e17 100644
--- a/databases/redis/Makefile
+++ b/databases/redis/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	redis
 PORTVERSION=	6.2.5
+PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	https://download.redis.io/releases/
 
@@ -61,7 +62,7 @@ USE_GCC=	yes
 CFLAGS+=	-march=i586
 .endif
 
-.if defined(_addflags)
+.if defined(_ADDFLAGS)
 CFLAGS=		-fPIC
 LDFLAGS=	-Wl,-E
 .endif
diff --git a/databases/redis6/Makefile b/databases/redis6/Makefile
index c906c8f9cce3..08874b0fd75f 100644
--- a/databases/redis6/Makefile
+++ b/databases/redis6/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	redis6
 PORTVERSION=	6.0.15
+PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	https://download.redis.io/releases/
 DISTNAME=	redis-${PORTVERSION}
@@ -62,7 +63,7 @@ USE_GCC=	yes
 CFLAGS+=	-march=i586
 .endif
 
-.if defined(_addflags)
+.if defined(_ADDFLAGS)
 CFLAGS=		-fPIC
 LDFLAGS=	-Wl,-E
 .endif