git: 897891227032 - main - x11/konsole: allow /bin/sh as shell

[Adriaan de Groot]

The branch main has been updated by adridg:

URL: https://cgit.FreeBSD.org/ports/commit/?id=89789122703299f245224d5be66e3d94f263a97f

commit 89789122703299f245224d5be66e3d94f263a97f
Author:     Adriaan de Groot <adridg at FreeBSD.org>
AuthorDate: 2021-06-04 10:32:42 +0000
Commit:     Adriaan de Groot <adridg at FreeBSD.org>
CommitDate: 2021-06-04 10:38:24 +0000

    x11/konsole: allow /bin/sh as shell
    
    This pulls in an upstream fix (developed by Kurt Hindenburg
    and myself) to correct a logic error that disallows /bin/sh
    as shell in konsole sessions.
    
    While here, reduce dependencies a little (helloSystem might
    like that) because ecm is a build-dep and only very rarely
    a runtime-dep; kdelibs4support isn't needed at all.
---
 x11/konsole/Makefile | 12 +++++++-----
 x11/konsole/distinfo |  4 +++-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/x11/konsole/Makefile b/x11/konsole/Makefile
index 56aac7fb5fee..71845efa501f 100644
--- a/x11/konsole/Makefile
+++ b/x11/konsole/Makefile
@@ -1,10 +1,11 @@
 PORTNAME=	konsole
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11 kde kde-applications # kde kde-applications-applications
 
 PATCH_SITES=	https://invent.kde.org/utilities/konsole/-/commit/
-PATCHFILES=	585f9a561a07ec1cf5c20af37229667a3009362a.diff:-p1
+PATCHFILES+=	585f9a561a07ec1cf5c20af37229667a3009362a.diff:-p1
+PATCHFILES+=	34ad14c8cee4ab352481bf2ba190df9f8b744d29.diff:-p1
 
 MAINTAINER=	kde at FreeBSD.org
 COMMENT=	KDE terminal emulator
@@ -19,10 +20,11 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 USES=		cmake compiler:c++11-lang gettext pkgconfig kde:5 \
 		qt:5 tar:xz
 USE_KDE=	auth attica bookmarks codecs completion config configwidgets \
-		coreaddons crash dbusaddons ecm emoticons globalaccel guiaddons i18n \
-		iconthemes init itemmodels jobwidgets kdelibs4support kio \
+		coreaddons crash dbusaddons emoticons globalaccel guiaddons i18n \
+		iconthemes init itemmodels jobwidgets kio \
 		newstuff notifications notifyconfig parts pty service sonnet \
-		textwidgets widgetsaddons windowsystem xmlgui
+		textwidgets widgetsaddons windowsystem xmlgui \
+		ecm_build
 USE_QT=		concurrent core dbus gui network printsupport script scripttools sql \
 		widgets xml \
 		buildtools_build qmake_build
diff --git a/x11/konsole/distinfo b/x11/konsole/distinfo
index d921ac58131b..71dce5304c96 100644
--- a/x11/konsole/distinfo
+++ b/x11/konsole/distinfo
@@ -1,5 +1,7 @@
-TIMESTAMP = 1622274244
+TIMESTAMP = 1622802522
 SHA256 (KDE/release-service/21.04.1/konsole-21.04.1.tar.xz) = 46802bbddca8dd4c264107a411a58c86cc7707c9210ddfbd38d8a971ea735293
 SIZE (KDE/release-service/21.04.1/konsole-21.04.1.tar.xz) = 1277552
 SHA256 (KDE/release-service/21.04.1/585f9a561a07ec1cf5c20af37229667a3009362a.diff) = f2fb1a996459e5092dabeb142ffc095be9d321bdefaae664369510683cc892de
 SIZE (KDE/release-service/21.04.1/585f9a561a07ec1cf5c20af37229667a3009362a.diff) = 644
+SHA256 (KDE/release-service/21.04.1/34ad14c8cee4ab352481bf2ba190df9f8b744d29.diff) = f991e65519328df95b53be5b184092df365ed2060a41b07733954af49e03f6ab
+SIZE (KDE/release-service/21.04.1/34ad14c8cee4ab352481bf2ba190df9f8b744d29.diff) = 1042