From nobody Mon Mar 11 05:53:30 2024 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 4TtQtg1zdZz5DknT; Mon, 11 Mar 2024 05:53:31 +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 4TtQtf69xBz4QMN; Mon, 11 Mar 2024 05:53:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710136410; 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=xb6pkp0cM1C5/dYNu6CYmo8iq0g842ioyu3nDCxFbjI=; b=U10hYcpRICe/zDwW+4I22Sq+3hLwPSlwaBfd59wjw4msrJ1uyLEHpPxF8a4miR9c32lC1M Ud+2/5rfHVjKjKV8UWn76Xrm0Kay+jxrElVTMfbsmFnMFwGHNUvTl3fU4LWtaInZ2weUw5 1+wmnS9v8tf6gmOC0+wed98nIgO9lfoO45fqAEsC3NH5uza7u88kYD0Egn65A8x34HfNSE uyhdhZCy81Yfjqzz6JfPUAXXJB69YfooZwxbUigkdrnWnEFX/yulQKT+SJ4NZyW1OemEnv b3jO2BJou0fDB6gPPiPdqZnUFZPKGeTKludLe9PCUhCb9F/OUiEbHA991z7cJQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710136410; a=rsa-sha256; cv=none; b=cPL/ETJtMlKZoLE+CquunuXzg0GYdumqqDZJb+giNpqFyd73aw84G0lDAWZqI31SaRDRsk EHl99iv7BuQv8GI5KUPbhUqhRVwxI1KSB2trXDTYqGE9aoHwAJr7owNQO+O07hdRUjWkZR WbnxPypQgvbeNT6CxznMlKdq4aHd6gAhDxzeyn8aWztrppY03ZMlHdEF1RHy5oLg6grCUZ zLzZxlgzNSaY5MLhYf3GqI0HjoAl+AJ3li4XeTTZEXCq6340fdII3Mn1aISqe3I8344aa/ CcOJB+vdz53qhJ0eMlgyxKkax4uOjXNT1cLWTlQqxY7RSSYrprrtHNbKaudGhw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710136410; 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=xb6pkp0cM1C5/dYNu6CYmo8iq0g842ioyu3nDCxFbjI=; b=U0dE7iJ73EWCH4AYJIlAE2nfyG6u88p3NoyVzcP9uzlHrMbqDxeXH4i10vtFRbUbMdnH9s eNGQ1mR4WFDhKOKeTBlnjJ3IBffiDOul3c8jNJNcG49UNu/vV1fOPfgRm/B3Fq7qSSTchB VCxltowFurdcHQtOVoNlZriri0kJrVcDQIB6PwEvJ4ZY/gxT24KETg/jvGuAbU0w8oGxhO qXConygjNNivtEUQcxUlU2+01V8zqrNBzDdt096H4L0qVl1L7nOf3lzBHNEzv9vGiepz7H Y3ZBiW/M3qxd3SOozqvnqs0JmaMVogLW1YGxdRFZjQ7OIej3RXI1JtdEKJaBhw== 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 4TtQtf5lLnzHr9; Mon, 11 Mar 2024 05:53:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42B5rUxC051463; Mon, 11 Mar 2024 05:53:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42B5rUnK051461; Mon, 11 Mar 2024 05:53:30 GMT (envelope-from git) Date: Mon, 11 Mar 2024 05:53:30 GMT Message-Id: <202403110553.42B5rUnK051461@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: 731a1350fde4 - main - graphics/yacreader: prefer Qt6 after 163e26d8c6d7 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: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 731a1350fde4a5efe0cc5141f0c64dbbc9ff770f Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=731a1350fde4a5efe0cc5141f0c64dbbc9ff770f commit 731a1350fde4a5efe0cc5141f0c64dbbc9ff770f Author: Jan Beich AuthorDate: 2024-03-10 23:19:27 +0000 Commit: Jan Beich CommitDate: 2024-03-11 05:52:33 +0000 graphics/yacreader: prefer Qt6 after 163e26d8c6d7 --- graphics/yacreader/Makefile | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/graphics/yacreader/Makefile b/graphics/yacreader/Makefile index ef18f42a7726..bcd20e93a9ab 100644 --- a/graphics/yacreader/Makefile +++ b/graphics/yacreader/Makefile @@ -1,6 +1,6 @@ PORTNAME= yacreader DISTVERSION= 9.14.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MAINTAINER= jbeich@FreeBSD.org @@ -10,21 +10,21 @@ WWW= https://www.yacreader.com/ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING.txt -FLAVORS= qt5 qt6 +FLAVORS= qt6 qt5 -USES= compiler:c++11-lib desktop-file-utils pkgconfig qmake qt:5 +USES= compiler:c++11-lib desktop-file-utils pkgconfig qmake qt:6 USE_GITHUB= yes +USE_QT= 5compat base declarative multimedia svg tools:build + +.if ${FLAVOR:U} == qt5 +PKGNAMESUFFIX= -${FLAVOR} +USES:= ${USES:S/qt:6/qt:5/} USE_QT= qmake:build buildtools:build core concurrent:build declarative \ gui linguisttools:build multimedia network quickcontrols2 \ sql sql-sqlite3:run svg testlib:build widgets - -.if ${FLAVOR:U} == qt6 -PKGNAMESUFFIX= -${FLAVOR} -USES:= ${USES:S/qt:5/qt:6/} -USE_QT= 5compat base declarative multimedia svg tools:build CONFLICTS_INSTALL= ${PORTNAME} .else -CONFLICTS_INSTALL= ${PORTNAME}-qt6 +CONFLICTS_INSTALL= ${PORTNAME}-qt5 .endif OPTIONS_DEFINE= ARCHIVE OPENGL POPPLER