Re: git: ff38dac0b6f3 - main - deskutils/fet: Update to 7.5.6

On Thu, Nov 13, 2025 at 12:31 AM Zsolt Udvari <uzsolt@freebsd.org> wrote:
>
> The branch main has been updated by uzsolt:
>
> URL: https://cgit.FreeBSD.org/ports/commit/?id=ff38dac0b6f33a939cfa1cace4e4c083dbcf91cb
>
> commit ff38dac0b6f33a939cfa1cace4e4c083dbcf91cb
> Author:     Zsolt Udvari <uzsolt@FreeBSD.org>
> AuthorDate: 2025-11-13 05:28:22 +0000
> Commit:     Zsolt Udvari <uzsolt@FreeBSD.org>
> CommitDate: 2025-11-13 05:30:59 +0000
>
>     deskutils/fet: Update to 7.5.6
>
>     Now removes Qt5 flavor so remove it entirely.
>
>     Changelog: https://lalescu.ro/liviu/fet/news.html
> ---
>  UPDATING               |  8 ++++++++
>  deskutils/fet/Makefile | 14 ++++----------
>  deskutils/fet/distinfo |  6 +++---
>  3 files changed, 15 insertions(+), 13 deletions(-)
>
> diff --git a/UPDATING b/UPDATING
> index 1e210022df94..c31c18dc0a60 100644
> --- a/UPDATING
> +++ b/UPDATING
> @@ -5,6 +5,14 @@ they are unavoidable.
>  You should get into the habit of checking this file for changes each time
>  you update your ports collection, before attempting any port upgrades.
>
> +20251113:
> +  AFFECTS: users of deskutils/fet
> +  AUTHOR: uzsolt@FreeBSD.org
> +
> +  Remove Qt flavors, only use Qt6.
> +
> +  You should uninstall the flavored package and install the unflavored package.
> +
>  20251105:
>    AFFECTS: users of net/unison
>    AUTHOR: madpilot@FreeBSD.org
> diff --git a/deskutils/fet/Makefile b/deskutils/fet/Makefile
> index e7680644d8da..c5dc7c048007 100644
> --- a/deskutils/fet/Makefile
> +++ b/deskutils/fet/Makefile
> @@ -1,11 +1,10 @@
>  PORTNAME=      fet
> -DISTVERSION=   7.5.4
> +DISTVERSION=   7.5.6
>  CATEGORIES=    deskutils education
>  MASTER_SITES=  https://lalescu.ro/liviu/fet/download/ \
>                 https://lalescu.ro/liviu/fet/download/old/ \
>                 https://timetabling.de/download/ \
>                 https://timetabling.de/download/old/
> -PKGNAMESUFFIX= -${FLAVOR}
>
>  MAINTAINER=    uzsolt@FreeBSD.org
>  COMMENT=       Free timetabling software
> @@ -14,16 +13,11 @@ WWW=                https://lalescu.ro/liviu/fet/
>  LICENSE=       GPLv3+
>  LICENSE_FILE=  ${WRKSRC}/COPYING
>
> -FLAVORS=       qt6 qt5
> -FLAVOR?=       qt6
> -
> -USES=          compiler:c++17-lang gl qmake qt:${FLAVOR:S/qt//} tar:bzip2
> +USES=          compiler:c++17-lang gl qmake qt:6 tar:bzip2
>  USE_GL=                gl
> -_USE_QT5=      core gui network printsupport widgets buildtools:build
> -_USE_QT6=      base
> -USE_QT=                ${_USE_QT${FLAVOR:S/qt//}}
> +USE_QT=                base
>
> -CONFLICTS_INSTALL=     ${FLAVORS:@fl@fet-${fl}@}
> +CONFLICTS_INSTALL=     ${PORTNAME}-qt5 ${PORTNAME}-qt6
>
>  DESKTOP_ENTRIES=       "FET" \
>                         "Free timetable software" \
> diff --git a/deskutils/fet/distinfo b/deskutils/fet/distinfo
> index d450d6155581..d4594dce0602 100644
> --- a/deskutils/fet/distinfo
> +++ b/deskutils/fet/distinfo
> @@ -1,3 +1,3 @@
> -TIMESTAMP = 1761107699
> -SHA256 (fet-7.5.4.tar.bz2) = 61481b76fccabd6dc81dcb28d93d2f2d2585819915b21933b37d0fbd53de526e
> -SIZE (fet-7.5.4.tar.bz2) = 17734617
> +TIMESTAMP = 1762968765
> +SHA256 (fet-7.5.6.tar.bz2) = e0700d852430e3578293575bb60cff49ab99ad2a1c3369678d9ad03a180c5e8b
> +SIZE (fet-7.5.6.tar.bz2) = 17734158
>

Woo!!! Another Qt5 port down. This makes me so happy. Many thanks!

For Qt6, though, USE_GL should be:
USE_GL= opengl

I'd also drop the CONFLICTS_INSTALL in favor of a MOVED entry for each
of the former flavors, e.g.:
deskutils/fet@qt5|deskutils/fet|2025-11-13|Qt Flavorization has been
removed. Qt 5.x is EOL and deskutils/fet now based on Qt 6.x
deskutils/fet@qt6|deskutils/fet|2025-11-13|Qt Flavorization has been
removed; Continue to enjoy deskutils/fet based on Qt 6.x as usual

-Jason