4 files changed, 20 insertions, 35 deletions

diff --git a/graphics/qcomicbook/Makefile b/graphics/qcomicbook/Makefile
index f1bf175799b1..5853af7281e3 100644
--- a/graphics/qcomicbook/Makefile
+++ b/graphics/qcomicbook/Makefile
@@ -1,30 +1,22 @@
-# New ports collection makefile for:	qcomicbook
-# Date created:				24 April, 2005
-# Whom:					Adam Weinberger <adamw@FreeBSD.org>
-#
+# Created by: Adam Weinberger <adamw@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	qcomicbook
-PORTVERSION=	0.8.1
-PORTREVISION=	3
+PORTVERSION=	0.9.0
 CATEGORIES=	graphics
 MASTER_SITES=	http://qcomicbook.linux-projects.net/releases/
 
 MAINTAINER=	lioux@FreeBSD.org
-COMMENT=	QT-based comic book archive viewer
+COMMENT=	Qt-based comic book archive viewer
 
 LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	lrelease-qt4:${PORTSDIR}/devel/qt4-linguist
-LIB_DEPENDS=	poppler-qt4.3:${PORTSDIR}/graphics/poppler-qt4
+LIB_DEPENDS=	poppler-qt4:${PORTSDIR}/graphics/poppler-qt4
 RUN_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip \
 		unrar:${PORTSDIR}/archivers/unrar
-
-USE_QT4=	corelib gui moc_build qmake_build rcc_build uic_build \
-		xml
-USE_CMAKE=	yes
+USE_QT4=	corelib gui linguist_build moc_build qmake_build rcc_build \
+		uic_build xml
+USES=		cmake
 MAKE_JOBS_SAFE=	yes
 
 PLIST_FILES=	\
@@ -33,6 +25,7 @@ PLIST_FILES=	\
 		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 \
@@ -46,15 +39,17 @@ PLIST_FILES=	\
 		share/qcomicbook/i18n/qcomicbook_uk_UA.qm \
 		share/qcomicbook/i18n/qcomicbook_zh_CN.qm
 
-#
 PLIST_DIRS=	share/qcomicbook/i18n \
 		share/qcomicbook
 
 MAN1=		qcomicbook.1
 NO_MANCOMPRESS=	yes
 
-OPTIONS=	7ZIP "Enable support for 7-Zip (.cb7) comic book archives" on \
-		ACE "Enable support for ACE (.cba) comic book archives" on
+OPTIONS_DEFINE=	7ZIP ACE
+OPTIONS_DEFAULT=7ZIP ACE
+
+7ZIP_DESC=	7-Zip (.cb7) comic book archives support
+ACE_DESC=	ACE (.cba) comic book archives support
 
 post-patch:
 # fix man install directory
@@ -66,25 +61,16 @@ post-patch:
 		-e 's|(qcomicbook.png)|${PREFIX}/share/pixmaps/\1|' \
 		${WRKSRC}/data/qcomicbook.desktop
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 700042
-CPPFLAGS+=	${PTHREAD_CFLAGS}
-QTCFGLIBS+=	${PTHREAD_LIBS}
-.endif
-
-.if ${OSVERSION} < 700000
-BROKEN=		does not link on 6.X
-.endif
+.include <bsd.port.options.mk>
 
 # 7-Zip (.cb7) support
-.if !defined(WITHOUT_7ZIP)
+.if ${PORT_OPTIONS:M7ZIP}
 RUN_DEPENDS+=	7z:${PORTSDIR}/archivers/p7zip
 .endif
 
 # ACE (.cba) support
-.if !defined(WITHOUT_ACE)
+.if ${PORT_OPTIONS:MACE}
 RUN_DEPENDS+=	unace:${PORTSDIR}/archivers/unace
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/qcomicbook/distinfo b/graphics/qcomicbook/distinfo
index 38c6caabd265..571af9114710 100644
--- a/graphics/qcomicbook/distinfo
+++ b/graphics/qcomicbook/distinfo
@@ -1,2 +1,2 @@
-SHA256 (qcomicbook-0.8.1.tar.gz) = 1f9f8d8d49571da507a57ec69a59338fe9d268784758fd232842a4b0c3d3124e
-SIZE (qcomicbook-0.8.1.tar.gz) = 716588
+SHA256 (qcomicbook-0.9.0.tar.gz) = 8e36f94d7b55798258b6df085324da150b0983020853eb270992157e9692abcb
+SIZE (qcomicbook-0.9.0.tar.gz) = 738514
diff --git a/graphics/qcomicbook/pkg-descr b/graphics/qcomicbook/pkg-descr
index 6876580d3e47..90e9eadb7013 100644
--- a/graphics/qcomicbook/pkg-descr
+++ b/graphics/qcomicbook/pkg-descr
@@ -6,7 +6,7 @@ convenience and ease of use. Features include:
 	* full-screen mode
 	* two-pages mode and japanese mode
 	* thumbnails view
-	* page scaling (fit to window witdth/height, whole page)
+	* page scaling (fit to window width/height, whole page)
 	* mouse or keyboard navigation, whatever you prefer
 	* bookmarks
 	* PDF support
diff --git a/graphics/qcomicbook/pkg-plist b/graphics/qcomicbook/pkg-plist
deleted file mode 100644
index c600576442b4..000000000000
--- a/graphics/qcomicbook/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-@dirrmtry share/applications