update redia, vlc3

data/redis6/Makefile

@@ -0,0 +1,72 @@
+# Created by: Sergey Skvortsov <skv@protey.ru>
+# $FreeBSD: head/databases/redis/Makefile 476416 2018-08-05 16:13:45Z osa $
+
+PORTNAME=	redis
+DISTVERSION=	6.2.6
+CATEGORIES=	databases
+MASTER_SITES=	http://download.redis.io/releases/
+
+MAINTAINER=	osa@FreeBSD.org
+COMMENT=	Persistent key-value database with built-in net interface
+
+.include <bsd.port.options.mk>
+
+.if ${ARCH} == i386 && ! ${CFLAGS:M-march=*}
+# Needed for __atomic_fetch_add_8
+USE_GCC=	yes
+CFLAGS+=	-march=i586
+.endif
+
+LDFLAGS+=	-lpthread -lm -lexecinfo
+
+USES+=		gmake
+MAKE_ENV=	"V=yo"
+USE_RC_SUBR=	redis sentinel
+
+BIN_FILES+=	redis-benchmark
+BIN_FILES+=	redis-check-aof
+BIN_FILES+=	redis-check-rdb
+BIN_FILES+=	redis-cli
+BIN_FILES+=	redis-sentinel
+BIN_FILES+=	redis-server
+
+OWNER=	redis
+GROUP=	redis
+
+OWNER_ID=	535
+GROUP_ID=	535
+
+DBDIR=	/var/db/redis
+RUNDIR=	/var/run/redis
+LOGDIR=	/var/log/redis
+
+SUB_LIST+= OWNER=${OWNER}
+SUB_LIST+= GROUP=${GROUP}
+SUB_LIST+= OWNER_ID=${OWNER_ID}
+SUB_LIST+= GROUP_ID=${GROUP_ID}
+
+SUB_LIST+=	PORTNAME=${PORTNAME}
+SUB_LIST+=	OWNER=${OWNER}
+SUB_LIST+=	DBDIR=${DBDIR}
+SUB_LIST+=	LOGDIR=${LOGDIR}
+SUB_LIST+=	RUNDIR=${RUNDIR}
+SUB_LIST+=	DBDIR=${DBDIR}
+
+
+PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
+PKGINSTALL=	${WRKDIR}/pkg-install
+SUB_FILES+= 	pkg-install pkg-deinstall pkg-message redis.conf
+
+PORTEXAMPLES= *
+
+#post-build:
+#	${INSTALL_DATA} ${WRKSRC}/redis.conf ${FILESDIR}/redis.conf.in
+
+do-install:
+	${INSTALL_PROGRAM} ${BIN_FILES:C!^!${WRKSRC}/src/!} ${STAGEDIR}${PREFIX}/bin/
+	${MKDIR} ${STAGEDIR}/${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKDIR}/redis.conf ${STAGEDIR}/${EXAMPLESDIR}/redis.conf.example
+	${INSTALL_DATA} ${WRKSRC}/sentinel.conf ${STAGEDIR}/${EXAMPLESDIR}/sentinel.conf.example
+
+.include <bsd.port.mk>
+#EOF

data/redis6/distinfo

@@ -0,0 +1,3 @@
+TIMESTAMP = 1638128321
+SHA256 (redis-6.2.6.tar.gz) = 5b2b8b7a50111ef395bf1c1d5be11e6e167ac018125055daa8b5c2317ae131ab
+SIZE (redis-6.2.6.tar.gz) = 2476542

data/redis6/files/extra-patch-deps_lua_src_lua__cjson.c

