*/*: sync with upstream

Taken from: HardenedBSD

audio/klystrack/Makefile

@@ -12,6 +12,8 @@ COMMENT=	Tracker for making C64/NES/Amiga-style chiptunes
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+BROKEN_FreeBSD_13=	ld: error: duplicate symbol: menu_
+
 LIB_DEPENDS=	libasound.so:audio/alsa-lib
 
 USES=		compiler:c11 desktop-file-utils dos2unix gmake localbase:ldconfig \

audio/wavpack/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	wavpack
-DISTVERSION=	5.3.0
+DISTVERSION=	5.4.0
 CATEGORIES=	audio
 MASTER_SITES=	http://www.wavpack.com/
 

audio/wavpack/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1587136662
-SHA256 (wavpack-5.3.0.tar.bz2) = b6f00b3a2185a1d2df6cf8d893ec60fd645d2eb90db7428a617fd27c9e8a6a01
-SIZE (wavpack-5.3.0.tar.bz2) = 851092
+TIMESTAMP = 1610607585
+SHA256 (wavpack-5.4.0.tar.bz2) = 0716a6dcf9a72d61005e1b09bbbd61aaf49837cb4e4a351992a6daed16cac034
+SIZE (wavpack-5.4.0.tar.bz2) = 863429

audio/wavpack/pkg-plist

@@ -6,7 +6,7 @@ include/wavpack/wavpack.h
 lib/libwavpack.a
 lib/libwavpack.so
 lib/libwavpack.so.1
-lib/libwavpack.so.1.2.2
+lib/libwavpack.so.1.2.3
 libdata/pkgconfig/wavpack.pc
 man/man1/wavpack.1.gz
 man/man1/wvgain.1.gz

cad/calculix-ccx/Makefile

@@ -55,6 +55,11 @@ CFLAGS+=	-fpic
 FFLAGS+=	-fpic
 .endif
 
+.if ${GCC_DEFAULT} >= 10
+# workaround for Missing actual argument for argument '_formal_15' at (1)
+FFLAGS+=	-fallow-argument-mismatch
+.endif
+
 pre-build:
 	@${REINPLACE_CMD} -e 's+%%FC%%+${FC}+g ; s+%%CC%%+${CC}+g ; \
 	s+%%BLAS_LIBS%%+${BLASLIB}+ ; \

comms/openobex/pkg-plist

@@ -20,7 +20,6 @@ libdata/pkgconfig/openobex.pc
 %%DOXYGEN%%%%DOCSDIR%%/html/dir_d44c64559bbebec7f509842c48db8b23.html
 %%DOXYGEN%%%%DOCSDIR%%/html/doc.png
 %%DOXYGEN%%%%DOCSDIR%%/html/doxygen.css
-%%DOXYGEN%%%%DOCSDIR%%/html/doxygen.png
 %%DOXYGEN%%%%DOCSDIR%%/html/dynsections.js
 %%DOXYGEN%%%%DOCSDIR%%/html/files.html
 %%DOXYGEN%%%%DOCSDIR%%/html/folderclosed.png

comms/wsjtx/Makefile

@@ -36,6 +36,13 @@ PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
 
 _PATCHES=	wsjtx.patch hamlib.patch
 
+.include <bsd.port.pre.mk>
+
+.if ${GCC_DEFAULT} >= 10
+# workaround for More actual than formal arguments in procedure call at (1)
+FFLAGS+=	-fallow-argument-mismatch
+.endif
+
 post-patch:
 .  for _patch in ${_PATCHES}
 	# Keep a copy of the blank patch for the post-build target below

databases/Makefile

@@ -843,6 +843,7 @@
     SUBDIR += redis
     SUBDIR += redis-devel
     SUBDIR += redis4
+    SUBDIR += redis5
     SUBDIR += redis_exporter
     SUBDIR += redisdesktopmanager
     SUBDIR += retcl

databases/grass7/Makefile

@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	grass
-PORTVERSION=	7.8.4
-PORTREVISION=	2
+PORTVERSION=	7.8.5
 CATEGORIES=	databases geography
 MASTER_SITES=	https://grass.osgeo.org/%SUBDIR%/ \
 		http://grass.cict.fr/%SUBDIR%/ \
@@ -65,10 +64,10 @@ CONFIGURE_ARGS=	--with-includes=${LOCALBASE}/include \
 		--with-readline \
 		--enable-largefile \
 		--with-wxwidgets=${WX_CONFIG} \
-		--with-proj=${LOCALBASE}/bin/proj \
 		--with-proj-share=${LOCALBASE}/share/proj \
 		--with-proj-includes=${LOCALBASE}/include \
 		--with-proj-libs=${LOCALBASE}/lib \
+		--with-proj=${LOCALBASE}/bin/proj \
 		--with-geos=${LOCALBASE}/bin/geos-config \
 		--with-gdal=${LOCALBASE}/bin/gdal-config \
 		--with-pthread=yes \

databases/grass7/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1601924206
-SHA256 (grass-7.8.4.tar.gz) = d9535afb5e43ecdcf9a6233f5a1fa83908b66456bdd06107e7320a51ee86cff9
-SIZE (grass-7.8.4.tar.gz) = 61791074
+TIMESTAMP = 1610555224
+SHA256 (grass-7.8.5.tar.gz) = a359bb665524ecccb643335d70f5436b1c84ffb6a0e428b78dffebacd983ff37
+SIZE (grass-7.8.5.tar.gz) = 61801712

databases/mariadb105-server/Makefile

@@ -212,7 +212,7 @@ PLIST_SUB+=	WSREP="@comment "
 .endif
 
 .if ${ARCH} == i386
-USE_GCC=	yes
+USE_GCC=	9
 CFLAGS+=	-DHAVE_GCC_C11_ATOMICS -latomic -DUSE_NEW_READLINE_INTERFACE
 CXXFLAGS+=	-fpermissive
 .endif

databases/mongodb40/Makefile

@@ -19,7 +19,7 @@ LICENSE_FILE_SSPLv1=	${WRKSRC}/LICENSE-Community.txt
 LICENSE_PERMS_SSPLv1=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 ONLY_FOR_ARCHS=	aarch64 amd64 powerpc64le
-ONLY_FOR_ARCHS_REASON=	"Only supported on amd64 and aarch64 (i386 deprecated in v3)"
+ONLY_FOR_ARCHS_REASON=	Only supported on amd64, aarch64 and powerpc64le (i386 deprecated in v3)
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cheetah3>0:devel/py-cheetah3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${PY_FLAVOR} \

databases/mongodb42/Makefile

@@ -20,7 +20,7 @@ LICENSE_FILE_SSPLv1=	${WRKSRC}/LICENSE-Community.txt
 LICENSE_PERMS_SSPLv1=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 ONLY_FOR_ARCHS=	aarch64 amd64 powerpc64le
-ONLY_FOR_ARCHS_REASON=	"Only ported to amd64 and aarch64 on FreeBSD. Upstream supports arm64, ppc64le, s390x and x86-64."
+ONLY_FOR_ARCHS_REASON=	Only ported to amd64, aarch64 and powerpc64le on FreeBSD. Upstream supports arm64, ppc64le, s390x and x86-64.
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cheetah3>0:devel/py-cheetah3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${PY_FLAVOR} \

databases/mongodb44/Makefile

@@ -20,7 +20,7 @@ LICENSE_FILE_SSPLv1=	${WRKSRC}/LICENSE-Community.txt
 LICENSE_PERMS_SSPLv1=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 ONLY_FOR_ARCHS=	aarch64 amd64 powerpc64le
-ONLY_FOR_ARCHS_REASON=	"Only ported to amd64 and aarch64 on FreeBSD. Upstream supports arm64, ppc64le, s390x and x86-64."
+ONLY_FOR_ARCHS_REASON=	Only ported to amd64, aarch64 and powerpc64le on FreeBSD. Upstream supports arm64, ppc64le, s390x and x86-64.
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cheetah3>0:devel/py-cheetah3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${PY_FLAVOR} \

databases/p5-AnyEvent-Redis/Makefile

@@ -3,7 +3,7 @@
 
 PORTNAME=	AnyEvent-Redis
 PORTVERSION=	0.24
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DGL

databases/p5-Redis-Fast/Makefile

@@ -2,6 +2,7 @@
 
 PORTNAME=	Redis-Fast
 PORTVERSION=	0.28
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-

databases/percona-toolkit/Makefile

@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	percona-toolkit
-PORTVERSION=	3.2.0
+PORTVERSION=	3.2.1
 CATEGORIES=	databases
 MASTER_SITES=	https://www.percona.com/downloads/${PORTNAME}/${PORTVERSION}/source/tarball/
 

databases/percona-toolkit/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1588274839
-SHA256 (percona-toolkit-3.2.0.tar.gz) = e7c7028631d5b1c66ba21841c55919537bd4ed2f3a5975f989fa4abd7d9d753d
-SIZE (percona-toolkit-3.2.0.tar.gz) = 15551389
+TIMESTAMP = 1604187366
+SHA256 (percona-toolkit-3.2.1.tar.gz) = 92da0d3712533205f283515ff47ce68521fc2de20989c45b4c65a9743d0f7487
+SIZE (percona-toolkit-3.2.1.tar.gz) = 15521123

databases/py-redis2/Makefile

@@ -3,7 +3,7 @@
 
 PORTNAME=	redis
 PORTVERSION=	2.10.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 PKGNAMESUFFIX=	2

databases/py-txredisapi/Makefile

@@ -2,6 +2,7 @@
 
 PORTNAME=	txredisapi
 DISTVERSION=	1.4.7
+PORTREVISION=	1
 CATEGORIES=	databases python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 

databases/redis-devel/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	redis
-PORTVERSION=	6.0.8.20200910
+DISTVERSION=	6.2.0rc2
 CATEGORIES=	databases
 PKGNAMESUFFIX=	-devel
 
@@ -14,7 +14,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES+=		compiler:c11 gmake
 USE_GITHUB=	yes
-GH_TUPLE= 	redis:${PORTNAME}:03b59cd
+GH_TUPLE= 	redis:${PORTNAME}:ec2d180
 
 OPTIONS_DEFINE=	JEMALLOC TESTS TLS TRIB
 OPTIONS_RADIO=	EXTLUA
@@ -71,7 +71,7 @@ LDFLAGS=	-Wl,-E
 
 LDFLAGS+=	-lpthread -lm -lexecinfo
 
-CONFLICTS?=	redis4-4.* redis-5.*
+CONFLICTS?=	redis4-4.* redis5-5.* redis-6.*
 
 USE_RC_SUBR=	redis sentinel
 BIN_FILES=	redis-benchmark redis-check-aof redis-check-rdb \

databases/redis-devel/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1599714558
-SHA256 (redis-redis-6.0.8.20200910-03b59cd_GH0.tar.gz) = 61f8d085c8c75d712d4a171f2e79795f478270ba1f34a95f740e57a0230ba7ad
-SIZE (redis-redis-6.0.8.20200910-03b59cd_GH0.tar.gz) = 2266772
+TIMESTAMP = 1610554801
+SHA256 (redis-redis-6.2.0rc2-ec2d180_GH0.tar.gz) = 8f727a04f3054239ab21e05a527b854e8dd65728833bba1bc4fd3d30fdc486ad
+SIZE (redis-redis-6.2.0rc2-ec2d180_GH0.tar.gz) = 2400829

databases/redis-devel/files/extra-patch-src-Makefile.lua

@@ -1,15 +1,15 @@
---- src/Makefile.orig	2020-05-15 16:29:52.000000000 -0400
-+++ src/Makefile	2020-05-16 12:20:46.728148000 -0400
+--- src/Makefile.orig	2021-01-12 09:21:03.000000000 -0500
++++ src/Makefile	2021-01-13 11:52:33.070529000 -0500
 @@ -16,7 +16,7 @@
  uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
  uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not')
  OPTIMIZATION?=-O2
--DEPENDENCY_TARGETS=hiredis linenoise lua
-+DEPENDENCY_TARGETS=hiredis linenoise
+-DEPENDENCY_TARGETS=hiredis linenoise lua hdr_histogram
++DEPENDENCY_TARGETS=hiredis linenoise hdr_histogram
  NODEPS:=clean distclean
 
  # Default settings
-@@ -73,8 +73,8 @@
+@@ -83,8 +83,8 @@
  # Override default settings if possible
  -include .make-settings
 
@@ -20,17 +20,17 @@
  FINAL_LIBS=-lm
  DEBUG=-g -ggdb
 
-@@ -149,7 +149,7 @@
+@@ -188,7 +188,7 @@
  endif
  endif
  # Include paths to dependencies
--FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src
-+FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise
+-FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src -I../deps/hdr_histogram
++FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/hdr_histogram
 
  # Determine systemd support and/or build preference (defaulting to auto-detection)
  BUILD_WITH_SYSTEMD=no
-@@ -197,6 +197,9 @@
-     FINAL_LIBS += ../deps/hiredis/libhiredis_ssl.a -lssl -lcrypto
+@@ -251,6 +251,9 @@
+ 	FINAL_LIBS += ../deps/hiredis/libhiredis_ssl.a $(LIBSSL_LIBS) $(LIBCRYPTO_LIBS)
  endif
 
 +FINAL_CFLAGS+=-I${PREFIX}/include/lua51
@@ -39,15 +39,15 @@
  REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS)
  REDIS_LD=$(QUIET_LINK)$(CC) $(FINAL_LDFLAGS)
  REDIS_INSTALL=$(QUIET_INSTALL)$(INSTALL)
-@@ -217,6 +220,7 @@
- REDIS_SERVER_NAME=redis-server
- REDIS_SENTINEL_NAME=redis-sentinel
- REDIS_SERVER_OBJ=adlist.o quicklist.o ae.o anet.o dict.o server.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o crc16.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crcspeed.o crc64.o bitops.o sentinel.o notify.o setproctitle.o blocked.o hyperloglog.o latency.o sparkline.o redis-check-rdb.o redis-check-aof.o geo.o lazyfree.o module.o evict.o expire.o geohash.o geohash_helper.o childinfo.o defrag.o siphash.o rax.o t_stream.o listpack.o localtime.o lolwut.o lolwut5.o lolwut6.o acl.o gopher.o tracking.o connection.o tls.o sha256.o timeout.o setcpuaffinity.o
+@@ -271,6 +274,7 @@
+ REDIS_SERVER_NAME=redis-server$(PROG_SUFFIX)
+ REDIS_SENTINEL_NAME=redis-sentinel$(PROG_SUFFIX)
+ REDIS_SERVER_OBJ=adlist.o quicklist.o ae.o anet.o dict.o server.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o crc16.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crcspeed.o crc64.o bitops.o sentinel.o notify.o setproctitle.o blocked.o hyperloglog.o latency.o sparkline.o redis-check-rdb.o redis-check-aof.o geo.o lazyfree.o module.o evict.o expire.o geohash.o geohash_helper.o childinfo.o defrag.o siphash.o rax.o t_stream.o listpack.o localtime.o lolwut.o lolwut5.o lolwut6.o acl.o gopher.o tracking.o connection.o tls.o sha256.o timeout.o setcpuaffinity.o monotonic.o mt19937-64.o
 +REDIS_SERVER_OBJ+=fpconv.o lua_bit.o lua_cjson.o lua_cmsgpack.o lua_struct.o strbuf.o
- REDIS_CLI_NAME=redis-cli
- REDIS_CLI_OBJ=anet.o adlist.o dict.o redis-cli.o zmalloc.o release.o ae.o crcspeed.o crc64.o siphash.o crc16.o
- REDIS_BENCHMARK_NAME=redis-benchmark
-@@ -268,7 +272,7 @@
+ REDIS_CLI_NAME=redis-cli$(PROG_SUFFIX)
+ REDIS_CLI_OBJ=anet.o adlist.o dict.o redis-cli.o zmalloc.o release.o ae.o crcspeed.o crc64.o siphash.o crc16.o monotonic.o cli_common.o mt19937-64.o
+ REDIS_BENCHMARK_NAME=redis-benchmark$(PROG_SUFFIX)
+@@ -324,7 +328,7 @@
 
  # redis-server
  $(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ)

databases/redis-devel/files/extra-patch-src-Makefile.luajit

@@ -1,15 +1,15 @@
---- src/Makefile.orig	2020-05-15 16:29:52.000000000 -0400
-+++ src/Makefile	2020-05-16 12:25:33.461058000 -0400
+--- src/Makefile.orig	2021-01-12 09:21:03.000000000 -0500
++++ src/Makefile	2021-01-13 12:25:07.823451000 -0500
 @@ -16,7 +16,7 @@
  uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
  uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not')
  OPTIMIZATION?=-O2
--DEPENDENCY_TARGETS=hiredis linenoise lua
-+DEPENDENCY_TARGETS=hiredis linenoise
+-DEPENDENCY_TARGETS=hiredis linenoise lua hdr_histogram
++DEPENDENCY_TARGETS=hiredis linenoise hdr_histogram
  NODEPS:=clean distclean
 
  # Default settings
-@@ -73,8 +73,8 @@
+@@ -83,8 +83,8 @@
  # Override default settings if possible
  -include .make-settings
 
@@ -20,17 +20,17 @@
  FINAL_LIBS=-lm
  DEBUG=-g -ggdb
 
-@@ -149,7 +149,7 @@
+@@ -188,7 +188,7 @@
  endif
  endif
  # Include paths to dependencies
--FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src
-+FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise
+-FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src -I../deps/hdr_histogram
++FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/hdr_histogram
 
  # Determine systemd support and/or build preference (defaulting to auto-detection)
  BUILD_WITH_SYSTEMD=no
-@@ -197,6 +197,9 @@
-     FINAL_LIBS += ../deps/hiredis/libhiredis_ssl.a -lssl -lcrypto
+@@ -251,6 +251,9 @@
+ 	FINAL_LIBS += ../deps/hiredis/libhiredis_ssl.a $(LIBSSL_LIBS) $(LIBCRYPTO_LIBS)
  endif
 
 +FINAL_CFLAGS+=-I${PREFIX}/include/luajit-2.0
@@ -39,15 +39,15 @@
  REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS)
  REDIS_LD=$(QUIET_LINK)$(CC) $(FINAL_LDFLAGS)
  REDIS_INSTALL=$(QUIET_INSTALL)$(INSTALL)
-@@ -217,6 +220,7 @@
- REDIS_SERVER_NAME=redis-server
- REDIS_SENTINEL_NAME=redis-sentinel
- REDIS_SERVER_OBJ=adlist.o quicklist.o ae.o anet.o dict.o server.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o crc16.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crcspeed.o crc64.o bitops.o sentinel.o notify.o setproctitle.o blocked.o hyperloglog.o latency.o sparkline.o redis-check-rdb.o redis-check-aof.o geo.o lazyfree.o module.o evict.o expire.o geohash.o geohash_helper.o childinfo.o defrag.o siphash.o rax.o t_stream.o listpack.o localtime.o lolwut.o lolwut5.o lolwut6.o acl.o gopher.o tracking.o connection.o tls.o sha256.o timeout.o setcpuaffinity.o
+@@ -271,6 +274,7 @@
+ REDIS_SERVER_NAME=redis-server$(PROG_SUFFIX)
+ REDIS_SENTINEL_NAME=redis-sentinel$(PROG_SUFFIX)
+ REDIS_SERVER_OBJ=adlist.o quicklist.o ae.o anet.o dict.o server.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o crc16.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crcspeed.o crc64.o bitops.o sentinel.o notify.o setproctitle.o blocked.o hyperloglog.o latency.o sparkline.o redis-check-rdb.o redis-check-aof.o geo.o lazyfree.o module.o evict.o expire.o geohash.o geohash_helper.o childinfo.o defrag.o siphash.o rax.o t_stream.o listpack.o localtime.o lolwut.o lolwut5.o lolwut6.o acl.o gopher.o tracking.o connection.o tls.o sha256.o timeout.o setcpuaffinity.o monotonic.o mt19937-64.o
 +REDIS_SERVER_OBJ+=fpconv.o lua_bit.o lua_cjson.o lua_cmsgpack.o lua_struct.o strbuf.o
- REDIS_CLI_NAME=redis-cli
- REDIS_CLI_OBJ=anet.o adlist.o dict.o redis-cli.o zmalloc.o release.o ae.o crcspeed.o crc64.o siphash.o crc16.o
- REDIS_BENCHMARK_NAME=redis-benchmark
-@@ -268,7 +272,7 @@
+ REDIS_CLI_NAME=redis-cli$(PROG_SUFFIX)
+ REDIS_CLI_OBJ=anet.o adlist.o dict.o redis-cli.o zmalloc.o release.o ae.o crcspeed.o crc64.o siphash.o crc16.o monotonic.o cli_common.o mt19937-64.o
+ REDIS_BENCHMARK_NAME=redis-benchmark$(PROG_SUFFIX)
+@@ -324,7 +328,7 @@
 
  # redis-server
  $(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ)