From nobody Sun Jan 09 21:13:41 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 01CCD193B95B; Sun, 9 Jan 2022 21:13:44 +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 4JX8ny1Jztz4WPt; Sun, 9 Jan 2022 21:13:42 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 04DFA192D0; Sun, 9 Jan 2022 21:13:42 +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 209LDfbZ092076; Sun, 9 Jan 2022 21:13:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 209LDf6P092075; Sun, 9 Jan 2022 21:13:41 GMT (envelope-from git) Date: Sun, 9 Jan 2022 21:13:41 GMT Message-Id: <202201092113.209LDf6P092075@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: 7b6492b4dde7 - main - archivers/deco: refactor port 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: 7b6492b4dde75a5b985c23365ea632331e8e7192 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641762822; 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=pV/WHKH1YlTDl7OswoTEQujTYxAG3NAASDfJ07yfOYs=; b=MgBWYxROFKyo3yflbUXcBw4Ms0eixU8p7GVspLl81LPMuH/Rxe1e2BoiQIr76TomKSZPqJ gOZpucg5vTrvHH0I1fACKrbDPI/u9cUHPMSzAGLDbDnHEik7s0WX2ldzsiiygnN4/JIGgt D2/wi0iofxa7x0RuZxOKW/E26imOVWNct7qlfjLIoi1l3nw9zyy03aewTMZqNq9muACQVH kaK3b2ftx8HMnaTcIa6d+g7UGb+zYcZqQxK+il5YlJlGMi1fVG2dpYo/rpSeriKn1+zScy 6igoXUCWVIjl9lVALkuNNnDm8rPg6dlUOcuWKe8CZd/pznL0ChC4CDvyCJDWqg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641762822; a=rsa-sha256; cv=none; b=We8vi1dktczUSxIWO7TZTMOsIAsJRaXEXqOkD9MfdUbBEv+gfzn7YHyHNb5J/BIzyfd5o3 9Ntc6miiW3r6fah+bZzKW1+fWCkCU5gvKgADnCDZ//vV3vk+vLlGggmCbYz7Krz0UQ5AAx mOF75nD7QMdWyLSfeXv3txvSnmogetela3zMzHxXFq4KL+q3O7AcZoa4x9TkQb47ZFN17l NJL7eNEhCT49kScnZcJycDinq1rcnCe6MkBuEB27YfVMNXGqh4CAKbLZjd/IcUWro4RZv7 5FaRcLvzDO5O96nwZFCni9eScB9Vxr3wplWnK7lGfFkqmg0MS4NyBJiROdNIMQ== 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=7b6492b4dde75a5b985c23365ea632331e8e7192 commit 7b6492b4dde75a5b985c23365ea632331e8e7192 Author: Max Brazhnikov AuthorDate: 2022-01-09 21:11:28 +0000 Commit: Max Brazhnikov CommitDate: 2022-01-09 21:11:28 +0000 archivers/deco: refactor port - Rename binary and package to avoid conflict with deco filemanager - Switch from p7zip to 7-Zip PR: 260866 --- archivers/deco/Makefile | 18 +++++++++++------- archivers/deco/pkg-plist | 2 +- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/archivers/deco/Makefile b/archivers/deco/Makefile index b4a0a61acc8f..392d995029eb 100644 --- a/archivers/deco/Makefile +++ b/archivers/deco/Makefile @@ -1,6 +1,8 @@ PORTNAME= deco PORTVERSION= 1.6.4 +PORTREVISION= 1 CATEGORIES= archivers +PKGNAMESUFFIX= -extractor # avoid collision with misc/deco MAINTAINER= ports@FreeBSD.org COMMENT= Program to extract various archive file formats @@ -11,14 +13,14 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USE_GITHUB= yes GH_ACCOUNT= peha GH_PROJECT= deco-archive:archive -GH_TAGNAME= 1.7:archive +GH_TAGNAME= ${DARCHIVE_VER}:archive RUN_DEPENDS= arc:archivers/arc \ arj:archivers/arj \ cabextract:archivers/cabextract \ dpkg:archivers/dpkg \ lzop:archivers/lzop \ - 7z:archivers/p7zip \ + 7zz:archivers/7-zip \ rpm:archivers/rpm4 \ rzip:archivers/rzip \ unace:archivers/unace \ @@ -26,22 +28,24 @@ RUN_DEPENDS= arc:archivers/arc \ zoo:archivers/zoo \ flac:audio/flac -CONFLICTS= deco +DARCHIVE_VER= 1.7 +DARCHIVE= deco-archive-${DARCHIVE_VER} post-patch: - @${CP} ${FILESDIR}/extract ${WRKDIR}/${PORTNAME}-archive-1.7/x/"tar\.xz" + @${CP} ${FILESDIR}/extract ${WRKDIR}/${DARCHIVE}/x/"tar\.xz" + ${REINPLACE_CMD} 's/7za/7zz/;s,-l ,,' ${WRKDIR}/${DARCHIVE}/x/7z/extract do-build: cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/deco ${STAGEDIR}${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/deco ${STAGEDIR}${PREFIX}/bin/deco-extract @${MKDIR} ${STAGEDIR}${DATADIR} .for i in LICENSE Makefile NEWS README config.mk - ${RM} -r ${WRKSRC}/../${PORTNAME}-archive-1.7/${i} + ${RM} -r ${WRKSRC}/../${DARCHIVE}/${i} .endfor - @cd ${WRKDIR}/${PORTNAME}-archive-1.7/x/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR} + @cd ${WRKDIR}/${DARCHIVE}/x/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR} @${FIND} ${STAGEDIR}${DATADIR} -type f -exec ${CHMOD} +x {} \; .include diff --git a/archivers/deco/pkg-plist b/archivers/deco/pkg-plist index 150824d07830..3a4707500325 100644 --- a/archivers/deco/pkg-plist +++ b/archivers/deco/pkg-plist @@ -1,4 +1,4 @@ -bin/deco +bin/deco-extract %%DATADIR%%/7z/extract %%DATADIR%%/7z\.[0-9]{2,} %%DATADIR%%/a/extract