Please find below a simple diff to update kdiff3 to 1.8, This update get rid of Qt3 and switch to the moder KDE framework 5.
Very short and little tested, need real world users. Cheers, RS Index: Makefile =================================================================== RCS file: /cvs/ports/devel/kdiff3/Makefile,v retrieving revision 1.13 diff -u -p -u -p -r1.13 Makefile --- Makefile 24 Oct 2018 14:28:00 -0000 1.13 +++ Makefile 14 May 2019 19:00:06 -0000 @@ -2,27 +2,53 @@ COMMENT = compares and merges multiple files or directories -DISTNAME = kdiff3-0.9.98 -REVISION = 2 -CATEGORIES = devel x11/kde -HOMEPAGE = http://kdiff3.sourceforge.net/ +DISTNAME = kdiff3-1.8 -MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=kdiff3/} +CATEGORIES = devel -# GPLv2 -PERMIT_PACKAGE_CDROM = Yes - -WANTLIB = ICE QtGui SM X11 Xext Xi Xinerama Xrender -WANTLIB += c fontconfig freetype m pthread ${COMPILER_LIBCXX} +HOMEPAGE = https://kde.org/applications/development/kdiff3/ -COMPILER = base-clang ports-gcc base-gcc +MASTER_SITES = ${MASTER_SITE_KDE:=stable/kdiff3/} +EXTRACT_SUFX = .tar.xz -MODULES = x11/qt4 devel/qmake - -CONFIGURE_STYLE = qmake -MODQMAKE_PROJECTS = src-QT4/kdiff3.pro +# GPLv2 +PERMIT_PACKAGE_CDROM = Yes -pre-configure: - @${SUBST_CMD} ${WRKSRC}/src-QT4/kdiff3.pro +WANTLIB += ${COMPILER_LIBCXX} KF5Auth KF5Codecs KF5Completion +WANTLIB += KF5ConfigCore KF5ConfigGui KF5ConfigWidgets KF5CoreAddons +WANTLIB += KF5Crash KF5I18n KF5IconThemes KF5JobWidgets KF5KIOCore +WANTLIB += KF5KIOWidgets KF5Parts KF5Service KF5SonnetUi KF5TextWidgets +WANTLIB += KF5WidgetsAddons KF5XmlGui Qt5Concurrent Qt5Core Qt5DBus +WANTLIB += Qt5Gui Qt5Network Qt5PrintSupport Qt5Widgets Qt5Xml +WANTLIB += c m + +MODULES = devel/kf5 + +BUILD_DEPENDS += devel/gettext-tools \ + devel/kf5/kbookmarks \ + devel/kf5/kdoctools \ + +RUN_DEPENDS += devel/desktop-file-utils \ + devel/kf5/kbookmarks \ + devel/kf5/kdoctools \ + x11/gtk+3,-guic + +LIB_DEPENDS += devel/kf5/kauth \ + devel/kf5/kbookmarks \ + devel/kf5/kcodecs \ + devel/kf5/kcompletion \ + devel/kf5/kconfig \ + devel/kf5/kconfigwidgets \ + devel/kf5/kcoreaddons \ + devel/kf5/kcrash \ + devel/kf5/ki18n \ + devel/kf5/kiconthemes \ + devel/kf5/kio \ + devel/kf5/kparts \ + devel/kf5/kservice \ + devel/kf5/ktextwidgets \ + devel/kf5/kwidgetsaddons \ + devel/kf5/kxmlgui \ + devel/kf5/sonnet .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/devel/kdiff3/distinfo,v retrieving revision 1.4 diff -u -p -u -p -r1.4 distinfo --- distinfo 14 Mar 2016 23:50:50 -0000 1.4 +++ distinfo 14 May 2019 19:00:06 -0000 @@ -1,2 +1,2 @@ -SHA256 (kdiff3-0.9.98.tar.gz) = gCwauroCtAOl3KFZVcAVkplxFqJJCXRQFpMVNyEP1mg= -SIZE (kdiff3-0.9.98.tar.gz) = 1762715 +SHA256 (kdiff3-1.8.tar.xz) = pFzkkn8v5/CnbxfaXsfUBV4/zFHof7Q0gYkeHlj5dyA= +SIZE (kdiff3-1.8.tar.xz) = 897716 Index: patches/patch-src-QT4_kdiff3_pro =================================================================== RCS file: patches/patch-src-QT4_kdiff3_pro diff -N patches/patch-src-QT4_kdiff3_pro --- patches/patch-src-QT4_kdiff3_pro 2 Oct 2012 01:54:47 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,17 +0,0 @@ -$OpenBSD: patch-src-QT4_kdiff3_pro,v 1.2 2012/10/02 01:54:47 lteo Exp $ ---- src-QT4/kdiff3.pro.orig Sat Jul 14 06:27:14 2012 -+++ src-QT4/kdiff3.pro Thu Sep 27 00:29:53 2012 -@@ -64,11 +64,11 @@ os2 { - } - - unix { -- documentation.path = /usr/local/share/doc/kdiff3 -+ documentation.path = ${PREFIX}/share/doc/kdiff3 - documentation.files = ../doc/* - - INSTALLS += documentation - -- target.path = /usr/local/bin -+ target.path = ${PREFIX}/bin - INSTALLS += target - } Index: patches/patch-src-QT4_optiondialog_cpp =================================================================== RCS file: patches/patch-src-QT4_optiondialog_cpp diff -N patches/patch-src-QT4_optiondialog_cpp --- patches/patch-src-QT4_optiondialog_cpp 19 Aug 2011 07:12:11 -0000 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ -$OpenBSD: patch-src-QT4_optiondialog_cpp,v 1.1.1.1 2011/08/19 07:12:11 landry Exp $ ---- src-QT4/optiondialog.cpp.orig Wed Aug 17 22:02:08 2011 -+++ src-QT4/optiondialog.cpp Wed Aug 17 22:02:29 2011 -@@ -34,6 +34,7 @@ - #include <QPixmap> - #include <QFrame> - #include <QVBoxLayout> -+#include <QDir> - - #include <kapplication.h> - #include <kcolorbutton.h> Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/devel/kdiff3/pkg/PLIST,v retrieving revision 1.2 diff -u -p -u -p -r1.2 PLIST --- pkg/PLIST 14 Mar 2016 23:50:50 -0000 1.2 +++ pkg/PLIST 14 May 2019 19:00:06 -0000 @@ -1,94 +1,167 @@ @comment $OpenBSD: PLIST,v 1.2 2016/03/14 23:50:50 zhuk Exp $ @bin bin/kdiff3 -share/doc/kdiff3/ -share/doc/kdiff3/CMakeLists.txt -share/doc/kdiff3/README -share/doc/kdiff3/createpdfdoc -share/doc/kdiff3/da/ -share/doc/kdiff3/da/CMakeLists.txt -share/doc/kdiff3/da/index.docbook -share/doc/kdiff3/de/ -share/doc/kdiff3/de/CMakeLists.txt -share/doc/kdiff3/de/index.docbook -share/doc/kdiff3/en/ -share/doc/kdiff3/en/CMakeLists.txt -share/doc/kdiff3/en/common/ -share/doc/kdiff3/en/common/1.png -share/doc/kdiff3/en/common/10.png -share/doc/kdiff3/en/common/2.png -share/doc/kdiff3/en/common/3.png -share/doc/kdiff3/en/common/4.png -share/doc/kdiff3/en/common/5.png -share/doc/kdiff3/en/common/6.png -share/doc/kdiff3/en/common/7.png -share/doc/kdiff3/en/common/8.png -share/doc/kdiff3/en/common/9.png -share/doc/kdiff3/en/common/artistic-license.html -share/doc/kdiff3/en/common/block_title_bottom.png -share/doc/kdiff3/en/common/block_title_mid.png -share/doc/kdiff3/en/common/block_title_top.png -share/doc/kdiff3/en/common/bottom-left.png -share/doc/kdiff3/en/common/bottom-middle.png -share/doc/kdiff3/en/common/bottom-right.png -share/doc/kdiff3/en/common/bsd-license.html -share/doc/kdiff3/en/common/doxygen.css -share/doc/kdiff3/en/common/favicon.ico -share/doc/kdiff3/en/common/fdl-license -share/doc/kdiff3/en/common/fdl-license.html -share/doc/kdiff3/en/common/fdl-notice.html -share/doc/kdiff3/en/common/footer.html -share/doc/kdiff3/en/common/gpl-license -share/doc/kdiff3/en/common/gpl-license.html -share/doc/kdiff3/en/common/header.html -share/doc/kdiff3/en/common/kde-default.css -share/doc/kdiff3/en/common/kde_logo_bg.png -share/doc/kdiff3/en/common/lgpl-license -share/doc/kdiff3/en/common/lgpl-license.html -share/doc/kdiff3/en/common/mainfooter.html -share/doc/kdiff3/en/common/mainheader.html -share/doc/kdiff3/en/common/qpl-license.html -share/doc/kdiff3/en/common/tabs.css -share/doc/kdiff3/en/common/top-kde.jpg -share/doc/kdiff3/en/common/top-left.jpg -share/doc/kdiff3/en/common/top-left.png -share/doc/kdiff3/en/common/top-middle.png -share/doc/kdiff3/en/common/top-right.jpg -share/doc/kdiff3/en/common/top-right.png -share/doc/kdiff3/en/common/top.jpg -share/doc/kdiff3/en/common/x11-license.html -share/doc/kdiff3/en/common/xml.dcl -share/doc/kdiff3/en/dirbrowser.png -share/doc/kdiff3/en/dirmergebig.png -share/doc/kdiff3/en/index.docbook -share/doc/kdiff3/en/iteminfo.png -share/doc/kdiff3/en/kdiff3.1 -share/doc/kdiff3/en/letter_by_letter.png -share/doc/kdiff3/en/merge_current.png -share/doc/kdiff3/en/new.png -share/doc/kdiff3/en/open_dialog.png -share/doc/kdiff3/en/screenshot_diff.png -share/doc/kdiff3/en/screenshot_merge.png -share/doc/kdiff3/en/triple_diff.png -share/doc/kdiff3/en/white_space.png -share/doc/kdiff3/es/ -share/doc/kdiff3/es/CMakeLists.txt -share/doc/kdiff3/es/index.docbook -share/doc/kdiff3/et/ -share/doc/kdiff3/et/CMakeLists.txt -share/doc/kdiff3/et/index.docbook -share/doc/kdiff3/fr/ -share/doc/kdiff3/fr/CMakeLists.txt -share/doc/kdiff3/fr/index.docbook -share/doc/kdiff3/it/ -share/doc/kdiff3/it/CMakeLists.txt -share/doc/kdiff3/it/index.docbook -share/doc/kdiff3/nl/ -share/doc/kdiff3/nl/CMakeLists.txt -share/doc/kdiff3/nl/index.docbook -share/doc/kdiff3/pt/ -share/doc/kdiff3/pt/CMakeLists.txt -share/doc/kdiff3/pt/index.docbook -share/doc/kdiff3/sv/ -share/doc/kdiff3/sv/CMakeLists.txt -share/doc/kdiff3/sv/index.docbook -share/doc/kdiff3/update_doc_dir +lib/qt5/plugins/kf5/kfileitemaction/ +lib/qt5/plugins/kf5/kfileitemaction/kdiff3fileitemaction.so +lib/qt5/plugins/kf5/parts/ +lib/qt5/plugins/kf5/parts/kdiff3part.so +@man man/man1/kdiff3.1 +share/applications/org.kde.kdiff3.desktop +share/doc/HTML/en/kdiff3/ +share/doc/HTML/en/kdiff3/dirbrowser.png +share/doc/HTML/en/kdiff3/dirmergebig.png +share/doc/HTML/en/kdiff3/index.cache.bz2 +share/doc/HTML/en/kdiff3/index.docbook +share/doc/HTML/en/kdiff3/iteminfo.png +share/doc/HTML/en/kdiff3/letter_by_letter.png +share/doc/HTML/en/kdiff3/merge_current.png +share/doc/HTML/en/kdiff3/new.png +share/doc/HTML/en/kdiff3/open_dialog.png +share/doc/HTML/en/kdiff3/screenshot_diff.png +share/doc/HTML/en/kdiff3/screenshot_merge.png +share/doc/HTML/en/kdiff3/triple_diff.png +share/doc/HTML/en/kdiff3/white_space.png +share/doc/HTML/it/kdiff3/ +share/doc/HTML/it/kdiff3/index.cache.bz2 +share/doc/HTML/it/kdiff3/index.docbook +share/doc/HTML/nl/kdiff3/ +share/doc/HTML/nl/kdiff3/index.cache.bz2 +share/doc/HTML/nl/kdiff3/index.docbook +share/doc/HTML/uk/kdiff3/ +share/doc/HTML/uk/kdiff3/index.cache.bz2 +share/doc/HTML/uk/kdiff3/index.docbook +share/icons/hicolor/128x128/apps/kdiff3.png +share/icons/hicolor/16x16/apps/kdiff3.png +share/icons/hicolor/22x22/apps/kdiff3.png +share/icons/hicolor/256x256/apps/kdiff3.png +share/icons/hicolor/32x32/apps/kdiff3.png +share/icons/hicolor/48x48/apps/kdiff3.png +share/icons/hicolor/64x64/apps/kdiff3.png +share/icons/hicolor/scalable/apps/kdiff3.svgz +share/kservices5/ +share/kservices5/kdiff3part.desktop +share/kxmlgui5/ +share/kxmlgui5/kdiff3/ +share/kxmlgui5/kdiff3/kdiff3_shell.rc +share/kxmlgui5/kdiff3part/ +share/kxmlgui5/kdiff3part/kdiff3_part.rc +share/locale/ar/LC_MESSAGES/kdiff3.mo +share/locale/bg/LC_MESSAGES/kdiff3.mo +share/locale/br/LC_MESSAGES/kdiff3.mo +share/locale/bs/LC_MESSAGES/kdiff3.mo +share/locale/bs/LC_MESSAGES/kdiff3fileitemactionplugin.mo +share/locale/ca/LC_MESSAGES/diff_ext.mo +share/locale/ca/LC_MESSAGES/kdiff3.mo +share/locale/ca/LC_MESSAGES/kdiff3fileitemactionplugin.mo +share/locale/ca@valencia/LC_MESSAGES/diff_ext.mo +share/locale/ca@valencia/LC_MESSAGES/kdiff3.mo +share/locale/ca@valencia/LC_MESSAGES/kdiff3fileitemactionplugin.mo +share/locale/cs/LC_MESSAGES/diff_ext.mo +share/locale/cs/LC_MESSAGES/kdiff3.mo +share/locale/cs/LC_MESSAGES/kdiff3fileitemactionplugin.mo +share/locale/cy/LC_MESSAGES/kdiff3.mo +share/locale/da/LC_MESSAGES/kdiff3.mo +share/locale/da/LC_MESSAGES/kdiff3fileitemactionplugin.mo +share/locale/de/LC_MESSAGES/diff_ext.mo +share/locale/de/LC_MESSAGES/kdiff3.mo +share/locale/de/LC_MESSAGES/kdiff3fileitemactionplugin.mo +share/locale/el/LC_MESSAGES/kdiff3.mo +share/locale/el/LC_MESSAGES/kdiff3fileitemactionplugin.mo +share/locale/en_GB/LC_MESSAGES/diff_ext.mo +share/locale/en_GB/LC_MESSAGES/kdiff3.mo +share/locale/en_GB/LC_MESSAGES/kdiff3fileitemactionplugin.mo +share/locale/eo/LC_MESSAGES/kdiff3.mo +share/locale/es/LC_MESSAGES/diff_ext.mo +share/locale/es/LC_MESSAGES/kdiff3.mo +share/locale/es/LC_MESSAGES/kdiff3fileitemactionplugin.mo +share/locale/et/LC_MESSAGES/kdiff3.mo +share/locale/et/LC_MESSAGES/kdiff3fileitemactionplugin.mo +share/locale/eu/LC_MESSAGES/kdiff3.mo +share/locale/fi/LC_MESSAGES/diff_ext.mo +share/locale/fi/LC_MESSAGES/kdiff3.mo +share/locale/fi/LC_MESSAGES/kdiff3fileitemactionplugin.mo +share/locale/fr/LC_MESSAGES/diff_ext.mo +share/locale/fr/LC_MESSAGES/kdiff3.mo +share/locale/fr/LC_MESSAGES/kdiff3fileitemactionplugin.mo +share/locale/ga/LC_MESSAGES/kdiff3.mo +share/locale/ga/LC_MESSAGES/kdiff3fileitemactionplugin.mo +share/locale/gl/LC_MESSAGES/diff_ext.mo +share/locale/gl/LC_MESSAGES/kdiff3.mo +share/locale/gl/LC_MESSAGES/kdiff3fileitemactionplugin.mo +share/locale/hi/LC_MESSAGES/kdiff3.mo +share/locale/hne/LC_MESSAGES/kdiff3.mo +share/locale/hr/LC_MESSAGES/kdiff3.mo +share/locale/hu/LC_MESSAGES/kdiff3.mo +share/locale/hu/LC_MESSAGES/kdiff3fileitemactionplugin.mo +share/locale/is/LC_MESSAGES/kdiff3.mo +share/locale/it/LC_MESSAGES/diff_ext.mo +share/locale/it/LC_MESSAGES/kdiff3.mo +share/locale/it/LC_MESSAGES/kdiff3fileitemactionplugin.mo +share/locale/ja/LC_MESSAGES/diff_ext.mo +share/locale/ja/LC_MESSAGES/kdiff3.mo +share/locale/ja/LC_MESSAGES/kdiff3fileitemactionplugin.mo +share/locale/ka/LC_MESSAGES/kdiff3.mo +share/locale/ko/LC_MESSAGES/diff_ext.mo +share/locale/ko/LC_MESSAGES/kdiff3.mo +share/locale/ko/LC_MESSAGES/kdiff3fileitemactionplugin.mo +share/locale/lt/LC_MESSAGES/kdiff3.mo +share/locale/lt/LC_MESSAGES/kdiff3fileitemactionplugin.mo +share/locale/mai/LC_MESSAGES/kdiff3.mo +share/locale/ml/LC_MESSAGES/kdiff3.mo +share/locale/mr/LC_MESSAGES/kdiff3.mo +share/locale/mr/LC_MESSAGES/kdiff3fileitemactionplugin.mo +share/locale/nb/LC_MESSAGES/kdiff3.mo +share/locale/nb/LC_MESSAGES/kdiff3fileitemactionplugin.mo +share/locale/nds/LC_MESSAGES/kdiff3.mo +share/locale/nds/LC_MESSAGES/kdiff3fileitemactionplugin.mo +share/locale/nl/LC_MESSAGES/diff_ext.mo +share/locale/nl/LC_MESSAGES/kdiff3.mo +share/locale/nl/LC_MESSAGES/kdiff3fileitemactionplugin.mo +share/locale/nn/LC_MESSAGES/kdiff3.mo +share/locale/pl/LC_MESSAGES/diff_ext.mo +share/locale/pl/LC_MESSAGES/kdiff3.mo +share/locale/pl/LC_MESSAGES/kdiff3fileitemactionplugin.mo +share/locale/pt/LC_MESSAGES/diff_ext.mo +share/locale/pt/LC_MESSAGES/kdiff3.mo +share/locale/pt/LC_MESSAGES/kdiff3fileitemactionplugin.mo +share/locale/pt_BR/LC_MESSAGES/diff_ext.mo +share/locale/pt_BR/LC_MESSAGES/kdiff3.mo +share/locale/pt_BR/LC_MESSAGES/kdiff3fileitemactionplugin.mo +share/locale/ro/LC_MESSAGES/kdiff3.mo +share/locale/ro/LC_MESSAGES/kdiff3fileitemactionplugin.mo +share/locale/ru/LC_MESSAGES/kdiff3.mo +share/locale/ru/LC_MESSAGES/kdiff3fileitemactionplugin.mo +share/locale/rw/LC_MESSAGES/kdiff3.mo +share/locale/sk/LC_MESSAGES/diff_ext.mo +share/locale/sk/LC_MESSAGES/kdiff3.mo +share/locale/sk/LC_MESSAGES/kdiff3fileitemactionplugin.mo +share/locale/sl/LC_MESSAGES/kdiff3.mo +share/locale/sl/LC_MESSAGES/kdiff3fileitemactionplugin.mo +share/locale/sr/LC_MESSAGES/kdiff3.mo +share/locale/sr/LC_MESSAGES/kdiff3fileitemactionplugin.mo +share/locale/sr@ijekavian/LC_MESSAGES/kdiff3.mo +share/locale/sr@ijekavian/LC_MESSAGES/kdiff3fileitemactionplugin.mo +share/locale/sr@ijekavianlatin/LC_MESSAGES/kdiff3.mo +share/locale/sr@ijekavianlatin/LC_MESSAGES/kdiff3fileitemactionplugin.mo +share/locale/sr@latin/LC_MESSAGES/kdiff3.mo +share/locale/sr@latin/LC_MESSAGES/kdiff3fileitemactionplugin.mo +share/locale/sv/LC_MESSAGES/diff_ext.mo +share/locale/sv/LC_MESSAGES/kdiff3.mo +share/locale/sv/LC_MESSAGES/kdiff3fileitemactionplugin.mo +share/locale/ta/LC_MESSAGES/kdiff3.mo +share/locale/tg/LC_MESSAGES/kdiff3.mo +share/locale/tr/LC_MESSAGES/kdiff3.mo +share/locale/ug/LC_MESSAGES/kdiff3.mo +share/locale/ug/LC_MESSAGES/kdiff3fileitemactionplugin.mo +share/locale/uk/LC_MESSAGES/diff_ext.mo +share/locale/uk/LC_MESSAGES/kdiff3.mo +share/locale/uk/LC_MESSAGES/kdiff3fileitemactionplugin.mo +share/locale/zh_CN/LC_MESSAGES/diff_ext.mo +share/locale/zh_CN/LC_MESSAGES/kdiff3.mo +share/locale/zh_CN/LC_MESSAGES/kdiff3fileitemactionplugin.mo +share/locale/zh_TW/LC_MESSAGES/diff_ext.mo +share/locale/zh_TW/LC_MESSAGES/kdiff3.mo +share/locale/zh_TW/LC_MESSAGES/kdiff3fileitemactionplugin.mo +share/metainfo/ +share/metainfo/org.kde.kdiff3.appdata.xml +@tag update-desktop-database +@tag gtk-update-icon-cache %D/share/icons/hicolor