@@ -0,0 +1,11 @@
+--- deps/lua/src/lua_cjson.c.orig	2019-12-08 07:56:31.419672000 -0500
++++ deps/lua/src/lua_cjson.c	2019-12-08 07:56:52.389362000 -0500
+@@ -1299,7 +1299,7 @@
+  *
+  * luaL_setfuncs() is used to create a module table where the functions have
+  * json_config_t as their first upvalue. Code borrowed from Lua 5.2 source. */
+-static void luaL_setfuncs (lua_State *l, const luaL_Reg *reg, int nup)
++void luaL_setfuncs (lua_State *l, const luaL_Reg *reg, int nup)
+ {
+     int i;
+ 

data/redis6/files/extra-patch-src-Makefile.lua

@@ -0,0 +1,58 @@
+--- 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 hdr_histogram
++DEPENDENCY_TARGETS=hiredis linenoise hdr_histogram
+ NODEPS:=clean distclean
+ 
+ # Default settings
+@@ -83,8 +83,8 @@
+ # Override default settings if possible
+ -include .make-settings
+ 
+-FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS)
+-FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG)
++FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS)
++FINAL_LDFLAGS=$(LDFLAGS) $(DEBUG)
+ FINAL_LIBS=-lm
+ DEBUG=-g -ggdb
+ 
+@@ -188,7 +188,7 @@
+ endif
+ endif
+ # Include paths to dependencies
+-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
+@@ -251,6 +251,9 @@
+ 	FINAL_LIBS += ../deps/hiredis/libhiredis_ssl.a $(LIBSSL_LIBS) $(LIBCRYPTO_LIBS)
+ endif
+ 
++FINAL_CFLAGS+=-I${PREFIX}/include/lua51
++FINAL_LIBS+= -L${PREFIX}/lib -llua-5.1
++
+ REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS)
+ REDIS_LD=$(QUIET_LINK)$(CC) $(FINAL_LDFLAGS)
+ REDIS_INSTALL=$(QUIET_INSTALL)$(INSTALL)
+@@ -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$(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)
+-	$(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a ../deps/lua/src/liblua.a $(FINAL_LIBS)
++	$(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a $(FINAL_LIBS)
+ 
+ # redis-sentinel
+ $(REDIS_SENTINEL_NAME): $(REDIS_SERVER_NAME)

data/redis6/files/extra-patch-src-Makefile.luajit

@@ -0,0 +1,58 @@
+--- 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 hdr_histogram
++DEPENDENCY_TARGETS=hiredis linenoise hdr_histogram
+ NODEPS:=clean distclean
+ 
+ # Default settings
+@@ -83,8 +83,8 @@
+ # Override default settings if possible
+ -include .make-settings
+ 
+-FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS)
+-FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG)
++FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS)
++FINAL_LDFLAGS=$(LDFLAGS) $(DEBUG)
+ FINAL_LIBS=-lm
+ DEBUG=-g -ggdb
+ 
+@@ -188,7 +188,7 @@
+ endif
+ endif
+ # Include paths to dependencies
+-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
+@@ -251,6 +251,9 @@
+ 	FINAL_LIBS += ../deps/hiredis/libhiredis_ssl.a $(LIBSSL_LIBS) $(LIBCRYPTO_LIBS)
+ endif
+ 
++FINAL_CFLAGS+=-I${PREFIX}/include/luajit-2.0
++FINAL_LIBS+= -L${PREFIX}/lib -lluajit-5.1
++
+ REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS)
+ REDIS_LD=$(QUIET_LINK)$(CC) $(FINAL_LDFLAGS)
+ REDIS_INSTALL=$(QUIET_INSTALL)$(INSTALL)
+@@ -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$(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)
+-	$(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a ../deps/lua/src/liblua.a $(FINAL_LIBS)
++	$(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a $(FINAL_LIBS)
+ 
+ # redis-sentinel
+ $(REDIS_SENTINEL_NAME): $(REDIS_SERVER_NAME)

data/redis6/files/extra-patch-src-Makefile.luajit-or

@@ -0,0 +1,58 @@
+--- src/Makefile.orig	2021-01-12 09:21:03.000000000 -0500
++++ src/Makefile	2021-01-13 12:27:19.444193000 -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 hdr_histogram
++DEPENDENCY_TARGETS=hiredis linenoise hdr_histogram
+ NODEPS:=clean distclean
+ 
+ # Default settings
+@@ -83,8 +83,8 @@
+ # Override default settings if possible
+ -include .make-settings
+ 
+-FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS)
+-FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG)
++FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS)
++FINAL_LDFLAGS=$(LDFLAGS) $(DEBUG)
+ FINAL_LIBS=-lm
+ DEBUG=-g -ggdb
+ 
+@@ -188,7 +188,7 @@
+ endif
+ endif
+ # Include paths to dependencies
+-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
+@@ -251,6 +251,9 @@
+ 	FINAL_LIBS += ../deps/hiredis/libhiredis_ssl.a $(LIBSSL_LIBS) $(LIBCRYPTO_LIBS)
+ endif
+ 
++FINAL_CFLAGS+=-I${PREFIX}/include/luajit-2.1
++FINAL_LIBS+= -L${PREFIX}/lib -lluajit-5.1
++
+ REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS)
+ REDIS_LD=$(QUIET_LINK)$(CC) $(FINAL_LDFLAGS)
+ REDIS_INSTALL=$(QUIET_INSTALL)$(INSTALL)
+@@ -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$(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)
+-	$(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a ../deps/lua/src/liblua.a $(FINAL_LIBS)
++	$(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a $(FINAL_LIBS)
+ 
+ # redis-sentinel
+ $(REDIS_SENTINEL_NAME): $(REDIS_SERVER_NAME)

data/redis6/files/patch-deps-Makefile

@@ -0,0 +1,20 @@
+--- deps/Makefile.orig	2021-01-12 09:21:03.000000000 -0500
++++ deps/Makefile	2021-01-13 11:37:45.979445000 -0500
+@@ -69,7 +69,7 @@
+ 	LUA_CFLAGS= -D__C99FEATURES__=1
+ endif
+ 
+-LUA_CFLAGS+= -O2 -Wall -DLUA_ANSI -DENABLE_CJSON_GLOBAL -DREDIS_STATIC='' -DLUA_USE_MKSTEMP $(CFLAGS)
++LUA_CFLAGS+= -Wall -DLUA_ANSI -DENABLE_CJSON_GLOBAL -DREDIS_STATIC='' -DLUA_USE_MKSTEMP $(CFLAGS)
+ 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 @@
+ 
+ lua: .make-prerequisites
+ 	@printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR)
+-	cd lua/src && $(MAKE) all CFLAGS="$(LUA_CFLAGS)" MYLDFLAGS="$(LUA_LDFLAGS)" AR="$(AR) $(ARFLAGS)"
++	cd lua/src && $(MAKE) all CC="$(CC)" CFLAGS="$(LUA_CFLAGS)" MYLDFLAGS="$(LUA_LDFLAGS)" AR="$(AR) $(ARFLAGS)"
+ 
+ .PHONY: lua
+ 

data/redis6/files/patch-deps-hiredis-Makefile

@@ -0,0 +1,41 @@
+--- deps/hiredis/Makefile.orig	2021-01-12 09:21:03.000000000 -0500
++++ deps/hiredis/Makefile	2021-01-13 11:40:26.109827000 -0500
+@@ -21,7 +21,7 @@
+ HIREDIS_SONAME=$(shell grep HIREDIS_SONAME hiredis.h | awk '{print $$3}')
+ 
+ # Installation related variables and target
+-PREFIX?=/usr/local
++PREFIX?=${PREFIX}
+ INCLUDE_PATH?=include/hiredis
+ LIBRARY_PATH?=lib
+ PKGCONF_PATH?=pkgconfig
+@@ -44,10 +44,8 @@
+ # 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++')
+-OPTIMIZATION?=-O3
+ WARNINGS=-Wall -W -Wstrict-prototypes -Wwrite-strings -Wno-missing-field-initializers
+-DEBUG_FLAGS?= -g -ggdb
+-REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CPPFLAGS) $(CFLAGS) $(WARNINGS) $(DEBUG_FLAGS)
++REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CFLAGS) $(WARNINGS) $(DEBUG_FLAGS)
+ REAL_LDFLAGS=$(LDFLAGS)
+ 
+ DYLIBSUFFIX=so
+@@ -83,7 +81,16 @@
+   CFLAGS+=-I$(OPENSSL_PREFIX)/include
+   SSL_LDFLAGS+=-L$(OPENSSL_PREFIX)/lib -lssl -lcrypto
+ endif
+-
++ifeq ($(uname_S),FreeBSD)
++  CFLAGS?=$(CFLAGS)
++  CCLINK?=pthread
++  LDFLAGS?=-L. -Wl,-rpath,.
++  DYLIBNAME?=libhiredis.so
++  DYLIB_MAKE_CMD?=$(CC) -o ${DYLIBNAME} ${OBJ}
++  STLIBNAME?=libhiredis.a
++  STLIB_MAKE_CMD?=ar rcs ${STLIBNAME} ${OBJ}
++  SSL_LDFLAGS+=${OPENSSL_LDFLAGS}
++endif
+ ifeq ($(uname_S),SunOS)
+   IS_SUN_CC=$(shell sh -c '$(CC) -V 2>&1 |egrep -i -c "sun|studio"')
+   ifeq ($(IS_SUN_CC),1)

