diff options
| author | Matthew D. Fuller <fullermd@over-yonder.net> | 2023-03-26 21:55:28 +0000 |
|---|---|---|
| committer | Robert Clausecker <fuz@FreeBSD.org> | 2023-05-25 09:39:34 +0000 |
| commit | 482b709de36de5949cb55d43da9b08bc51bcc07c (patch) | |
| tree | a953bee6167a5448937cff079d34a93b309f3d3b | |
| parent | a1fbebbcb6fc7439b6c01c63d2a39b1ee48e5246 (diff) | |
| download | ports-482b709de36de5949cb55d43da9b08bc51bcc07c.tar.gz ports-482b709de36de5949cb55d43da9b08bc51bcc07c.zip | |
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
| -rw-r--r-- | textproc/Makefile | 1 | ||||
| -rw-r--r-- | textproc/py-merge3/Makefile | 19 | ||||
| -rw-r--r-- | textproc/py-merge3/distinfo | 3 | ||||
| -rw-r--r-- | textproc/py-merge3/pkg-descr | 5 |
4 files changed, 28 insertions, 0 deletions
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 <bsd.port.mk> 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. |