From nobody Fri May 02 13:09:46 2025 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Zprqb2MX9z5vhFk; Fri, 02 May 2025 13:09:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZprqZ697cz3Pws; Fri, 02 May 2025 13:09:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746191386; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7y/RyAZKMToMFPnVkD6fXFiM9+izCqH7QlSfTOYmhqA=; b=dkDp9ESqDuAD3e47EmER9vJqy5E7B9Sw/PrZfnrO3QEBDQHlUo992epfUx0TkXcCwZE4Mr kWqmQyrZYby0yduYnyYCtcO+KLDsCVBAOFOm0pBKtNem3UB3YcdLfF/dRXm8HTjibvy4nv 3NIMWwH6EVmBqKwQx+42KzQIWU/tRpfqySEDZ4SnKDeCyHYAspfPL8LkOewy4N1qyKUbG7 VF+/VQVnvQ7YFbmXKoQoA3vuujtrob5rTUslB+CxQW3P6UY/hK9aXxq+39ibPxlHG9dPSN aYqTEzPU5TMbCPXHov5rGCZ0Jt7PO0ecR0abhTpHj+gGPDbJ0zTIx/r/KUQQ4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746191386; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7y/RyAZKMToMFPnVkD6fXFiM9+izCqH7QlSfTOYmhqA=; b=m7/k+f1lPZqeytrZ2hbbNc7zZvbjirDFIAA2REWI5SPmMB9JTm4P5KBLKWyiMjQb1UD7oX YT8zm/ZB/DCoVYcRWPS1Y4nQvJbXIC68FAds3rpTfLD3wlUMk0XoK1u1NqJe1HZTL+s8Hw MhVI5xymZv0p4/2vSgRfJkphKTfdIeGtIsliEU8NF3Jq0xf0+FTh0ae+WPWN/Gmqy4L3+b pXz1BjkFH2wac2zV0a5cxz9k1VbMsbEnrLfJWl/P0AqFY+dCJ3COIcOE7bzoTTjl+PQjNU 62LZkMgwfAf6cVi61odbtc2/jjVagS/TmitQvn9ocPVdVWo/3LiiiOhR0gQ/Iw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746191386; a=rsa-sha256; cv=none; b=Z84vGP8VsySFf7DycMT4y8uxn3L25C9ZlC42NSLoLig6oDQrlDFRAWMXea2IUhIbneG3FZ 3Ls/8g4/PnqXAkA+3ixpHO1ozUARWOfzuAtYTi5uSp+qIyjk2qZI61XUZBvbT99iiTd8CV UzRdNEL2PWHxb7S97s0SIhkEc4epftrINbNF7ZZ77cymHBppLB+LoNG2y/rgIDtKs1e+oH ZpgapNS44QwqVGmySV4zSvJTGe2vVxfHoBeUWxIYpKXlUI7+TQg8Us7w7GUdMNBeV27hUr H0f+dZ/u8cRPVAwmfqqxVxiS0T77jA0hCMaMenWpev7lX9BewhYYub3oWiky8A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZprqZ4Qb7z1ChZ; Fri, 02 May 2025 13:09:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 542D9kTr099835; Fri, 2 May 2025 13:09:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 542D9kBK099832; Fri, 2 May 2025 13:09:46 GMT (envelope-from git) Date: Fri, 2 May 2025 13:09:46 GMT Message-Id: <202505021309.542D9kBK099832@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yasuhiro Kimura Subject: git: a1fad3ac052f - main - databases/redis74: Copy from databases/redis72 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yasu X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a1fad3ac052f195e8164526526b026df314ec5a4 Auto-Submitted: auto-generated The branch main has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=a1fad3ac052f195e8164526526b026df314ec5a4 commit a1fad3ac052f195e8164526526b026df314ec5a4 Author: Yasuhiro Kimura AuthorDate: 2025-05-02 12:26:23 +0000 Commit: Yasuhiro Kimura CommitDate: 2025-05-02 13:00:38 +0000 databases/redis74: Copy from databases/redis72 Copy databases/redis to databases/redis74 as preparation for updating the former to 8.0. --- databases/Makefile | 1 + databases/redis74/Makefile | 82 ++++++++++++++++++++++ databases/redis74/distinfo | 3 + databases/redis74/files/patch-deps-Makefile | 21 ++++++ .../redis74/files/patch-deps-hiredis-Makefile | 41 +++++++++++ databases/redis74/files/patch-deps-hiredis-net.c | 39 ++++++++++ .../redis74/files/patch-deps-linenoise-Makefile | 15 ++++ .../redis74/files/patch-deps_lua_src_lua__cjson.c | 12 ++++ databases/redis74/files/patch-redis.conf | 38 ++++++++++ databases/redis74/files/patch-src-Makefile | 39 ++++++++++ databases/redis74/files/patch-src-mkreleasehdr.sh | 11 +++ databases/redis74/files/pkg-message.in | 11 +++ databases/redis74/files/redis.in | 67 ++++++++++++++++++ databases/redis74/files/sentinel.in | 39 ++++++++++ databases/redis74/pkg-descr | 17 +++++ databases/redis74/pkg-plist | 11 +++ 16 files changed, 447 insertions(+) diff --git a/databases/Makefile b/databases/Makefile index 0e3bcc993d80..94d00d854237 100644 --- a/databases/Makefile +++ b/databases/Makefile @@ -874,6 +874,7 @@ SUBDIR += redis-devel SUBDIR += redis62 SUBDIR += redis72 + SUBDIR += redis74 SUBDIR += redis_exporter SUBDIR += redisdesktopmanager SUBDIR += redisjson diff --git a/databases/redis74/Makefile b/databases/redis74/Makefile new file mode 100644 index 000000000000..ee650777b1bc --- /dev/null +++ b/databases/redis74/Makefile @@ -0,0 +1,82 @@ +PORTNAME= redis +DISTVERSION= 7.4.3 +CATEGORIES= databases +MASTER_SITES= https://download.redis.io/releases/ +PKGNAMESUFFIX= 74 + +MAINTAINER= yasu@FreeBSD.org +COMMENT= Persistent key-value database with built-in net interface +WWW= https://redis.io/ + +LICENSE= RSALv2 SSPLv1 +LICENSE_COMB= dual +LICENSE_NAME_RSALv2= Redis Source Available License v2 +LICENSE_NAME_SSPLv1= Server Side Public License v1 +LICENSE_FILE= ${WRKSRC}/LICENSE.txt +LICENSE_PERMS_RSALv2= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept +LICENSE_PERMS_SSPLv1= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept + +USES= compiler:c11 cpe gmake tcl:test +CPE_VENDOR= redislabs +USE_RC_SUBR= redis sentinel + +MAKE_ENV= OPTIMIZATION= \ + V=yo + +LDFLAGS+= -lpthread -lm -lexecinfo + +CONFLICTS_INSTALL= redis-devel redis62 redis72 + +SUB_FILES= pkg-message +SUB_LIST= PORTNAME=${PORTNAME} \ + REDIS_DBDIR=${REDIS_DBDIR} \ + REDIS_LOGDIR=${REDIS_LOGDIR} \ + REDIS_RUNDIR=${REDIS_RUNDIR} \ + REDIS_USER=${USERS} + +USERS= redis +GROUPS= redis + +PLIST_SUB= REDIS_DBDIR=${REDIS_DBDIR} \ + REDIS_GROUP=${GROUPS} \ + REDIS_LOGDIR=${REDIS_LOGDIR} \ + REDIS_RUNDIR=${REDIS_RUNDIR} \ + REDIS_USER=${USERS} + +OPTIONS_DEFINE= JEMALLOC TLS +OPTIONS_DEFAULT= TLS +OPTIONS_SUB= yes + +JEMALLOC_DESC= Use jemalloc +TLS_DESC= Use TLS (openssl req.) + +JEMALLOC_MAKE_ENV= USE_JEMALLOC=yes +TLS_USES= ssl +TLS_MAKE_ENV= BUILD_TLS=yes + +BIN_FILES= redis-benchmark redis-check-aof redis-check-rdb redis-cli \ + redis-sentinel redis-server + +REDIS_DBDIR?= /var/db/redis +REDIS_RUNDIR?= /var/run/redis +REDIS_LOGDIR?= /var/log/redis + +post-patch-JEMALLOC-on: + @${REINPLACE_CMD} '78s!Linux!FreeBSD!g' ${WRKSRC}/src/Makefile + +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-test: + @cd ${WRKSRC} && ${TCLSH} tests/test_helper.tcl + +.include diff --git a/databases/redis74/distinfo b/databases/redis74/distinfo new file mode 100644 index 000000000000..6d3c2716a02b --- /dev/null +++ b/databases/redis74/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1745481453 +SHA256 (redis-7.4.3.tar.gz) = e1807d7c0f824f4c5450244ef50c1e596b8d09b35d03a83f4e018fb7316acf45 +SIZE (redis-7.4.3.tar.gz) = 3530739 diff --git a/databases/redis74/files/patch-deps-Makefile b/databases/redis74/files/patch-deps-Makefile new file mode 100644 index 000000000000..33e36467dbca --- /dev/null +++ b/databases/redis74/files/patch-deps-Makefile @@ -0,0 +1,21 @@ +--- deps/Makefile.orig 2023-07-10 11:55:20 UTC ++++ deps/Makefile +@@ -84,7 +84,7 @@ LUA_LDFLAGS+= $(LDFLAGS) + ifeq ($(LUA_DEBUG),yes) + LUA_CFLAGS+= -O0 -g -DLUA_USE_APICHECK + else +- LUA_CFLAGS+= -O2 ++ LUA_CFLAGS+= + endif + ifeq ($(LUA_COVERAGE),yes) + LUA_CFLAGS += -fprofile-arcs -ftest-coverage +@@ -112,7 +112,7 @@ endif + + jemalloc: .make-prerequisites + @printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR) +- cd jemalloc && ./configure --disable-cxx --with-version=5.3.0-0-g0 --with-lg-quantum=3 --disable-cache-oblivious --with-jemalloc-prefix=je_ CFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" $(JEMALLOC_CONFIGURE_OPTS) +- cd jemalloc && $(MAKE) lib/libjemalloc.a ++ cd jemalloc && ./configure --disable-cxx --with-version=5.3.0-0-g0 --with-lg-quantum=3 --disable-cache-oblivious --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 diff --git a/databases/redis74/files/patch-deps-hiredis-Makefile b/databases/redis74/files/patch-deps-hiredis-Makefile new file mode 100644 index 000000000000..76e3ea96245d --- /dev/null +++ b/databases/redis74/files/patch-deps-hiredis-Makefile @@ -0,0 +1,41 @@ +--- deps/hiredis/Makefile.orig 2023-08-15 09:38:36 UTC ++++ deps/hiredis/Makefile +@@ -15,7 +15,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 +-PREFIX?=/usr/local ++PREFIX?=${PREFIX} + INCLUDE_PATH?=include/hiredis + LIBRARY_PATH?=lib + PKGCONF_PATH?=pkgconfig +@@ -38,10 +38,9 @@ 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++') +-OPTIMIZATION?=-O3 + WARNINGS=-Wall -Wextra -Werror -Wstrict-prototypes -Wwrite-strings -Wno-missing-field-initializers + DEBUG_FLAGS?= -g -ggdb +-REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CPPFLAGS) $(CFLAGS) $(WARNINGS) $(DEBUG_FLAGS) $(PLATFORM_FLAGS) ++REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CFLAGS) $(WARNINGS) $(DEBUG_FLAGS) $(PLATFORM_FLAGS) + REAL_LDFLAGS=$(LDFLAGS) + + DYLIBSUFFIX=so +@@ -122,7 +121,16 @@ ifeq ($(uname_S),FreeBSD) + else + REAL_CFLAGS+=-pedantic + 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) diff --git a/databases/redis74/files/patch-deps-hiredis-net.c b/databases/redis74/files/patch-deps-hiredis-net.c new file mode 100644 index 000000000000..0dfde3135238 --- /dev/null +++ b/databases/redis74/files/patch-deps-hiredis-net.c @@ -0,0 +1,39 @@ +--- deps/hiredis/net.c.orig 2019-11-28 19:32:05 UTC ++++ deps/hiredis/net.c +@@ -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)); diff --git a/databases/redis74/files/patch-deps-linenoise-Makefile b/databases/redis74/files/patch-deps-linenoise-Makefile new file mode 100644 index 000000000000..aef0f10966af --- /dev/null +++ b/databases/redis74/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) diff --git a/databases/redis74/files/patch-deps_lua_src_lua__cjson.c b/databases/redis74/files/patch-deps_lua_src_lua__cjson.c new file mode 100644 index 000000000000..0bb150504c67 --- /dev/null +++ b/databases/redis74/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" diff --git a/databases/redis74/files/patch-redis.conf b/databases/redis74/files/patch-redis.conf new file mode 100644 index 000000000000..b653f89a3211 --- /dev/null +++ b/databases/redis74/files/patch-redis.conf @@ -0,0 +1,38 @@ +--- redis.conf.orig 2021-01-12 14:21:03 UTC ++++ redis.conf +@@ -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 ################################# + diff --git a/databases/redis74/files/patch-src-Makefile b/databases/redis74/files/patch-src-Makefile new file mode 100644 index 000000000000..6b3ed47b68be --- /dev/null +++ b/databases/redis74/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 diff --git a/databases/redis74/files/patch-src-mkreleasehdr.sh b/databases/redis74/files/patch-src-mkreleasehdr.sh new file mode 100644 index 000000000000..2a568628139d --- /dev/null +++ b/databases/redis74/files/patch-src-mkreleasehdr.sh @@ -0,0 +1,11 @@ +--- src/mkreleasehdr.sh.orig 2024-06-06 11:03:20 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 -- ../src ../deps 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) diff --git a/databases/redis74/files/pkg-message.in b/databases/redis74/files/pkg-message.in new file mode 100644 index 000000000000..85a89529262a --- /dev/null +++ b/databases/redis74/files/pkg-message.in @@ -0,0 +1,11 @@ +[ +{ type: install + message: <