5 files changed, 82 insertions, 52 deletions

diff --git a/deskutils/basket/Makefile b/deskutils/basket/Makefile
index 2e007df47db0..1654276c98dc 100644
--- a/deskutils/basket/Makefile
+++ b/deskutils/basket/Makefile
@@ -2,26 +2,33 @@
 # $FreeBSD$
 
 PORTNAME=	basket
-PORTVERSION=	1.81
-PORTREVISION=	9
+DISTVERSIONPREFIX=	v
+DISTVERSION=	2.49a-46
+DISTVERSIONSUFFIX=	-g60e38c6
 CATEGORIES=	deskutils kde
-MASTER_SITES=	http://basket.kde.org/downloads/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Desktop organization tool
 
 LICENSE=	GPLv2
 
-DEPRECATED=		Qt4 has been EOL since december 2015
-EXPIRATION_DATE=	2018-12-31
+LIB_DEPENDS=	libassuan.so:security/libassuan \
+		libgpg-error.so:security/libgpg-error \
+		libgpgme.so:security/gpgme \
+		libgit2.so:devel/libgit2
 
-LIB_DEPENDS=	libgpgme.so:security/gpgme
+USES=		cmake desktop-file-utils gettext-tools kde:5 pkgconfig qt:5 \
+		shared-mime-info tar:bzip2
+USE_KDE=	ecm archive auth codecs completion config configwidgets \
+		coreaddons crash dbusaddons doctools filemetadata globalaccel \
+		guiaddons i18n iconthemes jobwidgets kcmutils kio \
+		notifications parts service sonnet textwidgets widgetsaddons \
+		windowsystem xmlgui
+USE_QT=		concurrent core dbus gui network phonon4 testlib widgets xml \
+		buildtools_build qmake_build
+USE_XORG=	x11
 
-USES=		cmake gettext-tools kde:4 qt:4 tar:bzip2
-USE_XORG=	xft xpm
-USE_KDE=	automoc4 kdelibs qimageblitz
-USE_QT=		moc_build qmake_build rcc_build uic_build
-USE_LDCONFIG=	yes
-USE_CXXSTD=	gnu++98
+USE_GITHUB=	yes
+GH_ACCOUNT=	basket-notepads
 
 .include <bsd.port.mk>