data/redis6/files/patch-deps-hiredis-net.c

@@ -0,0 +1,39 @@
+--- deps/hiredis/net.c.orig	2019-11-28 14:32:05.942453000 -0500
++++ deps/hiredis/net.c	2019-11-28 14:39:08.326408000 -0500
+@@ -178,14 +178,34 @@
+         __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
+         return REDIS_ERR;
+     }
+-#else
+-#if defined(__GLIBC__) && !defined(__FreeBSD_kernel__)
++#elif defined(__GLIBC__)
+     if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &val, sizeof(val)) < 0) {
+         __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
+         return REDIS_ERR;
+     }
+ 
+     val = interval/3;
++    if (val == 0) val = 1;
++    if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPINTVL, &val, sizeof(val)) < 0) {
++        __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
++        return REDIS_ERR;
++    }
++
++    val = 3;
++    if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPCNT, &val, sizeof(val)) < 0) {
++        __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
++        return REDIS_ERR;
++    }
++#else
++#if !defined(__sun) && defined(TCP_KEEPIDLE) && defined(TCP_KEEPINTL) && \
++    defined(TCP_KEEPCNT)
++    val = interval;
++    if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &val, sizeof(val)) < 0) {
++        __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
++        return REDIS_ERR;
++    }
++
++    val = internal/3;
+     if (val == 0) val = 1;
+     if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPINTVL, &val, sizeof(val)) < 0) {
+         __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));

