From nobody Mon Feb 21 16:33:34 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 5440819C4347; Mon, 21 Feb 2022 16:33:35 +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 4K2SXt5dnvz4ksj; Mon, 21 Feb 2022 16:33:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645461215; 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=Lxsw4jWVuJ77UokwYpXIpxYoG7qvgGSE2fosrw1BVqM=; b=HzMxAFH9Pnrs93uhJZqAE5pABpcANdRuACBCeifoC9aDce5SleEsIE+0hAmVHerqHrsluo NA6griBu+7vaEYWOLpWR/LHZN5yRsZ1irVwWJO85wfPRjBkqHqw4uVp+sRwwgeteoeJaNN o0lnsS+FEo++7lljdRbX5N77jfLIwOT0fTsI9ETleXsm0jBKS458+oJrhkMRxAoTYgQ2Bk New7Uh+csHSwGvDWwMZPwHhIy99yfMX4fHuQXKnVsfJt69/L7Rr4s8SahalBviuGQM2WnY thbW83Au5FInGSEK/flgneqj7So7HYpGwlXG3eqyoJM3W0YEoDBGh3A6BPx1PQ== 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 742BA13B39; Mon, 21 Feb 2022 16:33:34 +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 21LGXY9i021749; Mon, 21 Feb 2022 16:33:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21LGXYr1021748; Mon, 21 Feb 2022 16:33:34 GMT (envelope-from git) Date: Mon, 21 Feb 2022 16:33:34 GMT Message-Id: <202202211633.21LGXYr1021748@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: fac9c630f3c6 - main - games/fishfight: fix patch after f3d7b45ee594 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: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fac9c630f3c6e3d7053c31e23193ac40f8881435 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645461215; 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=Lxsw4jWVuJ77UokwYpXIpxYoG7qvgGSE2fosrw1BVqM=; b=V1a2Kl0foR6GtuLs3OfdoCwI8pvKDFxawB7WxrJamK2SsUqO5wnM1zEz9YjIYxgubaMHhs c43r1dNahWv+Z8rM0++7HAZ+v9LnWO9gIT/Z6lCmdC58NbE5eM5lM9lg6ZNZXsTCzZBLc7 iMQStcpm0SD/OAxpUNoGtJQkEQtC/gJgvBqvY3fFWGy37zbyMd+XavDi2/H+hqUJkoja5o UHab3ZzFdde41jUYmZaDPwFxY8fD1x6I58id0amVQJQVFxSBcdHAkha/sHnt7DLroBha63 kHzk9DH6Gzk6VlkUi+LsiZJBO5dfNuTwZJdx+OeNEugvIMjDOn1F7pJJz0jA3w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645461215; a=rsa-sha256; cv=none; b=Nlnl3vfE3BtkcuQzurpsUSQZQfeDSU34NGYx4Y6z2FLx5E80IUKUPRha2JWn9KpQv7Nzsm PYpjsbsKRiQRDPC9emTQneUS6XnGPz7ywPCNBI4svhC2deAt/sgpk26Kxo0vXwKubdLJBk AhAMGVCEOPRX875FggsZF/lDRIr78IjHwijIsjz2FeGyQdUc7WRWgnkG8WlHTFWLbltl+6 3knbvzD3deu49CRPVr7dCXDov3LKR3dd6NzAOGcAjgU5+oP/M0tebfJ0zOOKI6K94iXr9E ouH4ZI96VEaIysBYbJdyMSZDbJI1WtRsZNd1na6Lfk/G8dk3f7jVwloTsNpMCQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=fac9c630f3c6e3d7053c31e23193ac40f8881435 commit fac9c630f3c6e3d7053c31e23193ac40f8881435 Author: Jan Beich AuthorDate: 2022-02-21 16:27:25 +0000 Commit: Jan Beich CommitDate: 2022-02-21 16:33:18 +0000 games/fishfight: fix patch after f3d7b45ee594 --- games/fishfight/files/patch-miniquad | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/games/fishfight/files/patch-miniquad b/games/fishfight/files/patch-miniquad index 1e441e6524cc..61c3bbd17f3f 100644 --- a/games/fishfight/files/patch-miniquad +++ b/games/fishfight/files/patch-miniquad @@ -73,13 +73,13 @@ error[E0428]: the name `GL_TIME_ELAPSED` is defined multiple times #[cfg(not(any( - all(target_os = "linux", feature = "sapp-linux"), -+ all(feature = "sapp-linux"), any( ++ all(feature = "sapp-linux", any( + target_os = "linux", + target_os = "dragonfly", + target_os = "freebsd", + target_os = "netbsd", -+ target_os = "openbsd" -+ ), ++ target_os = "openbsd", ++ )), target_os = "windows", target_arch = "wasm32" )))]