diff --git a/archivers/7-zip/Makefile b/archivers/7-zip/Makefile
index a99e69d947e2..20e4f78952b1 100644
--- a/archivers/7-zip/Makefile
+++ b/archivers/7-zip/Makefile
@@ -1,64 +1,62 @@
 PORTNAME=	7-zip
-DISTVERSION=	23.01
+DISTVERSION=	24.07
 CATEGORIES=	archivers
 MASTER_SITES=	https://www.7-zip.org/a/
 DISTNAME=	7z${DISTVERSION:S/.//}-src
 
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Console version of the 7-Zip file archiver
 WWW=		https://www.7-zip.org/
 
-CONFLICTS_INSTALL=	p7zip
-
 LICENSE=	BSD3CLAUSE LGPL21+ UNRAR
 LICENSE_COMB=	multi
 LICENSE_NAME_UNRAR=	unRAR license
 LICENSE_FILE_BSD3CLAUSE=	${WRKSRC}/DOC/License.txt
 LICENSE_FILE_LGPL21+ =	${WRKSRC}/DOC/copying.txt
 LICENSE_FILE_UNRAR=	${WRKSRC}/DOC/unRarLicense.txt
 LICENSE_PERMS_UNRAR=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 LIB_DEPENDS=	libsysinfo.so:devel/libsysinfo
 
 USES=		7z cpe dos2unix gmake localbase
 
 CPE_VENDOR=	7-zip
 
 MAKEFILE=	../../cmpl_clang.mak
 MAKE_ARGS=	LOCAL_FLAGS="${CFLAGS}" \
 		LOCAL_LIBS="${LIBS} -lsysinfo"
 CFLAGS_aarch64?=	-march=armv8-a+crc+crypto
 
 NO_WRKSUBDIR=	yes
 BUILD_WRKSRC=	${WRKSRC}/CPP/7zip/Bundles/Alone2
 DOS2UNIX_FILES=	C/CpuArch.c \
 		C/7zCrc.c \
 		C/Aes.c \
 		C/AesOpt.c \
 		C/Sha1Opt.c \
 		C/Sha256Opt.c \
 		CPP/7zip/7zip_gcc.mak \
 		CPP/7zip/var_gcc.mak \
 		CPP/Windows/SystemInfo.cpp
 
 PLIST_FILES=	bin/7z \
 		bin/7zz \
 		share/man/man1/7zz.1.gz
 PORTDOCS=	7zC.txt 7zFormat.txt Methods.txt \
 		lzma.txt readme.txt src-history.txt
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	${ECHO_CMD} > ${WRKSRC}/CPP/7zip/warn_clang.mak
 
 do-install:
 	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/b/c/7zz ${STAGEDIR}/${PREFIX}/bin
 	${LN} -sf 7zz ${STAGEDIR}/${PREFIX}/bin/7z
 	${INSTALL_MAN} ${FILESDIR}/7zz.1 ${STAGEDIR}/${PREFIX}/share/man/man1
 
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR} && \
 	${INSTALL_DATA} ${PORTDOCS:C,^,${WRKSRC}/DOC/,} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/archivers/7-zip/distinfo b/archivers/7-zip/distinfo
index ed3c02a007cf..82f6922accbe 100644
--- a/archivers/7-zip/distinfo
+++ b/archivers/7-zip/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1687255440
-SHA256 (7z2301-src.7z) = fc459c2314a032231c157fd3257906c070ceed11efd6ffa621c2dfebbbc31281
-SIZE (7z2301-src.7z) = 1365807
+TIMESTAMP = 1719257884
+SHA256 (7z2407-src.7z) = c814f46dd39696c8522a9f3fe030fa835a371d0801a547864386c0403e73ba34
+SIZE (7z2407-src.7z) = 1475943
diff --git a/archivers/7-zip/files/patch-CPP_7zip_7zip__gcc.mak b/archivers/7-zip/files/patch-CPP_7zip_7zip__gcc.mak
index 7d7ed073351b..4861b4ab07b5 100644
--- a/archivers/7-zip/files/patch-CPP_7zip_7zip__gcc.mak
+++ b/archivers/7-zip/files/patch-CPP_7zip_7zip__gcc.mak
@@ -1,29 +1,28 @@
---- CPP/7zip/7zip_gcc.mak.orig	2023-08-31 09:13:13 UTC
+--- CPP/7zip/7zip_gcc.mak.orig	2024-06-24 19:51:06 UTC
 +++ CPP/7zip/7zip_gcc.mak
-@@ -24,7 +24,7 @@ PROGPATH_STATIC = $(O)/$(PROG)s
+@@ -24,7 +24,7 @@ ifneq ($(CC), xlc)
  
  
  ifneq ($(CC), xlc)
 -CFLAGS_WARN_WALL = -Werror -Wall -Wextra
 +CFLAGS_WARN_WALL = 
  endif
  
  # for object file
