CVS commit: pkgsrc/textproc/py-merge3

["Olaf Seibert" <rhialto%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rhialto
Date:           Sun Jan  7 15:57:02 UTC 2024

Added Files:
        pkgsrc/textproc/py-merge3: DESCR Makefile PLIST distinfo

Log Message:
textproc/py-merge3: added, needed for devel/breezy.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 pkgsrc/textproc/py-merge3/DESCR \
    pkgsrc/textproc/py-merge3/Makefile pkgsrc/textproc/py-merge3/PLIST \
    pkgsrc/textproc/py-merge3/distinfo

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Added files:

Index: pkgsrc/textproc/py-merge3/DESCR
diff -u /dev/null pkgsrc/textproc/py-merge3/DESCR:1.1
--- /dev/null   Sun Jan  7 15:57:02 2024
+++ pkgsrc/textproc/py-merge3/DESCR     Sun Jan  7 15:57:02 2024
@@ -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.
Index: pkgsrc/textproc/py-merge3/Makefile
diff -u /dev/null pkgsrc/textproc/py-merge3/Makefile:1.1
--- /dev/null   Sun Jan  7 15:57:02 2024
+++ pkgsrc/textproc/py-merge3/Makefile  Sun Jan  7 15:57:02 2024
@@ -0,0 +1,16 @@
+# $NetBSD: Makefile,v 1.1 2024/01/07 15:57:02 rhialto Exp $
+
+DISTNAME=      merge3-0.0.14
+PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
+CATEGORIES=    textproc python
+MASTER_SITES=  ${MASTER_SITE_PYPI:source/=af/40/98be4a5641b0244be5881ff5e00057f8227ff183d8675a697bdfeae43b1a/}
+
+MAINTAINER=    rhialto%NetBSD.org@localhost
+HOMEPAGE=      https://www.breezy-vcs.org/
+COMMENT=       Python implementation of 3-way merge
+LICENSE=       gnu-gpl-v2 OR gnu-gpl-v3 # or later
+
+PYTHON_VERSIONS_INCOMPATIBLE=  27
+
+.include "../../lang/python/wheel.mk"
+.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/textproc/py-merge3/PLIST
diff -u /dev/null pkgsrc/textproc/py-merge3/PLIST:1.1
--- /dev/null   Sun Jan  7 15:57:02 2024
+++ pkgsrc/textproc/py-merge3/PLIST     Sun Jan  7 15:57:02 2024
@@ -0,0 +1,16 @@
+@comment $NetBSD: PLIST,v 1.1 2024/01/07 15:57:02 rhialto Exp $
+bin/merge3
+${PYSITELIB}/${WHEEL_INFODIR}/AUTHORS
+${PYSITELIB}/${WHEEL_INFODIR}/COPYING
+${PYSITELIB}/${WHEEL_INFODIR}/METADATA
+${PYSITELIB}/${WHEEL_INFODIR}/RECORD
+${PYSITELIB}/${WHEEL_INFODIR}/WHEEL
+${PYSITELIB}/${WHEEL_INFODIR}/entry_points.txt
+${PYSITELIB}/${WHEEL_INFODIR}/top_level.txt
+${PYSITELIB}/merge3/__init__.py
+${PYSITELIB}/merge3/__init__.pyc
+${PYSITELIB}/merge3/__init__.pyo
+${PYSITELIB}/merge3/__main__.py
+${PYSITELIB}/merge3/__main__.pyc
+${PYSITELIB}/merge3/__main__.pyo
+${PYSITELIB}/merge3/py.typed
Index: pkgsrc/textproc/py-merge3/distinfo
diff -u /dev/null pkgsrc/textproc/py-merge3/distinfo:1.1
--- /dev/null   Sun Jan  7 15:57:02 2024
+++ pkgsrc/textproc/py-merge3/distinfo  Sun Jan  7 15:57:02 2024
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1 2024/01/07 15:57:02 rhialto Exp $
+
+BLAKE2s (merge3-0.0.14.tar.gz) = ac1bcf93f5aed202e96178f180ad3c9f7d796539702087ebfa00f0be49270963
+SHA512 (merge3-0.0.14.tar.gz) = 5fea61ff655299b1186d3cb060688210d80df117c049fdc283afeaa630db211a88acc6fdbaeba51f8bb58a1ec311a125f4b6027ea6ad101769eb13feec639894
+Size (merge3-0.0.14.tar.gz) = 17742 bytes