From nobody Tue Jan 04 16:46:31 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 A9FA4192BD70; Tue, 4 Jan 2022 16:46:32 +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 4JSz6014DXz4Ypn; Tue, 4 Jan 2022 16:46:32 +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 D3EA51C881; Tue, 4 Jan 2022 16:46:31 +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 204GkVwR017538; Tue, 4 Jan 2022 16:46:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 204GkVFe017537; Tue, 4 Jan 2022 16:46:31 GMT (envelope-from git) Date: Tue, 4 Jan 2022 16:46:31 GMT Message-Id: <202201041646.204GkVFe017537@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Emanuel Haupt Subject: git: 16fc163575c8 - main - www/fgallery: 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: ehaupt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 16fc163575c88db3cebd7aa0ec49b3a2c33e9ce5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641314792; 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=wnU4yRfnfZ2X+jXT3AA7o8yu4xAdqUVwufmJu6icFv4=; b=sAf1OLpwjIDFNqDm1VsHnQ5cSxJjejYls7fKaE5CXE3ER4dgVJPEFXE4sj/SadXhGLpBCA ylcjME90lcYwGTafB3uKfPlZUgFIw02OzoRAQAtpbCjjRNIuYAzT+9FqSXxJvI63RN8EW5 NpXDY+0A1/BWcNtPL6ufxRESUVqdf4Z+ELqm6GuANlKl781YS21XiMvA51tvpYWw84Ty70 v6JNOyBGmSh24cmi3L6S9/dZizP0q/GNSuFOX7LPwioBmi9E2FM6Q/m/qJMDbF+KCuidW7 E0asuSw6RUnahKNWQD0P3tp2UcswYkYovPKFdTfkERZBvLsdCbdqrI3TGvZhLA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641314792; a=rsa-sha256; cv=none; b=MwZJ5Cm+Z7v0U0/wWDIZLEwQk35tMoVCOjJaB+DzhMmIAOYWR+GTl1O1+xdGQKmmjlurJ8 cRM8lupYAEXfKtrZT4pX+ZiOMRBnwCBcR3Xrq88N5sw756/3Dc6H31Y+xLXijN+owK3kaX FatPErj9kIW6UOc68MFPTNeVCFoIreAua32iaOrm0GwANLr1gj66fkJrX1sfcxuTHZIuEN 5iNmBTR8dNypoBxiN80czZv10DV7zZJYLIjZXjFfFu3Wj9EBnnIJMunzu2GvKxf+IsZ7h9 RPTLAn1kVyfSvyEvmiS0nh8gLdJskoxHMPWUf9C+UV/5FL337XMmEXZ/mFfaiQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by ehaupt: URL: https://cgit.FreeBSD.org/ports/commit/?id=16fc163575c88db3cebd7aa0ec49b3a2c33e9ce5 commit 16fc163575c88db3cebd7aa0ec49b3a2c33e9ce5 Author: Emanuel Haupt AuthorDate: 2022-01-04 16:43:50 +0000 Commit: Emanuel Haupt CommitDate: 2022-01-04 16:46:03 +0000 www/fgallery: Switch from p7zip to 7-zip Switch from outdated archivers/p7zip tp archivers/7-zip which is encouraged by the maintainer (see PR). While here, pacify portclippy/portfmt. PR: 260866 (based on) --- www/fgallery/Makefile | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/www/fgallery/Makefile b/www/fgallery/Makefile index eed6ffa04aea..3fcc6b11d683 100644 --- a/www/fgallery/Makefile +++ b/www/fgallery/Makefile @@ -2,7 +2,7 @@ PORTNAME= fgallery PORTVERSION= 1.8.2 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= www graphics MAINTAINER= ehaupt@FreeBSD.org @@ -11,33 +11,36 @@ COMMENT= Modern, static javascript photo gallery generator LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING.txt +LIB_DEPENDS= liblcms2.so:graphics/lcms2 RUN_DEPENDS= exiftool:graphics/p5-Image-ExifTool \ exiftran:graphics/exiftran \ p5-Cpanel-JSON-XS>=0:converters/p5-Cpanel-JSON-XS -LIB_DEPENDS= liblcms2.so:graphics/lcms2 USES= magick:6,run USE_GITHUB= yes -NO_BUILD= yes -NO_ARCH= yes - GH_ACCOUNT= wavexx GH_TAGNAME= 45a8629 -OPTIONS_DEFINE= 7ZIP FACEDETECT JPEGOPTIM PNGCRUSH -OPTIONS_DEFAULT=7ZIP FACEDETECT JPEGOPTIM PNGCRUSH +NO_ARCH= yes +NO_BUILD= yes -7ZIP_DESC= Use 7-Zip for better zip compression -FACEDETECT_DESC=Face detection for improved thumbnail centering -JPEGOPTIM_DESC= Use jpegoptim for JPEG size optimization -PNGCRUSH_DESC= Use pngcrush for PNG size optimization +OPTIONS_DEFINE= 7ZIP FACEDETECT JPEGOPTIM PNGCRUSH +OPTIONS_DEFAULT= 7ZIP FACEDETECT JPEGOPTIM PNGCRUSH -7ZIP_RUN_DEPENDS= 7z:archivers/p7zip +7ZIP_DESC= Use 7-Zip for better zip compression +FACEDETECT_DESC= Face detection for improved thumbnail centering +JPEGOPTIM_DESC= Use jpegoptim for JPEG size optimization +PNGCRUSH_DESC= Use pngcrush for PNG size optimization + +7ZIP_RUN_DEPENDS= 7zz:archivers/7-zip 7ZIP_RUN_DEPENDS_OFF= zip:archivers/zip FACEDETECT_RUN_DEPENDS= facedetect:graphics/facedetect JPEGOPTIM_RUN_DEPENDS= jpegoptim:graphics/jpegoptim PNGCRUSH_RUN_DEPENDS= pngcrush:graphics/pngcrush +post-patch-7ZIP-on: + @${REINPLACE_CMD} -e 's|7za|7zz|g' ${WRKSRC}/${PORTNAME} + do-install: .for d in album view (cd ${WRKSRC} && \