From nobody Wed Nov 06 00:24:51 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 4XjmDh1N4lz5bq6N; Wed, 06 Nov 2024 00:24:52 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XjmDh0n4cz4rpy; Wed, 6 Nov 2024 00:24:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730852692; 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=JUf1evT1RBl5PDstYY4xXICpz86eSG6GaI6KQ1UWPVk=; b=DNAji6EgdbXyWSEXfzUVFN3hkdtdsfF2EylDkwwZ2moYeDKT2r/rBvkxwnZUMRc7yeFmcc LV3ELcAbUHFZj3or8tWdIXr6LjxLGkJTHQd5PSlgzVvXHAzVeaPzszLTXKyVw9SWf2Wrpk A9OR1C3uthoG2yHxN52pqVatoWdnjfVCgg/YW1rxNWw0NJPU0ssBwlETO7fwp8vrdHrt53 z1k2C0yh3YgqfRCiWhErBC9vEQBbVj2nCBBePmxlFohdffF8yCI7PXF9a3k7UPpPW/i9hz /5Q5LTCVQKNyUjsTM0keO9WWAhPmrboIFwI+KX8ERbEiUpS/ahVKE6u9mEDbnw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730852692; 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=JUf1evT1RBl5PDstYY4xXICpz86eSG6GaI6KQ1UWPVk=; b=j0aFJyPptk6qTeRoVKb6ps6PmE9kevRGbRDnKDPVfuibgjKvS+/15dSvpRlQ3jIzExKMyw dPGR8eSsAIhQ3PQkxh64dZMO5pK2/M68zck5nOO3T5KzOo2TsKqAaXKnZcoTt7A9Rp4IUY rhoCZ6hO4q7pyjNPcHYrvhP3upaN3VWrE96eFm0jjo/yK0nnQzS8Tzlrq3XD3aU7DXMKFT tZ26M550wiWmU1KfXnNiQxSn9uXSblqsL9Qm4GyoG2anC+CmfV9arKs7EuAHCgIQXPjd0o nQQZvY+uJ3HVCtrDiuFWuN0MgUKXQUrLoGYQ1602ftb+bWWMcVCvG0XcNMBQeQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730852692; a=rsa-sha256; cv=none; b=gzW8CtWQPJaVQUBTdWmtFeWA5YIQnXYLvVcyM9X/KLl5AuiMU55ZmBq7fO8vnm0alm8G6X tPLYIPo7++Vb6XNBtpRJyeEyO7vGDJwFy0YSurEW9r09pKd6pps5XoqzLGIaTNtsDOs8js x0mmO9iu5vrYFBrHRMINYvqjODzOvlIfj0z/Ied1cniMvMjMbCvlwTVqmk30oZQ4h+AEFq KqtBZATHnDxSAvQlXBKsEYr2ju0vL+6dpVcUPiSk8oIx1P7mq1RSA6h3FY43Y2HOLiZ+w/ SkA0KWXxcI3C61RLbcoJA3DcOM1uCeDLCGnWM47tnrQrV2ejhavKZ0cV+14Ngw== 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 4XjmDh0LLQzfjc; Wed, 6 Nov 2024 00:24:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A60OpIt091463; Wed, 6 Nov 2024 00:24:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A60OppA091460; Wed, 6 Nov 2024 00:24:51 GMT (envelope-from git) Date: Wed, 6 Nov 2024 00:24:51 GMT Message-Id: <202411060024.4A60OppA091460@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Sergey A. Osokin" Subject: git: 96de6ae007dd - main - graphics/xpdf4: add Qt5/Qt6 flavors 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: osa X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 96de6ae007dd2d770f685d8997523c9ea2def06d Auto-Submitted: auto-generated The branch main has been updated by osa: URL: https://cgit.FreeBSD.org/ports/commit/?id=96de6ae007dd2d770f685d8997523c9ea2def06d commit 96de6ae007dd2d770f685d8997523c9ea2def06d Author: Sergey A. Osokin AuthorDate: 2024-11-06 00:23:35 +0000 Commit: Sergey A. Osokin CommitDate: 2024-11-06 00:24:46 +0000 graphics/xpdf4: add Qt5/Qt6 flavors Bump PORTREVISION. Approved by: cy (maintainer) --- graphics/xpdf4/Makefile | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/graphics/xpdf4/Makefile b/graphics/xpdf4/Makefile index a6f999c9babe..c41d6d9d7e3c 100644 --- a/graphics/xpdf4/Makefile +++ b/graphics/xpdf4/Makefile @@ -1,5 +1,6 @@ PORTNAME= xpdf PORTVERSION= 4.05 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= graphics print MASTER_SITES= https://dl.xpdfreader.com/ @@ -20,6 +21,13 @@ CONFLICTS_INSTALL+= xpdf3 xpdf CONFLICTS_INSTALL+= xpdf3 xpdf4 .endif +FLAVORS= qt5 qt6 +FLAVOR?= ${FLAVORS:[1]} +qt5_PKGNAMESUFFIX= +qt6_PKGNAMESUFFIX= -qt6 +qt5_CONFLICTS_INSTALL= ${PORTNAME}-qt6 +qt6_CONFLICTS_INSTALL= ${PORTNAME} + USES= compiler:c++11-lang cmake cpe localbase:ldflags LIB_DEPENDS= libfreetype.so:print/freetype2 \ libpng.so:graphics/png \ @@ -33,9 +41,7 @@ CMAKE_ARGS+= -DOPI_SUPPORT:BOOL=ON -DCMAKE_DISABLE_FIND_PACKAGE_Qt4:BOOL=ON \ -DCMAKE_INSTALL_PREFIX=${PREFIX} \ -DCMAKE_INSTALL_BINDIR=${PREFIX}/libexec/xpdf \ -DCMAKE_INSTALL_MANDIR=${PREFIX}/share/xpdf/man \ - -DNO_TEXT_SELECT:BOOL=OFF \ - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Widgets:BOOL=FALSE \ - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Widgets:BOOL=ON + -DNO_TEXT_SELECT:BOOL=OFF CPE_VENDOR= xpdfreader PLIST_SUB= DESKTOPDIR="${DESKTOPDIR}" @@ -51,10 +57,20 @@ TYPE1_RUN_DEPENDS= ${LOCALBASE}/share/ghostscript/fonts/d050000l.pfb:print/gsfon LIBPAPER_CMAKE_BOOL= USE_LIBPAPER LIBPAPER_LIB_DEPENDS= libpaper.so:print/libpaper -GUI_CMAKE_OFF= -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Widgets=1 -GUI_DESC= QT5 interface -GUI_USES= qt:5 desktop-file-utils -GUI_USE= QT=buildtools:build,qmake:build,concurrent,core,gui,widgets,printsupport,svg,network,printsupport +GUI_DESC= GUI interface +GUI_USES= desktop-file-utils + +.if ${FLAVOR} == qt5 +USES+= qt:5 +GUI_USE= QT=buildtools:build,qmake:build,concurrent,core,gui,network,printsupport,svg,widgets +CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Widgets:BOOL=FALSE \ + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Widgets:BOOL=ON +.else +USES+= qt:6 +GUI_USE= QT=base,tools:build +CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Widgets:BOOL=ON \ + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Widgets:BOOL=FALSE +.endif PRINT_CMAKE_ON= -DXPDFWIDGET_PRINTING:BOOL=ON -DCUPS:BOOL=ON PRINT_CMAKE_OFF= -DXPDFWIDGET_PRINTING:BOOL=OFF -DCUPS:BOOL=OFF