From nobody Fri Jul 29 13:05:47 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 4LvSSD0Zrjz4X6rq; Fri, 29 Jul 2022 13:05:48 +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 4LvSSC6xn7z45lY; Fri, 29 Jul 2022 13:05:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659099948; 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=goT5/WhfuCAdUVvlFGdlW238DA/Fo/PGGbqQhxHpl64=; b=KlU/Xe2+AJbZ0NI3iKiOrhXkJvMFj070kW8y9K/MV8zKTdC1MNQttTegn1NNCbGZ57fUBH S6aLTnXZwIZk7z3SIZC8dCKSI+P9SD+BoLedyMPnjZcYpi4g1+W9In3AoKVTjebWg92sul 8v91XzQdMZVNHDEhMGTmCriv8r3oE4k3jG+HAQdiQrADBPEP6mxbciboxRJDpPpFFdTkWh yjlgSOLaNw5yZfnPvWfyCFI9+gUmx1/XMpDwneSxbF4ATc+4PN/mADukRrh3bH+1XuxEJx LptffOfwxdWW97274ut/QLHY4TRZmN5vqst3hizGlsIswOZX1JZGnz6Adr7n3g== 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 4LvSSC5vTvzcBL; Fri, 29 Jul 2022 13:05:47 +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 26TD5las061300; Fri, 29 Jul 2022 13:05:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26TD5lQA061299; Fri, 29 Jul 2022 13:05:47 GMT (envelope-from git) Date: Fri, 29 Jul 2022 13:05:47 GMT Message-Id: <202207291305.26TD5lQA061299@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: b7240d45e804 - main - science/linux-zotero: Install icons 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: 0mp X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b7240d45e8043eda676c9e714aceabff0c359b68 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659099948; 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=goT5/WhfuCAdUVvlFGdlW238DA/Fo/PGGbqQhxHpl64=; b=WkyiVoanSomUSyPWpH69Vtows97LriPSgVz3CHRSCrgHVg22Jsk+Q8Ssj9EQE6b2PYM0NF SNix4Pap+WnACcSCDYJSYXN9LGkTC+sbRRTtErhY4lVnV4nn5oxFuqzGc957G/KHfiEpTo xf9AHf7cuPB8E2vEdzHQvoDPPP0SO2i3UmBtXdTJjY1WL8Q80+uV9mAO/UmAm6c4fulyeV PjSikBUHA1XzD7GnBn8lq1LPWRt64k+xvRGQFYqRiODpFsEIk1Ux5NH91K3qIg1AM+OnQZ tHb3uCoi9jm3xjPz2iAy/qB7BnKxtcY1Y22cHnwRdGi9EMvPyZkBcGv3yJcLWQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1659099948; a=rsa-sha256; cv=none; b=Funb+080Kfg/KhezFmA9xoNVXDbVYy2VJDkwSvLz7G8eBkz262cpvcEdV4sUGJ0tsRVA4s wytdGbFhNz9veLHMunenqm7DjpW/4qP4f00Aw+TlG4nV0+LeBKPacAxeTyxhN4umYuNELw h2pNscgJkjZKGPb6dIVCLgptSBpQMG8byfEc+/n+mR40wbyw7chvFPVbd4surlnaNvrieK 36uoa+cvHimhrm6unE+zNOaXQ1MQH3rm8NbBoZbd7i4SRXGcX2HuhIQQTIlTphhkpbETf9 7wHrScrV0uUyuHVrkjV01gp6DR8y2wmZd6HykAg/GOuMpOIZ+YBDBwW6S8Khcg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/ports/commit/?id=b7240d45e8043eda676c9e714aceabff0c359b68 commit b7240d45e8043eda676c9e714aceabff0c359b68 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2022-07-29 13:04:00 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2022-07-29 13:05:40 +0000 science/linux-zotero: Install icons Also, remove .orig files that were getting installed by accident. --- science/linux-zotero/Makefile | 10 +++++++++- science/linux-zotero/pkg-plist | 6 ++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/science/linux-zotero/Makefile b/science/linux-zotero/Makefile index 77d100d69d64..98a01ea33525 100644 --- a/science/linux-zotero/Makefile +++ b/science/linux-zotero/Makefile @@ -1,5 +1,6 @@ PORTNAME= zotero DISTVERSION= 6.0.10 +PORTREVISION= 1 CATEGORIES= science deskutils linux MASTER_SITES= https://download.zotero.org/client/release/${DISTVERSION}/ \ https://raw.githubusercontent.com/zotero/zotero-standalone-build/${DISTVERSION}/:LICENSE @@ -29,6 +30,8 @@ SUB_FILES= zotero-wrapper WRKSRC= ${WRKDIR}/Zotero_linux-x86_64 _BINARIES= pdftotext pdfinfo zotero-bin +_ICONSDIR= ${PREFIX}/share/icons/hicolor +_ICON_SIZES= 16 32 48 256 _MAIN_DISTFILE= Zotero-${DISTVERSION}_linux-x86_64${EXTRACT_SUFX} post-extract: @@ -39,11 +42,16 @@ do-configure: do-install: @${MKDIR} ${STAGEDIR}${DATADIR} - (cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}) + (cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR} "! -name '*.orig'") (cd ${WRKSRC} && ${CHMOD} +x ${_BINARIES}) # Only strip zotero-bin. Other ${_BINARIES} break strip(1). (cd ${STAGEDIR}${DATADIR} && ${STRIP_CMD} zotero-bin) ${MV} ${STAGEDIR}${DATADIR}/zotero.desktop ${STAGEDIR}${DESKTOPDIR} ${INSTALL_SCRIPT} ${WRKDIR}/zotero-wrapper ${STAGEDIR}${PREFIX}/bin/zotero +.for _size in ${_ICON_SIZES} + @${MKDIR} ${STAGEDIR}${_ICONSDIR}/${_size}x${_size}/apps + ${RLN} ${STAGEDIR}${DATADIR}/chrome/icons/default/default${_size}.png \ + ${STAGEDIR}${_ICONSDIR}/${_size}x${_size}/apps/${PORTNAME}.png +.endfor .include diff --git a/science/linux-zotero/pkg-plist b/science/linux-zotero/pkg-plist index 3e16b188efaf..82ee058e89f5 100644 --- a/science/linux-zotero/pkg-plist +++ b/science/linux-zotero/pkg-plist @@ -1,5 +1,9 @@ bin/zotero share/applications/zotero.desktop +share/icons/hicolor/16x16/apps/zotero.png +share/icons/hicolor/256x256/apps/zotero.png +share/icons/hicolor/32x32/apps/zotero.png +share/icons/hicolor/48x48/apps/zotero.png %%DATADIR%%/Throbber-small.gif %%DATADIR%%/application.ini %%DATADIR%%/chrome.manifest @@ -13,7 +17,6 @@ share/applications/zotero.desktop %%DATADIR%%/components/zotero-protocol-handler.js %%DATADIR%%/components/zotero-service.js %%DATADIR%%/defaults/preferences/local-settings.js -%%DATADIR%%/defaults/preferences/local-settings.js.orig %%DATADIR%%/defaults/preferences/prefs.js %%DATADIR%%/defaults/preferences/zotero.js %%DATADIR%%/dependentlibs.list @@ -66,7 +69,6 @@ share/applications/zotero.desktop %%DATADIR%%/libxul.so.sig %%DATADIR%%/minidump-analyzer %%DATADIR%%/mozilla.cfg -%%DATADIR%%/mozilla.cfg.orig %%DATADIR%%/omni.ja %%DATADIR%%/pdfinfo %%DATADIR%%/pdftotext