From nobody Tue Mar 21 19:29:20 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 4Ph1rM5cx3z40hvT; Tue, 21 Mar 2023 19:29:23 +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 4Ph1rJ5TS7z4Sd4; Tue, 21 Mar 2023 19:29:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679426960; 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=Yns29ohvD1p5NgVjh1eswlpMCGUvwm/WvMKLddbC9TE=; b=X/FI3MoUeziD7SMh4MCUs/xZ5tAWYSsWw4WM0tvBx2kqp+/6tJdWkrumSydfk04JJ9HBQp k6XDO5yUAStUfbSPH+P+UPGTTdIBrGyJFOBZQ0rI+YaVvMIb4+zuTjbOHKgbgJxwP+tLcY QnVC0uqZa2LFpU8e4sW53w1xOA7Bv5C27nVTskrGScf/nyJsN/DA4HMRi5/HiVglaxxM9Q oWbxm5uSW1H9aucxcwCzKhs+aMpAweGp3Ynooq+VSmiGJSs0CrFNU7aWzIqWZq5s/K1kqY HlBsmb8GFtb369A00k/JdZuSqLHCGWLa0GdBKtagiAvR8bDw0j7Xc2FL96nZdg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679426960; 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=Yns29ohvD1p5NgVjh1eswlpMCGUvwm/WvMKLddbC9TE=; b=TMy0Hq5ruG6aX9qzbVF9NfgmApFk265WSwph4Pnsz/X1F3I51buJ+3+Tm3kV3AoIs3FRDz 9aPdF2LPYwU2bpqfPHuahE8Q3L8WQDEjyFQzLvCANAPuspW/Alu5TLVREaaCFOw0FXErK7 X1t3SJNlBnVpH2TpX9mVrL4gqU/b1dh8KZYyzUNHkSJ58YOp8KN+KhI5mP3i9gsvs3gW0G I7n/0mPoy9jDSUcuciLGzFeRLHwbU1x96gXXIvGcO8YZ9jEyQlGyuMHUR9b87byU2UdtEN RkjN714x/RsnqOI7qR81W26ssVtnHTCoSuUeKGhMBjEKaqjh/kayiXdl0EJtIw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679426960; a=rsa-sha256; cv=none; b=L2kQUOqn6W3MwE/tZfVnAQRTzx1Dua2txL97exm6nm+4TPQvjSD3TkxDeVODYZmwyI3swd XHgeYg++C0j9V2VzD+F4ajkh/Nye7txArxH9WLB8OsAX2KoVE4tt47sQMn9h374Kkpezj7 TDccvRxL8wQmRbTG1MVT2CdNu/TVr9T66q63HKVZctXriPYBO77Dew4ZhdNbt/P6vSjUk7 siDeOi7Jm6KjFZuKCwGK6Q2w7CrB8/G7q0fGHs1si4Uyc8gRhNsAeAiifPGQEvLAbaNtJX IaUyv6ZvBc5YgBFpQhZIL4WPSWmJDYSMrE5+FHQkJaj8jlSWmjaKUtOtJWv2ww== 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 4Ph1rJ3HfLzPYc; Tue, 21 Mar 2023 19:29:20 +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 32LJTKXi033067; Tue, 21 Mar 2023 19:29:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32LJTKjS033066; Tue, 21 Mar 2023 19:29:20 GMT (envelope-from git) Date: Tue, 21 Mar 2023 19:29:20 GMT Message-Id: <202303211929.32LJTKjS033066@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: f4720fee2c41 - main - dns/py-idna: Patch existing setup.py instead of providing a new one 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: f4720fee2c41e96c74a9abaf487c7d93fe006eaf Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=f4720fee2c41e96c74a9abaf487c7d93fe006eaf commit f4720fee2c41e96c74a9abaf487c7d93fe006eaf Author: Po-Chuan Hsieh AuthorDate: 2023-03-21 18:45:48 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-03-21 19:21:08 +0000 dns/py-idna: Patch existing setup.py instead of providing a new one - Do not bump PORTREVISION because the package is unchanged --- dns/py-idna/Makefile | 5 ++--- dns/py-idna/files/patch-setup.py | 6 ++++++ dns/py-idna/files/setup.py | 21 --------------------- 3 files changed, 8 insertions(+), 24 deletions(-) diff --git a/dns/py-idna/Makefile b/dns/py-idna/Makefile index a20d8feec47a..2df8d5fa6715 100644 --- a/dns/py-idna/Makefile +++ b/dns/py-idna/Makefile @@ -11,12 +11,11 @@ WWW= https://github.com/kjd/idna LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.md +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py-setuptools_scm@${PY_FLAVOR} + USES= python:3.5+ USE_PYTHON= autoplist concurrent distutils unittest NO_ARCH= yes -post-patch: - @${SED} -e 's|%%PORTVERSION%%|${PORTVERSION}|' ${FILESDIR}/setup.py > ${WRKSRC}/setup.py - .include diff --git a/dns/py-idna/files/patch-setup.py b/dns/py-idna/files/patch-setup.py new file mode 100644 index 000000000000..ef23da1c27a3 --- /dev/null +++ b/dns/py-idna/files/patch-setup.py @@ -0,0 +1,6 @@ +--- setup.py.orig 2022-09-14 00:01:44 UTC ++++ setup.py +@@ -1,2 +1,2 @@ + from setuptools import setup +-setup() ++setup(use_scm_version=True) diff --git a/dns/py-idna/files/setup.py b/dns/py-idna/files/setup.py deleted file mode 100644 index a7d30bb8e879..000000000000 --- a/dns/py-idna/files/setup.py +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env python -# setup.py generated by flit for tools that don't yet use PEP 517 - -from distutils.core import setup - -packages = \ -['idna'] - -package_data = \ -{'': ['*']} - -setup(name='idna', - version='%%PORTVERSION%%', - description='Internationalized Domain Names in Applications (IDNA)', - author=None, - author_email='Kim Davies ', - url=None, - packages=packages, - package_data=package_data, - python_requires='>=3.5', - )