Update to the recent commit.

Make portlint(1) more happier by regenerating the patch and move
USES knob up.
Add another patch to respect [C|CXX]FLAGS.

3 files changed, 30 insertions, 12 deletions

diff --git a/databases/redis-devel/files/patch-deps-hiredis-Makefile b/databases/redis-devel/files/patch-deps-hiredis-Makefile
index db5f7b7c5ca6..1b08c4514d3d 100644
--- a/databases/redis-devel/files/patch-deps-hiredis-Makefile
+++ b/databases/redis-devel/files/patch-deps-hiredis-Makefile
@@ -1,6 +1,6 @@
---- deps/hiredis/Makefile.orig	2019-11-24 18:44:27.552196000 -0500
-+++ deps/hiredis/Makefile	2019-11-24 19:16:28.147610000 -0500
-@@ -21,7 +21,7 @@
+--- deps/hiredis/Makefile.orig	2019-11-29 16:35:59 UTC
++++ deps/hiredis/Makefile
+@@ -21,7 +21,7 @@ HIREDIS_PATCH=$(shell grep HIREDIS_PATCH hiredis.h | a
  HIREDIS_SONAME=$(shell grep HIREDIS_SONAME hiredis.h | awk '{print $$3}')
  
  # Installation related variables and target
@@ -9,7 +9,7 @@
  INCLUDE_PATH?=include/hiredis
  LIBRARY_PATH?=lib
  PKGCONF_PATH?=pkgconfig
-@@ -44,10 +44,8 @@
+@@ -44,10 +44,8 @@ export REDIS_TEST_CONFIG
  # Fallback to gcc when $CC is not in $PATH.
  CC:=$(shell sh -c 'type $${CC%% *} >/dev/null 2>/dev/null && echo $(CC) || echo gcc')
  CXX:=$(shell sh -c 'type $${CXX%% *} >/dev/null 2>/dev/null && echo $(CXX) || echo g++')
@@ -21,7 +21,7 @@
  REAL_LDFLAGS=$(LDFLAGS)
  
  DYLIBSUFFIX=so
-@@ -82,6 +80,16 @@
+@@ -82,6 +80,16 @@ endif
  ifeq ($(uname_S),SunOS)
    REAL_LDFLAGS+= -ldl -lnsl -lsocket
    DYLIB_MAKE_CMD=$(CC) -G -o $(DYLIBNAME) -h $(DYLIB_MINOR_NAME) $(LDFLAGS)
diff --git a/databases/redis-devel/files/patch-deps_Makefile b/databases/redis-devel/files/patch-deps_Makefile
new file mode 100644
index 000000000000..ab5b282c67f5
--- /dev/null
+++ b/databases/redis-devel/files/patch-deps_Makefile
@@ -0,0 +1,18 @@
+--- deps/Makefile.orig	2019-11-29 16:35:59 UTC
++++ deps/Makefile
+@@ -76,12 +76,12 @@ lua: .make-prerequisites
+ 
+ .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.1.0-0-g0 --with-lg-quantum=3 --with-jemalloc-prefix=je_ --enable-cc-silence CFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)"
+-	cd jemalloc && $(MAKE) CFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" lib/libjemalloc.a
++	cd jemalloc && ./configure --with-version=5.1.0-0-g0 --with-lg-quantum=3 --with-jemalloc-prefix=je_ --enable-cc-silence 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-src-Makefile b/databases/redis-devel/files/patch-src-Makefile
index 039f8f0dbe1e..6b3ed47b68be 100644
--- a/databases/redis-devel/files/patch-src-Makefile
+++ b/databases/redis-devel/files/patch-src-Makefile
@@ -1,4 +1,4 @@
---- src/Makefile.orig	2019-09-25 10:40:18 UTC
+--- src/Makefile.orig	2019-11-29 16:35:59 UTC
 +++ src/Makefile
 @@ -29,7 +29,7 @@ endif
  WARN=-Wall -W -Wno-missing-field-initializers
@@ -15,11 +15,11 @@
  FINAL_LIBS=-lm
 -DEBUG=-g -ggdb
  
- ifeq ($(uname_S),SunOS)
- 	# SunOS
-@@ -94,6 +93,11 @@ ifeq ($(uname_S),Darwin)
- 	# Darwin
- 	FINAL_LIBS+= -ldl
+ # Linux ARM needs -latomic at linking time
+ ifneq (,$(filter aarch64 armv,$(uname_M)))
+@@ -105,6 +104,11 @@ ifeq ($(uname_S),Darwin)
+ 	OPENSSL_CFLAGS=-I/usr/local/opt/openssl/include
+ 	OPENSSL_LDFLAGS=-L/usr/local/opt/openssl/lib
  else
 +ifeq ($(uname_S),FreeBSD)
 +        # FreeBSD
@@ -29,7 +29,7 @@
  ifeq ($(uname_S),AIX)
          # AIX
          FINAL_LDFLAGS+= -Wl,-bexpall
-@@ -120,6 +124,7 @@ else
+@@ -131,6 +135,7 @@ else
  	# All the other OSes (notably Linux)
  	FINAL_LDFLAGS+= -rdynamic
  	FINAL_LIBS+=-ldl -pthread -lrt