diff --git a/archivers/7-zip/Makefile b/archivers/7-zip/Makefile index 7fcfca41f7b4..a99e69d947e2 100644 --- a/archivers/7-zip/Makefile +++ b/archivers/7-zip/Makefile @@ -1,64 +1,64 @@ PORTNAME= 7-zip -DISTVERSION= 22.01 +DISTVERSION= 23.01 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 diff --git a/archivers/7-zip/distinfo b/archivers/7-zip/distinfo index e87c809f04cb..ed3c02a007cf 100644 --- a/archivers/7-zip/distinfo +++ b/archivers/7-zip/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1668954126 -SHA256 (7z2201-src.7z) = 24cb2b9c6c0fb87d9c77a8d2afb572f5c75b45c950eff81a37ebac7fa73d1b4a -SIZE (7z2201-src.7z) = 1280446 +TIMESTAMP = 1687255440 +SHA256 (7z2301-src.7z) = fc459c2314a032231c157fd3257906c070ceed11efd6ffa621c2dfebbbc31281 +SIZE (7z2301-src.7z) = 1365807 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 82ace8e6b679..7d7ed073351b 100644 --- a/archivers/7-zip/files/patch-CPP_7zip_7zip__gcc.mak +++ b/archivers/7-zip/files/patch-CPP_7zip_7zip__gcc.mak @@ -1,27 +1,29 @@ ---- CPP/7zip/7zip_gcc.mak.orig 2021-12-12 12:16:07 UTC +--- CPP/7zip/7zip_gcc.mak.orig 2023-08-31 09:13:13 UTC +++ CPP/7zip/7zip_gcc.mak -@@ -14,13 +14,13 @@ PROGPATH_STATIC = $(O)/$(PROG)s +@@ -24,7 +24,7 @@ PROGPATH_STATIC = $(O)/$(PROG)s ifneq ($(CC), xlc) --CFLAGS_WARN_WALL = -Wall -Werror -Wextra +-CFLAGS_WARN_WALL = -Werror -Wall -Wextra +CFLAGS_WARN_WALL = endif # for object file +@@ -32,7 +32,7 @@ endif + # -save-temps CFLAGS_BASE_LIST = -c # 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 \ -fPIC -@@ -111,7 +111,7 @@ MY_MKDIR=mkdir -p +@@ -142,7 +142,7 @@ DEL_OBJ_EXE = -$(RM) $(PROGPATH) $(PROGPATH_STATIC) $( # LOCAL_LIBS=-lpthread # LOCAL_LIBS_DLL=$(LOCAL_LIBS) -ldl -LIB2 = -lpthread -ldl +LIB2 = $(LOCAL_LIBS) -lpthread - + endif