From nobody Thu May 25 09:44:09 2023 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 4QRjn643dzz4TGkj; Thu, 25 May 2023 09:44:10 +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 4QRjn626r2z3kt9; Thu, 25 May 2023 09:44:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685007850; 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=uw25yIB/8xKkdOEiCJDQGG49MyRSMUBFJva1n15UcR8=; b=FvprNLLNAnkAXjOD9VBDMt63zEnt+Z6siLJCLFQK7cFQBzdNEGo7OeFa+4V8jWgxR4+gAs 4wvJaJG/0at46DbeRMYp5cACAp7rNqk0VbegKYa5TvJ7aPWEliPVzLDSusoxRLxMmtSM7H 410eZSS4TN2JOIlDeSaXCwzOf6zbBtlTVpWY0CVvZK2o9hfWAZn4Bo/1393kGhZZ8RUdMF V6F5Lm41QGCSXKXtiu+G52fViHo+t56XcY4P9CH1CtQSmvjT3FfFDqVfkuFV+KJGlmBgDi dQbV0EGljJ3nupEdGiqotZjNWKkWgh1rrPQo9JbTN1BaedE0aQE9b9D5QlZebA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685007850; 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=uw25yIB/8xKkdOEiCJDQGG49MyRSMUBFJva1n15UcR8=; b=Z3DQSruG0lIrLLKdm8j2Loe6SRd4CYeOsV3afmGUzshUTNY9pEA7gD20Bl9Ty2U2EyjjTZ WySrtVLyyDu3apPSgbSe5+zMG5M7ipZyAkITssKO2/18LU0rcxtQF4DqjDZqgcESShgguC G8xRlATD6a3uTUWj3jdBtcU//YH3MHEspjRSptreVqbqRywSl62U7vw15iKtTohkG/W3r9 Sol+kpgKkqES2SJPBxqj0UwWR40v313tndhBlDnRZJWGlNAf7f0HEPJDFhjfUoGx/dch76 +QmGJ+wSiCmpBUAKC2rFrL1UI9zXi0V6oOZbU8+LnIzkspTBEZfmt90jwAgbBA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685007850; a=rsa-sha256; cv=none; b=b6hgu2x5kimL+UuzaPR7Pu7J/IFwlsgVZJZGcVwkTzU8Bw1vpCW0QArALYwpvNnp5iDex8 qrgMRFxVv/ccRR8J5VNPJAtVNs7LDILd3t7e3VuRtQYcHnYs006gVK538Tb2GTkUw43RhV T+lNcS3oHKaxahpcd3Aduq8liVFlIpX68B4qn2A1PTN6FLOSnT8FDK15/IGfHDQUpON6ja 8MjLzJUZDMdX48mihdCKFnA8l/jaQ+BbX0gnc4udqfEe4+DwmY21n7novQ6rkxc9817JDh 87XK11xIghJ+vijz5Q24uMAC2kyAlF3IK6WStACc/54CVFwuszE2IEejb8pR5Q== 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 4QRjn60Q6szKNb; Thu, 25 May 2023 09:44:10 +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 34P9i9fY001304; Thu, 25 May 2023 09:44:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34P9i90h001303; Thu, 25 May 2023 09:44:09 GMT (envelope-from git) Date: Thu, 25 May 2023 09:44:09 GMT Message-Id: <202305250944.34P9i90h001303@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Clausecker Subject: git: 482b709de36d - main - textproc/py-merge3: new port 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: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 482b709de36de5949cb55d43da9b08bc51bcc07c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=482b709de36de5949cb55d43da9b08bc51bcc07c commit 482b709de36de5949cb55d43da9b08bc51bcc07c Author: Matthew D. Fuller AuthorDate: 2023-03-26 21:55:28 +0000 Commit: Robert Clausecker CommitDate: 2023-05-25 09:39:34 +0000 textproc/py-merge3: new port A Python implementation of 3-way merge of texts. Given BASE, OTHER, THIS, tries to produce a combined text incorporating the changes from both BASE->OTHER and BASE->THIS. All three will typically be sequences of lines. WWW: https://github.com/breezy-team/merge3 PR: 267681 --- textproc/Makefile | 1 + textproc/py-merge3/Makefile | 19 +++++++++++++++++++ textproc/py-merge3/distinfo | 3 +++ textproc/py-merge3/pkg-descr | 5 +++++ 4 files changed, 28 insertions(+) diff --git a/textproc/Makefile b/textproc/Makefile index e93ee3ad2666..dde242499892 100644 --- a/textproc/Makefile +++ b/textproc/Makefile @@ -1400,6 +1400,7 @@ SUBDIR += py-mathics-pygments SUBDIR += py-mdit-py-plugins SUBDIR += py-mdurl + SUBDIR += py-merge3 SUBDIR += py-mike SUBDIR += py-misaka SUBDIR += py-mistletoe diff --git a/textproc/py-merge3/Makefile b/textproc/py-merge3/Makefile new file mode 100644 index 000000000000..cd1b05515e2c --- /dev/null +++ b/textproc/py-merge3/Makefile @@ -0,0 +1,19 @@ +PORTNAME= merge3 +PORTVERSION= 0.0.13 +CATEGORIES= textproc python +MASTER_SITES= PYPI +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} + +MAINTAINER= fullermd@over-yonder.net +COMMENT= 3-way merge implementation +WWW= https://github.com/breezy-team/merge3 + +LICENSE= GPLv2+ +LICENSE_FILE= ${WRKSRC}/COPYING + +USES= python:3.7+ +USE_PYTHON= autoplist concurrent distutils + +NO_ARCH= yes + +.include diff --git a/textproc/py-merge3/distinfo b/textproc/py-merge3/distinfo new file mode 100644 index 000000000000..2a74facfc259 --- /dev/null +++ b/textproc/py-merge3/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1679867605 +SHA256 (merge3-0.0.13.tar.gz) = 8abda1d2d49776323d23d09bfdd80d943a57d43d28d6152ffd2c87956a9b6b54 +SIZE (merge3-0.0.13.tar.gz) = 13603 diff --git a/textproc/py-merge3/pkg-descr b/textproc/py-merge3/pkg-descr new file mode 100644 index 000000000000..4c2f4c248e37 --- /dev/null +++ b/textproc/py-merge3/pkg-descr @@ -0,0 +1,5 @@ +A Python implementation of 3-way merge of texts. + +Given BASE, OTHER, THIS, tries to produce a combined text incorporating +the changes from both BASE->OTHER and BASE->THIS. All three will +typically be sequences of lines.