From owner-svn-ports-head@FreeBSD.ORG Mon Nov 25 14:38:48 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5DFCF794; Mon, 25 Nov 2013 14:38:48 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4CD812E31; Mon, 25 Nov 2013 14:38:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAPEcm2R076587; Mon, 25 Nov 2013 14:38:48 GMT (envelope-from makc@svn.freebsd.org) Received: (from makc@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAPEclBv076583; Mon, 25 Nov 2013 14:38:47 GMT (envelope-from makc@svn.freebsd.org) Message-Id: <201311251438.rAPEclBv076583@svn.freebsd.org> From: Max Brazhnikov Date: Mon, 25 Nov 2013 14:38:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r334853 - head/print/qpdfview X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.16 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: Mon, 25 Nov 2013 14:38:48 -0000 Author: makc Date: Mon Nov 25 14:38:47 2013 New Revision: 334853 URL: http://svnweb.freebsd.org/changeset/ports/334853 Log: - Convert to USES=qmake - Use options helpers - Add stage support - Update port comment/description - Fix PDF option, add CUPS option Approved by: vg (maintainer) Modified: head/print/qpdfview/Makefile head/print/qpdfview/pkg-descr head/print/qpdfview/pkg-plist Modified: head/print/qpdfview/Makefile ============================================================================== --- head/print/qpdfview/Makefile Mon Nov 25 14:21:29 2013 (r334852) +++ head/print/qpdfview/Makefile Mon Nov 25 14:38:47 2013 (r334853) @@ -7,59 +7,40 @@ CATEGORIES= print MASTER_SITES= https://launchpadlibrarian.net/140746246/ MAINTAINER= vg@FreeBSD.org -COMMENT= Tabbed PDF viewer using the poppler library +COMMENT= Tabbed DjVu/PDF/PS document viewer LICENSE= GPLv2 -LIB_DEPENDS= poppler-qt4:${PORTSDIR}/graphics/poppler-qt4 \ - cups:${PORTSDIR}/print/cups-client - -USES= pkgconfig -USE_QT4= corelib dbus gui imageformats linguist_build moc_build \ - qmake_build rcc_build sql sql-sqlite3_run svg xml -QMAKEFLAGS+= QMAKE_CFLAGS_RELEASE="" QMAKE_CXXFLAGS_RELEASE="" +USES= desktop-file-utils pkgconfig qmake +USE_QT4= corelib dbus gui imageformats_run linguist_build moc_build \ + rcc_build sql sql-sqlite3_run svg xml +QMAKE_ARGS+= QMAKE_CFLAGS_RELEASE="" QMAKE_CXXFLAGS_RELEASE="" +QMAKE_SOURCE_PATH= ${PORTNAME}.pro DATADIR= ${PREFIX}/share/${PORTNAME} -MAN1= ${PORTNAME}.1 +OPTIONS_DEFINE= CUPS +OPTIONS_MULTI= BACKEND +OPTIONS_MULTI_BACKEND= DJVU PDF PS +BACKEND_DESC= Documents support +OPTIONS_DEFAULT= CUPS PDF +OPTIONS_SUB= yes + +CUPS_QMAKE_OFF= "CONFIG+=without_cups" +CUPS_LIB_DEPENDS= libcups.so:${PORTSDIR}/print/cups-client + +DJVU_LIB_DEPENDS= libdjvulibre.so:${PORTSDIR}/graphics/djvulibre +DJVU_QMAKE_OFF= "CONFIG+=without_djvu" -OPTIONS_DEFINE= DJVU PDF PS -DJVU_DESC= DjVu support -PS_DESC= PostScript support -OPTIONS_DEFAULT= PDF - -NO_STAGE= yes -.include - -.if ${PORT_OPTIONS:MDJVU} -PLIST_SUB+= DJVU="" -LIB_DEPENDS+= djvulibre:${PORTSDIR}/graphics/djvulibre -.else -QMAKEFLAGS+= "CONFIG+=without_djvu" -PLIST_SUB+= DJVU="@comment " -.endif - -.if ${PORT_OPTIONS:MPDF} -PLIST_SUB+= PDF="" -.else -QMAKEFLAGS+= "CONFIG+=without_pdf" -PLIST_SUB+= PDF="@comment " -.endif - -.if ${PORT_OPTIONS:MPS} -PLIST_SUB+= PS="" -LIB_DEPENDS+= spectre:${PORTSDIR}/print/libspectre -.else -QMAKEFLAGS+= "CONFIG+=without_ps" -PLIST_SUB+= PS="@comment " -.endif +PDF_LIB_DEPENDS= libpoppler-qt4.so:${PORTSDIR}/graphics/poppler-qt4 +PDF_QMAKE_OFF= "CONFIG+=without_pdf" + +PS_LIB_DEPENDS= libspectre.so:${PORTSDIR}/print/libspectre +PS_QMAKE_OFF= "CONFIG+=without_ps" pre-configure: ${REINPLACE_CMD} -e 's#/usr#${PREFIX}#g;s#${PREFIX}/share/man#${PREFIX}/man#g' \ ${WRKSRC}/${PORTNAME}.pri - -do-configure: - cd ${WRKSRC} && lrelease-qt4 ${PORTNAME}.pro - cd ${WRKSRC} && ${QMAKE} ${QMAKEFLAGS} ${PORTNAME}.pro + cd ${WRKSRC} && ${LRELEASE} ${PORTNAME}.pro .include Modified: head/print/qpdfview/pkg-descr ============================================================================== --- head/print/qpdfview/pkg-descr Mon Nov 25 14:21:29 2013 (r334852) +++ head/print/qpdfview/pkg-descr Mon Nov 25 14:38:47 2013 (r334853) @@ -1,3 +1,5 @@ -qpdfview is a tabbed PDF viewer using the poppler library. +qpdfview is a tabbed document viewer. It uses Poppler for PDF +support, libspectre for PS support, DjVuLibre for DjVu support, +CUPS for printing support and the Qt toolkit for its interface. WWW: https://launchpad.net/qpdfview Modified: head/print/qpdfview/pkg-plist ============================================================================== --- head/print/qpdfview/pkg-plist Mon Nov 25 14:21:29 2013 (r334852) +++ head/print/qpdfview/pkg-plist Mon Nov 25 14:38:47 2013 (r334853) @@ -2,6 +2,7 @@ bin/qpdfview %%DJVU%%lib/qpdfview/libqpdfview_djvu.so %%PDF%%lib/qpdfview/libqpdfview_pdf.so %%PS%%lib/qpdfview/libqpdfview_ps.so +man/man1/qpdfview.1.gz share/applications/qpdfview.desktop %%DATADIR%%/help.html %%DATADIR%%/qpdfview.svg