Received: by mail.netbsd.org (Postfix, from userid 605) id 2D3E684D6F; Sun, 7 Jan 2024 16:16:21 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 4B0DC84D6F for ; Sun, 7 Jan 2024 16:03:47 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id oHy7Qq5UfKDl for ; Sun, 7 Jan 2024 16:03:46 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 99AF484CFE for ; Sun, 7 Jan 2024 16:03:46 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 89B89FA42; Sun, 7 Jan 2024 16:03:46 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1704643426253160" MIME-Version: 1.0 Date: Sun, 7 Jan 2024 16:03:46 +0000 From: "Thomas Klausner" Subject: CVS commit: pkgsrc/textproc/py-merge3 To: pkgsrc-changes@NetBSD.org Reply-To: wiz@netbsd.org X-Mailer: log_accum Message-Id: <20240107160346.89B89FA42@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1704643426253160 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: wiz Date: Sun Jan 7 16:03:46 UTC 2024 Modified Files: pkgsrc/textproc/py-merge3: Makefile Log Message: py-merge3: add missing tools, simplify download URL To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 pkgsrc/textproc/py-merge3/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1704643426253160 Content-Disposition: inline Content-Length: 1049 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/textproc/py-merge3/Makefile diff -u pkgsrc/textproc/py-merge3/Makefile:1.1 pkgsrc/textproc/py-merge3/Makefile:1.2 --- pkgsrc/textproc/py-merge3/Makefile:1.1 Sun Jan 7 15:57:02 2024 +++ pkgsrc/textproc/py-merge3/Makefile Sun Jan 7 16:03:46 2024 @@ -1,15 +1,18 @@ -# $NetBSD: Makefile,v 1.1 2024/01/07 15:57:02 rhialto Exp $ +# $NetBSD: Makefile,v 1.2 2024/01/07 16:03:46 wiz Exp $ DISTNAME= merge3-0.0.14 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} CATEGORIES= textproc python -MASTER_SITES= ${MASTER_SITE_PYPI:source/=af/40/98be4a5641b0244be5881ff5e00057f8227ff183d8675a697bdfeae43b1a/} +MASTER_SITES= ${MASTER_SITE_PYPI:=m/merge3/} MAINTAINER= rhialto@NetBSD.org HOMEPAGE= https://www.breezy-vcs.org/ COMMENT= Python implementation of 3-way merge LICENSE= gnu-gpl-v2 OR gnu-gpl-v3 # or later +TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools +TOOL_DEPENDS+= ${PYPKGPREFIX}-wheel-[0-9]*:../../devel/py-wheel + PYTHON_VERSIONS_INCOMPATIBLE= 27 .include "../../lang/python/wheel.mk" --_----------=_1704643426253160--