diff --git a/textproc/kdiff3/Makefile b/textproc/kdiff3/Makefile index c6c3e7d0c268..2d91bb4efb80 100644 --- a/textproc/kdiff3/Makefile +++ b/textproc/kdiff3/Makefile @@ -1,29 +1,28 @@ PORTNAME= kdiff3 -DISTVERSION= 1.9.6 -PORTREVISION= 2 +DISTVERSION= 1.10.0 CATEGORIES= textproc kde MASTER_SITES= KDE/stable/${PORTNAME} MAINTAINER= kde@FreeBSD.org COMMENT= KDE graphical frontend for diff WWW= http://kdiff3.sourceforge.net/ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ${LOCALBASE}/include/boost/range/algorithm.hpp:devel/boost-libs USES= cmake compiler:c++11-lang kde:5 qt:5 tar:xz xorg USE_KDE= auth bookmarks codecs completion config configwidgets \ coreaddons crash i18n iconthemes jobwidgets kio \ parts service solid sonnet textwidgets widgetsaddons windowsystem \ xmlgui \ doctools:build ecm:build USE_QT= concurrent core dbus gui network printsupport widgets xml \ buildtools:build qmake:build USE_XORG= x11 OPTIONS_DEFINE= DOCS DOCSDIR_REL= share/doc/HTML .include diff --git a/textproc/kdiff3/distinfo b/textproc/kdiff3/distinfo index 1d2af939eba9..8f777f268e0c 100644 --- a/textproc/kdiff3/distinfo +++ b/textproc/kdiff3/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1656437560 -SHA256 (kdiff3-1.9.6.tar.xz) = ac922476f850613a739284e3faf477c98ac349ad15a737a2b72ded8451f6b2bc -SIZE (kdiff3-1.9.6.tar.xz) = 1059880 +TIMESTAMP = 1673373292 +SHA256 (kdiff3-1.10.0.tar.xz) = acddb30b8a067e17477105bcdf67d75ff8bdd1b1f0ebd840063b841067252eae +SIZE (kdiff3-1.10.0.tar.xz) = 1074824 diff --git a/textproc/kdiff3/files/patch-CMakeLists.txt b/textproc/kdiff3/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..ee79e462d35b --- /dev/null +++ b/textproc/kdiff3/files/patch-CMakeLists.txt @@ -0,0 +1,11 @@ +--- CMakeLists.txt.orig 2023-01-11 06:42:35 UTC ++++ CMakeLists.txt +@@ -48,7 +48,7 @@ include(ECMOptionalAddSubdirectory) + include(ECMAddTests) + include(ECMOptionalAddSubdirectory) + +-ecm_setup_version(1.9.70 VARIABLE_PREFIX KDIFF3 VERSION_HEADER ${CMAKE_BINARY_DIR}/src/version.h) ++ecm_setup_version(1.10.0 VARIABLE_PREFIX KDIFF3 VERSION_HEADER ${CMAKE_BINARY_DIR}/src/version.h) + + # Some older versions on boost contain a bug that prevents compiling gcc offers a built-in workaround + # but that isn't enough to ship as clang has no such workaround. 1.65 is known to be affected. diff --git a/textproc/kdiff3/pkg-plist b/textproc/kdiff3/pkg-plist index 6c888c2e00ae..9ed42c41be79 100644 --- a/textproc/kdiff3/pkg-plist +++ b/textproc/kdiff3/pkg-plist @@ -1,177 +1,183 @@ bin/kdiff3 %%QT_PLUGINDIR%%/kf5/kfileitemaction/kdiff3fileitemaction.so %%QT_PLUGINDIR%%/kf5/parts/kdiff3part.so man/ca/man1/kdiff3.1.gz man/de/man1/kdiff3.1.gz man/es/man1/kdiff3.1.gz man/it/man1/kdiff3.1.gz man/man1/kdiff3.1.gz man/nl/man1/kdiff3.1.gz man/sv/man1/kdiff3.1.gz man/uk/man1/kdiff3.1.gz share/applications/org.kde.kdiff3.desktop %%PORTDOCS%%%%DOCSDIR%%/ca/kdiff3/index.cache.bz2 %%PORTDOCS%%%%DOCSDIR%%/ca/kdiff3/index.docbook %%PORTDOCS%%%%DOCSDIR%%/ca/kdiff3/open_dialog.png %%PORTDOCS%%%%DOCSDIR%%/de/kdiff3/index.cache.bz2 %%PORTDOCS%%%%DOCSDIR%%/de/kdiff3/index.docbook %%PORTDOCS%%%%DOCSDIR%%/en/kdiff3/dirbrowser.png %%PORTDOCS%%%%DOCSDIR%%/en/kdiff3/dirmergebig.png %%PORTDOCS%%%%DOCSDIR%%/en/kdiff3/index.cache.bz2 %%PORTDOCS%%%%DOCSDIR%%/en/kdiff3/index.docbook %%PORTDOCS%%%%DOCSDIR%%/en/kdiff3/iteminfo.png %%PORTDOCS%%%%DOCSDIR%%/en/kdiff3/letter_by_letter.png %%PORTDOCS%%%%DOCSDIR%%/en/kdiff3/merge_current.png %%PORTDOCS%%%%DOCSDIR%%/en/kdiff3/new.png %%PORTDOCS%%%%DOCSDIR%%/en/kdiff3/open_dialog.png %%PORTDOCS%%%%DOCSDIR%%/en/kdiff3/screenshot_diff.png %%PORTDOCS%%%%DOCSDIR%%/en/kdiff3/screenshot_merge.png %%PORTDOCS%%%%DOCSDIR%%/en/kdiff3/triple_diff.png %%PORTDOCS%%%%DOCSDIR%%/en/kdiff3/white_space.png %%PORTDOCS%%%%DOCSDIR%%/es/kdiff3/index.cache.bz2 %%PORTDOCS%%%%DOCSDIR%%/es/kdiff3/index.docbook %%PORTDOCS%%%%DOCSDIR%%/it/kdiff3/index.cache.bz2 %%PORTDOCS%%%%DOCSDIR%%/it/kdiff3/index.docbook %%PORTDOCS%%%%DOCSDIR%%/nl/kdiff3/index.cache.bz2 %%PORTDOCS%%%%DOCSDIR%%/nl/kdiff3/index.docbook %%PORTDOCS%%%%DOCSDIR%%/sv/kdiff3/index.cache.bz2 %%PORTDOCS%%%%DOCSDIR%%/sv/kdiff3/index.docbook %%PORTDOCS%%%%DOCSDIR%%/uk/kdiff3/index.cache.bz2 %%PORTDOCS%%%%DOCSDIR%%/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/kdiff3part.desktop share/kxmlgui5/kdiff3/kdiff3_shell.rc share/kxmlgui5/kdiff3part/kdiff3_part.rc share/locale/ar/LC_MESSAGES/kdiff3.mo +share/locale/bg/LC_MESSAGES/diff_ext.mo share/locale/bg/LC_MESSAGES/kdiff3.mo +share/locale/bg/LC_MESSAGES/kdiff3fileitemactionplugin.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/diff_ext.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/diff_ext.mo share/locale/et/LC_MESSAGES/kdiff3.mo share/locale/et/LC_MESSAGES/kdiff3fileitemactionplugin.mo share/locale/eu/LC_MESSAGES/diff_ext.mo share/locale/eu/LC_MESSAGES/kdiff3.mo share/locale/eu/LC_MESSAGES/kdiff3fileitemactionplugin.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/ia/LC_MESSAGES/diff_ext.mo share/locale/ia/LC_MESSAGES/kdiff3.mo share/locale/ia/LC_MESSAGES/kdiff3fileitemactionplugin.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/diff_ext.mo share/locale/ka/LC_MESSAGES/kdiff3.mo +share/locale/ka/LC_MESSAGES/kdiff3fileitemactionplugin.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/nn/LC_MESSAGES/kdiff3fileitemactionplugin.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/diff_ext.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/diff_ext.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/diff_ext.mo share/locale/tr/LC_MESSAGES/kdiff3.mo +share/locale/tr/LC_MESSAGES/kdiff3fileitemactionplugin.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/org.kde.kdiff3.appdata.xml