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

2 files changed, 33 insertions, 45 deletions

diff --git a/graphics/qcomicbook/Makefile b/graphics/qcomicbook/Makefile
index bc81f3531acd..842c34353a04 100644
--- a/graphics/qcomicbook/Makefile
+++ b/graphics/qcomicbook/Makefile
@@ -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 <bsd.port.options.mk>
-
-# 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 <bsd.port.mk>
diff --git a/graphics/qcomicbook/pkg-plist b/graphics/qcomicbook/pkg-plist
new file mode 100644
index 000000000000..d678a6e05380
--- /dev/null
+++ b/graphics/qcomicbook/pkg-plist
@@ -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%%