From owner-svn-ports-all@freebsd.org Wed Feb 20 06:59:46 2019 Return-Path: Delivered-To: svn-ports-all@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 CAA8D14E8485; Wed, 20 Feb 2019 06:59:46 +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 4B51868140; Wed, 20 Feb 2019 06:59:46 +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 38D081B6F; Wed, 20 Feb 2019 06:59:46 +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 x1K6xjxi010648; Wed, 20 Feb 2019 06:59:45 GMT (envelope-from cy@FreeBSD.org) Received: (from cy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x1K6xjRB010647; Wed, 20 Feb 2019 06:59:45 GMT (envelope-from cy@FreeBSD.org) Message-Id: <201902200659.x1K6xjRB010647@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org using -f From: Cy Schubert Date: Wed, 20 Feb 2019 06:59:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r493411 - head/graphics/xpdf4 X-SVN-Group: ports-head X-SVN-Commit-Author: cy X-SVN-Commit-Paths: head/graphics/xpdf4 X-SVN-Commit-Revision: 493411 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 4B51868140 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_SHORT(-0.96)[-0.958,0]; NEURAL_HAM_LONG(-1.00)[-0.999,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Feb 2019 06:59:47 -0000 Author: cy Date: Wed Feb 20 06:59:45 2019 New Revision: 493411 URL: https://svnweb.freebsd.org/changeset/ports/493411 Log: Properly specify USE_QT. This has been broken since this port was created. While here pet portlint. Reported by: koobs@, tobik@ Point hat to: cy@ Modified: head/graphics/xpdf4/Makefile Modified: head/graphics/xpdf4/Makefile ============================================================================== --- head/graphics/xpdf4/Makefile Wed Feb 20 06:51:49 2019 (r493410) +++ head/graphics/xpdf4/Makefile Wed Feb 20 06:59:45 2019 (r493411) @@ -7,9 +7,6 @@ CATEGORIES= graphics print MASTER_SITES= https://xpdfreader-dl.s3.amazonaws.com/ .if !defined(MASTERDIR) PKGNAMESUFFIX= 4 -CONFLICTS_INSTALL= xpdf3-* xpdf-* -.else -CONFLICTS_INSTALL= xpdf3-* xpdf4-* .endif MAINTAINER= cy@FreeBSD.org @@ -17,17 +14,21 @@ COMMENT= Display PDF files and convert them to other f LICENSE= GPLv2 -LIB_DEPENDS= libfreetype.so:print/freetype2 \ - libpng.so:graphics/png - CONFLICTS_INSTALL= xpdf +.if !defined(MASTERDIR) +CONFLICTS_INSTALL+= xpdf3-* xpdf-* +.else +CONFLICTS_INSTALL+= xpdf3-* xpdf4-* +.endif -MANPREFIX= ${PREFIX}/share/xpdf -SUB_FILES= xpdf-man.conf - USES= compiler:c++11-lang cmake localbase:ldflags \ desktop-file-utils qt:5 -USE_QT= buildtools_build,concurrent,core,gui,network,printsupport,qmake_build,svg,widgets +LIB_DEPENDS= libfreetype.so:print/freetype2 \ + libpng.so:graphics/png +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} \