data/redis6/files/patch-deps-linenoise-Makefile

@@ -0,0 +1,15 @@
+--- deps/linenoise/Makefile.orig	2019-09-25 10:40:18 UTC
++++ deps/linenoise/Makefile
+@@ -1,10 +1,10 @@
+ STD=
+ WARN= -Wall
+-OPT= -Os
++#OPT= -Os
+ 
+ R_CFLAGS= $(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS)
+ R_LDFLAGS= $(LDFLAGS)
+-DEBUG= -g
++#DEBUG= -g
+ 
+ R_CC=$(CC) $(R_CFLAGS)
+ R_LD=$(CC) $(R_LDFLAGS)

data/redis6/files/patch-deps_Makefile

@@ -0,0 +1,18 @@
+--- deps/Makefile.orig	2021-01-13 11:43:05.174197000 -0500
++++ deps/Makefile	2021-01-13 11:44:13.744658000 -0500
+@@ -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.1.0-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.1.0-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

data/redis6/files/patch-deps_lua_src_lua__cjson.c

@@ -0,0 +1,12 @@
+--- deps/lua/src/lua_cjson.c.orig	2019-09-25 10:40:18 UTC
++++ deps/lua/src/lua_cjson.c
+@@ -46,7 +46,9 @@
+ #include "strbuf.h"
+ #include "fpconv.h"
+ 
++#if defined(__sun)
+ #include "../../../src/solarisfixes.h"
++#endif
+ 
+ #ifndef CJSON_MODNAME
+ #define CJSON_MODNAME   "cjson"

data/redis6/files/patch-redis.conf

@@ -0,0 +1,38 @@
+--- redis.conf.orig	2021-01-12 09:21:03.000000000 -0500
++++ redis.conf	2021-01-13 11:46:40.445746000 -0500
+@@ -244,7 +244,7 @@
+ # By default Redis does not run as a daemon. Use 'yes' if you need it.
+ # Note that Redis will write a pid file in /var/run/redis.pid when daemonized.
+ # When Redis is supervised by upstart or systemd, this parameter has no impact.
+-daemonize no
++daemonize yes
+ 
+ # If you run Redis from upstart or systemd, Redis can interact with your
+ # supervision tree. Options:
+@@ -276,7 +276,7 @@
+ #
+ # Note that on modern Linux systems "/run/redis.pid" is more conforming
+ # and should be used instead.
+-pidfile /var/run/redis_6379.pid
++pidfile %%REDIS_RUNDIR%%/redis.pid
+ 
+ # Specify the server verbosity level.
+ # This can be one of:
+@@ -289,7 +289,7 @@
+ # Specify the log file name. Also the empty string can be used to force
+ # Redis to log on the standard output. Note that if you use standard
+ # output for logging but daemonize, logs will be sent to /dev/null
+-logfile ""
++logfile %%REDIS_LOGDIR%%/redis.log
+ 
+ # To enable logging to the system logger, just set 'syslog-enabled' to yes,
+ # and optionally update the other syslog parameters to suit your needs.
+@@ -420,7 +420,7 @@
+ # The Append Only File will also be created inside this directory.
+ #
+ # Note that you must specify a directory here, not a file name.
+-dir ./
++dir %%REDIS_DBDIR%%/
+ 
+ ################################# REPLICATION #################################
+ 

