| Port details |
- py-merge3 3-way merge implementation
- 0.0.13_1 textproc
 =2      0.0.13Version of this port present on the latest quarterly branch. - Maintainer: fullermd@over-yonder.net
- Port Added: 2023-05-25 09:46:20
- Last Update: 2025-03-08 04:05:21
- Commit Hash: 06a08e6
- People watching this port, also watch:: jdictionary, py311-Automat, py311-python-gdsii, py311-PyOpenGL, p5-Sane
- Also Listed In: python
- License: GPLv2+
- WWW:
- https://github.com/breezy-team/merge3
- Description:
- 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.
  ¦  ¦  ¦  ¦ 
- 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}merge3>0:textproc/py-merge3@${PY_FLAVOR}
- To install the port:
- cd /usr/ports/textproc/py-merge3/ && make install clean
- To add the package, run one of these commands:
- pkg install textproc/py-merge3
- pkg install py311-merge3
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 py311-merge3 listed in the above command, you can pick from the names under the Packages section.- PKGNAME: py311-merge3
- Package flavors (<flavor>: <package>)
- distinfo:
- TIMESTAMP = 1679867605
SHA256 (merge3-0.0.13.tar.gz) = 8abda1d2d49776323d23d09bfdd80d943a57d43d28d6152ffd2c87956a9b6b54
SIZE (merge3-0.0.13.tar.gz) = 13603
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:
-
- py311-setuptools>=63.1.0 : devel/py-setuptools@py311
- python3.11 : lang/python311
- Test dependencies:
-
- python3.11 : lang/python311
- Runtime dependencies:
-
- python3.11 : lang/python311
- There are no ports dependent upon this port
Configuration Options:- No options to configure
- Options name:
- textproc_py-merge3
- USES:
- python
- FreshPorts was unable to extract/find any pkg message
- Master Sites:
|
Number of commits found: 3
| Commit History - (may be incomplete: for full details, see links to repositories near top of page) |
| Commit | Credits | Log message |
|---|
0.0.13_1
08 Mar 2025 04:05:21
 |
Charlie Li (vishwin) |
python: bump all USE_PYTHON=distutils consumers after RUN_DEPENDS removal
Any missed ports, feel free to bump.
Any ports that need setuptools at runtime can have the devel/py-setuptools
manually added back to RUN_DEPENDS, but understand that this practice
is deprecated; see CHANGES for details. |
0.0.13
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.0.13
25 May 2023 09:39:34
|
Robert Clausecker (fuz)
Author: Matthew D. Fuller |
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 |
Number of commits found: 3
|
As an Amazon Associate I earn from qualifying purchases.