git: a68cfe190372 - main - deskutils/fet: update to 6.9.1

From: Fernando Apesteguía <fernape_at_FreeBSD.org>
Date: Tue, 13 Jun 2023 14:42:48 UTC
The branch main has been updated by fernape:

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

commit a68cfe19037250aa4a7bc86911bbed1dc408b4b9
Author:     Zsolt Udvari <uzsolt@uzsolt.hu>
AuthorDate: 2023-06-12 08:23:59 +0000
Commit:     Fernando Apesteguía <fernape@FreeBSD.org>
CommitDate: 2023-06-13 14:37:42 +0000

    deskutils/fet: update to 6.9.1
    
    ChangeLog: https://lalescu.ro/liviu/fet/news.html
    
     * Updated to Qt 6.5.1.
     * Corrected a few English fields.
     * Updated the Italian translation.
     * Updated the Greek translation.
    
    While here, pet linters.
    
    PR:             271950
    Reported by:    uzsolt@uzsolt.hu (maintainer)
---
 deskutils/fet/Makefile | 5 +++--
 deskutils/fet/distinfo | 6 +++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/deskutils/fet/Makefile b/deskutils/fet/Makefile
index fd728bc236e4..d765da0d218a 100644
--- a/deskutils/fet/Makefile
+++ b/deskutils/fet/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	fet
-DISTVERSION=	6.9.0
+DISTVERSION=	6.9.1
 CATEGORIES=	deskutils education
 MASTER_SITES=	https://lalescu.ro/liviu/fet/download/ \
 		https://lalescu.ro/liviu/fet/download/old/ \
@@ -16,7 +16,6 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 FLAVORS=	qt5 qt6
 FLAVOR?=	qt6
-CONFLICTS_INSTALL=	${FLAVORS:@fl@fet-${fl}@}
 
 USES=		compiler:c++14-lang gl qmake qt:${FLAVOR:S/qt//} tar:bzip2
 USE_GL=		gl
@@ -24,6 +23,8 @@ _USE_QT5=	core gui network printsupport widgets buildtools:build
 _USE_QT6=	base
 USE_QT=		${_USE_QT${FLAVOR:S/qt//}}
 
+CONFLICTS_INSTALL=	${FLAVORS:@fl@fet-${fl}@}
+
 DESKTOP_ENTRIES=	"FET" \
 			"Free timetable software" \
 			"" \
diff --git a/deskutils/fet/distinfo b/deskutils/fet/distinfo
index 7221f2638674..8045866bfeed 100644
--- a/deskutils/fet/distinfo
+++ b/deskutils/fet/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1680876722
-SHA256 (fet-6.9.0.tar.bz2) = daf39231f7c9e4ca99c0540f2e4a78172513044db35266bfc3b0d1a01e2adcd2
-SIZE (fet-6.9.0.tar.bz2) = 18857314
+TIMESTAMP = 1686491628
+SHA256 (fet-6.9.1.tar.bz2) = 90a53b7a23ce4d98223b82def046f7b079a223d968fbcdab12e66b26840c76e5
+SIZE (fet-6.9.1.tar.bz2) = 18905421