-@@ -32,7 +32,7 @@ endif
- # -save-temps
- CFLAGS_BASE_LIST = -c
+@@ -50,7 +50,7 @@ endif
+ endif
+ 
  # CFLAGS_BASE_LIST = -S
 -CFLAGS_BASE = -O2 $(CFLAGS_BASE_LIST) $(CFLAGS_WARN_WALL) $(CFLAGS_WARN) \
 +CFLAGS_BASE = $(CFLAGS_BASE_LIST) $(CFLAGS_WARN_WALL) $(CFLAGS_WARN) \
-  -DNDEBUG -D_REENTRANT -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
+  $(CFLAGS_DEBUG) -D_REENTRANT -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
   -fPIC
  
-@@ -142,7 +142,7 @@ DEL_OBJ_EXE = -$(RM) $(PROGPATH) $(PROGPATH_STATIC) $(
- 
+@@ -162,7 +162,6 @@ LIB2 = -lpthread
  # LOCAL_LIBS=-lpthread
  # LOCAL_LIBS_DLL=$(LOCAL_LIBS) -ldl
+ LIB2 = -lpthread
 -LIB2 = -lpthread -ldl
-+LIB2 = $(LOCAL_LIBS) -lpthread
  
  
  endif
diff --git a/archivers/7-zip/files/patch-CPP_Windows_SystemInfo.cpp b/archivers/7-zip/files/patch-CPP_Windows_SystemInfo.cpp
deleted file mode 100644
index 1f99e0c5da91..000000000000
--- a/archivers/7-zip/files/patch-CPP_Windows_SystemInfo.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
---- CPP/Windows/SystemInfo.cpp.orig	2021-12-28 14:08:56 UTC
-+++ CPP/Windows/SystemInfo.cpp
-@@ -20,6 +20,15 @@
- 
- #include <sys/auxv.h>
- 
-+#if defined(__FreeBSD__)
-+unsigned long getauxval(unsigned long type)
-+{
-+    unsigned long aux = 0;
-+    elf_aux_info(type, &aux, sizeof(aux));
-+    return aux;
-+}
-+#endif
-+
- // #undef AT_HWCAP    // to debug
- // #undef AT_HWCAP2   // to debug
- 
-@@ -36,7 +45,7 @@
- #endif
- */
- 
--#ifdef MY_CPU_ARM_OR_ARM64
-+#if defined(MY_CPU_ARM_OR_ARM64) && !defined(__FreeBSD__)
- #include <asm/hwcap.h>
- #endif
- #endif
diff --git a/archivers/7-zip/files/patch-C_7zCrc.c b/archivers/7-zip/files/patch-C_7zCrc.c
deleted file mode 100644
index 085636273a14..000000000000
--- a/archivers/7-zip/files/patch-C_7zCrc.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- C/7zCrc.c.orig	2022-04-12 15:58:06 UTC
-+++ C/7zCrc.c
-@@ -71,7 +71,7 @@ UInt32 MY_FAST_CALL CrcUpdateT1(UInt32 v, const void *
- 
- #ifdef MY_CPU_LE
- 
--#if defined(MY_CPU_ARM_OR_ARM64)
-+#if defined(MY_CPU_ARM64)
- 
- // #pragma message("ARM*")
- 
diff --git a/archivers/7-zip/files/patch-C_Aes.c b/archivers/7-zip/files/patch-C_Aes.c
deleted file mode 100644
index 5c7f45168933..000000000000
--- a/archivers/7-zip/files/patch-C_Aes.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- C/Aes.c.orig	2022-04-12 15:57:33 UTC
-+++ C/Aes.c
-@@ -55,7 +55,7 @@ static Byte InvS[256];
- 
- #ifdef MY_CPU_X86_OR_AMD64
-   #define USE_HW_AES
--#elif defined(MY_CPU_ARM_OR_ARM64) && defined(MY_CPU_LE)
-+#elif defined(MY_CPU_ARM) && defined(MY_CPU_LE)
-   #if defined(__clang__)
-     #if (__clang_major__ >= 8) // fix that check
-       #define USE_HW_AES
diff --git a/archivers/7-zip/files/patch-C_AesOpt.c b/archivers/7-zip/files/patch-C_AesOpt.c
deleted file mode 100644
index 861b62e51b3d..000000000000
--- a/archivers/7-zip/files/patch-C_AesOpt.c
+++ /dev/null
@@ -1,41 +0,0 @@
---- C/AesOpt.c.orig	2023-09-05 00:20:25 UTC
-+++ C/AesOpt.c
-@@ -554,7 +554,7 @@ VAES_COMPAT_STUB (AesCtr_Code_HW)
- #endif // ! USE_INTEL_VAES
- 
- 
--#elif defined(MY_CPU_ARM_OR_ARM64) && defined(MY_CPU_LE)
-+#elif defined(MY_CPU_ARM64) && defined(MY_CPU_LE)
- 
-   #if defined(__clang__)
-     #if (__clang_major__ >= 8) // fix that check
-@@ -828,7 +828,28 @@ AES_FUNC_START2 (AesCtr_Code_HW)
- 
- #endif // USE_HW_AES
- 
--#endif // MY_CPU_ARM_OR_ARM64
-+#else
-+
-+/* no USE_HW_AES */
-+
-+#pragma message("AES  HW_SW stub was used")
-+
-+#define AES_TYPE_keys UInt32
-+#define AES_TYPE_data Byte
-+
-+#define AES_FUNC_START(name) \
-+    void name(UInt32 *p, Byte *data, size_t numBlocks) \
-+
-+#define AES_COMPAT_STUB(name) \
-+    AES_FUNC_START(name); \
-+    AES_FUNC_START(name ## _HW) \
-+    { name(p, data, numBlocks); }
-+
-+AES_COMPAT_STUB (AesCbc_Encode)
-+AES_COMPAT_STUB (AesCbc_Decode)
-+AES_COMPAT_STUB (AesCtr_Code)
-+
-+#endif
- 
- #undef NUM_WAYS
- #undef WOP_M1
diff --git a/archivers/7-zip/files/patch-C_CpuArch.c b/archivers/7-zip/files/patch-C_CpuArch.c
deleted file mode 100644
index f0c8cba0f67c..000000000000
--- a/archivers/7-zip/files/patch-C_CpuArch.c
+++ /dev/null
@@ -1,42 +0,0 @@
---- C/CpuArch.c.orig	2023-08-31 09:13:13 UTC
-+++ C/CpuArch.c
-@@ -762,6 +762,31 @@ BoolInt CPU_IsSupported_AES (void) { return APPLE_CRYP
- 
- #include <sys/auxv.h>
- 
-+#if defined(__FreeBSD__)
-+static unsigned long get_hwcap(int aux) {
-+  unsigned long hwcap;
-+  if (elf_aux_info(aux, &hwcap, sizeof hwcap) != 0) {
-+        return 0;
-+  }
-+  return hwcap;
-+}
-+
-+#ifdef MY_CPU_ARM64
-+BoolInt CPU_IsSupported_CRC32(void) { return get_hwcap(AT_HWCAP) & HWCAP_CRC32; }
-+BoolInt CPU_IsSupported_NEON(void) { return 1; }
-+BoolInt CPU_IsSupported_SHA1(void){ return get_hwcap(AT_HWCAP) & HWCAP_SHA1; }
-+BoolInt CPU_IsSupported_SHA2(void) { return get_hwcap(AT_HWCAP) & HWCAP_SHA2; }
-+BoolInt CPU_IsSupported_AES(void) { return get_hwcap(AT_HWCAP) & HWCAP_AES; }
-+#else /* MY_CPU_ARM */
-+BoolInt CPU_IsSupported_CRC32(void) { return get_hwcap(AT_HWCAP2) & HWCAP2_CRC32; }
-+BoolInt CPU_IsSupported_NEON(void) { return get_hwcap(AT_HWCAP) & HWCAP_NEON; }
-+BoolInt CPU_IsSupported_SHA1(void){ return get_hwcap(AT_HWCAP2) & HWCAP2_SHA1; }
-+BoolInt CPU_IsSupported_SHA2(void) { return get_hwcap(AT_HWCAP2) & HWCAP2_SHA2; }
-+BoolInt CPU_IsSupported_AES(void) { return get_hwcap(AT_HWCAP2) & HWCAP2_AES; }
-+#endif
-+
-+#else // __FreeBSD__
-+
- #define USE_HWCAP
- 
- #ifdef USE_HWCAP
-@@ -795,6 +820,7 @@ MY_HWCAP_CHECK_FUNC (SHA1)
- MY_HWCAP_CHECK_FUNC (SHA2)
- MY_HWCAP_CHECK_FUNC (AES)
- 
-+#endif // FreeBSD
- #endif // __APPLE__
- #endif // _WIN32
- 
diff --git a/archivers/7-zip/files/patch-C_Sha1Opt.c b/archivers/7-zip/files/patch-C_Sha1Opt.c
deleted file mode 100644
index 69b00669795b..000000000000
--- a/archivers/7-zip/files/patch-C_Sha1Opt.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- C/Sha1Opt.c.orig	2023-08-31 09:13:13 UTC
-+++ C/Sha1Opt.c
-@@ -202,7 +202,7 @@ void Z7_FASTCALL Sha1_UpdateBlocks_HW(UInt32 state[5],
- 
- #endif // USE_HW_SHA
- 
--#elif defined(MY_CPU_ARM_OR_ARM64)
-+#elif defined(MY_CPU_ARM64)
- 
-   #if defined(__clang__)
-     #if (__clang_major__ >= 8) // fix that check
diff --git a/archivers/7-zip/files/patch-C_Sha256Opt.c b/archivers/7-zip/files/patch-C_Sha256Opt.c
deleted file mode 100644
index cfbd3dd9befa..000000000000
--- a/archivers/7-zip/files/patch-C_Sha256Opt.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- C/Sha256Opt.c.orig	2023-08-31 09:13:13 UTC
-+++ C/Sha256Opt.c
-@@ -202,7 +202,7 @@ void Z7_FASTCALL Sha256_UpdateBlocks_HW(UInt32 state[8
- 
- #endif // USE_HW_SHA
- 
--#elif defined(MY_CPU_ARM_OR_ARM64)
-+#elif defined(MY_CPU_ARM64)
- 
-   #if defined(__clang__)
-     #if (__clang_major__ >= 8) // fix that check