From owner-svn-ports-all@FreeBSD.ORG Mon May 12 10:05:40 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9E18D8AD; Mon, 12 May 2014 10:05:40 +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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8B2762168; Mon, 12 May 2014 10:05:40 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4CA5e1r044636; Mon, 12 May 2014 10:05:40 GMT (envelope-from makc@svn.freebsd.org) Received: (from makc@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4CA5eh8044634; Mon, 12 May 2014 10:05:40 GMT (envelope-from makc@svn.freebsd.org) Message-Id: <201405121005.s4CA5eh8044634@svn.freebsd.org> From: Max Brazhnikov Date: Mon, 12 May 2014 10:05:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r353792 - head/graphics/qcomicbook X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 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: Mon, 12 May 2014 10:05:40 -0000 Author: makc Date: Mon May 12 10:05:39 2014 New Revision: 353792 URL: http://svnweb.freebsd.org/changeset/ports/353792 QAT: https://qat.redports.org/buildarchive/r353792/ Log: graphics/qcomicbook: - Add stage support - Use options helpers - Convert to pkg-plist - Make all archivers optional and disable by default to give pkg users more control over dependencies/functionality. - Take maintainership Added: head/graphics/qcomicbook/pkg-plist (contents, props changed) Modified: head/graphics/qcomicbook/Makefile Modified: head/graphics/qcomicbook/Makefile ============================================================================== --- head/graphics/qcomicbook/Makefile Mon May 12 10:00:49 2014 (r353791) +++ head/graphics/qcomicbook/Makefile Mon May 12 10:05:39 2014 (r353792) @@ -3,55 +3,34 @@ PORTNAME= qcomicbook PORTVERSION= 0.9.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= http://qcomicbook.linux-projects.net/releases/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= makc@FreeBSD.org COMMENT= Qt-based comic book archive viewer LICENSE= GPLv2 LIB_DEPENDS= libpoppler-qt4.so:${PORTSDIR}/graphics/poppler-qt4 -RUN_DEPENDS= unzip:${PORTSDIR}/archivers/unzip \ - unrar:${PORTSDIR}/archivers/unrar USE_QT4= corelib gui linguist_build moc_build qmake_build rcc_build \ uic_build xml -USES= cmake pkgconfig +USES= cmake:outsource pkgconfig -PLIST_FILES= \ - ${DESKTOPDIR:S,^${PREFIX}/,,}/${PORTNAME}.desktop \ - bin/qcomicbook \ - share/pixmaps/qcomicbook.png \ - share/qcomicbook/i18n/qcomicbook_cs_CZ.qm \ - share/qcomicbook/i18n/qcomicbook_de_DE.qm \ - share/qcomicbook/i18n/qcomicbook_en_EN.qm \ - share/qcomicbook/i18n/qcomicbook_es_ES.qm \ - share/qcomicbook/i18n/qcomicbook_it_IT.qm \ - share/qcomicbook/i18n/qcomicbook_fi_FI.qm \ - share/qcomicbook/i18n/qcomicbook_fr_FR.qm \ - share/qcomicbook/i18n/qcomicbook_fr_CA.qm \ - share/qcomicbook/i18n/qcomicbook_ko_KR.qm \ - share/qcomicbook/i18n/qcomicbook_nl_NL.qm \ - share/qcomicbook/i18n/qcomicbook_pl_PL.qm \ - share/qcomicbook/i18n/qcomicbook_pt_BR.qm \ - share/qcomicbook/i18n/qcomicbook_ru_RU.qm \ - share/qcomicbook/i18n/qcomicbook_uk_UA.qm \ - share/qcomicbook/i18n/qcomicbook_zh_CN.qm +OPTIONS_DEFINE= 7ZIP ACE RAR ZIP -PLIST_DIRS= share/qcomicbook/i18n \ - share/qcomicbook +7ZIP_DESC= 7-Zip (.cb7) comic book archives support +7ZIP_RUN_DEPENDS= 7z:${PORTSDIR}/archivers/p7zip -MAN1= qcomicbook.1 -NO_MANCOMPRESS= yes +ACE_DESC= ACE (.cba) comic book archives support +ACE_RUN_DEPENDS= unace:${PORTSDIR}/archivers/unace -OPTIONS_DEFINE= 7ZIP ACE -OPTIONS_DEFAULT=7ZIP ACE +RAR_DESC= Rar (.cbr) comic book archives support +RAR_RUN_DEPENDS= unrar:${PORTSDIR}/archivers/unrar -7ZIP_DESC= 7-Zip (.cb7) comic book archives support -ACE_DESC= ACE (.cba) comic book archives support +ZIP_DESC= Zip (.cbz) comic book archives support +ZIP_RUN_DEPENDS= unzip:${PORTSDIR}/archivers/unzip -NO_STAGE= yes post-patch: # fix man install directory @${REINPLACE_CMD} -E \ @@ -62,16 +41,4 @@ post-patch: -e 's|(qcomicbook.png)|${PREFIX}/share/pixmaps/\1|' \ ${WRKSRC}/data/qcomicbook.desktop -.include - -# 7-Zip (.cb7) support -.if ${PORT_OPTIONS:M7ZIP} -RUN_DEPENDS+= 7z:${PORTSDIR}/archivers/p7zip -.endif - -# ACE (.cba) support -.if ${PORT_OPTIONS:MACE} -RUN_DEPENDS+= unace:${PORTSDIR}/archivers/unace -.endif - .include Added: head/graphics/qcomicbook/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/qcomicbook/pkg-plist Mon May 12 10:05:39 2014 (r353792) @@ -0,0 +1,21 @@ +bin/qcomicbook +man/man1/qcomicbook.1.gz +share/applications/qcomicbook.desktop +share/pixmaps/qcomicbook.png +%%DATADIR%%/i18n/qcomicbook_cs_CZ.qm +%%DATADIR%%/i18n/qcomicbook_de_DE.qm +%%DATADIR%%/i18n/qcomicbook_en_EN.qm +%%DATADIR%%/i18n/qcomicbook_es_ES.qm +%%DATADIR%%/i18n/qcomicbook_fi_FI.qm +%%DATADIR%%/i18n/qcomicbook_fr_CA.qm +%%DATADIR%%/i18n/qcomicbook_fr_FR.qm +%%DATADIR%%/i18n/qcomicbook_it_IT.qm +%%DATADIR%%/i18n/qcomicbook_ko_KR.qm +%%DATADIR%%/i18n/qcomicbook_nl_NL.qm +%%DATADIR%%/i18n/qcomicbook_pl_PL.qm +%%DATADIR%%/i18n/qcomicbook_pt_BR.qm +%%DATADIR%%/i18n/qcomicbook_ru_RU.qm +%%DATADIR%%/i18n/qcomicbook_uk_UA.qm +%%DATADIR%%/i18n/qcomicbook_zh_CN.qm +@dirrm %%DATADIR%%/i18n +@dirrm %%DATADIR%%