From nobody Mon May 22 18:27:50 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 4QQ5Xl2SRfz4CJBQ; Mon, 22 May 2023 18:27:51 +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 4QQ5Xl1twQz3wC2; Mon, 22 May 2023 18:27:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684780071; 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=nk1PlaJ6Wyujq41fnIyQVJP+ybMMXqeCsRiFVqb4CME=; b=FcTo55KYHPNGmdBcvnT0DN63tYU4E9yv9tZ/tODaiDa8koIgdEqvLejqAUs5/ug5NEen+V BHrgQyrblk+7D/hsQg/+Kif4MIlX2HktQpoHZIMjo+lWdYkI4w5CpPCyPluTGb52pZj+RK jCXBT/G18VgRFKw0ctaqNsmHUl0Ql3J1EPEHX5gGGPd4bNbxLbKRvtokdOaxKX/x9Dlvis d/Sm4p/H6egFBdf9Y9TZ6K+0f5pz8E6p78LIi/iNUpLLg8AOIYgQLwgPp6B3b5H2PaT8FY JWOQrinyzYJCfcbQIeLIiceSCHahAP8zftGmz/O3GF97fKg5vVFd8+5myJqAtw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684780071; 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=nk1PlaJ6Wyujq41fnIyQVJP+ybMMXqeCsRiFVqb4CME=; b=vyWtVitdiBEQHf0yUVlPA7tYk86TCdBmc5GIxJ59Pe/RokCeqzbfEVEaLl31D8717+EpZb XuDoZ7ulHsVa5HrByuRgLY2YRPc8Rg6SxFI3dGEwunuWMdKXqvf6p/s2NRCh6t6PTWnWP6 SBY/SG+ER2OlTY0mSBRhtnRfr83rLA3lKDE2b2RzX+oGcg7ehycCRpyrbLc/yPu5egbvqC HLBr/qjSgvisAp5KWqnmtSXQ9WEUJNUkmnM7UABKHdEfmc/AZW0QkliyHh0d4VRL3sH9J1 4xpILHIoEQIttX34lNULQ2jKgdimEYWYWinJcNAjjEaPYwJPEBRmNoFNQALSBw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684780071; a=rsa-sha256; cv=none; b=Jvzxe7FDQn0+7aQYgCBMZQPDZgnGFI7aC/pqGhm+zIKOsrp6TRAytKVpV03+c0448wGnAr D6PyJUs3XvbxzTSm/Iq1xFJRObliCLYJx5f/NVV85u6vfOzKCn87k7J8U7Yh4nNTV+QHt9 g1gz/SQQWwAnK42U7r5qHKUkuiOGIQ0ZWj/BxDtFeVfk4hJQ0+Gwccx8TBroX6c6kBYpqu 8PLe6buPN5JkMy7iDvYtVuH7b0LOqhHPJVqO7BfMpOpMpFrLCTP7yUAVVbRCM47mi4gP5a qbq9KgTKckGEm48IHaJWHRM3+PLuD7scpk0NOK9HlTs+w0aHxVqPY+TRbpcJzA== 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 4QQ5Xl0jzYzRx2; Mon, 22 May 2023 18:27:51 +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 34MIRp7q038721; Mon, 22 May 2023 18:27:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34MIRoDq038720; Mon, 22 May 2023 18:27:50 GMT (envelope-from git) Date: Mon, 22 May 2023 18:27:50 GMT Message-Id: <202305221827.34MIRoDq038720@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dmitry Marakasov Subject: git: 79e392c15d25 - main - games/instead: enable harfbuzz support, fix lua(jit) deps 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: amdmi3 X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 79e392c15d25a7fac189d22fe2d0c59585306f4f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=79e392c15d25a7fac189d22fe2d0c59585306f4f commit 79e392c15d25a7fac189d22fe2d0c59585306f4f Author: Dmitry Marakasov AuthorDate: 2023-05-22 15:41:29 +0000 Commit: Dmitry Marakasov CommitDate: 2023-05-22 18:27:10 +0000 games/instead: enable harfbuzz support, fix lua(jit) deps - Enable harfbuzz support which is now available in SDL2_ttf (disabled by default according to upstream setting) [1] - Switch luajit dependency to USES=luajit (it also should now work on powerpc, so a related hack is no longer needed) - Fix dependency on lua - Remove no longer needed CMake argument PR: 271545 [1] Reported by: jbeich [1] --- games/instead/Makefile | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/games/instead/Makefile b/games/instead/Makefile index c4647f6e83af..b1fdc3c8e1ad 100644 --- a/games/instead/Makefile +++ b/games/instead/Makefile @@ -1,6 +1,6 @@ PORTNAME= instead PORTVERSION= 3.5.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= SF DISTNAME= ${PORTNAME}_${PORTVERSION} @@ -12,16 +12,15 @@ WWW= https://instead.syscall.ru/ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -USES= cmake compiler:c++11-lang iconv lua:51 pkgconfig sdl +USES= cmake compiler:c++11-lang iconv pkgconfig sdl USE_SDL= sdl2 image2 ttf2 mixer2 -CMAKE_ARGS= -DMANDIR=share/man WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} PORTDOCS= * PORTDATA= * -OPTIONS_DEFINE= LUAJIT DOCS # HARFBUZZ # requires unreleased version of sdl2_ttf +OPTIONS_DEFINE= LUAJIT DOCS HARFBUZZ OPTIONS_DEFAULT= LUAJIT GTK3 OPTIONS_RADIO= GTK_VERSION OPTIONS_RADIO_GTK_VERSION= GTK2 GTK3 @@ -38,16 +37,10 @@ GTK2_CMAKE_BOOL= WITH_GTK2 GTK3_USES= gnome GTK3_USE= GNOME=gtk30 GTK3_CMAKE_BOOL= WITH_GTK3 -LUAJIT_LIB_DEPENDS= libluajit-5.1.so:lang/luajit -LUAJIT_USE_OFF= lua:51 +LUAJIT_USES= luajit +LUAJIT_USES_OFF= lua:51 LUAJIT_CMAKE_BOOL= WITH_LUAJIT HARFBUZZ_CMAKE_BOOL= WITH_HARFBUZZ HARFBUZZ_LIB_DEPENDS= libharfbuzz.so:print/harfbuzz -.include - -.if ${ARCH:Mpowerpc64*} -LUAJIT_LIB_DEPENDS= libluajit-5.1.so:lang/luajit-openresty -.endif - .include