From nobody Fri Jun 30 07:23:16 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 4Qsmxy05WFz4krwQ; Fri, 30 Jun 2023 07:23:18 +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 4Qsmxx1dHQz44Zm; Fri, 30 Jun 2023 07:23:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688109797; 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=+jBapfiSWW/CKjgZfyItMUtmJ/RpwiKLChL3854ABv4=; b=IbUb4dQKTRPjbfquwZTXH4ESA+4MRhiRF1ekU+Vk6d17U+rOlvvpw+4ntaOkK4s7VLjO9e loPK+S5lD5e6a2+s6yDTonWMBp9zIeQ3kfkNi5rO8ywCE7OTJg3w6W+upGHm9kJ1ddKxgc lpWtaF3g1OzSbU1QprDLWLJNg29/Bhj8hHJeJK5ykbCT43qxCoLr6lvVVRkYWfhm5TdBA4 yirx6vGRFQ3synku7oSe4oUo1z5dM5RAr+nbfAHxExtIIi98XAbviTlmzEQDJN/0ocL8sq oahIb1/SFG04JnjYcUrPK/xoVEWF5acZB8Whs1BXXzeHpGuXkK/pFtCMCHtPwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688109797; 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=+jBapfiSWW/CKjgZfyItMUtmJ/RpwiKLChL3854ABv4=; b=jDL3yrfbH9HrRVfz/AIez86KPUV0Xv6SSbAA6Z5LShzprTv/6kp6L50aaQ5Jg2VAKvTwEJ gs252VMw9qs1LvH8p38eluOh7fprjTI8nwerd7SqJPTQ+9VtrZ35GFgjWpSqOR4GFNGhlq 6OaAHfU5jE2KxLy/FMzeM6z4MB4K7veTVefc88qGLGfMO3PHuELglA+vnX3TLo1H4jBXYs BIV0qCnpu3kMOMme9E6IYUwMBm+TsshDRIzdmrz7o/PqQLhRvREkDP5lfrsSx3DY+4DnWV CDqDQTvuYDG/0GhjeGfulFYJlj65zNTABEOui3JJPuFNvfTvh+pmenz49VXxNg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688109797; a=rsa-sha256; cv=none; b=XpDpW3U8bbwDXs0XcnaZdgvGuiO4Z7FPOIyI8iseKB7LeTi1J7+9eFmmmTANy4BBD5kj3H YYriVqXb1u/AD4pSbumW/dclct5r2M+h+bzsMN4UYHVOTdcq3j0T5NhCaR/Kl6SPV+jilj jr7NCVZuIYbgSCTUS6Fn8OAlsiSs5T3MVAxIMF4y/MVHM4AAqoP1hMWDqa3olByQUwJkOM bsjuq7l1k4BNZaBW9xKyD1zcFEeKITzQRCPLiPLD3iJUlb/6PvAGnzpX8INkKXu58DniBl h5N2jZr2YkgkdKjScKhJIk14IgvuumOWuJASQ0KalcUyfJTz4YLw3v9kpHYNcQ== 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 4Qsmxw6jqTzqgq; Fri, 30 Jun 2023 07:23:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 35U7NGBs085156; Fri, 30 Jun 2023 07:23:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 35U7NGr6085155; Fri, 30 Jun 2023 07:23:16 GMT (envelope-from git) Date: Fri, 30 Jun 2023 07:23:16 GMT Message-Id: <202306300723.35U7NGr6085155@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: ad8818050521 - main - games/adonthell: Remove outdated PYTHON_REL check after lang/python37 removal 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: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ad8818050521a27eed4f1b04f0545da5d0f5f9a1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=ad8818050521a27eed4f1b04f0545da5d0f5f9a1 commit ad8818050521a27eed4f1b04f0545da5d0f5f9a1 Author: Po-Chuan Hsieh AuthorDate: 2023-06-30 07:08:35 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-06-30 07:08:35 +0000 games/adonthell: Remove outdated PYTHON_REL check after lang/python37 removal --- games/adonthell/Makefile | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/games/adonthell/Makefile b/games/adonthell/Makefile index e6d007c63ec6..fae7d1d4238f 100644 --- a/games/adonthell/Makefile +++ b/games/adonthell/Makefile @@ -21,7 +21,7 @@ USE_SDL= mixer2 ttf2 GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-py-debug \ --disable-pyc \ - --with-py-libs="$$(${PYTHON_CMD}-config --ldflags ${_PY_EMBED})" \ + --with-py-libs="$$(${PYTHON_CMD}-config --ldflags --embed)" \ --with-python=${PYTHON_CMD} PLIST_DIRS= ${DATADIR}/games @@ -30,17 +30,7 @@ PLIST_FILES= bin/adonthell \ ${DATADIR}/modules/adonthell.py \ ${DATADIR}/modules/dialogue.py -.include - -# The "--embed" flag was introduced with Python 3.8 and is required because -# C extensions are no longer linked to libpython since Python 3.8 and onwards. -# -# See also https://bugs.python.org/issue36721 for reference. -.if ${PYTHON_REL} >= 30800 -_PY_EMBED= --embed -.endif - post-patch: @${REINPLACE_CMD} 's,adonthell-0.3,adonthell,g' ${WRKSRC}/src/Makefile.in -.include +.include