data/redis6/files/patch-src-Makefile

@@ -0,0 +1,39 @@
+--- src/Makefile.orig	2019-11-29 16:35:59 UTC
++++ src/Makefile
+@@ -29,7 +29,7 @@ endif
+ WARN=-Wall -W -Wno-missing-field-initializers
+ OPT=$(OPTIMIZATION)
+ 
+-PREFIX?=/usr/local
++PREFIX:=$(PREFIX)
+ INSTALL_BIN=$(PREFIX)/bin
+ INSTALL=install
+ 
+@@ -75,7 +75,6 @@ endif
+ FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS)
+ FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG)
+ FINAL_LIBS=-lm
+-DEBUG=-g -ggdb
+ 
+ # 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
++        FINAL_CFLAGS?= $(CFLAGS) $(REDIS_CFLAGS) -I${PREFIX}/include
++        FINAL_LDFLAGS= $(LDFLAGS) -pthread
++else
+ ifeq ($(uname_S),AIX)
+         # AIX
+         FINAL_LDFLAGS+= -Wl,-bexpall
+@@ -131,6 +135,7 @@ else
+ 	# All the other OSes (notably Linux)
+ 	FINAL_LDFLAGS+= -rdynamic
+ 	FINAL_LIBS+=-ldl -pthread -lrt
++endif
+ endif
+ endif
+ endif

data/redis6/files/patch-src-mkreleasehdr.sh

@@ -0,0 +1,11 @@
+--- src/mkreleasehdr.sh.orig	2019-11-22 16:54:22 UTC
++++ src/mkreleasehdr.sh
+@@ -1,6 +1,6 @@
+ #!/bin/sh
+-GIT_SHA1=`(git show-ref --head --hash=8 2> /dev/null || echo 00000000) | head -n1`
+-GIT_DIRTY=`git diff --no-ext-diff 2> /dev/null | wc -l`
++GIT_SHA1="00000000"
++GIT_DIRTY="0"
+ BUILD_ID=`uname -n`"-"`date +%s`
+ if [ -n "$SOURCE_DATE_EPOCH" ]; then
+   BUILD_ID=$(date -u -d "@$SOURCE_DATE_EPOCH" +%s 2>/dev/null || date -u -r "$SOURCE_DATE_EPOCH" +%s 2>/dev/null || date -u +%s)

data/redis6/files/pkg-deinstall.in

@@ -0,0 +1,12 @@
+#!/bin/sh
+
+set -x
+
+case $2 in 
+    DEINSTALL)
+	;;
+    POST-DEINSTALL)
+	;;
+esac
+exit 0
+#EOF

data/redis6/files/pkg-install.in

@@ -0,0 +1,41 @@
+#!/bin/sh
+
+set -x
+
+
+case $2 in 
+    PRE-INSTALL)
+
+	GROUP="%%GROUP%%"
+	OWNER="%%OWNER%%"
+	GROUP_ID="%%GROUP_ID%%"
+	OWNER_ID="%%OWNER_ID%%"
+
+	PKG_PREFIX="%%PREFIX%%"
+
+	RUNDIR="%%RUNDIR%%"
+	LOGDIR="%%LOGDIR%%"
+	DBDIR="%%DBDIR%%"
+
+	NAME="redis"
+	SHELL="/usr/sbin/nologin"
+
+	pw group add ${GROUP}  -g ${GROUP_ID}
+	pw group show ${GROUP}
+	pw user add ${OWNER} -u ${OWNER_ID} \
+	    -g ${GROUP}  \
+	    -d ${PKG_PREFIX} \
+	    -s "${SHELL}" -u ${OWNER_ID} \
+	    -c "${NAME}"
+	pw group mod ${GROUP} -M ${OWNER}
+	pw user show ${OWNER}
+	pw group show ${GROUP}
+	for dir in ${LOGDIR} ${RUNDIR} ${DBDIR}; do
+	    install -d -o ${OWNER} -g ${GROUP} -m 0750 ${dir}
+	done
+	;;
+    POST-INSTALL)
+	;;
+esac
+exit 0
+#EOF

data/redis6/files/pkg-message.in

