From owner-dev-commits-ports-main@freebsd.org Fri May 28 01:37:42 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B261A649133; Fri, 28 May 2021 01:37:42 +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 4FrnPL4bvKz3Nkk; Fri, 28 May 2021 01:37: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 778B36B01; Fri, 28 May 2021 01:37: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 14S1bgTR069460; Fri, 28 May 2021 01:37:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14S1bgpM069459; Fri, 28 May 2021 01:37:42 GMT (envelope-from git) Date: Fri, 28 May 2021 01:37:42 GMT Message-Id: <202105280137.14S1bgpM069459@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: eabb1532ca37 - main - cad/digital: Install icons and desktop file provided by the project MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: eabb1532ca37317952fd79ee8ce3fa91108882eb Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 May 2021 01:37:42 -0000 The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=eabb1532ca37317952fd79ee8ce3fa91108882eb commit eabb1532ca37317952fd79ee8ce3fa91108882eb Author: Yuri Victorovich AuthorDate: 2021-05-28 01:33:26 +0000 Commit: Yuri Victorovich CommitDate: 2021-05-28 01:37:40 +0000 cad/digital: Install icons and desktop file provided by the project PR: 256210 Reported by: Duane --- cad/digital/Makefile | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/cad/digital/Makefile b/cad/digital/Makefile index 5520c9e0a802..6c4d3b2a0ef9 100644 --- a/cad/digital/Makefile +++ b/cad/digital/Makefile @@ -1,6 +1,7 @@ PORTNAME= digital DISTVERSIONPREFIX= v DISTVERSION= 0.27 +PORTREVISION= 1 CATEGORIES= cad java MAINTAINER= yuri@FreeBSD.org @@ -11,6 +12,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= mvn:devel/maven +USES= desktop-file-utils + USE_JAVA= yes USE_GITHUB= yes GH_ACCOUNT= hneemann @@ -37,10 +40,14 @@ DISTFILES+= ${PORTNAME}-${DISTVERSION}-deps${EXTRACT_SUFX}:maven MVN_ARGS= --offline .endif -DESKTOP_ENTRIES= "Digital logic designer" "Digital logic designer and circuit simulator" "" "${PORTNAME}" "Electronics;" "" +ICON_SIZES= 32 48 64 128 +ICON_NAME= digital-logic-designer PLIST_FILES= bin/${PORTNAME} \ - ${JAVAJARDIR}/Digital.jar + ${JAVAJARDIR}/Digital.jar \ + ${ICON_SIZES:C/(.*)/share\/icons\/hicolor\/\1x\1\/apps\/${ICON_NAME}.png/} \ + share/icons/hicolor/scalable/apps/${ICON_NAME}.svg \ + share/applications/${PORTNAME}.desktop do-build: @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ @@ -51,11 +58,26 @@ do-build: -P no-git-rev -Dgit.commit.id.describe=${DISTVERSIONFULL} \ package do-install: + # install jar ${INSTALL_DATA} ${WRKSRC}/target/Digital.jar ${STAGEDIR}${JAVAJARDIR} + # install shell wrapper @(echo "#!/bin/sh"; \ echo ""; \ echo "${JAVA} -jar ${JAVAJARDIR}/Digital.jar \""$$"@\"" \ ) > ${STAGEDIR}${PREFIX}/bin/${PORTNAME} @${CHMOD} +x ${STAGEDIR}${PREFIX}/bin/${PORTNAME} + # install desktop file + ${SED} -e '\ + s||${PREFIX}/bin/${PORTNAME}| ; \ + s||${ICON_NAME}|' \ + < ${WRKSRC}/distribution/linux/desktop.template \ + > ${STAGEDIR}${PREFIX}/share/applications/${PORTNAME}.desktop + # install icons +.for SZ in ${ICON_SIZES} + ${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${SZ}x${SZ}/apps + ${INSTALL_DATA} ${WRKSRC}/src/main/resources/icons/icon${SZ}.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/${SZ}x${SZ}/apps/${ICON_NAME}.png +.endfor + ${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps + ${INSTALL_DATA} ${WRKSRC}/src/main/svg/icon.svg ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/${ICON_NAME}.svg .include