Page MenuHomeFreeBSD
Files F148637366

D18016.id50921.diff
No OneTemporary
Actions

D18016.id50921.diff
View Options

Index: UPDATING
===================================================================
--- UPDATING
+++ UPDATING
@@ -5,6 +5,13 @@
You should get into the habit of checking this file for changes each time
you update your ports collection, before attempting any port upgrades.
+20181110:
+ AFFECTS: users of textproc/kdiff3
+ AUTHOR: kde@FreeBSD.org
+
+ textproc/kdiff3 has been replaced by a Qt5 based version. People who want
+ to stick with the Qt4 based one can switch to textproc/kdiff3-kde4.
+
20181111
AFFECTS: users of graphics/mesa-libs
AUTHOR: jbeich@FreeBSD.org
Index: textproc/kdiff3-kde4/Makefile
===================================================================
--- textproc/kdiff3-kde4/Makefile
+++ textproc/kdiff3-kde4/Makefile
@@ -3,8 +3,9 @@
PORTNAME= kdiff3
PORTVERSION= 0.9.98
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= textproc kde
+PKGNAMESUFFIX= -kde4
MASTER_SITES= SF
MAINTAINER= pizzamig@FreeBSD.org
Index: textproc/kdiff3/Makefile
===================================================================
--- textproc/kdiff3/Makefile
+++ textproc/kdiff3/Makefile
@@ -1,30 +1,28 @@
-# Created by: Heiner Eichmann <h.eichmann@gmx.de>
# $FreeBSD$
PORTNAME= kdiff3
-PORTVERSION= 0.9.98
-PORTREVISION= 2
+DISTVERSION= 1.7.90.20181029
CATEGORIES= textproc kde
-MASTER_SITES= SF
-MAINTAINER= pizzamig@FreeBSD.org
-COMMENT= KDE4 graphical frontend for diff
+MAINTAINER= kde@FreeBSD.org
+COMMENT= KDE graphical frontend for diff
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= cmake:outsource kde:4 qt:4
-USE_KDE= kdelibs libkonq automoc4
-USE_QT= moc_build qmake_build rcc_build uic_build
+USES= cmake:outsource kde:5 qt:5
+USE_GITHUB= yes
+GH_ACCOUNT= KDE
+GH_TAGNAME= 42403aa
+USE_KDE= auth bookmarks codecs completion config configwidgets \
+ coreaddons crash ecm i18n iconthemes jobwidgets kio \
+ parts service sonnet textwidgets widgetsaddons xmlgui
+USE_QT= concurrent core dbus gui network printsupport widgets xml \
+ buildtools_build qmake_build
-OPTIONS_DEFINE= NLS DOCS
+CONFLICTS_INSTALL= kdiff-kde4
-OPTIONS_SUB= yes
-
-NLS_USES= gettext
-NLS_CMAKE_OFF= -DBUILD_po:BOOL=FALSE
-NLS_CMAKE_ON= -DBUILD_po:BOOL=TRUE
-DOCS_CMAKE_OFF= -DBUILD_doc:BOOL=FALSE
-DOCS_CMAKE_ON= -DBUILD_doc:BOOL=TRUE
+OPTIONS_DEFINE= DOCS
+DOCSDIR_REL= share/doc/HTML
.include <bsd.port.mk>
Index: textproc/kdiff3/distinfo
===================================================================
--- textproc/kdiff3/distinfo
+++ textproc/kdiff3/distinfo
@@ -1,2 +1,3 @@
-SHA256 (kdiff3-0.9.98.tar.gz) = 802c1ababa02b403a5dca15955c01592997116a24909745016931537210fd668
-SIZE (kdiff3-0.9.98.tar.gz) = 1762715
+TIMESTAMP = 1541075987
+SHA256 (KDE-kdiff3-1.7.90.20181029-42403aa_GH0.tar.gz) = be36ccbc0f0f7c689733306b64ba8b31be61534aafb8a362165b87c55269f183
+SIZE (KDE-kdiff3-1.7.90.20181029-42403aa_GH0.tar.gz) = 392206
Index: textproc/kdiff3/files/patch-CMakeLists.txt
===================================================================
--- textproc/kdiff3/files/patch-CMakeLists.txt
+++ textproc/kdiff3/files/patch-CMakeLists.txt
@@ -1,31 +0,0 @@
---- CMakeLists.txt.orig 2011-08-27 12:48:36.000000000 +0200
-+++ CMakeLists.txt 2014-01-14 15:16:41.070645341 +0100
-@@ -20,8 +20,26 @@
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config-kdiff3.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kdiff3.h )
-
- add_subdirectory(src-QT4)
--add_subdirectory(po)
--add_subdirectory(doc)
-+if(BUILD_po)
-+ message(STATUS "")
-+ message(STATUS "NLS activated ")
-+ message(STATUS "")
-+ add_subdirectory(po)
-+else(BUILD_po)
-+ message(STATUS "")
-+ message(STATUS "NLS deactivated ")
-+ message(STATUS "")
-+endif(BUILD_po)
-+if(BUILD_doc)
-+ message(STATUS "")
-+ message(STATUS "DOCS activated ")
-+ message(STATUS "")
-+ add_subdirectory(doc)
-+else(BUILD_doc)
-+ message(STATUS "")
-+ message(STATUS "DOCS deactivated ")
-+ message(STATUS "")
-+endif(BUILD_doc)
-
-
- find_file(KFILEITEMACTIONPLUGIN_FOUND kfileitemactionplugin.h PATHS ${KDE4_INCLUDE_DIR} NO_DEFAULT_PATH)
Index: textproc/kdiff3/pkg-plist
===================================================================
--- textproc/kdiff3/pkg-plist
+++ textproc/kdiff3/pkg-plist
@@ -1,156 +1,24 @@
bin/kdiff3
-lib/kde4/kdiff3fileitemaction.so
-share/applications/kde4/kdiff3.desktop
-share/apps/kdiff3/kdiff3_shell.rc
-share/apps/kdiff3part/kdiff3_part.rc
-%%PORTDOCS%%share/doc/HTML/da/kdiff3/common
-%%PORTDOCS%%share/doc/HTML/da/kdiff3/index.cache.bz2
-%%PORTDOCS%%share/doc/HTML/da/kdiff3/index.docbook
-%%PORTDOCS%%share/doc/HTML/de/kdiff3/common
-%%PORTDOCS%%share/doc/HTML/de/kdiff3/index.cache.bz2
-%%PORTDOCS%%share/doc/HTML/de/kdiff3/index.docbook
-%%PORTDOCS%%share/doc/HTML/en/kdiff3/common
-%%PORTDOCS%%share/doc/HTML/en/kdiff3/dirbrowser.png
-%%PORTDOCS%%share/doc/HTML/en/kdiff3/dirmergebig.png
-%%PORTDOCS%%share/doc/HTML/en/kdiff3/index.cache.bz2
-%%PORTDOCS%%share/doc/HTML/en/kdiff3/index.docbook
-%%PORTDOCS%%share/doc/HTML/en/kdiff3/iteminfo.png
-%%PORTDOCS%%share/doc/HTML/en/kdiff3/letter_by_letter.png
-%%PORTDOCS%%share/doc/HTML/en/kdiff3/merge_current.png
-%%PORTDOCS%%share/doc/HTML/en/kdiff3/new.png
-%%PORTDOCS%%share/doc/HTML/en/kdiff3/open_dialog.png
-%%PORTDOCS%%share/doc/HTML/en/kdiff3/screenshot_diff.png
-%%PORTDOCS%%share/doc/HTML/en/kdiff3/screenshot_merge.png
-%%PORTDOCS%%share/doc/HTML/en/kdiff3/triple_diff.png
-%%PORTDOCS%%share/doc/HTML/en/kdiff3/white_space.png
-%%PORTDOCS%%share/doc/HTML/es/kdiff3/common
-%%PORTDOCS%%share/doc/HTML/es/kdiff3/index.cache.bz2
-%%PORTDOCS%%share/doc/HTML/es/kdiff3/index.docbook
-%%PORTDOCS%%share/doc/HTML/et/kdiff3/common
-%%PORTDOCS%%share/doc/HTML/et/kdiff3/index.cache.bz2
-%%PORTDOCS%%share/doc/HTML/et/kdiff3/index.docbook
-%%PORTDOCS%%share/doc/HTML/fr/kdiff3/common
-%%PORTDOCS%%share/doc/HTML/fr/kdiff3/index.cache.bz2
-%%PORTDOCS%%share/doc/HTML/fr/kdiff3/index.docbook
-%%PORTDOCS%%share/doc/HTML/it/kdiff3/common
-%%PORTDOCS%%share/doc/HTML/it/kdiff3/index.cache.bz2
-%%PORTDOCS%%share/doc/HTML/it/kdiff3/index.docbook
-%%PORTDOCS%%share/doc/HTML/nl/kdiff3/common
-%%PORTDOCS%%share/doc/HTML/nl/kdiff3/index.cache.bz2
-%%PORTDOCS%%share/doc/HTML/nl/kdiff3/index.docbook
-%%PORTDOCS%%share/doc/HTML/pt/kdiff3/common
-%%PORTDOCS%%share/doc/HTML/pt/kdiff3/index.cache.bz2
-%%PORTDOCS%%share/doc/HTML/pt/kdiff3/index.docbook
+%%QT_PLUGINDIR%%/kf5/kfileitemaction/kdiff3fileitemaction.so
+%%QT_PLUGINDIR%%/kf5/parts/kdiff3part.so
+man/man1/kdiff3.1.gz
+share/appdata/org.kde.kdiff3.appdata.xml
+share/applications/org.kde.kdiff3.desktop
+%%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
share/icons/hicolor/16x16/apps/kdiff3.png
share/icons/hicolor/32x32/apps/kdiff3.png
-share/icons/locolor/16x16/apps/kdiff3.png
-share/icons/locolor/32x32/apps/kdiff3.png
-share/kde4/services/kdiff3part.desktop
-share/kde4/services/kdiff3fileitemaction.desktop
-%%NLS%%share/locale/ar/LC_MESSAGES/kdiff3.mo
-%%NLS%%share/locale/bg/LC_MESSAGES/kdiff3.mo
-%%NLS%%share/locale/br/LC_MESSAGES/kdiff3.mo
-%%NLS%%share/locale/bs/LC_MESSAGES/kdiff3.mo
-%%NLS%%share/locale/bs/LC_MESSAGES/kdiff3fileitemactionplugin.mo
-%%NLS%%share/locale/bs/LC_MESSAGES/kdiff3plugin.mo
-%%NLS%%share/locale/ca/LC_MESSAGES/kdiff3.mo
-%%NLS%%share/locale/ca/LC_MESSAGES/kdiff3fileitemactionplugin.mo
-%%NLS%%share/locale/ca/LC_MESSAGES/kdiff3plugin.mo
-%%NLS%%share/locale/ca@valencia/LC_MESSAGES/kdiff3.mo
-%%NLS%%share/locale/ca@valencia/LC_MESSAGES/kdiff3plugin.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/kdiff3.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/kdiff3plugin.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/kdiff3fileitemactionplugin.mo
-%%NLS%%share/locale/cy/LC_MESSAGES/kdiff3.mo
-%%NLS%%share/locale/da/LC_MESSAGES/kdiff3.mo
-%%NLS%%share/locale/da/LC_MESSAGES/kdiff3fileitemactionplugin.mo
-%%NLS%%share/locale/da/LC_MESSAGES/kdiff3plugin.mo
-%%NLS%%share/locale/de/LC_MESSAGES/kdiff3.mo
-%%NLS%%share/locale/de/LC_MESSAGES/kdiff3plugin.mo
-%%NLS%%share/locale/de/LC_MESSAGES/kdiff3fileitemactionplugin.mo
-%%NLS%%share/locale/el/LC_MESSAGES/kdiff3.mo
-%%NLS%%share/locale/el/LC_MESSAGES/kdiff3plugin.mo
-%%NLS%%share/locale/el/LC_MESSAGES/kdiff3fileitemactionplugin.mo
-%%NLS%%share/locale/en_GB/LC_MESSAGES/kdiff3.mo
-%%NLS%%share/locale/en_GB/LC_MESSAGES/kdiff3plugin.mo
-%%NLS%%share/locale/eo/LC_MESSAGES/kdiff3.mo
-%%NLS%%share/locale/eo/LC_MESSAGES/kdiff3plugin.mo
-%%NLS%%share/locale/es/LC_MESSAGES/kdiff3.mo
-%%NLS%%share/locale/es/LC_MESSAGES/kdiff3plugin.mo
-%%NLS%%share/locale/es/LC_MESSAGES/kdiff3fileitemactionplugin.mo
-%%NLS%%share/locale/et/LC_MESSAGES/kdiff3.mo
-%%NLS%%share/locale/et/LC_MESSAGES/kdiff3plugin.mo
-%%NLS%%share/locale/et/LC_MESSAGES/kdiff3fileitemactionplugin.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/kdiff3fileitemactionplugin.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/kdiff3.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/kdiff3plugin.mo
-%%NLS%%share/locale/ga/LC_MESSAGES/kdiff3.mo
-%%NLS%%share/locale/ga/LC_MESSAGES/kdiff3plugin.mo
-%%NLS%%share/locale/gl/LC_MESSAGES/kdiff3.mo
-%%NLS%%share/locale/gl/LC_MESSAGES/kdiff3plugin.mo
-%%NLS%%share/locale/hi/LC_MESSAGES/kdiff3.mo
-%%NLS%%share/locale/hne/LC_MESSAGES/kdiff3.mo
-%%NLS%%share/locale/hr/LC_MESSAGES/kdiff3.mo
-%%NLS%%share/locale/hr/LC_MESSAGES/kdiff3plugin.mo
-%%NLS%%share/locale/hu/LC_MESSAGES/kdiff3.mo
-%%NLS%%share/locale/hu/LC_MESSAGES/kdiff3plugin.mo
-%%NLS%%share/locale/is/LC_MESSAGES/kdiff3.mo
-%%NLS%%share/locale/is/LC_MESSAGES/kdiff3plugin.mo
-%%NLS%%share/locale/it/LC_MESSAGES/kdiff3.mo
-%%NLS%%share/locale/it/LC_MESSAGES/kdiff3fileitemactionplugin.mo
-%%NLS%%share/locale/it/LC_MESSAGES/kdiff3plugin.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/kdiff3.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/kdiff3fileitemactionplugin.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/kdiff3plugin.mo
-%%NLS%%share/locale/ka/LC_MESSAGES/kdiff3.mo
-%%NLS%%share/locale/lt/LC_MESSAGES/kdiff3.mo
-%%NLS%%share/locale/lt/LC_MESSAGES/kdiff3plugin.mo
-%%NLS%%share/locale/mai/LC_MESSAGES/kdiff3.mo
-%%NLS%%share/locale/ml/LC_MESSAGES/kdiff3.mo
-%%NLS%%share/locale/ml/LC_MESSAGES/kdiff3plugin.mo
-%%NLS%%share/locale/nb/LC_MESSAGES/kdiff3.mo
-%%NLS%%share/locale/nb/LC_MESSAGES/kdiff3plugin.mo
-%%NLS%%share/locale/nb/LC_MESSAGES/kdiff3fileitemactionplugin.mo
-%%NLS%%share/locale/nds/LC_MESSAGES/kdiff3.mo
-%%NLS%%share/locale/nds/LC_MESSAGES/kdiff3plugin.mo
-%%NLS%%share/locale/nds/LC_MESSAGES/kdiff3fileitemactionplugin.mo
-%%NLS%%share/locale/nl/LC_MESSAGES/kdiff3.mo
-%%NLS%%share/locale/nl/LC_MESSAGES/kdiff3plugin.mo
-%%NLS%%share/locale/nl/LC_MESSAGES/kdiff3fileitemactionplugin.mo
-%%NLS%%share/locale/nn/LC_MESSAGES/kdiff3.mo
-%%NLS%%share/locale/nn/LC_MESSAGES/kdiff3plugin.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/kdiff3.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/kdiff3fileitemactionplugin.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/kdiff3plugin.mo
-%%NLS%%share/locale/pt/LC_MESSAGES/kdiff3.mo
-%%NLS%%share/locale/pt/LC_MESSAGES/kdiff3plugin.mo
-%%NLS%%share/locale/pt/LC_MESSAGES/kdiff3fileitemactionplugin.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/kdiff3.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/kdiff3plugin.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/kdiff3fileitemactionplugin.mo
-%%NLS%%share/locale/ro/LC_MESSAGES/kdiff3.mo
-%%NLS%%share/locale/ro/LC_MESSAGES/kdiff3plugin.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/kdiff3.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/kdiff3fileitemactionplugin.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/kdiff3plugin.mo
-%%NLS%%share/locale/rw/LC_MESSAGES/kdiff3.mo
-%%NLS%%share/locale/sk/LC_MESSAGES/kdiff3.mo
-%%NLS%%share/locale/sk/LC_MESSAGES/kdiff3fileitemactionplugin.mo
-%%NLS%%share/locale/sk/LC_MESSAGES/kdiff3plugin.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/kdiff3.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/kdiff3plugin.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/kdiff3fileitemactionplugin.mo
-%%NLS%%share/locale/ta/LC_MESSAGES/kdiff3.mo
-%%NLS%%share/locale/tg/LC_MESSAGES/kdiff3.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/kdiff3.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/kdiff3plugin.mo
-%%NLS%%share/locale/ug/LC_MESSAGES/kdiff3.mo
-%%NLS%%share/locale/ug/LC_MESSAGES/kdiff3plugin.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/kdiff3.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/kdiff3plugin.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/kdiff3fileitemactionplugin.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/kdiff3.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/kdiff3plugin.mo
-%%NLS%%share/locale/zh_TW/LC_MESSAGES/kdiff3.mo
-%%NLS%%share/locale/zh_TW/LC_MESSAGES/kdiff3fileitemactionplugin.mo
-%%NLS%%share/locale/zh_TW/LC_MESSAGES/kdiff3plugin.mo
+share/kservices5/kdiff3part.desktop
+share/kxmlgui5/kdiff3/kdiff3_shell.rc
+share/kxmlgui5/kdiff3part/kdiff3_part.rc

File Metadata

Mime Type
text/plain
Expires
Fri, Mar 20, 7:14 AM (15 h, 58 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
30006282
Default Alt Text
D18016.id50921.diff (12 KB)

Event Timeline