CVS commit: pkgsrc/archivers/7-zip

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/archivers/7-zip
From: "Ryo ONODERA" <ryoon%netbsd.org@localhost>
Date: Fri, 21 Jul 2023 22:42:05 +0000

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Fri Jul 21 22:42:05 UTC 2023

Added Files:
        pkgsrc/archivers/7-zip: DESCR Makefile PLIST distinfo
        pkgsrc/archivers/7-zip/patches: patch-CPP_7zip_Common_FileStreams.cpp
            patch-CPP_7zip_UI_Common_UpdateCallback.cpp
            patch-CPP_Windows_System.cpp patch-CPP_Windows_SystemInfo.cpp

Log Message:
archivers/7-zip: import 7-zip-23.01

A command-line tool from the 7-Zip code base.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 pkgsrc/archivers/7-zip/DESCR \
    pkgsrc/archivers/7-zip/Makefile pkgsrc/archivers/7-zip/PLIST \
    pkgsrc/archivers/7-zip/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/archivers/7-zip/patches/patch-CPP_7zip_Common_FileStreams.cpp \
    pkgsrc/archivers/7-zip/patches/patch-CPP_7zip_UI_Common_UpdateCallback.cpp \
    pkgsrc/archivers/7-zip/patches/patch-CPP_Windows_System.cpp \
    pkgsrc/archivers/7-zip/patches/patch-CPP_Windows_SystemInfo.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Added files:

