./devel/kdiff3, File and directory diff and merge tool

[ CVSweb ] [ Homepage ] [ RSS ] [ Required by ] [ Add to tracker ]


Branch: CURRENT, Version: 1.10.7nb7, Package name: kdiff3-1.10.7nb7, Maintainer: pkgsrc-users

KDiff3 is a file and directory diff and merge tool which

* compares and merges two or three text input files or directories,
* shows the differences line by line and character by character(!),
* provides an automatic merge-facility,
* has an editor for comfortable solving of merge-conflicts,
* provides network transparency via KIO,
* has options to highlight or hide changes in white-space or comments,
* supports Unicode, UTF-8 and other file encodings,
* prints differences,
* supports version control keyword and history merging.


Required to run:
[graphics/hicolor-icon-theme] [security/gnupg2] [x11/qt5-qtbase] [x11/kwidgetsaddons] [graphics/kiconthemes] [devel/kio] [devel/kcrash] [devel/ki18n] [devel/kdoctools] [devel/kparts] [devel/kcoreaddons]

Required to build:
[pkgtools/x11-links] [x11/xcb-proto] [x11/fixesproto4] [pkgtools/cwrappers] [devel/extra-cmake-modules] [x11/xorgproto]

Master sites: (Expand)

Filesize: 1104.605 KB

Version history: (Expand)


CVS history: (Expand)


   2025-01-24 00:27:30 by Taylor R Campbell | Files touched by this commit (41)
Log message:
devel/extra-cmake-modules: Use buildlink3.mk, not TOOL_DEPENDS.

This one is borderline: should it be BUILD_DEPENDS or TOOL_DEPENDS?
It doesn't appear to vary depending on the build environment, so it
doesn't meaningfully describe the cross-builder vs the target system.
It is used only at build-time, but it doesn't have any native
executables -- they're just source code cmake scripts.

For now, it is convenient to use a buildlink3.mk file because this
enables us to explicitly expose only files under share/ECM/ -- and
not other random files installed in the prefix -- via buildlink3 to
keep dependent package builds clean.  Eventually we should have the
same mechanism for TOOL_DEPENDS but that day has not yet come.

This change creates a new use of BUILDLINK_DEPMETHOD build for
extra-cmake-modules, which is a priori risky.  Fortunately,
extra-cmake-modules has no libraries, so this is unlikely to cause
trouble.
   2024-11-14 23:22:33 by Thomas Klausner | Files touched by this commit (2429)
Log message:
*: recursive bump for icu 76 shlib major version bump
   2024-11-01 13:55:19 by Thomas Klausner | Files touched by this commit (2426)
Log message:
*: revbump for icu downgrade
   2024-11-01 01:54:33 by Thomas Klausner | Files touched by this commit (2427)
Log message:
*: recursive bump for icu 76.1 shlib bump
   2024-08-09 11:42:40 by Ryo ONODERA | Files touched by this commit (327)
Log message:
*: Recursive revbump from security/libassuan2
   2024-05-29 18:35:19 by Adam Ciarcinski | Files touched by this commit (1929) | Package updated
Log message:
revbump after icu and protobuf updates
   2024-04-06 10:07:18 by Thomas Klausner | Files touched by this commit (1490)
Log message:
* recursive bump for libxkbcommon 1.7.0

Marc Baudoin reported problems with using old binary packages
with the new libkxbcommon, so force everything to 1.7.0
   2024-01-30 15:22:43 by Ryo ONODERA | Files touched by this commit (672)
Log message:
*: Recursive revbump from audio/pulseaudio-17.0