notbugAs an Amazon Associate I earn from qualifying purchases.
Want a good read? Try FreeBSD Mastery: Jails (IT Mastery Book 15)
Ukraine
FreshPorts needs to find a new hosting provide willing to take a 2U chassis and host it free of charge. This is part of the FreshPorts project. Preferably in the Austin area. This is not a primary server, but it used for development.
Port details
py-three-merge Perform a 3-way merge between strings
0.1.1 textproc on this many watch lists=0 search for ports that depend on this port Find issues related to this port Report an issue related to this port View this port on Repology. pkg-fallout Version of this port present on the latest quarterly branch.
Maintainer: rhurlin@FreeBSD.org search for ports maintained by this maintainer
Port Added: 2021-02-26 11:26:14
Last Update: 2022-07-20 14:23:14
Commit Hash: 5cf7e35
Also Listed In: python
License: MIT
Description:
SVNWeb : git : Homepage
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>)
  • py39: py39-three-merge
distinfo:
Packages (timestamps in pop-ups are UTC):
py37-three-merge
ABIlatestquarterly
FreeBSD:11:aarch64--
FreeBSD:11:amd64--
FreeBSD:11:armv6--
FreeBSD:11:i386--
FreeBSD:11:mips--
FreeBSD:11:mips64--
FreeBSD:12:aarch64--
FreeBSD:12:amd64--
FreeBSD:12:armv6--
FreeBSD:12:armv7--
FreeBSD:12:i386--
FreeBSD:12:mips--
FreeBSD:12:mips64--
FreeBSD:12:powerpc64-0.1.1
FreeBSD:13:aarch64--
FreeBSD:13:amd64--
FreeBSD:13:armv6--
FreeBSD:13:armv7--
FreeBSD:13:i386--
FreeBSD:13:mips--
FreeBSD:13:mips64--
FreeBSD:13:powerpc64--
FreeBSD:13:riscv64--
FreeBSD:14:aarch64--
FreeBSD:14:amd64--
FreeBSD:14:armv6--
FreeBSD:14:armv7--
FreeBSD:14:i386--
FreeBSD:14:mips--
FreeBSD:14:mips64--
FreeBSD:14:powerpc640.1.1-
FreeBSD:14:riscv64--
 
py38-three-merge
ABIlatestquarterly
FreeBSD:11:aarch64--
FreeBSD:11:amd640.1.10.1.1
FreeBSD:11:armv6--
FreeBSD:11:i3860.1.10.1.1
FreeBSD:11:mips--
FreeBSD:11:mips64--
FreeBSD:12:aarch64--
FreeBSD:12:amd64--
FreeBSD:12:armv6--
FreeBSD:12:armv7--
FreeBSD:12:i386--
FreeBSD:12:mips--
FreeBSD:12:mips64--
FreeBSD:12:powerpc64--
FreeBSD:13:aarch64--
FreeBSD:13:amd64--
FreeBSD:13:armv6--
FreeBSD:13:armv7--
FreeBSD:13:i386--
FreeBSD:13:mips--
FreeBSD:13:mips64--
FreeBSD:13:powerpc64-0.1.1
FreeBSD:13:riscv64--
FreeBSD:14:aarch64--
FreeBSD:14:amd64--
FreeBSD:14:armv6--
FreeBSD:14:armv7--
FreeBSD:14:i386--
FreeBSD:14:mips--
FreeBSD:14:mips64--
FreeBSD:14:powerpc64--
FreeBSD:14:riscv640.1.1-
 
py39-three-merge
ABIlatestquarterly
FreeBSD:11:aarch64--
FreeBSD:11:amd64--
FreeBSD:11:armv6--
FreeBSD:11:i386--
FreeBSD:11:mips--
FreeBSD:11:mips64--
FreeBSD:12:aarch64-0.1.1
FreeBSD:12:amd640.1.10.1.1
FreeBSD:12:armv6--
FreeBSD:12:armv7--
FreeBSD:12:i3860.1.10.1.1
FreeBSD:12:mips--
FreeBSD:12:mips64--
FreeBSD:12:powerpc64--
FreeBSD:13:aarch640.1.10.1.1
FreeBSD:13:amd640.1.10.1.1
FreeBSD:13:armv6-0.1.1
FreeBSD:13:armv70.1.10.1.1
FreeBSD:13:i3860.1.10.1.1
FreeBSD:13:mips--
FreeBSD:13:mips64--
FreeBSD:13:powerpc64--
FreeBSD:13:riscv64-0.1.1
FreeBSD:14:aarch640.1.1-
FreeBSD:14:amd640.1.1-
FreeBSD:14:armv60.1.1-
FreeBSD:14:armv70.1.1-
FreeBSD:14:i3860.1.1-
FreeBSD:14:mips--
FreeBSD:14:mips64--
FreeBSD:14:powerpc64--
FreeBSD:14:riscv64--
 

Dependencies
NOTE: FreshPorts displays only information on required and default dependencies. Optional dependencies are not covered.
Build dependencies:
  1. py39-setuptools>=63.1.0 : devel/py-setuptools@py39
  2. python3.9 : lang/python39
Runtime dependencies:
  1. py39-diff-match-patch>=0 : textproc/py-diff-match-patch@py39
  2. py39-setuptools>=63.1.0 : devel/py-setuptools@py39
  3. python3.9 : lang/python39
There are no ports dependent upon this port

Configuration Options:
Options name:

USES:

FreshPorts was unable to extract/find any pkg message
Master Sites:
Expand this list (2 items)
Collapse this list.
  1. https://files.pythonhosted.org/packages/source/t/three-merge/
  2. https://pypi.org/packages/source/t/three-merge/
Collapse this list.

Number of commits found: 3

Commit History - (may be incomplete: see SVNWeb link above for full details)
DateByDescription
20 Jul 2022 14:23:14
 files touched by this commit commit hash:5cf7e35e8664e11393fedc7d89b4d09e0fcced9b  0.1.1
Tobias C. Berner (tcberner) search for other commits by this committer
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 View all of this commit message)
06 Apr 2021 14:31:07
 files touched by this commit commit hash:305f148f482daf30dcf728039d03d019f88344eb  0.1.1
Mathieu Arnold (mat) search for other commits by this committer
Remove # $FreeBSD$ from Makefiles.
26 Feb 2021 11:25:36
Original commit files touched by this commit Revision:566594  0.1.1
rhurlin search for other commits by this committer
New port: textproc/py-three-merge: Perform a 3-way merge between strings

https://github.com/spyder-ide/three-merge

Number of commits found: 3