From nobody Sun Jan 22 07:00:53 2023 X-Original-To: dev-commits-ports-all@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 4P03zT2VFgz2v5kC; Sun, 22 Jan 2023 07:00:53 +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 4P03zT231Tz4MDx; Sun, 22 Jan 2023 07:00:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674370853; 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=K8Ke/lWZ9idIBAikhauV5TGbli8Xbt1gcKRQBwk0g+o=; b=WIeWQPUDoyRuKQABiCT8Fi8IXHhoLSqh3jz4WWyljUKOlRPqLlxYcQXBw+oDp2y5VgeeVp 5AEMMvZAcH6klHQcbrGOHFsNsyMtvWwTL/CYypINNLbIYbaPx1WOHPnERJKZBfm+oBfLXc hbT4QdYbVLJ0TOTFHEpldLK4H5jYBt/L6G9cwoxOrHht8qX6r975CIhi5SYnROlnx5CuzM o4dY8Llpyn2djodsjwd1A+jQ1bxNJF7H302/XpmdG39fjfLw++/4Bv56eY8EwDb2IUrtBO IhXVLF80JRkFJfQVrw4i+VuPaKGTQAafvV1POOObVXE6vvWKtkapkNKkbNW0KA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674370853; 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=K8Ke/lWZ9idIBAikhauV5TGbli8Xbt1gcKRQBwk0g+o=; b=s7ZCvNcukYNrwp8gpGYvz3GbvRA/dXdmOvCaQEEMG3YfBVxPcK4+QaJrtbo7k3qOFR4oT3 vyjmPRwdIl1rhukV4w3JcLQTJgvFyGRhZC2PsY1Wyp1JYVRU66JT6B8b/y5jFunEN6eXOZ yw33C2UwqfjzxL9NM8MfIZhCIE7KpSHoPgyMF1yBtD9Nx/csM2MIQjhw+bVA7/cGIoBWG2 TqHKxtm5h6UYgjr3cRP8tRA9E90w1CRRMSbMj3sj6v2tydjPZIg7BT3h3z2X/y7/M4w2kU +6rl6UGMNLVYgdek0q3H7+RmzyCUhu+qWfigRISWLNFAZwXPyVZDIePEae30lg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674370853; a=rsa-sha256; cv=none; b=ojZNUUqkgmQ6ii7Yd9BMwPQQODvr3Le0/ckmJvlquH7nfKPb3FiKFky1cOTQPei88EZopj 8HHEa7XmXNJ/MEE9CT6X78YsrhOFZ8FphKvnY2CamErAuUcYx+C3D5weJpO+MqgQCUCyoq bO4Ufig+8xOpug3PNUJsBBiQyWo78u1UBQc/MFGoXheGvZW6H75kvHy3NsR3+/jm0tGFfz WFTw8ECkVIM/aZxpPQV7m9GbHUrLvO3P0DiDzdrtAFffc6kDNIN3EfU3qXgW0UP2MJi+Dn Ur32TUJqBuvGMXz/J/BqmjNdXEqGL34Ac12koDBl4eqcxEJ1sPGM5buekRYHXg== 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 4P03zT18mBzfvW; Sun, 22 Jan 2023 07:00:53 +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 30M70rA1054193; Sun, 22 Jan 2023 07:00:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30M70rpI054192; Sun, 22 Jan 2023 07:00:53 GMT (envelope-from git) Date: Sun, 22 Jan 2023 07:00:53 GMT Message-Id: <202301220700.30M70rpI054192@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: e79543bbe376 - main - games/openfodder: switch to upstream .desktop file after 3fa255ccb265 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e79543bbe37648eae4ee770f17aeb824e2606aa6 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=e79543bbe37648eae4ee770f17aeb824e2606aa6 commit e79543bbe37648eae4ee770f17aeb824e2606aa6 Author: Jan Beich AuthorDate: 2023-01-22 06:35:17 +0000 Commit: Jan Beich CommitDate: 2023-01-22 06:59:47 +0000 games/openfodder: switch to upstream .desktop file after 3fa255ccb265 --- games/openfodder/Makefile | 40 +++++++++++++++------------------------- 1 file changed, 15 insertions(+), 25 deletions(-) diff --git a/games/openfodder/Makefile b/games/openfodder/Makefile index 98999cd387ed..7b7e13692ffd 100644 --- a/games/openfodder/Makefile +++ b/games/openfodder/Makefile @@ -1,5 +1,6 @@ PORTNAME= OpenFodder DISTVERSION= 1.7.0 +PORTREVISION= 1 CATEGORIES= games PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ @@ -23,21 +24,14 @@ USE_SDL= mixer2 GH_TUPLE= ${PORTNAME}:data:1.7.0:data/Run \ ${PORTNAME}:scripts:c6f3076:scripts/Run/Scripts GH_PROJECT= ${PORTNAME:tl} -PLIST_FILES= bin/${PORTNAME} +PLIST_FILES= bin/${PORTNAME} \ + share/applications/${PORTNAME:tl}.desktop \ + share/metainfo/${PORTNAME:tl}.appdata.xml \ + share/pixmaps/${PORTNAME:tl}.png PORTDATA= * PORTDOCS= *.md -DESKTOP_ENTRIES="${PORTNAME}" \ - "" \ - "${PORTNAME:tl}" \ - "${PORTNAME}" \ - "Game;ActionGame;" \ - "" - -OPTIONS_DEFINE= DOCS ICONS -OPTIONS_DEFAULT=ICONS - -ICONS_USES= magick:build +OPTIONS_DEFINE= DOCS post-patch: @${REINPLACE_CMD} -e 's,clang++,${CXX},' \ @@ -46,17 +40,11 @@ post-patch: -e 's,git log -n 1 --pretty=,${ECHO_CMD} ,' \ -e 's,%%h,${DISTVERSIONFULL},' \ ${WRKSRC}/Makefile + @${REINPLACE_CMD} '/Exec/s/${PORTNAME:tl}/${PORTNAME}/' \ + ${WRKSRC}/FreeDesktop/*.desktop @${REINPLACE_CMD} 's,/usr/local,${PREFIX},' \ ${WRKSRC}/Source/ResourceMan.cpp -post-build-ICONS-on: - @for size in 16x16 24x24 32x32 48x48 57x57; do \ - ${MKDIR} ${WRKDIR}/icons/hicolor/$$size/apps; \ - done - @mogrify -verbose -set filename:size %wx%h -format png \ - -path ${WRKDIR}/icons/hicolor/%\[filename:size]/apps \ - ${WRKSRC}/Projects/${PORTNAME:tl}.ico - do-test: @(cd ${WRKSRC_data} && ${SETENV} ${TEST_ENV} \ ${WRKSRC}/Run/${PORTNAME} --unit-test-headless) @@ -66,14 +54,16 @@ do-install: ${STAGEDIR}${PREFIX}/bin (cd ${WRKSRC}/Run && ${COPYTREE_SHARE} "${PORTDATA}" \ ${STAGEDIR}${DATADIR} "! -name ${PORTNAME} -type f") + ${INSTALL_DATA} ${WRKSRC}/FreeDesktop/*.desktop \ + ${STAGEDIR}${PREFIX}/share/applications + ${INSTALL_DATA} ${WRKSRC}/FreeDesktop/*.png \ + ${STAGEDIR}${PREFIX}/share/pixmaps + ${MKDIR} ${STAGEDIR}${PREFIX}/share/metainfo + ${INSTALL_DATA} ${WRKSRC}/FreeDesktop/*.appdata.xml \ + ${STAGEDIR}${PREFIX}/share/metainfo do-install-DOCS-on: (cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTDOCS}" \ ${STAGEDIR}${DOCSDIR}) -do-install-ICONS-on: - (cd ${WRKDIR}/icons && ${COPYTREE_SHARE} . \ - ${STAGEDIR}${PREFIX}/share/icons) - (cd ${STAGEDIR}${PREFIX} && ${FIND} share/icons -type f >>${TMPPLIST}) - .include