7 files changed, 6 insertions, 124 deletions

diff --git a/astro/libkgeomap/Makefile b/astro/libkgeomap/Makefile
index 404a98a3f5e4..b6609cad42e4 100644
--- a/astro/libkgeomap/Makefile
+++ b/astro/libkgeomap/Makefile
@@ -2,7 +2,6 @@
 
 PORTNAME=	libkgeomap
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
-PORTREVISION=	1
 CATEGORIES=	astro kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/astro/libkgeomap/distinfo b/astro/libkgeomap/distinfo
index e7708e3357c4..aa74266c2c45 100644
--- a/astro/libkgeomap/distinfo
+++ b/astro/libkgeomap/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1551810991
-SHA256 (KDE/applications/18.12.3/libkgeomap-18.12.3.tar.xz) = 2c4459e61e471f0344d03cfa5f00fe2a1890cd2c1501323ceed26d522496c47b
-SIZE (KDE/applications/18.12.3/libkgeomap-18.12.3.tar.xz) = 151100
+TIMESTAMP = 1555094758
+SHA256 (KDE/applications/19.04.0/libkgeomap-19.04.0.tar.xz) = 12cf73da1d406b8f6efe88c1d1bc56ecf3260bbe41759c4dec061df627e990e9
+SIZE (KDE/applications/19.04.0/libkgeomap-19.04.0.tar.xz) = 151096
diff --git a/astro/marble/Makefile b/astro/marble/Makefile
index 1c54a488ce91..7f4db5d7a6b3 100644
--- a/astro/marble/Makefile
+++ b/astro/marble/Makefile
@@ -2,7 +2,6 @@
 
 PORTNAME=	marble
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
-PORTREVISION=	2
 CATEGORIES=	astro kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/astro/marble/distinfo b/astro/marble/distinfo
