From nobody Tue Feb 08 17:40:12 2022 X-Original-To: dev-commits-ports-main@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 BE8B119AD965; Tue, 8 Feb 2022 17:40:13 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JtVdm73FXz4sP2; Tue, 8 Feb 2022 17:40:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644342013; 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=wZkUl2M/y554HEgpgr8TgL6cakJ72kwRttCVhcWkUJI=; b=iiMttjidGg93tE/+BwLUCfXZX+7N4cwFxh0AM3rbxaDNWBqjfd5HfnFteHTNbf/IhxVSiN TUTvVQxQxg9EUqr6RixyeeVOs9XfvxBoZd4z4eR8cGLt+iIdPUtvpMJ2J//5ooq3+d0mAC JC0bcoo1pBRMq6Img+qNilRf2iNDwR//EIZI3O8h/uoxfzzQtm+H0XueasC+hUpyZMwrTP nV7MjbZSiWtM0WeZXD4d0LL1UyBwXiFWqtWSIMUuT8Z93XD0GdShE9HK25WnmyzyAPLBeu e6txZeSDShF9YHWWAF2eEWh20F3rOkc9+c3245gIugFq01RTga4Vi64qLrxbmg== 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 542781D267; Tue, 8 Feb 2022 17:40:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 218HeCYv012981; Tue, 8 Feb 2022 17:40:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 218HeCJK012975; Tue, 8 Feb 2022 17:40:12 GMT (envelope-from git) Date: Tue, 8 Feb 2022 17:40:12 GMT Message-Id: <202202081740.218HeCJK012975@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Max Brazhnikov Subject: git: d187db4415d7 - main - sysutils/unetbootin: switch from p7zip to 7-zip List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: makc X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d187db4415d7776fabf62996972958bf220276f1 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644342013; 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=wZkUl2M/y554HEgpgr8TgL6cakJ72kwRttCVhcWkUJI=; b=iKWDv8Iy0rWMmdvIknQ2oa26+rv584D2tIyJh6IHsaMYjppAEc7yVH3KzTg7+Ogm4Bln4z JzhOjrPCCI5wFfPzwjPKO2WWxWGDVZr6M2TeyC4AZEAi733640Jk19H16hhwXErQ84Kfvy 13U4v8VHkli93m1t3raNJYIe6rP+rLi0MXUsKS6IiZ1oqmDllLOdGx0DrK5ls9HU25gyTX uCQslyC4H2RZvN9z4Kedf7REpWuPaaqtP9aQn7mV0LuL7Op/mHrAraWYFGIns6EQ4ZZge+ 47Igg9+zogNHRSidjK2v71V3Y2jaRZ2dm+/Wd31Os5JLNFGTkp4+nVWQvIXw5g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644342013; a=rsa-sha256; cv=none; b=JOwp3zgmRWWavFl4imCgjGapSNPN6zkV910XV6gaHv3MuWnsL9HF2jMk54QqZJ18oIydQG dC/gk/J0QI9gfVq98RCMd1JhqCi6aJLQvxtN3nTdL4phyd+GJdaht/BG/5iCbSbyGMDqNd bD8qRz152adUA0WTLcmnrIG0XtnhdmBI8TBYEn/ooxYueiYx6AL0ZsUNA0XsiPsKil/3eC V/SdHWRtPlFZHgJeQ10xpt6hX2yNJojKd8Fp/j8tnlJ/4ckK8w+KJMC7mPqpN94edo4aB6 tist8UiXmqLtIeO7jSSZS0xiJdeL1tOgdOz7Rqfe5akIew+zdosWUXzTG08Gaw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by makc: URL: https://cgit.FreeBSD.org/ports/commit/?id=d187db4415d7776fabf62996972958bf220276f1 commit d187db4415d7776fabf62996972958bf220276f1 Author: Max Brazhnikov AuthorDate: 2022-02-08 17:38:33 +0000 Commit: Max Brazhnikov CommitDate: 2022-02-08 17:38:33 +0000 sysutils/unetbootin: switch from p7zip to 7-zip PR: 260866, 261569 Approved by: danfe@ (maintainer) --- sysutils/unetbootin/Makefile | 4 ++-- sysutils/unetbootin/files/patch-unetbootin.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sysutils/unetbootin/Makefile b/sysutils/unetbootin/Makefile index 70bb2cce05f5..88765958f716 100644 --- a/sysutils/unetbootin/Makefile +++ b/sysutils/unetbootin/Makefile @@ -2,7 +2,7 @@ PORTNAME= unetbootin PORTVERSION= 702 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/${PORTVERSION}/ DISTNAME= ${PORTNAME}-source-${PORTVERSION} @@ -12,7 +12,7 @@ COMMENT= Bootable Live USB creator for various Linux distributions LICENSE= GPLv2+ -RUN_DEPENDS= 7z:archivers/p7zip \ +RUN_DEPENDS= 7zz:archivers/7-zip \ syslinux:sysutils/syslinux \ mke2fs:sysutils/e2fsprogs diff --git a/sysutils/unetbootin/files/patch-unetbootin.cpp b/sysutils/unetbootin/files/patch-unetbootin.cpp index f697ec06c21e..30be2861057e 100644 --- a/sysutils/unetbootin/files/patch-unetbootin.cpp +++ b/sysutils/unetbootin/files/patch-unetbootin.cpp @@ -6,7 +6,7 @@ #endif // Q_OS_LINUX +#ifdef Q_OS_FREEBSD + syslinuxcommand = locatecommand("syslinux", tr("FAT32-formatted USB drive"), "syslinux"); -+ sevzcommand = locatecommand("7z", tr("either"), "p7zip"); ++ sevzcommand = locatecommand("7zz", tr("either"), "7-zip"); + mke2fscommand = locatecommand("mke2fs", tr("LiveUSB persistence"), "e2fsprogs"); +#endif // Q_OS_FREEBSD ubntmpf = QDir::toNativeSeparators(QString("%1/").arg(QDir::tempPath()));