From nobody Mon Apr 17 11:14:43 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q0Pb80wqHz45lJd; Mon, 17 Apr 2023 11:14:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Q0Pb80W6fz3hrn; Mon, 17 Apr 2023 11:14:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681730084; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Cb/c+hZdHTd54B8guUscMf+iUvTAqdscI3ITamo/cJw=; b=crJmkLCrG1MKHIntZcFAB3t9QXhyCr0Unp0hYylHCA+UH1id2vZAzCd/1yR5fsOMejn4Z+ b1M3opYlkLs11oPYQliTOivmpzJjm8JfJYg/7QQb1qDGYYPmvSbpayTtn/KN/N3x564ZT9 XT/V8gX1OmbQUEF604eiY3+xCdM/klXyWZt7820u8p1sGIp1hq3ks23HkKxXQnzkPlTy4U g3b2PZzMqv8t4GAgWNe1A84psuWN1vOW2Se+ixhfJzUtMEMhdcXKFKh5BVFh/x8vwztu2a Wa8rrv4Bhh+NxyKYs0Em/JD5+HKpVoAsFFC4rNw+Bpdbd9QGwUf5Qy23hCl91w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681730084; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Cb/c+hZdHTd54B8guUscMf+iUvTAqdscI3ITamo/cJw=; b=Qcwjp54QBeZ5C0PedTYA4Ff6d1Pci07es3bcwM0UvLy5fjA8pilbauHF3WqKSwhQRVXaUL FG3ylT07eRVMDAhLPDt5XMaxk9htVb5puYsSruRCuiWrHpqhgZZ8nhNAVDHwqg5CZh1DVh OdiRMem92dX45OYnUuk+GfbtGTgIFJkgPntexXDl+KwmD8oDE/sNqZsc/OGMeHnewpFcjO ktWVkdKQbeFc4XT+XDPIcHrzwgeEdO02X1hR9MNIk43qtMEujzC3KN8pWsUQQwxTossO9H O8ATOSNmYL6GVX7ZfNKl8ryi+K+YRXulg5NML586rd/c6t1E99kngfztZ6HZ8w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681730084; a=rsa-sha256; cv=none; b=wSNJGWb+5ArZ8h15yqQlYJ99TXh35mvqiONoU3nfs7tpyK6WveMVNKbXkxX63DK9+FDH99 +kLisvtUDrfKYH6hR5CyqOnlHEUsZfSu6kgjyTXWY1Sb1C0z+U9MInkrEr9qU01BAwy75a TZz2eJEccpy8P6h2bDE0MEuaLbpH6W2glwtU75gdxamkKSLjre7vG05yOsPAPD0nweIVrJ ZzHW5qO4Ii6OcOxrdDmzbd7OKOEWrfkDFvHN42LREUeBXgelaXsByDo4tEDJx2BIgfsnRL cc6aa5+iSzYTiYd7JbBxbYUXf9BsHuXxy4l279laAbuRXR/NwHyEZuKUJo+BLw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q0Pb76RFtzRhV; Mon, 17 Apr 2023 11:14:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33HBEhiv024357; Mon, 17 Apr 2023 11:14:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33HBEhFs024356; Mon, 17 Apr 2023 11:14:43 GMT (envelope-from git) Date: Mon, 17 Apr 2023 11:14:43 GMT Message-Id: <202304171114.33HBEhFs024356@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Nuno Teixeira Subject: git: 099afdf238ea - main - deskutils/fet: Update to 6.9.0/Add flavors qt5 and qt6 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eduardo X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 099afdf238ea2f7b4979d9f4143c8a855e793a5a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by eduardo: URL: https://cgit.FreeBSD.org/ports/commit/?id=099afdf238ea2f7b4979d9f4143c8a855e793a5a commit 099afdf238ea2f7b4979d9f4143c8a855e793a5a Author: Zsolt Udvari AuthorDate: 2023-04-17 11:00:55 +0000 Commit: Nuno Teixeira CommitDate: 2023-04-17 11:14:28 +0000 deskutils/fet: Update to 6.9.0/Add flavors qt5 and qt6 - qt6 as default flavor as recommended by upstream - Remove ONLY_CL option: qt6 flavor needs only one package so the ONLY_CL option is useless in qt6 (the number of dependencies don't decrease). I suggest to remove it because (as I understand) qt5 will be outdated soon. ChangeLog: https://lalescu.ro/liviu/fet/news.html PR: 270690 --- deskutils/fet/Makefile | 25 ++++++++++++------------- deskutils/fet/distinfo | 6 +++--- deskutils/fet/pkg-plist | 2 +- 3 files changed, 16 insertions(+), 17 deletions(-) diff --git a/deskutils/fet/Makefile b/deskutils/fet/Makefile index 533c9274261f..fd728bc236e4 100644 --- a/deskutils/fet/Makefile +++ b/deskutils/fet/Makefile @@ -1,10 +1,11 @@ PORTNAME= fet -DISTVERSION= 6.8.7 +DISTVERSION= 6.9.0 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@uzsolt.hu COMMENT= Free timetabling software @@ -13,11 +14,15 @@ WWW= https://lalescu.ro/liviu/fet/ LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING -USES= compiler:c++14-lang gl qmake qt:5 tar:bzip2 -USE_GL= gl -USE_QT= core printsupport widgets buildtools:build +FLAVORS= qt5 qt6 +FLAVOR?= qt6 +CONFLICTS_INSTALL= ${FLAVORS:@fl@fet-${fl}@} -INSTALL_TARGET= ${WRKSRC}/fet-cl +USES= compiler:c++14-lang gl qmake qt:${FLAVOR:S/qt//} tar:bzip2 +USE_GL= gl +_USE_QT5= core gui network printsupport widgets buildtools:build +_USE_QT6= base +USE_QT= ${_USE_QT${FLAVOR:S/qt//}} DESKTOP_ENTRIES= "FET" \ "Free timetable software" \ @@ -28,21 +33,15 @@ DESKTOP_ENTRIES= "FET" \ PORTEXAMPLES= * -OPTIONS_DEFINE= EXAMPLES NLS ONLYCL +OPTIONS_DEFINE= EXAMPLES NLS OPTIONS_SUB= yes -ONLYCL_DESC= Build only command line version (without Qt GUI) - -ONLYCL_VARS= QMAKE_SOURCE_PATH=${WRKSRC}/src/src-cl.pro -ONLYCL_VARS_OFF= INSTALL_TARGET+=${WRKSRC}/fet \ - USE_QT+="gui network" - post-patch: @${REINPLACE_CMD} -e 's|/usr/share/fet|${DATADIR}|g' \ ${WRKSRC}/src/interface/fet.cpp do-install: - ${INSTALL_PROGRAM} ${INSTALL_TARGET} ${STAGEDIR}${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/fet ${STAGEDIR}${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/fet-cl ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/man/fet*.gz ${STAGEDIR}${MANPREFIX}/man/man1 diff --git a/deskutils/fet/distinfo b/deskutils/fet/distinfo index bb5a4bbae165..7221f2638674 100644 --- a/deskutils/fet/distinfo +++ b/deskutils/fet/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1679062403 -SHA256 (fet-6.8.7.tar.bz2) = 35b8657b2cfc2fea4f039fb9028c0fb2505d2184c7aae23f903b38fc98169471 -SIZE (fet-6.8.7.tar.bz2) = 18844884 +TIMESTAMP = 1680876722 +SHA256 (fet-6.9.0.tar.bz2) = daf39231f7c9e4ca99c0540f2e4a78172513044db35266bfc3b0d1a01e2adcd2 +SIZE (fet-6.9.0.tar.bz2) = 18857314 diff --git a/deskutils/fet/pkg-plist b/deskutils/fet/pkg-plist index 142607ba20e5..76777fe48f6f 100644 --- a/deskutils/fet/pkg-plist +++ b/deskutils/fet/pkg-plist @@ -1,4 +1,4 @@ -%%NO_ONLYCL%%bin/fet +bin/fet bin/fet-cl man/man1/fet-cl.1.gz man/man1/fet.1.gz