diff --git a/deskutils/basket/distinfo b/deskutils/basket/distinfo
index 2bef3ce58fde..f9477c3fc26f 100644
--- a/deskutils/basket/distinfo
+++ b/deskutils/basket/distinfo
@@ -1,2 +1,3 @@
-SHA256 (basket-1.81.tar.bz2) = 60a3b49af34f1df2b983b1acd321ded256f92f10ce700dc6c7954793fea3fd83
-SIZE (basket-1.81.tar.bz2) = 4108025
+TIMESTAMP = 1545340462
+SHA256 (basket-notepads-basket-v2.49a-46-g60e38c6_GH0.tar.gz) = 24415255f9c2446cd7b3b972fa001ecd9dcaa20fe6c64b326828c5b5a1961464
+SIZE (basket-notepads-basket-v2.49a-46-g60e38c6_GH0.tar.gz) = 4688562
diff --git a/deskutils/basket/files/patch-file-integration_CMakeLists.txt b/deskutils/basket/files/patch-file-integration_CMakeLists.txt
new file mode 100644
index 000000000000..09442d6b1f81
--- /dev/null
+++ b/deskutils/basket/files/patch-file-integration_CMakeLists.txt
@@ -0,0 +1,21 @@
+--- file-integration/CMakeLists.txt.orig	2018-12-22 15:06:49 UTC
++++ file-integration/CMakeLists.txt
+@@ -11,15 +11,8 @@ install(TARGETS basketthumbcreator DESTINATION ${PLUGI
+ 
+ ########### install files ###############
+ 
+-find_program(XDG-MIME_EXECUTABLE xdg-mime)
+-find_program(XDG-DESKTOP-MENU_EXECUTABLE xdg-desktop-menu)
++find_package(SharedMimeInfo REQUIRED)
+ 
+ install(FILES  basketthumbcreator.desktop DESTINATION ${SERVICES_INSTALL_DIR})
+-install(CODE "
+-execute_process(COMMAND ${XDG-MIME_EXECUTABLE} install --novendor
+-  ${CMAKE_CURRENT_SOURCE_DIR}/basket.xml)
+-execute_process(COMMAND ${XDG-DESKTOP-MENU_EXECUTABLE} install
+-  --novendor ${CMAKE_SOURCE_DIR}/src/basket.desktop)
+-execute_process(COMMAND ${XDG-MIME_EXECUTABLE} default
+-  ${CMAKE_SOURCE_DIR}/src/basket.desktop application/x-basket-item)
+-")
++install(FILES basket.xml DESTINATION ${XDG_MIME_INSTALL_DIR})
++update_xdg_mimetypes(${XDG_MIME_INSTALL_DIR})
diff --git a/deskutils/basket/pkg-descr b/deskutils/basket/pkg-descr
index 6e9a551e093b..2b414b5c9609 100644
--- a/deskutils/basket/pkg-descr
+++ b/deskutils/basket/pkg-descr
@@ -2,4 +2,4 @@ BasKet is a desktop organization tool. It uses baskets / drawers ("baskets")
 to organize objects, such as text, URLs, images, sounds or other documents.
 Objects in a basket can be edited, copied, moved, dragged, etc.
 
-WWW: http://basket.kde.org/
+WWW: http://basket-notepads.github.io/
diff --git a/deskutils/basket/pkg-plist b/deskutils/basket/pkg-plist
index 72dde9b6dcd5..ad4ea91529c7 100644
--- a/deskutils/basket/pkg-plist
+++ b/deskutils/basket/pkg-plist
@@ -1,34 +1,34 @@
 bin/basket
-lib/kde4/basketthumbcreator.so
-lib/kde4/kcm_basket.so
 lib/libbasketcommon.so
-lib/libbasketcommon.so.4
-lib/libbasketcommon.so.%%KDE4_GENERIC_LIB_VERSION%%
-share/applications/kde4/basket.desktop
-share/apps/basket/backgrounds/abstract.png
-share/apps/basket/backgrounds/alien-artifact.png
-share/apps/basket/backgrounds/alien-artifact.png.config
-share/apps/basket/backgrounds/basket-title.png
-share/apps/basket/backgrounds/green-curves.png
-share/apps/basket/backgrounds/light.png
-share/apps/basket/backgrounds/painting.png
-share/apps/basket/backgrounds/pens.png
-share/apps/basket/backgrounds/pins.png
-share/apps/basket/backgrounds/rainbow-balls.png
-share/apps/basket/backgrounds/rounds-line.png
-share/apps/basket/backgrounds/strings.png
-share/apps/basket/backgrounds/todo.png
-share/apps/basket/backgrounds/working.png
-share/apps/basket/basketui.rc
-share/apps/basket/welcome/Welcome_de.baskets
-share/apps/basket/welcome/Welcome_en_US.baskets
-share/apps/basket/welcome/Welcome_fr.baskets
-share/apps/basket/welcome/Welcome_it.baskets
-share/apps/basket/welcome/Welcome_ja.baskets
-share/apps/basket/welcome/Welcome_nn.baskets
-share/apps/basket/welcome/Welcome_pt.baskets
-share/apps/basket/welcome/Welcome_ru.baskets
-share/config/magic/basket.magic
+lib/libbasketcommon.so.5
+lib/libbasketcommon.so.5.12.0
+%%QT_PLUGINDIR%%/basketthumbcreator.so
+%%QT_PLUGINDIR%%/kcm_basket.so
+%%DATADIR%%/backgrounds/abstract.png
+%%DATADIR%%/backgrounds/alien-artifact.png
+%%DATADIR%%/backgrounds/alien-artifact.png.config
+%%DATADIR%%/backgrounds/basket-title.png
+%%DATADIR%%/backgrounds/green-curves.png
+%%DATADIR%%/backgrounds/light.png
+%%DATADIR%%/backgrounds/painting.png
+%%DATADIR%%/backgrounds/pens.png
+%%DATADIR%%/backgrounds/pins.png
+%%DATADIR%%/backgrounds/rainbow-balls.png
+%%DATADIR%%/backgrounds/rounds-line.png
+%%DATADIR%%/backgrounds/strings.png
+%%DATADIR%%/backgrounds/todo.png
+%%DATADIR%%/backgrounds/working.png
+%%DATADIR%%/welcome/Welcome_de.baskets
+%%DATADIR%%/welcome/Welcome_en_US.baskets
+%%DATADIR%%/welcome/Welcome_fr.baskets
+%%DATADIR%%/welcome/Welcome_it.baskets
+%%DATADIR%%/welcome/Welcome_ja.baskets
+%%DATADIR%%/welcome/Welcome_nn.baskets
+%%DATADIR%%/welcome/Welcome_pt.baskets
+%%DATADIR%%/welcome/Welcome_ru.baskets
+share/applications/basket.desktop
+share/doc/HTML/en/basket/index.cache.bz2
+share/doc/HTML/en/basket/index.docbook
 share/icons/hicolor/128x128/apps/basket.png
 share/icons/hicolor/16x16/actions/likeback_bug.png
 share/icons/hicolor/16x16/actions/likeback_dislike.png
@@ -55,12 +55,6 @@ share/icons/hicolor/22x22/apps/basket.png
 share/icons/hicolor/32x32/apps/basket.png
 share/icons/hicolor/48x48/apps/basket.png
 share/icons/hicolor/64x64/apps/basket.png
-share/kde4/services/basket_config_apps.desktop
-share/kde4/services/basket_config_baskets.desktop
-share/kde4/services/basket_config_general.desktop
-share/kde4/services/basket_config_new_notes.desktop
-share/kde4/services/basket_config_notes_appearance.desktop
-share/kde4/services/basketthumbcreator.desktop
 share/locale/cs/LC_MESSAGES/basket.mo
 share/locale/da/LC_MESSAGES/basket.mo
 share/locale/de/LC_MESSAGES/basket.mo
@@ -76,5 +70,12 @@ share/locale/ru/LC_MESSAGES/basket.mo
 share/locale/tr/LC_MESSAGES/basket.mo
 share/locale/zh_CN/LC_MESSAGES/basket.mo
 share/locale/zh_TW/LC_MESSAGES/basket.mo
-share/mimelnk/application/x-basket-archive.desktop
-share/mimelnk/application/x-basket-template.desktop
+share/kservices5/basket_config_apps.desktop
+share/kservices5/basket_config_baskets.desktop
+share/kservices5/basket_config_general.desktop
+share/kservices5/basket_config_new_notes.desktop
+share/kservices5/basket_config_notes_appearance.desktop
+share/kservices5/basket_config_version_sync.desktop
+share/kservices5/basketthumbcreator.desktop
+share/kxmlgui5/basket/basketui.rc
+share/mime/packages/basket.xml