@@ -0,0 +1,11 @@
+[
+{ type: install
+  message: <<EOM
+      To setup "%%PORTNAME%%" you need to edit the configuration file:
+      %%PREFIX%%/etc/%%PORTNAME%%.conf
+
+      To run redis from startup, add %%PORTNAME%%_enable="YES"
+      in your /etc/rc.conf.
+EOM
+}
+]

data/redis6/files/redis.in

@@ -0,0 +1,67 @@
+#!/bin/sh
+
+# PROVIDE: redis
+# REQUIRE: LOGIN
+# BEFORE:  securelevel
+# KEYWORD: shutdown
+
+# Add the following line to /etc/rc.conf to enable `redis':
+#
+#redis_enable="YES"
+#
+# Define profiles here to run separate redis instances:
+#
+#redis_profiles="foo bar" #  Script uses %%PREFIX%%/etc/redis-NAME.conf respectively.
+#			     For correct script working please update pidfile entries in
+#			     redis-NAME.conf files.
+
+. /etc/rc.subr
+
+name="redis"
+rcvar="${name}_enable"
+
+extra_commands="reload"
+
+command="%%PREFIX%%/bin/redis-server"
+pidfile="%%RUNDIR%%/$name.pid"
+
+# read configuration and set defaults
+load_rc_config "$name"
+: ${redis_enable="NO"}
+: ${redis_user="%%OWNER%%"}
+: ${redis_config="%%PREFIX%%/etc/$name.conf"}
+
+command_args="${redis_config}"
+required_files="${redis_config}"
+
+_profile_exists() {
+	for _p in ${redis_profiles}; do
+		[ "${_p}" = "$1" ] && return 1;
+	done
+	return 0
+}
+
+if [ $# -eq 2 ]; then
+	_profile=$2
+	_profile_exists $_profile
+	_exists=$?
+	[ ${_exists} -ne 1 ] && {
+		echo "`basename %%PREFIX%%/etc/rc.d/redis`: no '$2' in 'redis_profiles'"
+		exit 1
+	};
+	echo "-- Profile: ${_profile} --"
+	config_file="%%PREFIX%%/etc/${name}-${_profile}.conf"
+	command_args="${config_file}"
+	pidfile="%%REDIS_RUNDIR%%/${_profile}.pid"
+	required_files="${config_file}"
+elif [ -n "${redis_profiles}" ]; then
+	_swap=$*; shift; _profiles=$*
+	_profiles=${_profiles:-${redis_profiles}}
+	set -- ${_swap}
+	for _profile in ${_profiles}; do
+		%%PREFIX%%/etc/rc.d/redis $1 ${_profile}
+	done
+	exit 0
+fi
+
+run_rc_command "$1"

data/redis6/files/sentinel.in

@@ -0,0 +1,39 @@
+#!/bin/sh
+
+# PROVIDE: sentinel
+# REQUIRE: LOGIN
+# BEFORE:  securelevel
+# KEYWORD: shutdown
+
+# Add the following line to /etc/rc.conf to enable `sentinel':
+#
+#sentinel_enable="YES"
+#
+
+. /etc/rc.subr
+
+name="sentinel"
+rcvar="${name}_enable"
+
+command="/usr/local/bin/redis-sentinel"
+pidfile="/var/run/redis/$name.pid"
+
+# read configuration and set defaults
+load_rc_config "$name"
+: ${sentinel_enable="NO"}
+: ${sentinel_user="redis"}
+: ${sentinel_config="/usr/local/etc/$name.conf"}
+
+command_args="${sentinel_config} --daemonize yes --pidfile ${pidfile}"
+required_files="${sentinel_config}"
+start_precmd="${name}_checks"
+restart_precmd="${name}_checks"
+
+sentinel_checks()
+{
+    if [ x`id -u ${sentinel_user}` != x`stat -f %u ${sentinel_config}` ]; then
+	err 1 "${sentinel_config} must be owned by user ${sentinel_user}"
+    fi
+}
+
+run_rc_command "$1"

data/redis6/pkg-descr

@@ -0,0 +1,19 @@
+Redis is an open source, advanced key-value store.  It is often referred
+to as a data structure server since keys can contain strings, hashes,
+lists, sets and sorted sets.
+
+You can run atomic operations on these types, like appending to a string;
+incrementing the value in a hash; pushing to a list; computing set
+intersection, union and difference; or getting the member with highest
+ranking in a sorted set.
+
+In order to achieve its outstanding performance, Redis works with an
+in-memory dataset.  Depending on your use case, you can persist it either
+by dumping the dataset to disk every once in a while, or by appending each
+command to a log.
+
+Redis also supports trivial-to-setup master-slave replication, with very
+fast non-blocking first synchronization, auto-reconnection on net split
+and so forth.
+
+WWW: http://redis.io/

data/redis6/pkg-plist

@@ -0,0 +1,9 @@
+bin/redis-benchmark
+bin/redis-check-aof
+bin/redis-check-rdb
+bin/redis-cli
+bin/redis-sentinel
+bin/redis-server
+share/examples/redis/redis.conf.example
+share/examples/redis/sentinel.conf.example
+@dir share/examples/redis

lang/go/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD: head/lang/go/Makefile 470619 2018-05-22 14:32:09Z jlaffaye $
 
 PORTNAME=	go
-PORTVERSION=	1.17.2 #1.16.6
+PORTVERSION=	1.17.3 #1.16.6
 CATEGORIES=	lang
 MASTER_SITES=	https://golang.org/dl/
 DISTNAME=	go${PORTVERSION}.src

lang/go/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1635514276
-SHA256 (go1.17.2.src.tar.gz) = 2255eb3e4e824dd7d5fcdc2e7f84534371c186312e546fb1086a34c17752f431
-SIZE (go1.17.2.src.tar.gz) = 22182111
+TIMESTAMP = 1638105937
+SHA256 (go1.17.3.src.tar.gz) = 705c64251e5b25d5d55ede1039c6aa22bea40a7a931d14c370339853643c3df0
+SIZE (go1.17.3.src.tar.gz) = 22183309

lang/go/pkg-plist

@@ -354,6 +354,8 @@ lib/go/misc/cgo/testshared/testdata/issue39777/b/b.go
 lib/go/misc/cgo/testshared/testdata/issue44031/a/a.go
 lib/go/misc/cgo/testshared/testdata/issue44031/b/b.go
 lib/go/misc/cgo/testshared/testdata/issue44031/main/main.go
+lib/go/misc/cgo/testshared/testdata/issue47837/a/a.go
+lib/go/misc/cgo/testshared/testdata/issue47837/main/main.go
 lib/go/misc/cgo/testshared/testdata/trivial/trivial.go
 lib/go/misc/cgo/testsigfwd/main.go
 lib/go/misc/cgo/testso/noso_test.go
@@ -2316,6 +2318,7 @@ lib/go/src/cmd/go/testdata/script/ldflag.txt
 lib/go/src/cmd/go/testdata/script/link_matching_actionid.txt
 lib/go/src/cmd/go/testdata/script/link_syso_issue33139.txt
 lib/go/src/cmd/go/testdata/script/linkname.txt
+lib/go/src/cmd/go/testdata/script/list_all_gobuild.txt
 lib/go/src/cmd/go/testdata/script/list_ambiguous_path.txt
 lib/go/src/cmd/go/testdata/script/list_bad_import.txt
 lib/go/src/cmd/go/testdata/script/list_case_collision.txt
@@ -4366,6 +4369,7 @@ lib/go/src/debug/macho/testdata/clang-amd64-darwin.obj.base64
 lib/go/src/debug/macho/testdata/fat-gcc-386-amd64-darwin-exec.base64
 lib/go/src/debug/macho/testdata/gcc-386-darwin-exec.base64
 lib/go/src/debug/macho/testdata/gcc-amd64-darwin-exec-debug.base64
+lib/go/src/debug/macho/testdata/gcc-amd64-darwin-exec-with-bad-dysym.base64
 lib/go/src/debug/macho/testdata/gcc-amd64-darwin-exec.base64
 lib/go/src/debug/macho/testdata/hello.c
 lib/go/src/debug/pe/file_cgo_test.go
@@ -10011,6 +10015,8 @@ lib/go/test/fixedbugs/issue48088.dir/b.go
 lib/go/test/fixedbugs/issue48088.go
 lib/go/test/fixedbugs/issue4813.go
 lib/go/test/fixedbugs/issue4847.go
+lib/go/test/fixedbugs/issue48473.go
+lib/go/test/fixedbugs/issue48476.go
 lib/go/test/fixedbugs/issue4879.dir/a.go
 lib/go/test/fixedbugs/issue4879.dir/b.go
 lib/go/test/fixedbugs/issue4879.go
@@ -10755,6 +10761,9 @@ lib/go/VERSION
 @dir lib/go/misc/cgo/testshared/testdata/issue44031/b
 @dir lib/go/misc/cgo/testshared/testdata/issue44031/main
 @dir lib/go/misc/cgo/testshared/testdata/issue44031
+@dir lib/go/misc/cgo/testshared/testdata/issue47837/a
+@dir lib/go/misc/cgo/testshared/testdata/issue47837/main
+@dir lib/go/misc/cgo/testshared/testdata/issue47837
 @dir lib/go/misc/cgo/testshared/testdata/trivial
 @dir lib/go/misc/cgo/testshared/testdata
 @dir lib/go/misc/cgo/testshared

xapp/geany-plugins/Makefile

@@ -21,6 +21,9 @@ LIB_DEPENDS+=	libgdk-pixbuf.so:gnome/libgtk2
 LIB_DEPENDS+=	libgdk-x11.so:gnome/libgtk2
 LIB_DEPENDS+=	libgtk-x11.so:gnome/libgtk2
 
+LIB_DEPENDS+=	libgit2.so:devel/libgit2
+
+
 RUN_DEPENDS+=	gtk-update-icon-cache:gnome/libgtk2
 RUN_DEPENDS+=	update-desktop-database:xfce/desktop-file-utils
 

xapp/geany-plugins/pkg-plist

@@ -56,6 +56,8 @@ lib/geany/treebrowser.la
 lib/geany/treebrowser.so
 lib/geany/vimode.la
 lib/geany/vimode.so
+lib/geany/workbench.la
+lib/geany/workbench.so
 lib/geany/xmlsnippets.la
 lib/geany/xmlsnippets.so
 lib/libgeanypluginutils.la
@@ -223,6 +225,11 @@ share/doc/geany-plugins/vimode/ChangeLog
 share/doc/geany-plugins/vimode/COPYING
 share/doc/geany-plugins/vimode/NEWS
 share/doc/geany-plugins/vimode/README
+share/doc/geany-plugins/workbench/AUTHORS
+share/doc/geany-plugins/workbench/ChangeLog
+share/doc/geany-plugins/workbench/COPYING
+share/doc/geany-plugins/workbench/NEWS
+share/doc/geany-plugins/workbench/README
 share/doc/geany-plugins/xmlsnippets/AUTHORS
 share/doc/geany-plugins/xmlsnippets/ChangeLog
 share/doc/geany-plugins/xmlsnippets/COPYING
@@ -315,6 +322,7 @@ share/locale/zh_CN/LC_MESSAGES/geany-plugins.mo
 @dir share/doc/geany-plugins/tableconvert
 @dir share/doc/geany-plugins/treebrowser
 @dir share/doc/geany-plugins/vimode
+@dir share/doc/geany-plugins/workbench
 @dir share/doc/geany-plugins/xmlsnippets
 @dir share/doc/geany-plugins
 @dir share/doc

xapp/vlc3/Makefile

@@ -2,7 +2,7 @@
 # $Id$
 #
 PORTNAME=	vlc
-DISTVERSION=	3.0.12
+DISTVERSION=	3.0.16
 CATEGORIES=	multimedia audio net www
 MASTER_SITES+=	http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION:S/a$//}/
 MASTER_SITES+=	http://ftp.snt.utwente.nl/pub/software/videolan/${PORTNAME}/${DISTVERSION:S/a$//}/

xapp/vlc3/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1616182294
-SHA256 (vlc-3.0.12.tar.xz) = eff458f38a92126094f44f2263c2bf2c7cdef271b48192d0fe7b1726388cf879
-SIZE (vlc-3.0.12.tar.xz) = 25997468
+TIMESTAMP = 1637343680
+SHA256 (vlc-3.0.16.tar.xz) = ffae35fc64f625c175571d2346bc5f6207be99762517f15423e74f18399410f6
+SIZE (vlc-3.0.16.tar.xz) = 26439328

xapp/vlc3/files/patch-modules-lua-vlc.h

@@ -1,10 +0,0 @@
---- modules/lua/vlc.h.orig	2015-07-11 03:08:07.625881252 +0000
-+++ modules/lua/vlc.h	2015-07-11 03:08:25.711881262 +0000
-@@ -38,6 +38,7 @@
- #include <vlc_stream.h>
- #include <vlc_demux.h>
- 
-+#define LUA_COMPAT_APIINTCASTS
- #define LUA_COMPAT_MODULE
- #include <lua.h>        /* Low level lua C API */
- #include <lauxlib.h>    /* Higher level C API */