From owner-svn-ports-head@freebsd.org Thu Feb 28 03:26:44 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id AAFCF1513B22; Thu, 28 Feb 2019 03:26:44 +0000 (UTC) (envelope-from cy@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4E2EE729DC; Thu, 28 Feb 2019 03:26:44 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 17F3A26DD9; Thu, 28 Feb 2019 03:26:44 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x1S3Qhix034635; Thu, 28 Feb 2019 03:26:43 GMT (envelope-from cy@FreeBSD.org) Received: (from cy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x1S3QhKN034634; Thu, 28 Feb 2019 03:26:43 GMT (envelope-from cy@FreeBSD.org) Message-Id: <201902280326.x1S3QhKN034634@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org using -f From: Cy Schubert Date: Thu, 28 Feb 2019 03:26:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r494124 - head/graphics/xpdf4 X-SVN-Group: ports-head X-SVN-Commit-Author: cy X-SVN-Commit-Paths: head/graphics/xpdf4 X-SVN-Commit-Revision: 494124 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 4E2EE729DC X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.96)[-0.963,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Feb 2019 03:26:44 -0000 Author: cy Date: Thu Feb 28 03:26:43 2019 New Revision: 494124 URL: https://svnweb.freebsd.org/changeset/ports/494124 Log: Rework and reimplementation of previous GUI option. PR: 235895 Modified: head/graphics/xpdf4/Makefile (contents, props changed) head/graphics/xpdf4/pkg-plist (contents, props changed) Modified: head/graphics/xpdf4/Makefile ============================================================================== --- head/graphics/xpdf4/Makefile Thu Feb 28 02:24:22 2019 (r494123) +++ head/graphics/xpdf4/Makefile Thu Feb 28 03:26:43 2019 (r494124) @@ -2,6 +2,7 @@ PORTNAME= xpdf PORTVERSION= 4.01 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= graphics print MASTER_SITES= https://xpdfreader-dl.s3.amazonaws.com/ @@ -22,15 +23,13 @@ CONFLICTS_INSTALL+= xpdf3-* xpdf4-* .endif USES= compiler:c++11-lang cmake localbase:ldflags \ - desktop-file-utils qt:5 + desktop-file-utils LIB_DEPENDS= libfreetype.so:print/freetype2 \ libpng.so:graphics/png BUILD_DEPENDS= ${LOCALBASE}/share/ghostscript/fonts/d050000l.pfb:print/gsfonts RUN_DEPENDS= ${LOCALBASE}/share/ghostscript/fonts/d050000l.pfb:print/gsfonts MANPREFIX= ${PREFIX}/share/xpdf SUB_FILES= xpdf-man.conf -USE_QT= buildtools_build concurrent core gui network printsupport \ - qmake_build svg widgets CMAKE_ARGS+= -DOPI_SUPPORT:BOOL=ON -DCMAKE_DISABLE_FIND_PACKAGE_Qt4:BOOL=ON \ -DUSE_LCMS:BOOL=OFF -DSYSTEM_XPDFRC=${PREFIX}/etc/xpdfrc \ -DCMAKE_INSTALL_PREFIX=${PREFIX} \ @@ -41,8 +40,8 @@ CMAKE_ARGS+= -DOPI_SUPPORT:BOOL=ON -DCMAKE_DISABLE_FIN PLIST_SUB= DESKTOPDIR="${DESKTOPDIR}" -OPTIONS_DEFINE= TYPE1 LIBPAPER PRINT -OPTIONS_DEFAULT= TYPE1 PRINT +OPTIONS_DEFINE= TYPE1 LIBPAPER PRINT GUI +OPTIONS_DEFAULT= TYPE1 PRINT GUI OPTIONS_SUB= yes TYPE1_CMAKE_BOOL= TYPE1 @@ -51,6 +50,12 @@ TYPE1_RUN_DEPENDS= ${LOCALBASE}/share/ghostscript/font 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_CMAKE_ARGS+= -DNO_TEXT_SELECT:BOOL=OFF +GUI_USES= qt:5 +GUI_USE= QT=buildtools_build,qmake_build,concurrent,core,gui,widgets,printsupport,svg,network,printsupport PRINT_CMAKE_ON= -DXPDFWIDGET_PRINTING:BOOL=ON -DCUPS:BOOL=ON PRINT_CMAKE_OFF= -DXPDFWIDGET_PRINTING:BOOL=OFF -DCUPS:BOOL=OFF Modified: head/graphics/xpdf4/pkg-plist ============================================================================== --- head/graphics/xpdf4/pkg-plist Thu Feb 28 02:24:22 2019 (r494123) +++ head/graphics/xpdf4/pkg-plist Thu Feb 28 03:26:43 2019 (r494124) @@ -7,8 +7,8 @@ libexec/xpdf/pdftopng libexec/xpdf/pdftoppm libexec/xpdf/pdftops libexec/xpdf/pdftotext -libexec/xpdf/xpdf -bin/xpdf +%%GUI%%libexec/xpdf/xpdf +%%GUI%%bin/xpdf %%DESKTOPDIR%%/xpdf.desktop etc/man.d/xpdf.conf %%DATADIR%%/man/man1/pdfdetach.1.gz @@ -20,6 +20,6 @@ etc/man.d/xpdf.conf %%DATADIR%%/man/man1/pdftoppm.1.gz %%DATADIR%%/man/man1/pdftops.1.gz %%DATADIR%%/man/man1/pdftotext.1.gz -%%DATADIR%%/man/man1/xpdf.1.gz +%%GUI%%%%DATADIR%%/man/man1/xpdf.1.gz %%DATADIR%%/man/man5/xpdfrc.5.gz @sample etc/xpdfrc.sample