| Port details |
- py-three-merge Perform a 3-way merge between strings
- 0.1.1 textproc
 =2      0.1.1Version of this port present on the latest quarterly branch. - Maintainer: rhurlin@FreeBSD.org
- Port Added: 2021-02-26 11:26:14
- Last Update: 2023-06-27 19:34:34
- Commit Hash: 3d9a815
- People watching this port, also watch:: jdictionary, py311-Automat, py311-python-gdsii, py39-PyOpenGL, p5-Sane
- Also Listed In: python
- License: MIT
- WWW:
- https://github.com/spyder-ide/three-merge
- Description:
- Simple Python library to perform a 3-way merge between strings, based on
diff-match-patch. This library performs merges at a character level, as
opposed to most VCS systems, which opt for a line-based approach.
  ¦  ¦  ¦  ¦ 
- Manual pages:
- FreshPorts has no man page information for this port.
- pkg-plist: as obtained via:
make generate-plist - There is no configure plist information for this port.
- Dependency lines:
-
- ${PYTHON_PKGNAMEPREFIX}three-merge>0:textproc/py-three-merge@${PY_FLAVOR}
- To install the port:
- cd /usr/ports/textproc/py-three-merge/ && make install clean
- To add the package, run one of these commands:
- pkg install textproc/py-three-merge
- pkg install py39-three-merge
NOTE: If this package has multiple flavors (see below), then use one of them instead of the name specified above.
NOTE: This is a Python port. Instead of py39-three-merge listed in the above command, you can pick from the names under the Packages section.- PKGNAME: py39-three-merge
- Package flavors (<flavor>: <package>)
- distinfo:
- TIMESTAMP = 1614332502
SHA256 (three-merge-0.1.1.tar.gz) = 60f6afe144595560d63ae32625351bcef3b94733b54eb97800a9feb0f3d9d970
SIZE (three-merge-0.1.1.tar.gz) = 5898
Packages (timestamps in pop-ups are UTC):
- Dependencies
- NOTE: FreshPorts displays only information on required and default dependencies. Optional dependencies are not covered.
- Build dependencies:
-
- py39-setuptools>=63.1.0 : devel/py-setuptools@py39
- python3.9 : lang/python39
- Test dependencies:
-
- python3.9 : lang/python39
- Runtime dependencies:
-
- py39-diff-match-patch>=0 : textproc/py-diff-match-patch@py39
- py39-setuptools>=63.1.0 : devel/py-setuptools@py39
- python3.9 : lang/python39
- This port is required by:
- for Run
-
- devel/spyder
-
Deleted ports which required this port:
- * - deleted ports are only shown under the This port is required by section. It was harder to do for the Required section. Perhaps later...
Configuration Options:- No options to configure
- Options name:
- textproc_py-three-merge
- USES:
- python
- FreshPorts was unable to extract/find any pkg message
- Master Sites:
|
Number of commits found: 7
| Commit History - (may be incomplete: for full details, see links to repositories near top of page) |
| Commit | Credits | Log message |
|---|
0.1.1
27 Jun 2023 19:34:34
 |
Rene Ladan (rene) |
all: remove explicit versions in USES=python for "3.x+"
The logic in USES=python will automatically convert this to 3.8+ by
itself.
Adjust two ports that only had Python 3.7 mentioned but build fine
on Python 3.8 too.
finance/quickfix: mark BROKEN with PYTHON
libtool: compile: c++ -DHAVE_CONFIG_H -I. -I../.. -I -I. -I.. -I../.. -I../C++
-DLIBICONV_PLUG -DPYTHON_MAJOR_VERSION=3 -Wno-unused-variable
-Wno-maybe-uninitialized -O2 -pipe -DLIBICONV_PLUG -fstack-protector-strong
-fno-strict-aliasing -DLIBICONV_PLUG -Wall -ansi
-Wno-unused-command-line-argument -Wpointer-arith -Wwrite-strings
-Wno-overloaded-virtual -Wno-deprecated-declarations -Wno-deprecated -std=c++0x
-MT _quickfix_la-QuickfixPython.lo -MD -MP -MF
.deps/_quickfix_la-QuickfixPython.Tpo -c QuickfixPython.cpp -fPIC -DPIC -o
.libs/_quickfix_la-QuickfixPython.o
warning: unknown warning option '-Wno-maybe-uninitialized'; did you mean
'-Wno-uninitialized'? [-Wunknown-warning-option]
QuickfixPython.cpp:175:11: fatal error: 'Python.h' file not found
^~~~~~~~~~
1 warning and 1 error generated.
Reviewed by: portmgr, vishwin, yuri
Differential Revision: <https://reviews.freebsd.org/D40568> |
0.1.1
11 Jan 2023 15:58:34
|
Dmitry Marakasov (amdmi3) |
*/*: rename CHEESESHOP to PYPI in MASTER_SITES
PR: 267994
Differential revision: D37518
Approved by: bapt |
07 Sep 2022 21:58:51
|
Stefan Eßer (se) |
Remove WWW entries moved into port Makefiles
Commit b7f05445c00f has added WWW entries to port Makefiles based on
WWW: lines in pkg-descr files.
This commit removes the WWW: lines of moved-over URLs from these
pkg-descr files.
Approved by: portmgr (tcberner) |
0.1.1
07 Sep 2022 21:10:59
|
Stefan Eßer (se) |
Add WWW entries to port Makefiles
It has been common practice to have one or more URLs at the end of the
ports' pkg-descr files, one per line and prefixed with "WWW:". These
URLs should point at a project website or other relevant resources.
Access to these URLs required processing of the pkg-descr files, and
they have often become stale over time. If more than one such URL was
present in a pkg-descr file, only the first one was tarnsfered into
the port INDEX, but for many ports only the last line did contain the
port specific URL to further information.
There have been several proposals to make a project URL available as
a macro in the ports' Makefiles, over time.
(Only the first 15 lines of the commit message are shown above  ) |
0.1.1
20 Jul 2022 14:23:14
|
Tobias C. Berner (tcberner) |
textproc: remove 'Created by' lines
A big Thank You to the original contributors of these ports:
* "Choe, Cheng-Dae" whitekid
* -
* <glewis@FreeBSD.org>
* <koshy@india.hp.com>
* Aaron Dalton <aaron@FreeBSD.org>
* Aaron Dalton <aaron@daltons.ca>
* Aaron Straup Cope
* Aaron Straup Cope <ascope@cpan.org>
* Ache
* Adam Herzog <adam@herzogdesigns.com>
* Adam Weinberger <adamw@FreeBSD.org> (Only the first 15 lines of the commit message are shown above ) |
0.1.1
06 Apr 2021 14:31:07
|
Mathieu Arnold (mat) |
Remove # $FreeBSD$ from Makefiles. |
0.1.1
26 Feb 2021 11:25:36
 |
rhurlin |
New port: textproc/py-three-merge: Perform a 3-way merge between strings
https://github.com/spyder-ide/three-merge |
Number of commits found: 7
|
As an Amazon Associate I earn from qualifying purchases.