git: f3ecabe6bfdc - main - databases/redis-devel: merge two patches

The branch main has been updated by osa:

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

commit f3ecabe6bfdc18e70dbf6d0bf71616264569b82f
Author:     Sergey A. Osokin <osa@FreeBSD.org>
AuthorDate: 2021-10-20 02:04:02 +0000
Commit:     Sergey A. Osokin <osa@FreeBSD.org>
CommitDate: 2021-10-20 02:04:02 +0000

    databases/redis-devel: merge two patches
    
    There's no any reasons to keep two patches for deps/Makefile.
    No functional changes, so do not bump PORTREVISION.
---
 databases/redis-devel/files/patch-deps-Makefile | 18 +++++++++++++++---
 databases/redis-devel/files/patch-deps_Makefile | 18 ------------------
 2 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/databases/redis-devel/files/patch-deps-Makefile b/databases/redis-devel/files/patch-deps-Makefile
index c2a757c59b33..cf77ec972392 100644
--- a/databases/redis-devel/files/patch-deps-Makefile
+++ b/databases/redis-devel/files/patch-deps-Makefile
@@ -1,5 +1,5 @@
---- deps/Makefile.orig	2021-01-12 09:21:03.000000000 -0500
-+++ deps/Makefile	2021-01-13 11:37:45.979445000 -0500
+--- deps/Makefile.orig	2021-10-19 22:00:31.196463000 -0400
++++ deps/Makefile	2021-10-19 22:00:41.781836000 -0400
 @@ -69,7 +69,7 @@
  	LUA_CFLAGS= -D__C99FEATURES__=1
  endif
@@ -9,7 +9,7 @@
  LUA_LDFLAGS+= $(LDFLAGS)
  # lua's Makefile defines AR="ar rcu", which is unusual, and makes it more
  # challenging to cross-compile lua (and redis).  These defines make it easier
-@@ -79,7 +79,7 @@
+@@ -79,16 +79,16 @@
  
  lua: .make-prerequisites
  	@printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR)
@@ -18,3 +18,15 @@
  
  .PHONY: lua
  
+-JEMALLOC_CFLAGS= -std=gnu99 -Wall -pipe -g3 -O3 -funroll-loops $(CFLAGS)
++JEMALLOC_CFLAGS= -std=gnu99 -Wall -pipe -funroll-loops $(CFLAGS)
+ JEMALLOC_LDFLAGS= $(LDFLAGS)
+ 
+ jemalloc: .make-prerequisites
+ 	@printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR)
+-	cd jemalloc && ./configure --with-version=5.2.1-0-g0 --with-lg-quantum=3 --with-jemalloc-prefix=je_ CFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)"
+-	cd jemalloc && $(MAKE) CFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" lib/libjemalloc.a
++	cd jemalloc && ./configure --with-version=5.2.1-0-g0 --with-lg-quantum=3 --with-jemalloc-prefix=je_ CFLAGS="$(JEMALLOC_CFLAGS)" CXXFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)"
++	cd jemalloc && $(MAKE) CFLAGS="$(JEMALLOC_CFLAGS)" CXXFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" lib/libjemalloc.a
+ 
+ .PHONY: jemalloc
diff --git a/databases/redis-devel/files/patch-deps_Makefile b/databases/redis-devel/files/patch-deps_Makefile
deleted file mode 100644
index bdcd035ec6d7..000000000000
--- a/databases/redis-devel/files/patch-deps_Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
---- deps/Makefile.orig	2021-10-19 21:44:53.819624000 -0400
-+++ deps/Makefile	2021-10-19 21:47:42.727500000 -0400
-@@ -83,12 +83,12 @@
- 
- .PHONY: lua
- 
--JEMALLOC_CFLAGS= -std=gnu99 -Wall -pipe -g3 -O3 -funroll-loops $(CFLAGS)
-+JEMALLOC_CFLAGS= -std=gnu99 -Wall -pipe -funroll-loops $(CFLAGS)
- JEMALLOC_LDFLAGS= $(LDFLAGS)
- 
- jemalloc: .make-prerequisites
- 	@printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR)
--	cd jemalloc && ./configure --with-version=5.2.1-0-g0 --with-lg-quantum=3 --with-jemalloc-prefix=je_ CFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)"
--	cd jemalloc && $(MAKE) CFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" lib/libjemalloc.a
-+	cd jemalloc && ./configure --with-version=5.2.1-0-g0 --with-lg-quantum=3 --with-jemalloc-prefix=je_ CFLAGS="$(JEMALLOC_CFLAGS)" CXXFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)"
-+	cd jemalloc && $(MAKE) CFLAGS="$(JEMALLOC_CFLAGS)" CXXFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" lib/libjemalloc.a
- 
- .PHONY: jemalloc