svn commit: r494124 - head/graphics/xpdf4

[Cy Schubert]

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