diff --git a/databases/redis-devel/Makefile b/databases/redis-devel/Makefile index 42a2470fce92..d5e69a943a08 100644 --- a/databases/redis-devel/Makefile +++ b/databases/redis-devel/Makefile @@ -1,129 +1,129 @@ # Created by: Sergey Skvortsov PORTNAME= redis -PORTVERSION= 7.0.0.20211105 +PORTVERSION= 7.0.0.20211201 CATEGORIES= databases PKGNAMESUFFIX= -devel MAINTAINER= osa@FreeBSD.org COMMENT= Persistent key-value database with built-in net interface LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING USES+= compiler:c11 cpe gmake CPE_VENDOR= redislabs USE_GITHUB= yes -GH_TUPLE= redis:redis:ddb508c +GH_TUPLE= redis:redis:0e5b813 OPTIONS_DEFINE= JEMALLOC TESTS TLS TRIB OPTIONS_RADIO= EXTLUA OPTIONS_RADIO_EXTLUA= LUA LUAJIT LUAJITOR OPTIONS_SUB= yes JEMALLOC_DESC= Use jemalloc LUA_DESC= Use lang/lua instead of builtin lua LUAJIT_DESC= Use lang/luajit instead of builtin lua LUAJITOR_DESC= Use lang/luajit-openresty instead of builtin lua TLS_DESC= Use TLS (openssl req.) TESTS_DESC= Install lang/tcl for redis unit tests TRIB_DESC= Install redis-trib.rb (lang/ruby req.) MAKE_ENV= V=yo OPTIMIZATION= JEMALLOC_MAKE_ENV= USE_JEMALLOC=yes LUA_USES= lua:51 LUA_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src-Makefile.lua LUA_VARS= _addflags=true LUAJIT_LIB_DEPENDS= libluajit-5.1.so:lang/luajit LUAJIT_BUILD_DEPENDS= ${LOCALBASE}/include/luajit-2.0/lua.h:lang/luajit LUAJIT_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src-Makefile.luajit LUAJIT_VARS= _addflags=true LUAJITOR_LIB_DEPENDS= libluajit-5.1.so:lang/luajit-openresty LUAJITOR_BUILD_DEPENDS= ${LOCALBASE}/include/luajit-2.1/lua.h:lang/luajit-openresty LUAJITOR_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src-Makefile.luajit-or \ ${PATCHDIR}/extra-patch-deps_lua_src_lua__cjson.c LUAJITOR_VARS= _addflags=true TESTS_USES= tcl:build TLS_USES= ssl TLS_MAKE_ENV= BUILD_TLS=yes TRIB_CATEGORIES= ruby TRIB_USE= ruby=yes TRIB_RUN_DEPENDS= rubygem-redis>=2.2:databases/rubygem-redis .include .if ${ARCH} == i386 && ! ${CFLAGS:M-march=*} # Needed for __atomic_fetch_add_8 USE_GCC= yes CFLAGS+= -march=i586 .endif .if defined(_ADDFLAGS) CFLAGS= -fPIC LDFLAGS= -Wl,-E .endif LDFLAGS+= -lpthread -lm -lexecinfo CONFLICTS?= redis5-5.* redis6-6.* redis-6.* USE_RC_SUBR= redis sentinel BIN_FILES= redis-benchmark redis-check-aof redis-check-rdb \ redis-cli redis-sentinel redis-server USERS= redis GROUPS= redis REDIS_DBDIR?= /var/db/redis REDIS_RUNDIR?= /var/run/redis REDIS_LOGDIR?= /var/log/redis SUB_FILES= pkg-message SUB_LIST+= PORTNAME=${PORTNAME} \ REDIS_USER=${USERS} \ REDIS_DBDIR=${REDIS_DBDIR} \ REDIS_LOGDIR=${REDIS_LOGDIR} \ REDIS_RUNDIR=${REDIS_RUNDIR} PLIST_SUB+= REDIS_USER=${USERS} \ REDIS_GROUP=${GROUPS} \ REDIS_LOGDIR=${REDIS_LOGDIR} \ REDIS_DBDIR=${REDIS_DBDIR} \ REDIS_RUNDIR=${REDIS_RUNDIR} post-patch: ${REINPLACE_CMD} '77s!malloc.h!stdlib.h!' ${WRKSRC}/src/zmalloc.h post-patch-JEMALLOC-on: @${REINPLACE_CMD} '35s!Linux!FreeBSD!g' ${WRKSRC}/src/Makefile post-patch-LUA-on: @cd ${WRKSRC}/deps/lua/src && ${CP} fpconv.* lua_* strbuf.* ${WRKSRC}/src/ post-patch-LUAJIT-on: post-patch-LUA-on post-patch-LUAJITOR-on: post-patch-LUA-on post-build: ${SED} ${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ ${WRKSRC}/redis.conf > ${WRKDIR}/redis.conf do-install: ${INSTALL_PROGRAM} ${BIN_FILES:C!^!${WRKSRC}/src/!} ${STAGEDIR}${PREFIX}/bin/ ${INSTALL_DATA} ${WRKDIR}/redis.conf ${STAGEDIR}${PREFIX}/etc/redis.conf.sample ${INSTALL_DATA} ${WRKSRC}/sentinel.conf ${STAGEDIR}${PREFIX}/etc/sentinel.conf.sample ${MKDIR} ${STAGEDIR}${REDIS_LOGDIR} \ ${STAGEDIR}${REDIS_DBDIR} \ ${STAGEDIR}${REDIS_RUNDIR} do-install-TRIB-on: ${INSTALL_SCRIPT} ${WRKSRC}/src/redis-trib.rb ${STAGEDIR}${PREFIX}/bin/ do-test: @cd ${WRKSRC} && ${TCLSH} tests/test_helper.tcl .include diff --git a/databases/redis-devel/distinfo b/databases/redis-devel/distinfo index b958b65791db..839c96e2cf29 100644 --- a/databases/redis-devel/distinfo +++ b/databases/redis-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1636129042 -SHA256 (redis-redis-7.0.0.20211105-ddb508c_GH0.tar.gz) = f60871bda3b14be93493d759af565f5e53c81a2e54ada99e0656cb2725ce08be -SIZE (redis-redis-7.0.0.20211105-ddb508c_GH0.tar.gz) = 2665367 +TIMESTAMP = 1638371049 +SHA256 (redis-redis-7.0.0.20211201-0e5b813_GH0.tar.gz) = b73a062ce2c4945a935792bcfa198e90f04df4e7d7a82a19001aad6f3010459a +SIZE (redis-redis-7.0.0.20211201-0e5b813_GH0.tar.gz) = 2677658 diff --git a/databases/redis-devel/files/patch-deps-Makefile b/databases/redis-devel/files/patch-deps-Makefile index 54e63847811f..c937bacb715e 100644 --- a/databases/redis-devel/files/patch-deps-Makefile +++ b/databases/redis-devel/files/patch-deps-Makefile @@ -1,35 +1,30 @@ ---- deps/Makefile.orig 2021-10-27 07:48:08.000000000 -0400 -+++ deps/Makefile 2021-10-27 09:49:28.847356000 -0400 -@@ -69,7 +69,7 @@ - LUA_CFLAGS= -D__C99FEATURES__=1 +--- deps/Makefile.orig 2021-12-01 10:06:05.001367000 -0500 ++++ deps/Makefile 2021-12-01 10:08:16.372525000 -0500 +@@ -76,7 +76,7 @@ + ifeq ($(LUA_DEBUG),yes) + LUA_CFLAGS+= -O0 -g -DLUA_USE_APICHECK + else +- LUA_CFLAGS+= -O2 ++ LUA_CFLAGS+= 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,11 +79,11 @@ - - 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)" +@@ -90,7 +90,7 @@ .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) ifneq ($(DEB_HOST_GNU_TYPE),) -@@ -92,7 +92,7 @@ +@@ -99,7 +99,7 @@ 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)" $(JEMALLOC_CONFIGURE_OPTS) - 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)" $(JEMALLOC_CONFIGURE_OPTS) + cd jemalloc && $(MAKE) CFLAGS="$(JEMALLOC_CFLAGS)" CXXFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" lib/libjemalloc.a .PHONY: jemalloc