From nobody Fri Jun 10 21:06:24 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 69D40857E77; Fri, 10 Jun 2022 21:06:24 +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 4LKYRN2ZRRz3K7Q; Fri, 10 Jun 2022 21:06:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654895184; 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=3L8tC96tEPumcfxQGIzpYeF7UjyHcvH39H1eGBl81Do=; b=krzRPBkZgmzUFFPn28D1zKuL3+tGWE0xsVcH6/hPeei/LoGOi6IrJhrZHVbzKB6ZSpaaYX TUoyGfu0w8EkcUFq+GR/Q+RqnODisebtOS4Bdd32oxyuAg2atANnVRCzAPcTsH6lLiV4wn FQwhbeDKEIweDv4pxbFkxUxNa8/A38lzdu6sY7nNll1LezHI0GDgol+myBzqZJcSLvL4HB 77epU1mIql7byLacb9QraZvssqEgU5jrMQtUvbeVnDoaEhgLRcJF/Ww3DJ4xCjprqADohv I2Es9gAMkUEHpBpb2yYLoH/i4HIdqpPwYmxIwx6pHNZK5i+oYZxLQ0LWwVOJvA== 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 385D31F67B; Fri, 10 Jun 2022 21:06:24 +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 25AL6Oj7018725; Fri, 10 Jun 2022 21:06:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25AL6OA1018724; Fri, 10 Jun 2022 21:06:24 GMT (envelope-from git) Date: Fri, 10 Jun 2022 21:06:24 GMT Message-Id: <202206102106.25AL6OA1018724@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Fernando=20Apestegu=C3=ADa?= Subject: git: ccceb7dfeb5e - main - games/opengfx: Restore previous do-install target 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: fernape X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ccceb7dfeb5e5232d51f54c05150560b9b94e26d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654895184; 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=3L8tC96tEPumcfxQGIzpYeF7UjyHcvH39H1eGBl81Do=; b=B/Hl0BL/L8sB69eNMmNymSZBvtdQWWHtl7XdmDwabI6xoP7qJNrm0ExLOdB0Rw/JQ0kfnP vp6/0ZP0BOmB6d6Rr8GVawGoPeXI81Pp01ubtZUL3f6LvBEDeK638qTsPnWX6L6pVLcwPQ 7gu0wn9Ou3pVBc1cDUie/ShfJBfpJ608axAOuTgYFUpjwyqtwQZYDk6BW/zIzNGqFHflpL iJWy7B3HDwvTiktbhDFfucfyUf0WmjtS1PyX5tr2uYLHuGPfD9EQetBYQfRFujDN/2uYcS vaFwqSDMZ1FTZ/lKKA+7TnCmuGrcSQjjgXbL2Ix5J1vp0pTnxZgsOd1/WR+CYQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1654895184; a=rsa-sha256; cv=none; b=kDQbs1l5CuMEH9w+QzfYurjoJoWFWU1ubvufVEhisMHfkE59rmY0AEjQm6TGKFN1vdBgNy 6cjVQ273tyNF3fYbnSOu6wDFoUH2EhDxvo6STOd2RmPKrUC3AbGov5bTc8sIOzq794fNyk tnytYuwcvi/qW6/xY10ARlo0qz3FNOYwyhF13vPWuemPIz26bDov9txirvrFpwAWvnISsc 1iaBiO4BgHI5q83Fjmo92F9+8AXhWsqjhAfd9XkEi5HFBe6eOG8BK1+B0EPU+RQZPpvJYa O6C4myzn7BKJ+6x/q1NXpFHK8/jU7LadzDANtP4Y4iaKGouOz5+u+qjdq1M+ug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=ccceb7dfeb5e5232d51f54c05150560b9b94e26d commit ccceb7dfeb5e5232d51f54c05150560b9b94e26d Author: Fernando Apesteguía AuthorDate: 2022-06-10 21:00:35 +0000 Commit: Fernando Apesteguía CommitDate: 2022-06-10 21:04:01 +0000 games/opengfx: Restore previous do-install target In 7a66a72bd431 a more verbose version of the do-install target was introduced. Restore the previous, more compact one. Reported by: danfe@ Fixes: 7a66a72bd431 --- games/opengfx/Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/games/opengfx/Makefile b/games/opengfx/Makefile index 5807ddc33fc4..b0cf6a4d9735 100644 --- a/games/opengfx/Makefile +++ b/games/opengfx/Makefile @@ -16,14 +16,14 @@ LICENSE_FILE= ${WRKSRC}/license.txt NO_ARCH= yes NO_BUILD= yes +DATADIR= ${PREFIX}/share/openttd/baseset/${PORTNAME} + post-extract: @cd ${WRKDIR} && tar -xf ${PORTNAME}-${PORTVERSION}.tar do-install: - @${MKDIR} \ - ${STAGEDIR}${PREFIX}/share/openttd/baseset/${PORTNAME} - ${INSTALL_DATA} \ - ${WRKSRC}/* \ - ${STAGEDIR}${PREFIX}/share/openttd/baseset/${PORTNAME} + @${MKDIR} ${STAGEDIR}${DATADIR} + ${INSTALL_DATA} ${WRKSRC}/* ${STAGEDIR}${DATADIR} + .include