5 files changed, 33 insertions, 51 deletions

diff --git a/graphics/qcomicbook/Makefile b/graphics/qcomicbook/Makefile
index 7d9751f80491..02408ee8de72 100644
--- a/graphics/qcomicbook/Makefile
+++ b/graphics/qcomicbook/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	qcomicbook
-PORTVERSION=	0.4.4
-PORTREVISION=	1
+PORTVERSION=	0.5.0
 CATEGORIES=	graphics
-MASTER_SITES=	http://linux.bydg.org/~yogin/qcomicbook/
+MASTER_SITES=	http://qcomicbook.linux-projects.net/releases/
 
 MAINTAINER=	lioux@FreeBSD.org
 COMMENT=	QT-based comic book archive viewer
@@ -21,22 +20,31 @@ LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USE_QT_VER=	4
-QT_COMPONENTS=	gui moc_build
-USE_GNOME=	pkgconfig
-USE_GMAKE=	yes
-# USE_EFL=	imlib2 #disabled in this release
-GNU_CONFIGURE=	yes
+QT_COMPONENTS=	gui moc_build uic
+USE_CMAKE=	yes
 MAKE_JOBS_SAFE=	yes
 
-MAN1=		qcomicbook.1
+PLIST_FILES=	\
+		${DESKTOPDIR:S,^${PREFIX}/,,}/${PORTNAME}.desktop \
+		bin/qcomicbook \
+		share/pixmaps/qcomicbook.png
 
-DESKTOP_ENTRIES="QComicBook" "Comic Book Viewer" \
-		"${PREFIX}/share/pixmaps/${PORTNAME}.png" \
-		"qcomicbook" "" false
+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
 
+post-patch:
+# fix man install directory
+	@${REINPLACE_CMD} -E \
+		-e 's|share/man|man|' \
+		${WRKSRC}/help/CMakeLists.txt
+# fix pixmap location
+	@${REINPLACE_CMD} -E \
+		-e 's|(qcomicbook.png)|${PREFIX}/share/pixmaps/\1|' \
+		${WRKSRC}/data/qcomicbook.desktop
+
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 700042
diff --git a/graphics/qcomicbook/distinfo b/graphics/qcomicbook/distinfo
index d20cef57f0eb..91d27fc1f697 100644
--- a/graphics/qcomicbook/distinfo
+++ b/graphics/qcomicbook/distinfo
@@ -1,3 +1,3 @@
-MD5 (qcomicbook-0.4.4.tar.gz) = 461ffcda36df1d4d32abb0ee074510cb
-SHA256 (qcomicbook-0.4.4.tar.gz) = dd420691a74697b4be9ce66daa12ad542b099e37c148225bc8aa15434e4c9f8a
-SIZE (qcomicbook-0.4.4.tar.gz) = 373675
+MD5 (qcomicbook-0.5.0.tar.gz) = 485646a63e4ba3ff79535cc3fced328d
+SHA256 (qcomicbook-0.5.0.tar.gz) = 51a6b976cf462d10ad00388f87a5ed4e054d88d31adbf2b3c67a3458af11b6c1
+SIZE (qcomicbook-0.5.0.tar.gz) = 586977
diff --git a/graphics/qcomicbook/files/patch-src__ImgArchiveSink.cpp b/graphics/qcomicbook/files/patch-src__ImgArchiveSink.cpp
deleted file mode 100644
index 1f141c43e43c..000000000000
--- a/graphics/qcomicbook/files/patch-src__ImgArchiveSink.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./src/ImgArchiveSink.cpp.orig	2009-09-16 17:06:54.000000000 -0300
-+++ ./src/ImgArchiveSink.cpp	2009-09-17 21:07:22.000000000 -0300
-@@ -485,6 +485,7 @@
- 	inf.type = SEVENZIP_ARCHIVE;
- 	inf.name = "7z";
- 	inf.extensions.append(".7z");
-+	inf.extensions.append(".cb7");
-         inf.reading = inf.writing = false;
- 	if (which("7z") != QString::null)
- 	{
diff --git a/graphics/qcomicbook/files/patch-src__P7zipArchiverStrategy.cpp b/graphics/qcomicbook/files/patch-src__P7zipArchiverStrategy.cpp
new file mode 100644
index 000000000000..15cc6c0686af
--- /dev/null
+++ b/graphics/qcomicbook/files/patch-src__P7zipArchiverStrategy.cpp
@@ -0,0 +1,10 @@
+--- src/P7zipArchiverStrategy.cpp.orig	2010-06-13 09:48:03.000000000 -0300
++++ src/P7zipArchiverStrategy.cpp	2010-06-13 09:48:10.000000000 -0300
+@@ -28,6 +28,7 @@
+ void P7zipArchiverStrategy::configure()
+ {
+     addExtension(".7z");
++    addExtension(".cbz");
+     setExecutables("7z", "7zr");
+ 
+     if (which("7z") != QString::null)
diff --git a/graphics/qcomicbook/pkg-plist b/graphics/qcomicbook/pkg-plist
deleted file mode 100644
index 44115f648752..000000000000
--- a/graphics/qcomicbook/pkg-plist
+++ /dev/null
@@ -1,26 +0,0 @@
-bin/qcomicbook
-%%DATADIR%%/bestfit.png
-%%DATADIR%%/bookmark.png
-%%DATADIR%%/fbackward.png
-%%DATADIR%%/fforward.png
-%%DATADIR%%/fitheight.png
-%%DATADIR%%/fitwidth.png
-%%DATADIR%%/info.png
-%%DATADIR%%/japanese.png
-%%DATADIR%%/nextpage.png
-%%DATADIR%%/openarch.png
-%%DATADIR%%/opendir.png
-%%DATADIR%%/orgsize.png
-%%DATADIR%%/pagebottom.png
-%%DATADIR%%/pagetop.png
-%%DATADIR%%/prevpage.png
-%%DATADIR%%/qcomicbook-splash.png
-%%DATADIR%%/qcomicbook.png
-%%DATADIR%%/rleft.png
-%%DATADIR%%/rright.png
-%%DATADIR%%/settings.png
-%%DATADIR%%/thumbnails.png
-%%DATADIR%%/twopages.png
-%%DATADIR%%/wholepage.png
-share/pixmaps/qcomicbook.png
-@dirrm %%DATADIR%%