Index: archivers/ark/Makefile =================================================================== --- archivers/ark/Makefile +++ archivers/ark/Makefile @@ -2,19 +2,18 @@ # $FreeBSD$ PORTNAME= ark -PORTVERSION= ${KDE4_VERSION} -PORTREVISION= 1 -CATEGORIES= archivers kde kde-kde4 +PORTVERSION= ${KDE_APPLICATIONS_VERSION} +CATEGORIES= archivers kde kde-applications MAINTAINER= kde@FreeBSD.org COMMENT= Archiving tool for KDE LIB_DEPENDS= libqjson.so:devel/qjson -USES= cmake:outsource kde:4 libarchive cpe tar:xz -USE_KDE= automoc4 kdelibs libkonq -CPE_VENDOR= kde -USE_QT4= qtestlib qmake_build moc_build rcc_build uic_build +USES= cmake:outsource gettext libarchive kde:5 tar:xz +USE_KDE= archive config crash dbusaddons doctools ecm i18n iconthemes \ + khtml kio pty service widgetsaddons +USE_QT5= buildtools_build core gui widgets qmake_build USE_LDCONFIG= yes OPTIONS_DEFINE= 7ZIP RAR ZIP Index: archivers/ark/distinfo =================================================================== --- archivers/ark/distinfo +++ archivers/ark/distinfo @@ -1,2 +1,3 @@ -SHA256 (KDE/4.14.3/ark-4.14.3.tar.xz) = cb2ef7ea9bbfccf3b16a1242681b33c1e6c17a7458f50f0703e87678a249b8dc -SIZE (KDE/4.14.3/ark-4.14.3.tar.xz) = 236116 +TIMESTAMP = 1486501513 +SHA256 (KDE/applications/16.12.2/ark-16.12.2.tar.xz) = 23d346f331de8d3bce14ce073244f79f99321bf59c037e3a229d398b6511571e +SIZE (KDE/applications/16.12.2/ark-16.12.2.tar.xz) = 1348476 Index: archivers/ark/files/patch-git_cd8ad27 =================================================================== --- archivers/ark/files/patch-git_cd8ad27 +++ /dev/null @@ -1,71 +0,0 @@ -commit cd8ad2761d41d1ec0a18cff7f4d166b53c899fc2 -Author: Raphael Kubo da Costa -Date: Mon Nov 24 01:37:06 2014 +0200 - - Stop crashing on exit when being used solely as a KPart. - - This change fixes a crash introduced by commit 3b981ca ("Remove Part - from KXMLGUIFactory on exit"). - - Part::~Part() is the wrong place to call KXMLGUIFactory::removeClient(), - as it assumes addClient() had been called in the first place. - - This is only true if Ark is called as a standalone program, since that - is done in MainWindow::loadPart()'s call to KXMLGuiWindow::createGUI(). - - Conversely, if the Ark KPart is being used as an embedded viewer in, - say, Konqueror or to preview an archive inside an archive (ie. Ark - inside Ark) that does not hold true and we try to access a - KXMLGUIFactory that does not exist. - - Instead, call KXMLGuiWindow::removeClient() in MainWindow's destructor, - since in this case we are certain that addClient() was been called - before. - - CCBUG: 341187 - - (cherry picked from commit 9c30f30b38c36a31e6fcb3aa047a0247ac5a22fb) - This was committed for completeness, as there will be no additional - releases from the KDE/4.14 branch. - - Conflicts: - part/part.cpp - ---- app/mainwindow.cpp.orig 2014-10-25 12:53:24 UTC -+++ app/mainwindow.cpp -@@ -38,6 +38,7 @@ - #include - #include - #include -+#include - - #include - #include -@@ -69,6 +70,8 @@ MainWindow::~MainWindow() - if (m_recentFilesAction) { - m_recentFilesAction->saveEntries(KGlobal::config()->group("Recent Files")); - } -+ -+ guiFactory()->removeClient(m_part); - delete m_part; - m_part = 0; - } ---- part/part.cpp.orig 2014-10-25 12:53:24 UTC -+++ part/part.cpp -@@ -53,7 +53,6 @@ - #include - #include - #include --#include - - #include - #include -@@ -138,8 +137,6 @@ Part::Part(QWidget *parentWidget, QObjec - - Part::~Part() - { -- factory()->removeClient(this); -- - saveSplitterSizes(); - - m_extractFilesAction->menu()->deleteLater(); Index: archivers/ark/pkg-plist =================================================================== --- archivers/ark/pkg-plist +++ archivers/ark/pkg-plist @@ -1,46 +1,37 @@ bin/ark -lib/kde4/arkpart.so -lib/kde4/kerfuffle_cli7z.so -lib/kde4/kerfuffle_clilha.so -lib/kde4/kerfuffle_clirar.so -lib/kde4/kerfuffle_clizip.so -lib/kde4/kerfuffle_libarchive.so -lib/kde4/kerfuffle_libbz2.so -lib/kde4/kerfuffle_libgz.so -lib/kde4/kerfuffle_libxz.so -lib/kde4/libextracthere.so -lib/libkerfuffle.so -lib/libkerfuffle.so.4 -lib/libkerfuffle.so.%%KDE4_GENERIC_LIB_VERSION%% +etc/xdg/ark.categories +lib/libkerfuffle.so.16 +lib/libkerfuffle.so.%%KDE_APPLICATIONS_VERSION%% +%%QT_PLUGINDIR%%/arkpart.so +%%QT_PLUGINDIR%%/kerfuffle/kerfuffle_cli7z.so +%%QT_PLUGINDIR%%/kerfuffle/kerfuffle_clirar.so +%%QT_PLUGINDIR%%/kerfuffle/kerfuffle_cliunarchiver.so +%%QT_PLUGINDIR%%/kerfuffle/kerfuffle_clizip.so +%%QT_PLUGINDIR%%/kerfuffle/kerfuffle_libarchive.so +%%QT_PLUGINDIR%%/kerfuffle/kerfuffle_libarchive_readonly.so +%%QT_PLUGINDIR%%/kerfuffle/kerfuffle_libbz2.so +%%QT_PLUGINDIR%%/kerfuffle/kerfuffle_libgz.so +%%QT_PLUGINDIR%%/kerfuffle/kerfuffle_libxz.so +%%QT_PLUGINDIR%%/kf5/kfileitemaction/compressfileitemaction.so +%%QT_PLUGINDIR%%/kf5/kfileitemaction/extractfileitemaction.so +%%QT_PLUGINDIR%%/kf5/kio_dnd/extracthere.so man/man1/ark.1.gz -share/appdata/ark.appdata.xml -share/applications/kde4/ark.desktop -share/apps/ark/ark_part.rc -share/apps/ark/arkui.rc +share/applications/org.kde.ark.desktop share/config.kcfg/ark.kcfg +share/doc/HTML/en/ark/create-archive.png +share/doc/HTML/en/ark/create-protected-archive.png +share/doc/HTML/en/ark/ark-comment.png share/doc/HTML/en/ark/ark-mainwindow.png -share/doc/HTML/en/ark/common +share/doc/HTML/en/ark/extract-dialog.png share/doc/HTML/en/ark/index.cache.bz2 share/doc/HTML/en/ark/index.docbook -share/doc/HTML/en/ark/man-ark.1.docbook share/icons/hicolor/128x128/apps/ark.png -share/icons/hicolor/16x16/apps/ark.png -share/icons/hicolor/22x22/apps/ark.png -share/icons/hicolor/32x32/apps/ark.png share/icons/hicolor/48x48/apps/ark.png share/icons/hicolor/64x64/apps/ark.png share/icons/hicolor/scalable/apps/ark.svgz -share/kde4/services/ServiceMenus/ark_addtoservicemenu.desktop -share/kde4/services/ServiceMenus/ark_servicemenu.desktop -share/kde4/services/ark_dndextract.desktop -share/kde4/services/ark_part.desktop -share/kde4/services/kerfuffle_cli7z.desktop -share/kde4/services/kerfuffle_clilha.desktop -share/kde4/services/kerfuffle_clirar.desktop -share/kde4/services/kerfuffle_clizip.desktop -share/kde4/services/kerfuffle_libarchive.desktop -share/kde4/services/kerfuffle_libarchive_readonly.desktop -share/kde4/services/kerfuffle_libbz2.desktop -share/kde4/services/kerfuffle_libgz.desktop -share/kde4/services/kerfuffle_libxz.desktop -share/kde4/servicetypes/kerfufflePlugin.desktop +share/kservices5/ark_part.desktop +share/kservicetypes5/kerfufflePlugin.desktop +share/kxmlgui5/ark/ark_part.rc +share/kxmlgui5/ark/arkui.rc +share/metainfo/org.kde.ark.appdata.xml +share/mime/packages/kerfuffle.xml