index f8f8638a67f1..850b53ac7f67 100644
--- a/astro/marble/distinfo
+++ b/astro/marble/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1551810992
-SHA256 (KDE/applications/18.12.3/marble-18.12.3.tar.xz) = 0bfd7ae576e42ebbddadc8c83c2fec5edaf462bcf284642b1002d36d751b24ee
-SIZE (KDE/applications/18.12.3/marble-18.12.3.tar.xz) = 52419848
+TIMESTAMP = 1555094759
+SHA256 (KDE/applications/19.04.0/marble-19.04.0.tar.xz) = 7405c76970d6ec500e5dc99ea2926cc11571e69f29c2e79f025f0f3ec4048960
+SIZE (KDE/applications/19.04.0/marble-19.04.0.tar.xz) = 52316628
diff --git a/astro/marble/files/patch-CMakeLists.txt b/astro/marble/files/patch-CMakeLists.txt
deleted file mode 100644
index c87fa9aadcdb..000000000000
--- a/astro/marble/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,49 +0,0 @@
-From bc206d50cf8c0d0fc9f90cce58a2499ec945bd29 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Wed, 9 Jan 2019 20:41:28 +0100
-Subject: [PATCH] Avoid overwriting Qt5_FOUND with Qt5DBus or Qt5WebEngine
- disabled
-
----
- CMakeLists.txt | 17 ++++++-----------
- 1 file changed, 6 insertions(+), 11 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9261a67a4..82f7206d2 100644
---- CMakeLists.txt
-+++ CMakeLists.txt
-@@ -121,18 +121,13 @@ find_package(Qt5 ${REQUIRED_QT_VERSION} REQUIRED
- )
- 
- if(CMAKE_SYSTEM_NAME STREQUAL Android)
--    find_package(Qt5 ${REQUIRED_QT_VERSION} REQUIRED
--        COMPONENTS
--            Positioning
--            Multimedia
--    )
-+    find_package(Qt5Positioning ${REQUIRED_QT_VERSION} REQUIRED)
-+    find_package(Qt5Multimedia)
-+
-    set ( MARBLE_NO_WEBKITWIDGETS TRUE )
- else()
--   find_package(Qt5 ${REQUIRED_QT_VERSION}
--        COMPONENTS
--            WebEngine
--            WebEngineWidgets
--    )
-+    find_package(Qt5WebEngine ${REQUIRED_QT_VERSION})
-+    find_package(Qt5WebEngineWidgets ${REQUIRED_QT_VERSION})
- 
-    if ( NOT Qt5WebEngineWidgets_FOUND )
-      set ( MARBLE_NO_WEBKITWIDGETS TRUE )
-@@ -140,7 +135,7 @@ else()
- endif()
- 
- if (BUILD_WITH_DBUS)
--  find_package(Qt5 ${REQUIRED_QT_VERSION} COMPONENTS DBus)
-+  find_package(Qt5DBus ${REQUIRED_QT_VERSION} COMPONENTS)
-   if (NOT Qt5DBus_FOUND)
-     set(MARBLE_NO_DBUS TRUE)
-   endif()
--- 
-2.20.1
diff --git a/astro/marble/files/patch-git_bc32ed4 b/astro/marble/files/patch-git_bc32ed4
deleted file mode 100644
index dcf0d9f43614..000000000000
--- a/astro/marble/files/patch-git_bc32ed4
+++ /dev/null
@@ -1,35 +0,0 @@
-From bc32ed4ef08d858edadcfd9eb87d550dfc2704ac Mon Sep 17 00:00:00 2001
-From: Aleix Pol <aleixpol@kde.org>
-Date: Wed, 21 Nov 2018 03:47:59 +0100
-Subject: [PATCH] Include a comment to the desktop file
-
-Summary:
-Otherwise the appstream file won't have a summary and appstream complains.
-
-CCBUG: 400431
-
-Reviewers: #marble, kossebau, sanjibanb
-
-Reviewed By: sanjibanb
-
-Subscribers: marble-devel, kde-edu
-
-Tags: #marble, #kde_edu
-
-Differential Revision: https://phabricator.kde.org/D16866
----
- src/plasma/wallpapers/worldmap/metadata.desktop | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/plasma/wallpapers/worldmap/metadata.desktop b/src/plasma/wallpapers/worldmap/metadata.desktop
-index af0eef807..816232d5e 100644
---- src/plasma/wallpapers/worldmap/metadata.desktop
-+++ src/plasma/wallpapers/worldmap/metadata.desktop
-@@ -26,6 +26,7 @@ Name[uk]=Карта світу
- Name[x-test]=xxWorld Mapxx
- Name[zh_CN]=世界地图
- Name[zh_TW]=世界地圖
-+Comment=Our beautiful globe as your wallpaper
- Type=Service
- Icon=marble
- 
diff --git a/astro/marble/files/patch-src_lib_marble_CMakeLists.txt b/astro/marble/files/patch-src_lib_marble_CMakeLists.txt
deleted file mode 100644
index 7e2facad85d5..000000000000
--- a/astro/marble/files/patch-src_lib_marble_CMakeLists.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/src/lib/marble/CMakeLists.txt b/src/lib/marble/CMakeLists.txt
-index 155c0fc51..1ce5f5f52 100644
---- src/lib/marble/CMakeLists.txt
-+++ src/lib/marble/CMakeLists.txt
-@@ -1,4 +1,4 @@
--PROJECT(marblewidget)
-+# PROJECT(marblewidget)
- 
- macro_optional_find_package(Phonon4Qt5 QUIET)
- marble_set_package_properties( Phonon4Qt5 PROPERTIES
-@@ -13,6 +13,10 @@ endif()
- CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/config-phonon.h.cmake
-                ${CMAKE_CURRENT_BINARY_DIR}/config-phonon.h)
- 
-+if(MARBLE_NO_WEBKITWIDGETS)
-+    add_definitions(-DMARBLE_NO_WEBKITWIDGETS)
-+endif()
-+
- INCLUDE_DIRECTORIES(
-  ${CMAKE_CURRENT_SOURCE_DIR}
-  ${CMAKE_CURRENT_BINARY_DIR}
-@@ -47,10 +51,6 @@ set(MARBLE_ABI_VERSION "28")
- 
- ########### next target ###############
- 
--if(MARBLE_NO_WEBKITWIDGETS)
--add_definitions(-DMARBLE_NO_WEBKITWIDGETS)
--endif()
--
- set(marblewidget_SRCS
-     ${geodata_SRCS}
-     ${graphicsview_SRCS}