Date: Sun, 9 Jan 2022 21:13:41 GMT From: Max Brazhnikov <makc@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 7b6492b4dde7 - main - archivers/deco: refactor port Message-ID: <202201092113.209LDf6P092075@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by makc: URL: https://cgit.FreeBSD.org/ports/commit/?id=7b6492b4dde75a5b985c23365ea632331e8e7192 commit 7b6492b4dde75a5b985c23365ea632331e8e7192 Author: Max Brazhnikov <makc@FreeBSD.org> AuthorDate: 2022-01-09 21:11:28 +0000 Commit: Max Brazhnikov <makc@FreeBSD.org> 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 <bsd.port.mk> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202201092113.209LDf6P092075>