notbugAs an Amazon Associate I earn from qualifying purchases.
Want a good read? Try FreeBSD Mastery: Jails (IT Mastery Book 15)
Want a good monitor light? See my photosAll times are UTC
Ukraine
This referral link gives you 10% off a Fastmail.com account and gives me a discount on my Fastmail account.

Get notified when packages are built

A new feature has been added. FreshPorts already tracks package built by the FreeBSD project. This information is displayed on each port page. You can now get an email when FreshPorts notices a new package is available for something on one of your watch lists. However, you must opt into that. Click on Report Subscriptions on the right, and New Package Notification box, and click on Update.

Finally, under Watch Lists, click on ABI Package Subscriptions to select your ABI (e.g. FreeBSD:14:amd64) & package set (latest/quarterly) combination for a given watch list. This is what FreshPorts will look for.

Port details
py-merge3 3-way merge implementation
0.0.13 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 0.0.13Version of this port present on the latest quarterly branch.
Maintainer: fullermd@over-yonder.net search for ports maintained by this maintainer
Port Added: 2023-05-25 09:46:20
Last Update: 2023-06-27 19:34:34
Commit Hash: 3d9a815
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.
Homepage    cgit ¦ Codeberg ¦ GitHub ¦ GitLab ¦ SVNWeb - no subversion history for this port

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 py39-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 py39-merge3 listed in the above command, you can pick from the names under the Packages section.
PKGNAME: py39-merge3
Package flavors (<flavor>: <package>)
  • py39: py39-merge3
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):
py39-merge3
ABIaarch64amd64armv6armv7i386powerpcpowerpc64powerpc64le
FreeBSD:13:latest0.0.130.0.13-0.0.130.0.13---
FreeBSD:13:quarterly0.0.130.0.130.0.130.0.130.0.130.0.130.0.130.0.13
FreeBSD:14:latest0.0.130.0.13-0.0.130.0.130.0.13-0.0.13
FreeBSD:14:quarterly0.0.130.0.13-0.0.130.0.130.0.130.0.130.0.13
FreeBSD:15:latest0.0.130.0.13n/a0.0.13n/a0.0.130.0.130.0.13
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
Test dependencies:
  1. python3.9 : lang/python39
Runtime dependencies:
  1. py39-setuptools>=63.1.0 : devel/py-setuptools@py39
  2. python3.9 : lang/python39
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:
Expand this list (2 items)
Collapse this list.
  1. https://files.pythonhosted.org/packages/source/m/merge3/
  2. https://pypi.org/packages/source/m/merge3/
Collapse this list.

Number of commits found: 2

Commit History - (may be incomplete: for full details, see links to repositories near top of page)
CommitCreditsLog message
0.0.13
27 Jun 2023 19:34:34
commit hash: 3d9a815d9c5acbb71f4bb07738bdeab4879feacbcommit hash: 3d9a815d9c5acbb71f4bb07738bdeab4879feacbcommit hash: 3d9a815d9c5acbb71f4bb07738bdeab4879feacbcommit hash: 3d9a815d9c5acbb71f4bb07738bdeab4879feacb files touched by this commit
Rene Ladan (rene) search for other commits by this committer
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
commit hash: 482b709de36de5949cb55d43da9b08bc51bcc07ccommit hash: 482b709de36de5949cb55d43da9b08bc51bcc07ccommit hash: 482b709de36de5949cb55d43da9b08bc51bcc07ccommit hash: 482b709de36de5949cb55d43da9b08bc51bcc07c files touched by this commit
Robert Clausecker (fuz) search for other commits by this committer
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: 2