From nobody Fri Nov 08 19:49:29 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 4XlTzY4LD6z5cjDr; Fri, 08 Nov 2024 19:49:29 +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 4XlTzY2qR9z4FW8; Fri, 8 Nov 2024 19:49:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731095369; 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=JXZf4885F74iw6Du1JZXedDy0+vo/LS7JVvJEC4Lmbc=; b=h/TTU+9SDE7myPJc/FO7+7qaQVaH88LbjAd87TrYgjmQ7bGZ5CChesMboPJfPO9OUQVQou U4vC2AO9ByLyTsMWhLf2NzXyXaZ9rIv/vr21Y0l8y0qI8idtXWMzx8YEnorprVFo+HqWXv Q4h5Zgw5+TWxbe68y7p+YpJ8DtOn/Nxls+dlq0qDxFVHd2nFkQS2OEiuppQwHXf/ayfSpQ EyGhJ8LeiwI4IXneoUi2fYBBX7coGt6HSY/QcCC6g0wnUly5KX/kwePubFUZfu14ULzImK L/HkufhivdFbqmdF3bLZ2jCpEGJEZrMiNYDPUsbpwXmKF/UYKW6eZJe9cg+x1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731095369; 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=JXZf4885F74iw6Du1JZXedDy0+vo/LS7JVvJEC4Lmbc=; b=e0PVddJmusSKIa4qp4N1PHhQDH3uvupJnoLD4SL0jQT5dK0/x3juERN/WJ5CHZ8yj/zcKE ewFG2Wpl+sSkKWr2lAgIZi6YDHGYA66lbVWJ+C2FYNsUSwdOQb10NOHhzElkuVqoo1rLWU rOq+yNV2zzUHVjKCh7gzowa5SrlhTBMcY88N7bNpf9jGUTwUbJyxM0C36hE2PVhMMCz7Wx pVLi3p7Rj+DndsIOwp+uTWhiY06PBRvE7pKwvBaQISGpvBwXN3N9ngzkkjY8yZ19wjWfNW u4rkV5b2jECAWygX6UDdf5oZeqVU7uGRc+YtWFQtKDpgdOAqq0gfP24NSJTA5w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731095369; a=rsa-sha256; cv=none; b=xUG9O9/OlafAIJhNG6MnbxdyhOEVCRw3XK3rRXEY+ShNElYgvN8GnL7tOqNezJxC7ZNd+C Uf6V/Hzv5MQrFdBtezvhPeTEi7k5nOatss+b0qBuznIOS2rIcBEoQboah6EjlO/wWZb48c KsJYLb7i9SQzXetabBSzUsE2WDuw/0LeoemnR398bSe45PbfGoZRiWa3bFjwkyw32GcOtj aOjtEf3PUlvh7s8PpcrcXoSVwpCVZ4GR6YcHU59WAsDf39SFjaO/Q4kq9T/ZXYAl52JkM+ 1iTiI0KLdDJNpac+ttShWtqgHmpRCXVjPl5RlxjJNcqWliBBG1r40Ka1HtSRgg== 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 4XlTzY2727zjh9; Fri, 8 Nov 2024 19:49:29 +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 4A8JnTZa002654; Fri, 8 Nov 2024 19:49:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A8JnTsw002651; Fri, 8 Nov 2024 19:49:29 GMT (envelope-from git) Date: Fri, 8 Nov 2024 19:49:29 GMT Message-Id: <202411081949.4A8JnTsw002651@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: 980f3d067c8a - 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: 980f3d067c8a375b10ef79854b8bf791599df284 Auto-Submitted: auto-generated The branch main has been updated by osa: URL: https://cgit.FreeBSD.org/ports/commit/?id=980f3d067c8a375b10ef79854b8bf791599df284 commit 980f3d067c8a375b10ef79854b8bf791599df284 Author: Sergey A. Osokin AuthorDate: 2024-11-08 19:32:38 +0000 Commit: Sergey A. Osokin CommitDate: 2024-11-08 19:49:22 +0000 graphics/xpdf4: add Qt5/Qt6 flavors Bump PORTREVISION. Approved by: cy (maintainer) Differential Revision: https://reviews.freebsd.org/D47466 --- graphics/xpdf4/Makefile | 41 ++++++++++++++++++++++++++++++----------- 1 file changed, 30 insertions(+), 11 deletions(-) diff --git a/graphics/xpdf4/Makefile b/graphics/xpdf4/Makefile index 59c26202b9ac..74358d07f7e5 100644 --- a/graphics/xpdf4/Makefile +++ b/graphics/xpdf4/Makefile @@ -1,12 +1,9 @@ PORTNAME= xpdf PORTVERSION= 4.05 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= graphics print MASTER_SITES= https://dl.xpdfreader.com/ -.if !defined(MASTERDIR) -PKGNAMESUFFIX= 4 -.endif MAINTAINER= cy@FreeBSD.org COMMENT= Display PDF files and convert them to other formats @@ -21,6 +18,20 @@ CONFLICTS_INSTALL+= xpdf3 xpdf CONFLICTS_INSTALL+= xpdf3 xpdf4 .endif +FLAVORS= qt5 qt6 +FLAVOR?= ${FLAVORS:[1]} +.if !defined(MASTERDIR) +qt5_PKGNAMESUFFIX= 4 +qt6_PKGNAMESUFFIX= 4-qt6 +qt5_CONFLICTS_INSTALL= ${PORTNAME}4-qt6 +qt6_CONFLICTS_INSTALL= ${PORTNAME}4 +.else +qt5_PKGNAMESUFFIX= +qt6_PKGNAMESUFFIX= -qt6 +qt5_CONFLICTS_INSTALL= ${PORTNAME}-qt6 +qt6_CONFLICTS_INSTALL= ${PORTNAME} +.endif + USES= compiler:c++11-lang cmake cpe localbase:ldflags LIB_DEPENDS= libfreetype.so:print/freetype2 \ libpng.so:graphics/png \ @@ -34,9 +45,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}" @@ -52,10 +61,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