devel/grantlee: update to 5.2.0

- While here, remove the patches to install the headers in a prefix;
  there currently is only one grantlee version in the tree, so no
  reason to make life harder for ourselves.

24 files changed, 53 insertions, 111 deletions

diff --git a/Mk/Uses/grantlee.mk b/Mk/Uses/grantlee.mk
index 4dcbaa65e750..6c9eb5668ca3 100644
--- a/Mk/Uses/grantlee.mk
+++ b/Mk/Uses/grantlee.mk
@@ -33,7 +33,7 @@ _INCLUDE_USES_GRANTLEE_MK=	YES
 
 GRANTLEE_SUPPORTED=	5
 
-GRANTLEE5_VER=	5.1.0
+GRANTLEE5_VER=	5.2.0
 
 GRANTLEE5_LIB_DEPEND=	libGrantlee_Templates.so:devel/grantlee5
 
diff --git a/deskutils/akregator/Makefile b/deskutils/akregator/Makefile
index ab82bfbad022..a2f20e2241d8 100644
--- a/deskutils/akregator/Makefile
+++ b/deskutils/akregator/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	akregator
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	deskutils kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/deskutils/grantlee-editor/Makefile b/deskutils/grantlee-editor/Makefile
index 8cae2f89d13f..d856f7c2bbc0 100644
--- a/deskutils/grantlee-editor/Makefile
+++ b/deskutils/grantlee-editor/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	grantlee-editor
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	deskutils kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/deskutils/grantleetheme/Makefile b/deskutils/grantleetheme/Makefile
index 36c4d89d65ad..cd4d8137b988 100644
--- a/deskutils/grantleetheme/Makefile
+++ b/deskutils/grantleetheme/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	grantleetheme
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	deskutils kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/deskutils/kaddressbook/Makefile b/deskutils/kaddressbook/Makefile
index 27723d0981f1..a7c16d190f70 100644
--- a/deskutils/kaddressbook/Makefile
+++ b/deskutils/kaddressbook/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	kaddressbook
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	deskutils kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/deskutils/kdepim-addons/Makefile b/deskutils/kdepim-addons/Makefile
index 3a53df6be273..0f2a4d487599 100644
--- a/deskutils/kdepim-addons/Makefile
+++ b/deskutils/kdepim-addons/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	kdepim-addons
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	deskutils kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/deskutils/kdepim-apps-libs/Makefile b/deskutils/kdepim-apps-libs/Makefile
index 2c55b084d569..710dc7cedaec 100644
--- a/deskutils/kdepim-apps-libs/Makefile
+++ b/deskutils/kdepim-apps-libs/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	kdepim-apps-libs
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	deskutils kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/deskutils/knotes/Makefile b/deskutils/knotes/Makefile
index 1476d83b895c..367e98e58afa 100644
--- a/deskutils/knotes/Makefile
+++ b/deskutils/knotes/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	knotes
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	deskutils kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/devel/grantlee5/Makefile b/devel/grantlee5/Makefile
index 6191221aba21..ddc77e740751 100644
--- a/devel/grantlee5/Makefile
+++ b/devel/grantlee5/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	grantlee
-PORTVERSION=	${GRANTLEE_VERSION}
-PORTREVISION=	7
+DISTVERSION=	${GRANTLEE_VERSION}
 CATEGORIES=	devel
 MASTER_SITES=	http://downloads.${PORTNAME}.org/
 PKGNAMESUFFIX=	5
