From nobody Sat Feb 25 17:15:15 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 4PPD0h0hz6z3tfCQ; Sat, 25 Feb 2023 17:15:16 +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 4PPD0h01pKz3p5b; Sat, 25 Feb 2023 17:15:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677345316; 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=GZqoTe/enBORe9jzfwWawdRC9B90eUmamzPPHg0jrN8=; b=W+3et6gxUEH5l+q8iQxLpol15wI/CgvsEIC3mZRjH7j0HN57OCkegaKBa5+2kOelx9n5R1 mjv52tx1q1T4QolkxltbKFkTDlb8L582Fz54uzjdh47I5gTzxfwi4Hm7W4LGRfsMDPW5Z7 EVw0OU47c7EBxqWsC6z0BTha65MTD0aSulK1mFHPJ7SS2kh0cafYI2khhRlLK0Fbej1BWN foYuh4PRIWZtrxw3WwpYQV804zewn9GBz86GsvnTgz6OTA1CcsR9M0qNFCwRFtsdkjzdH4 bBrQ41m8GP190sXm3GlAnZP3ZFHrlhW18r/pu7iFkSvjMsO0Tpa5CR4HpcXeQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677345316; 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=GZqoTe/enBORe9jzfwWawdRC9B90eUmamzPPHg0jrN8=; b=uudcJ6yRLlcEkTvhmSYKCWwgOFINP/yJVlnUca4H4bghS6ahh8MYLLYOTaRKr1Edswr6dZ SSwnphuQb8aGbdVYFeb8Xit1ale3a3VIdMDEeakWWxYh5xkxf5b9OqCA4Mc36kXx6cIMX4 Z7EjL5ZAgRRY1NcxGP5Xrr4UEqpeu5QkunYQHp6lvLKA1r+UaPVBiEEP7dq+/wTS/6acSd TCAXsgzaHinUgVwESzN4TTUhpFO+tJdTGPqMWBTYN7WUtTvpwtL55on+ES9hiMR/LyMlC6 JAlZgfcVHeQfeB74BcdSpsjxV2eExnpuxq9tcaI7O+yvABamePJFwTuR7YNSzg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677345316; a=rsa-sha256; cv=none; b=U0Nhkt0I5sJS696UN9I1aI59rB7CUhRLC8YOER0EGWwqSK3MnJM8byxMO2YJetwUk6vFjd xaJgkN0WmZch2pUQS796gwJcHe8TT+AMViS07CxaY3jCZ76NQyZ28zM4cifjjnVyhnOg6I IGyVpkeCBjXkfRbl+mNvXInZDZ3+NimukQzsLIh63bE8+WxSwMYcFH0imVCBSQRIPmq6em tiBXgHG5E3LidSvw3DX0RO9GQhYdfgC7lFiROf3bOcwOyC5sDt3zstu+GLWEBrJTkMx7fv HyTgCmcjH8v/ukTL1n2XiV7OeQ9ZSrwKNUFoWoBNdIkj1Z/54MLTPgpE9bTexg== 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 4PPD0g6CD1z1Bxf; Sat, 25 Feb 2023 17:15:15 +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 31PHFFNZ040623; Sat, 25 Feb 2023 17:15:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31PHFFIE040622; Sat, 25 Feb 2023 17:15:15 GMT (envelope-from git) Date: Sat, 25 Feb 2023 17:15:15 GMT Message-Id: <202302251715.31PHFFIE040622@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Charlie Li Subject: git: 4ed59043fe8e - main - devel/mercurial: convert to PEP-517 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: vishwin X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4ed59043fe8e453e31ed8a08e0d0d7ac1eb3a709 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by vishwin: URL: https://cgit.FreeBSD.org/ports/commit/?id=4ed59043fe8e453e31ed8a08e0d0d7ac1eb3a709 commit 4ed59043fe8e453e31ed8a08e0d0d7ac1eb3a709 Author: Charlie Li AuthorDate: 2023-02-25 17:10:40 +0000 Commit: Charlie Li CommitDate: 2023-02-25 17:10:40 +0000 devel/mercurial: convert to PEP-517 While here, remove dead code: - bytecode is now handled by the trigger - Python 2 has not been supported for some time - __modulepolicy__.py is part of the wheel Also use ${PYTHONPREFIX_SITELIBDIR} for strip path --- devel/mercurial/Makefile | 10 +++++++--- devel/mercurial/pkg-plist | 5 ----- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/devel/mercurial/Makefile b/devel/mercurial/Makefile index 5ef27804bd58..731e87eaf3fe 100644 --- a/devel/mercurial/Makefile +++ b/devel/mercurial/Makefile @@ -1,5 +1,6 @@ PORTNAME= mercurial PORTVERSION= 6.3.2 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= https://www.mercurial-scm.org/release/ @@ -10,9 +11,12 @@ WWW= https://www.mercurial-scm.org/ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -USES= cpe python:3.7+ shebangfix +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} + +USES= cpe python shebangfix SHEBANG_FILES= contrib/hgweb.fcgi hgweb.cgi -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist pep517 OPTIONS_DEFINE= CA_BUNDLE DATA DOCS NLS FREEBSD OPTIONS_DEFAULT= CA_BUNDLE DATA @@ -62,7 +66,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} post-install: ${INSTALL_MAN} ${WRKSRC}/doc/*.1 ${STAGEDIR}${PREFIX}/man/man1/ ${INSTALL_MAN} ${WRKSRC}/doc/*.5 ${STAGEDIR}${PREFIX}/man/man5/ - ${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR}/ -name '*.so' -exec ${STRIP_CMD} {} + + ${FIND} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/ -name '*.so' -exec ${STRIP_CMD} {} + post-install-DATA-on: .for d in hgsh vim diff --git a/devel/mercurial/pkg-plist b/devel/mercurial/pkg-plist index 147e99370cc0..5cbff357edfd 100644 --- a/devel/mercurial/pkg-plist +++ b/devel/mercurial/pkg-plist @@ -1,8 +1,3 @@ -%%PYTHON_SITELIBDIR%%/mercurial/__modulepolicy__.py -%%PYTHON2%%%%PYTHON_SITELIBDIR%%/mercurial/__modulepolicy__.pyc -%%PYTHON2%%%%PYTHON_SITELIBDIR%%/mercurial/__modulepolicy__.pyo -%%PYTHON3%%%%PYTHON_SITELIBDIR%%/mercurial/__pycache__/__modulepolicy__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc -%%PYTHON3%%%%PYTHON_SITELIBDIR%%/mercurial/__pycache__/__modulepolicy__.cpython-%%PYTHON_SUFFIX%%.pyc %%DATA%%%%DATADIR%%/contrib/bash_completion %%DATA%%%%DATADIR%%/contrib/casesmash.py %%DATA%%%%DATADIR%%/contrib/check-code.py