./devel/kdiff3 [compares and merges multiple files or directories]
[+] Add this package to your ports tracker

[ CVSweb ] [ Homepage ] [ RSS feed ]

Version: 1.8.5, Package name: kdiff3-1.8.5
Maintained by: Rafael Sadowski
Master sites:
Description
KDiff3 is a program that:
* compares or merges two or three text input files or directories,
* shows the differences line by line and character by character (!),
* provides an automatic merge-facility and
* an integrated editor for comfortable solving of merge-conflicts,
* supports Unicode, UTF-8 and other codecs, autodetection via
byte-order-mark "BOM"
* supports KIO on KDE (allows accessing ftp, sftp, fish, smb etc.),
* Printing of differences,
* Manual alignment of lines,
* Automatic merging of version control history
* and has an intuitive graphical user interface.

Filesize: 1021.301 KB
Version History (View Complete History)
  • (2021-01-24) Updated to version: kdiff3-1.8.5
  • (2020-09-04) Updated to version: kdiff3-1.8.4
  • (2020-06-27) Updated to version: kdiff3-1.8.3
  • (2020-03-30) Updated to version: kdiff3-1.8.2
  • (2019-06-03) Updated to version: kdiff3-1.8.1
  • (2019-05-18) Updated to version: kdiff3-1.8
  • (2016-03-15) Updated to version: kdiff3-0.9.98
  • (2012-10-02) Updated to version: kdiff3-0.9.97
  • (2011-09-07) Updated to version: kdiff3-0.9.96
  • (2011-08-23) Package added to openports.se, version kdiff3-0.9.95 (created)
[show/hide] View available PLISTS (Can be a lot of data)

CVS Commit History:

   2021-01-23 11:10:37 by Rafael Sadowski | Files touched by this commit (3)
Log message:
Update kdiff3 to 1.8.5
   2020-09-03 14:51:24 by Rafael Sadowski | Files touched by this commit (3)
Log message:
Update kdiff3 to 1.8.4
   2020-06-25 22:41:48 by Rafael Sadowski | Files touched by this commit (3)
Log message:
Update kdiff3 to 1.8.3
   2020-03-29 22:21:40 by Rafael Sadowski | Files touched by this commit (3)
Log message:
Update kdiff3 to 1.8.2
   2020-03-23 12:01:30 by Rafael Sadowski | Files touched by this commit (700)
Log message:
Update KDE Frameworks to 5.68.0 and KDE5 to 19.12
This commit includes 218 port updates and 16 tweak updates after KDE framework
changes. Most of this 16 changes caused by:
- KF5Auth split into KF5Auth and KF5AuthCore, which ends in a lot of new
WANTLIBs
- Upstream changed some xdg paths from share/examples/***/xdg/ to
share/qlogging-categories5/, which ends in a lot of PLIST chages.
List of notable changes:
- Bump all kf5 shared libs.
- Use ">=${MODKF5_VERSION}" in all kf5 ports that all kf5 use the
latest version an update together. (Idea from Qt5).
- s/=+/=/ for LIB_*,RUN_* and BUILD_* in x11/kde-applications, hint by jca@.
- Update okteta to 0.26.3
- Update spectacle only to 19.04.3, latest version without hard wayland
dependency.
- Remove python2 support in cantor, python3 only!
- devel/kf5/kfilemetadata: switch to python 3 (TDEP only), by kn@
- devel/kf5/ki18n: switch to python 3, by kn@
- devel/kf5/kservice: switch to python 3, by kn@
- devel/kf5/kconfigwidgets: remove python module usage, by kn@
- devel/kf5/ktextigwidgets: remove python module usage, by kn@
Tweaks and feedback from landry@, amd64 bulk build and error reports by naddy@
Thanks a lot!
   2019-07-12 14:45:17 by Stuart Henderson | Files touched by this commit (859)
Log message:
replace simple PERMIT_PACKAGE_CDROM=Yes with PERMIT_PACKAGE=Yes
   2019-06-02 13:17:10 by Rafael Sadowski | Files touched by this commit (3)
Log message:
Bugfix update kdiff3 to 1.8.1
   2019-05-20 16:15:31 by Christian Weisgerber | Files touched by this commit (488)
Log message:
Update gettext to 0.20.1.
Follow the upstream recommendations for packagers and switch to
multi-packages:
devel/gettext       -> devel/gettext,-runtime
devel/gettext-tools -> devel/gettext,-tools
(new)                  devel/gettext,-textstyle
   2019-05-18 07:32:19 by Rafael Sadowski | Files touched by this commit (5)
Log message:
Update kdiff3 to 1.8
This update get rid of Qt3 and switch to the modern KDE framework 5.
Tweak and OK kn@
   2018-10-24 08:28:14 by Stuart Henderson | Files touched by this commit (740)
Log message:
Add COMPILER lines to c++ ports which currently use the default. Adjust
some existing COMPILER lines with arch restrictions etc. In the usual
case this is now using "COMPILER = base-clang ports-gcc base-gcc" on
ports with c++ libraries in WANTLIB.
This is basically intended to be a noop on architectures using clang
as the system compiler, but help with other architectures where we
currently have many ports knocked out due to building with an unsuitable
compiler -
- some ports require c++11/newer so the GCC version in base that is used
on these archirtectures is too old.
- some ports have conflicts where an executable is built with one compiler
(e.g. gcc from base) but a library dependency is built with a different
one (e.g. gcc from ports), resulted in mixing incompatible libraries in the
same address space.
devel/gmp is intentionally skipped as it's on the path to building gcc -
the c++ library there is unused in ports (and not built by default upstream)
so intending to disable building gmpcxx in a future commit.
   2017-07-26 16:45:35 by Stuart Henderson | Files touched by this commit (937)
Log message:
bump LIBCXX/LIBECXX/COMPILER_LIBCXX ports.
   2017-07-16 13:19:06 by Marc Espie | Files touched by this commit (880)
Log message:
use COMPILER_LIBCXX where applicable
   2017-04-10 05:45:29 by Stuart Henderson | Files touched by this commit (281)
Log message:
use LIBCXX
   2016-04-06 20:32:02 by Lawrence Teo | Files touched by this commit (1)
Log message:
Drop maintainership; I no longer use kdiff3.
   2016-03-14 17:50:50 by Vadim Zhukov | Files touched by this commit (3)
Log message:
Switch to MODQMAKE, together with update to 0.9.98. -7 lines in Makefile.
okay lteo@ (MAINTAINER)