diff --git a/devel/grantlee5/distinfo b/devel/grantlee5/distinfo
index e0e3d3c28c6a..3b82f3604d6d 100644
--- a/devel/grantlee5/distinfo
+++ b/devel/grantlee5/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1471275306
-SHA256 (grantlee-5.1.0.tar.gz) = ea2e402466c74bb533eee2c7252209ec61cd93a5d236fecd625b4a0eb13a1478
-SIZE (grantlee-5.1.0.tar.gz) = 1175380
+TIMESTAMP = 1576744258
+SHA256 (grantlee-5.2.0.tar.gz) = d6cd04de39a073a787c9ab8e72a0888e40779d21b83fbc788a1b36d31ac659d5
+SIZE (grantlee-5.2.0.tar.gz) = 1166467
diff --git a/devel/grantlee5/files/patch-CMakeLists.txt b/devel/grantlee5/files/patch-CMakeLists.txt
deleted file mode 100644
index 30572ec98532..000000000000
--- a/devel/grantlee5/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-Install headers prefixed, as to not cause a possible conflict with
-different versions.
-
---- CMakeLists.txt.orig	2016-08-10 16:09:20 UTC
-+++ CMakeLists.txt
-@@ -100,7 +100,7 @@ set (LIB_SUFFIX "" CACHE STRING "Define
- set( LIB_INSTALL_DIR lib${LIB_SUFFIX} )
- set( PLUGIN_INSTALL_DIR ${LIB_INSTALL_DIR}/grantlee/${Grantlee5_MAJOR_MINOR_VERSION_STRING} )
- set( BIN_INSTALL_DIR bin )
--set( INCLUDE_INSTALL_DIR include )
-+set( INCLUDE_INSTALL_DIR include/grantlee5 )
- set( DATA_INSTALL_DIR share/apps )
-
- # set up RPATH/install_name_dir
diff --git a/devel/grantlee5/files/patch-git_1b4f22-fix-qt5.13 b/devel/grantlee5/files/patch-git_1b4f22-fix-qt5.13
deleted file mode 100644
index 1e9147120752..000000000000
--- a/devel/grantlee5/files/patch-git_1b4f22-fix-qt5.13
+++ /dev/null
@@ -1,30 +0,0 @@
-https://github.com/steveire/grantlee/commit/1b4f22431ae35dfd11f07a5ae88a1b4db3de2a85.patch
-
-From 1b4f22431ae35dfd11f07a5ae88a1b4db3de2a85 Mon Sep 17 00:00:00 2001
-From: Michael Pyne <mpyne@kde.org>
-Date: Tue, 18 Dec 2018 17:47:21 -0500
-Subject: [PATCH] Fix build with Qt 5.13 / GCC 8.2.
-
-At this point Grantlee doesn't build for me because QList is an
-incomplete type. I think the compiler is right to complain, so I fix by
-including the appropriate header.
-
-Fixes issue #47.
----
- templates/lib/lexer_p.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/templates/lib/lexer_p.h b/templates/lib/lexer_p.h
-index 275aeea..1ae451a 100644
---- templates/lib/lexer_p.h
-+++ templates/lib/lexer_p.h
-@@ -24,7 +24,7 @@
- #include "textprocessingmachine_p.h"
- #include "token.h"
-
--template <typename T> class QList;
-+#include <QList>
-
- namespace Grantlee
- {
-
diff --git a/devel/grantlee5/files/patch-templates_lib_CMakeLists.txt b/devel/grantlee5/files/patch-templates_lib_CMakeLists.txt
deleted file mode 100644
index dd067584192f..000000000000
--- a/devel/grantlee5/files/patch-templates_lib_CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-Install headers prefixed, as to not cause a possible conflict with
-different versions.
-
---- templates/lib/CMakeLists.txt.orig	2016-08-10 16:09:48 UTC
-+++ templates/lib/CMakeLists.txt
-@@ -137,7 +137,7 @@ install(TARGETS Grantlee_Templates EXPOR
-          RUNTIME DESTINATION ${BIN_INSTALL_DIR} COMPONENT Templates
-          LIBRARY DESTINATION ${LIB_INSTALL_DIR} COMPONENT Templates
-          ARCHIVE DESTINATION ${LIB_INSTALL_DIR} COMPONENT Templates
--         INCLUDES DESTINATION include
-+         INCLUDES DESTINATION include/grantlee5
- )
-
- install(FILES
diff --git a/devel/grantlee5/files/patch-textdocument_lib_CMakeLists.txt b/devel/grantlee5/files/patch-textdocument_lib_CMakeLists.txt
deleted file mode 100644
index 860b0cd03c32..000000000000
--- a/devel/grantlee5/files/patch-textdocument_lib_CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-Install headers prefixed, as to not cause a possible conflict with
-different versions.
-
---- textdocument/lib/CMakeLists.txt.orig	2016-08-10 16:10:17 UTC
-+++ textdocument/lib/CMakeLists.txt
-@@ -58,7 +58,7 @@ install(TARGETS Grantlee_TextDocument EX
-          RUNTIME DESTINATION ${BIN_INSTALL_DIR} COMPONENT TextDocument
-          LIBRARY DESTINATION ${LIB_INSTALL_DIR} COMPONENT TextDocument
-          ARCHIVE DESTINATION ${LIB_INSTALL_DIR} COMPONENT TextDocument
--         INCLUDES DESTINATION include
-+         INCLUDES DESTINATION include/grantlee5
- )
-
- install(FILES
diff --git a/devel/grantlee5/pkg-plist b/devel/grantlee5/pkg-plist
index 7d1030810ed8..e9e37da353cf 100644
--- a/devel/grantlee5/pkg-plist
+++ b/devel/grantlee5/pkg-plist
@@ -1,35 +1,35 @@
-include/grantlee5/grantlee/abstractlocalizer.h
-include/grantlee5/grantlee/abstractmarkupbuilder.h
-include/grantlee5/grantlee/bbcodebuilder.h
-include/grantlee5/grantlee/cachingloaderdecorator.h
-include/grantlee5/grantlee/context.h
-include/grantlee5/grantlee/engine.h
-include/grantlee5/grantlee/exception.h
-include/grantlee5/grantlee/filter.h
-include/grantlee5/grantlee/filterexpression.h
-include/grantlee5/grantlee/grantlee_templates_export.h
-include/grantlee5/grantlee/grantlee_textdocument_export.h
-include/grantlee5/grantlee/grantlee_version.h
-include/grantlee5/grantlee/markupdirector.h
-include/grantlee5/grantlee/mediawikimarkupbuilder.h
-include/grantlee5/grantlee/metatype.h
-include/grantlee5/grantlee/node.h
-include/grantlee5/grantlee/outputstream.h
-include/grantlee5/grantlee/parser.h
-include/grantlee5/grantlee/plaintextmarkupbuilder.h
-include/grantlee5/grantlee/qtlocalizer.h
-include/grantlee5/grantlee/rendercontext.h
-include/grantlee5/grantlee/safestring.h
-include/grantlee5/grantlee/taglibraryinterface.h
-include/grantlee5/grantlee/template.h
-include/grantlee5/grantlee/templateloader.h
-include/grantlee5/grantlee/texthtmlbuilder.h
-include/grantlee5/grantlee/token.h
-include/grantlee5/grantlee/typeaccessor.h
-include/grantlee5/grantlee/util.h
-include/grantlee5/grantlee/variable.h
-include/grantlee5/grantlee_templates.h
-include/grantlee5/grantlee_textdocument.h
+include/grantlee/abstractlocalizer.h
+include/grantlee/abstractmarkupbuilder.h
+include/grantlee/bbcodebuilder.h
+include/grantlee/cachingloaderdecorator.h
+include/grantlee/context.h
+include/grantlee/engine.h
+include/grantlee/exception.h
+include/grantlee/filter.h
+include/grantlee/filterexpression.h
+include/grantlee/grantlee_templates_export.h
+include/grantlee/grantlee_textdocument_export.h
+include/grantlee/grantlee_version.h
+include/grantlee/markupdirector.h
+include/grantlee/mediawikimarkupbuilder.h
+include/grantlee/metatype.h
+include/grantlee/node.h
+include/grantlee/outputstream.h
+include/grantlee/parser.h
+include/grantlee/plaintextmarkupbuilder.h
+include/grantlee/qtlocalizer.h
+include/grantlee/rendercontext.h
+include/grantlee/safestring.h
+include/grantlee/taglibraryinterface.h
+include/grantlee/template.h
+include/grantlee/templateloader.h
+include/grantlee/texthtmlbuilder.h
+include/grantlee/token.h
+include/grantlee/typeaccessor.h
+include/grantlee/util.h
+include/grantlee/variable.h
+include/grantlee_templates.h
+include/grantlee_textdocument.h
 lib/cmake/Grantlee5/Grantlee5Config.cmake
 lib/cmake/Grantlee5/Grantlee5ConfigVersion.cmake
 lib/cmake/Grantlee5/GrantleeMacros.cmake
diff --git a/devel/kdevelop/Makefile b/devel/kdevelop/Makefile
index 9c0cbbb7d3b2..77cc1755e2dd 100644
--- a/devel/kdevelop/Makefile
+++ b/devel/kdevelop/Makefile
@@ -5,7 +5,7 @@
 #  devel/kdev-python
 PORTNAME=	kdevelop
 DISTVERSION=	5.4.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel kde
 MASTER_SITES=	KDE/stable/kdevelop/${DISTVERSION}/src
 DIST_SUBDIR=	KDE/kdevelop
diff --git a/finance/skrooge/Makefile b/finance/skrooge/Makefile
index 9f62077e9377..f707c6f13ee3 100644
--- a/finance/skrooge/Makefile
+++ b/finance/skrooge/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	skrooge
 DISTVERSION=	2.21.1
+PORTREVISION=	1
 CATEGORIES=	finance kde
 MASTER_SITES=	KDE/stable/${PORTNAME}
 DIST_SUBDIR=	KDE/${PORTNAME}
diff --git a/math/rocs/Makefile b/math/rocs/Makefile
index 60712ffdc9ee..5e9cfeb6595d 100644
--- a/math/rocs/Makefile
+++ b/math/rocs/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	rocs
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	math kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/net/akonadi-contacts/Makefile b/net/akonadi-contacts/Makefile
index b3b4bcef556e..34d4c31f399e 100644
--- a/net/akonadi-contacts/Makefile
+++ b/net/akonadi-contacts/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	akonadi-contacts
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	net kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/net/kcalutils/Makefile b/net/kcalutils/Makefile
index 6bd30d904feb..32d08a34a08e 100644
--- a/net/kcalutils/Makefile
+++ b/net/kcalutils/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	kcalutils
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	net kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/net/kpimtextedit/Makefile b/net/kpimtextedit/Makefile
index 5019b6fc0e00..1dbd3c855cd8 100644
--- a/net/kpimtextedit/Makefile
+++ b/net/kpimtextedit/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	kpimtextedit
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	net kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/net/messagelib/Makefile b/net/messagelib/Makefile
index 9b41fb071a9c..3086702917b4 100644
--- a/net/messagelib/Makefile
+++ b/net/messagelib/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	messagelib
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	net kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/net/pimcommon/Makefile b/net/pimcommon/Makefile
index c76b242fc7c4..5a1a15107817 100644
--- a/net/pimcommon/Makefile
+++ b/net/pimcommon/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	pimcommon
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	net kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/sysutils/khelpcenter/Makefile b/sysutils/khelpcenter/Makefile
index a7c5c9e55396..60665ea0c2a3 100644
--- a/sysutils/khelpcenter/Makefile
+++ b/sysutils/khelpcenter/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	khelpcenter
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	sysutils kde kde-applications # kde kde-applications-plasma
 
 MAINTAINER=	kde@FreeBSD.org