Index: pkgsrc/archivers/7-zip/DESCR
diff -u /dev/null pkgsrc/archivers/7-zip/DESCR:1.1
--- /dev/null   Fri Jul 21 22:42:05 2023
+++ pkgsrc/archivers/7-zip/DESCR        Fri Jul 21 22:42:04 2023
@@ -0,0 +1 @@
+A command-line tool from the 7-Zip code base.
Index: pkgsrc/archivers/7-zip/Makefile
diff -u /dev/null pkgsrc/archivers/7-zip/Makefile:1.1
--- /dev/null   Fri Jul 21 22:42:05 2023
+++ pkgsrc/archivers/7-zip/Makefile     Fri Jul 21 22:42:04 2023
@@ -0,0 +1,43 @@
+# $NetBSD: Makefile,v 1.1 2023/07/21 22:42:04 ryoon Exp $
+
+DISTNAME=      7z2301-src
+PKGNAME=       7-zip-23.01
+CATEGORIES=    archivers
+MASTER_SITES=  https://www.7-zip.org/a/
+EXTRACT_SUFX=  .tar.xz
+
+MAINTAINER=    ryoon%NetBSD.org@localhost
+HOMEPAGE=      https://www.7-zip.org/
+COMMENT=       Latest command-line tool for .7z and some archive formats
+LICENSE=       gnu-lgpl-v2.1
+
+WRKSRC=                ${WRKDIR}
+USE_LANGUAGES= c c++
+
+USE_TOOLS+=    gmake
+
+BUILD_DIRS+=   CPP/7zip/Bundles/Alone2
+MAKE_FILE=     makefile.gcc
+
+.include "../../mk/dlopen.buildlink3.mk"
+BUILDLINK_TRANSFORM+=  opt:-ldl:${BUILDLINK_LDADD.dl:Q}
+
+# Disable RAR archive file support licensed under unRAR license.
+# You can see file listing and extract files without compression.
+BUILD_MAKE_FLAGS+=     DISABLE_RAR_COMPRESS=1
+
+INSTALLATION_DIRS+=    bin
+
+SUBST_CLASSES+=                crlf
+SUBST_MESSAGE.crlf=    Converting CRLF to LF.
+SUBST_STAGE.crlf=      post-extract
+SUBST_FILES.crlf=      CPP/7zip/Common/*
+SUBST_FILES.crlf+=     CPP/7zip/UI/Common/*
+SUBST_FILES.crlf+=     CPP/Windows/*
+SUBST_FILTER_CMD.crlf= ${TR} -d '\r'
+
+do-install:
+       ${INSTALL_PROGRAM} ${WRKSRC}/CPP/7zip/Bundles/Alone2/_o/7zz \
+               ${DESTDIR}${PREFIX}/bin
+
+.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/archivers/7-zip/PLIST
diff -u /dev/null pkgsrc/archivers/7-zip/PLIST:1.1
--- /dev/null   Fri Jul 21 22:42:05 2023
+++ pkgsrc/archivers/7-zip/PLIST        Fri Jul 21 22:42:04 2023
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST,v 1.1 2023/07/21 22:42:04 ryoon Exp $
+bin/7zz
Index: pkgsrc/archivers/7-zip/distinfo
diff -u /dev/null pkgsrc/archivers/7-zip/distinfo:1.1
--- /dev/null   Fri Jul 21 22:42:05 2023
+++ pkgsrc/archivers/7-zip/distinfo     Fri Jul 21 22:42:04 2023
@@ -0,0 +1,9 @@
+$NetBSD: distinfo,v 1.1 2023/07/21 22:42:04 ryoon Exp $
+
+BLAKE2s (7z2301-src.tar.xz) = 1d6243ac12be9625f9df3ba889ebeeb1f3f8a34f2629ec264aa692f5414c354f
+SHA512 (7z2301-src.tar.xz) = e39f660c023aa65e55388be225b5591fe2a5c9138693f3c9107e2eb4ce97fafde118d3375e01ada99d29de9633f56221b5b3d640c982178884670cd84c8aa986
+Size (7z2301-src.tar.xz) = 1378588 bytes
+SHA1 (patch-CPP_7zip_Common_FileStreams.cpp) = 712924b060cc2b00d0ce131afe29401971d061be
+SHA1 (patch-CPP_7zip_UI_Common_UpdateCallback.cpp) = 6d8612b37bcfbb8f8b46a1d7afb0a8c28f02becc
+SHA1 (patch-CPP_Windows_System.cpp) = 5183de07924c82dbe46b130ce4f2edbb2bc48803
+SHA1 (patch-CPP_Windows_SystemInfo.cpp) = d78be248fd24fee1900c4d36eb9d5937f2bdaf95

Index: pkgsrc/archivers/7-zip/patches/patch-CPP_7zip_Common_FileStreams.cpp
diff -u /dev/null pkgsrc/archivers/7-zip/patches/patch-CPP_7zip_Common_FileStreams.cpp:1.1
--- /dev/null   Fri Jul 21 22:42:05 2023
+++ pkgsrc/archivers/7-zip/patches/patch-CPP_7zip_Common_FileStreams.cpp        Fri Jul 21 22:42:05 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-CPP_7zip_Common_FileStreams.cpp,v 1.1 2023/07/21 22:42:05 ryoon Exp $
+
+* Fix NetBSD build.
+
+--- CPP/7zip/Common/FileStreams.cpp.orig       2023-06-26 07:32:05.420332662 +0000
++++ CPP/7zip/Common/FileStreams.cpp
+@@ -13,7 +13,7 @@
+ 
+ // for major()/minor():
+ #include <sys/types.h>
+-#if defined(__FreeBSD__) || defined(BSD) || defined(__APPLE__)
++#if defined(__FreeBSD__) || defined(BSD) || defined(__APPLE__) || defined(__NetBSD__)
+ #else
+ #ifndef major
+ #include <sys/sysmacros.h>
Index: pkgsrc/archivers/7-zip/patches/patch-CPP_7zip_UI_Common_UpdateCallback.cpp
diff -u /dev/null pkgsrc/archivers/7-zip/patches/patch-CPP_7zip_UI_Common_UpdateCallback.cpp:1.1
--- /dev/null   Fri Jul 21 22:42:05 2023
+++ pkgsrc/archivers/7-zip/patches/patch-CPP_7zip_UI_Common_UpdateCallback.cpp  Fri Jul 21 22:42:05 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-CPP_7zip_UI_Common_UpdateCallback.cpp,v 1.1 2023/07/21 22:42:05 ryoon Exp $
+
+* Fix NetBSD build.
+
+--- CPP/7zip/UI/Common/UpdateCallback.cpp.orig 2023-06-26 07:32:05.662479141 +0000
++++ CPP/7zip/UI/Common/UpdateCallback.cpp
+@@ -14,7 +14,7 @@ functions: gnu_dev_makedev(), gnu_dev_ma
+ */
+ // for major()/minor():
+ #include <sys/types.h>
+-#if defined(__FreeBSD__) || defined(BSD) || defined(__APPLE__)
++#if defined(__FreeBSD__) || defined(BSD) || defined(__APPLE__) || defined(__NetBSD__)
+ #else
+ #ifndef major
+ #include <sys/sysmacros.h>
Index: pkgsrc/archivers/7-zip/patches/patch-CPP_Windows_System.cpp
diff -u /dev/null pkgsrc/archivers/7-zip/patches/patch-CPP_Windows_System.cpp:1.1
--- /dev/null   Fri Jul 21 22:42:05 2023
+++ pkgsrc/archivers/7-zip/patches/patch-CPP_Windows_System.cpp Fri Jul 21 22:42:05 2023
@@ -0,0 +1,25 @@
+$NetBSD: patch-CPP_Windows_System.cpp,v 1.1 2023/07/21 22:42:05 ryoon Exp $
+
+* Use sys/sysinfo.h for Linux and the others use sys/sysctl.h.
+  Fix NetBSD build at least.
+
+--- CPP/Windows/System.cpp.orig        2023-06-26 07:32:05.849120590 +0000
++++ CPP/Windows/System.cpp
+@@ -5,7 +5,7 @@
+ #ifndef _WIN32
+ #include <unistd.h>
+ #include <limits.h>
+-#ifdef __APPLE__
++#if defined(__APPLE__) || defined(__NetBSD__)
+ #include <sys/sysctl.h>
+ #else
+ #include <sys/sysinfo.h>
+@@ -187,7 +187,7 @@ bool GetRamSize(UInt64 &size)
+ {
+   size = (UInt64)(sizeof(size_t)) << 29;
+ 
+-  #ifdef __APPLE__
++  #if defined(__APPLE__) || defined(__NetBSD__)
+ 
+     #ifdef HW_MEMSIZE
+       uint64_t val = 0; // support 2Gb+ RAM
Index: pkgsrc/archivers/7-zip/patches/patch-CPP_Windows_SystemInfo.cpp
diff -u /dev/null pkgsrc/archivers/7-zip/patches/patch-CPP_Windows_SystemInfo.cpp:1.1
--- /dev/null   Fri Jul 21 22:42:05 2023
+++ pkgsrc/archivers/7-zip/patches/patch-CPP_Windows_SystemInfo.cpp     Fri Jul 21 22:42:05 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-CPP_Windows_SystemInfo.cpp,v 1.1 2023/07/21 22:42:05 ryoon Exp $
+
+* Fix NetBSD build.
+
+--- CPP/Windows/SystemInfo.cpp.orig    2021-11-06 08:19:39.000000000 +0000
++++ CPP/Windows/SystemInfo.cpp
+@@ -16,7 +16,7 @@
+ #include <sys/utsname.h>
+ #ifdef __APPLE__
+ #include <sys/sysctl.h>
+-#elif !defined(_AIX)
++#elif !defined(_AIX) && !defined(__NetBSD__)
+ 
+ #include <sys/auxv.h>
+

Prev by Date: Re: CVS commit: pkgsrc/math/py-colormath
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/games/openrct2
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index