graphics/qcomicbook: update to 0.9.1 and switch to Qt5

- A future poppler update will remove poppler-qt4 (no longer supported)
  so switch this port to Qt5 as preparation.

6 files changed, 39 insertions, 43 deletions

diff --git a/graphics/qcomicbook/Makefile b/graphics/qcomicbook/Makefile
index f6d4fcaa1ff4..844e0bced123 100644
--- a/graphics/qcomicbook/Makefile
+++ b/graphics/qcomicbook/Makefile
@@ -1,22 +1,22 @@
 # Created by: Adam Weinberger <adamw@FreeBSD.org>
 # $FreeBSD$
 
-PORTNAME=	qcomicbook
-PORTVERSION=	0.9.0
-PORTREVISION=	12
+PORTNAME=	QComicBook
+PORTVERSION=	0.9.1
 CATEGORIES=	graphics
-MASTER_SITES=	http://qcomicbook.org/releases/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Qt-based comic book archive viewer
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libpoppler-qt4.so:graphics/poppler-qt4
+LIB_DEPENDS=	libpoppler-qt5.so:graphics/poppler-qt5
 
-USES=		cmake:outsource compiler:c++11-lang pkgconfig qt:4
-USE_QT=		corelib gui linguisttools_build moc_build qmake_build rcc_build \
-		uic_build xml
+USES=		cmake compiler:c++11-lang pkgconfig qt:5
+USE_GITHUB=	yes
+GH_ACCOUNT=	stolowski
+USE_QT=		core gui printsupport widgets x11extras\
+		buildtools_build linguisttools_build qmake_build
 
 OPTIONS_DEFINE=	7ZIP ACE RAR
 
@@ -29,14 +29,4 @@ ACE_RUN_DEPENDS=	unace:archivers/unace
 RAR_DESC=	Rar (.cbr) comic book archives support
 RAR_RUN_DEPENDS=	unrar:archivers/unrar
 
-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.mk>
diff --git a/graphics/qcomicbook/distinfo b/graphics/qcomicbook/distinfo
index 571af9114710..13da4ae2983a 100644
--- a/graphics/qcomicbook/distinfo
+++ b/graphics/qcomicbook/distinfo
@@ -1,2 +1,3 @@
-SHA256 (qcomicbook-0.9.0.tar.gz) = 8e36f94d7b55798258b6df085324da150b0983020853eb270992157e9692abcb
-SIZE (qcomicbook-0.9.0.tar.gz) = 738514
+TIMESTAMP = 1538907081
+SHA256 (stolowski-QComicBook-0.9.1_GH0.tar.gz) = 39bb6ba0e20569985c930b0e8bdb19ae9c5453f27e9f7c01c6d44f56fb204619
+SIZE (stolowski-QComicBook-0.9.1_GH0.tar.gz) = 739887
diff --git a/graphics/qcomicbook/files/patch-help_CMakeLists.txt b/graphics/qcomicbook/files/patch-help_CMakeLists.txt
new file mode 100644
index 000000000000..ae9b123c0001
--- /dev/null
+++ b/graphics/qcomicbook/files/patch-help_CMakeLists.txt
@@ -0,0 +1,5 @@
+--- help/CMakeLists.txt.orig	2018-10-07 10:17:17 UTC
++++ help/CMakeLists.txt
+@@ -1 +1 @@
+-INSTALL(FILES qcomicbook.1 DESTINATION share/man/man1)
++INSTALL(FILES qcomicbook.1 DESTINATION man/man1)
diff --git a/graphics/qcomicbook/files/patch-src__CMakeLists.txt b/graphics/qcomicbook/files/patch-src__CMakeLists.txt
index b4665cf30170..9b4303b9d6d3 100644
--- a/graphics/qcomicbook/files/patch-src__CMakeLists.txt
+++ b/graphics/qcomicbook/files/patch-src__CMakeLists.txt
@@ -1,11 +1,11 @@
---- src/CMakeLists.txt.orig	2011-07-08 07:18:50.000000000 -0300
-+++ src/CMakeLists.txt	2011-07-24 15:33:02.000000000 -0300
-@@ -116,6 +116,8 @@
- QT4_WRAP_UI(qcomicbook_ui_src ${qcomicbook_ui})
- ###QT4_ADD_TRANSLATION(qcomicbook_qm ../lang/pl_PL.ts)
+--- src/CMakeLists.txt.orig	2016-11-22 17:45:10 UTC
++++ src/CMakeLists.txt
+@@ -54,6 +54,8 @@ qt5_add_resources(qcomicbook_res ../data/qcomicbook.qr
+ qt5_wrap_cpp(qcomicbook_moc_src ${qcomicbook_moc_hdrs})
+ qt5_wrap_ui(qcomicbook_ui_src ${qcomicbook_ui})
  
 +link_directories(${POPPLER_LIBDIR})
 +
  ADD_EXECUTABLE(qcomicbook ${qcomicbook_src} ${qcomicbook_moc_src} ${qcomicbook_ui_src} ${qcomicbook_res})
  ADD_DEPENDENCIES(qcomicbook translations)
- TARGET_LINK_LIBRARIES(qcomicbook ${QT_LIBRARIES})
+ TARGET_LINK_LIBRARIES(qcomicbook Qt5::Widgets Qt5::PrintSupport Qt5::X11Extras)
diff --git a/graphics/qcomicbook/files/patch-src__FrameDetect__CompareFrames.h b/graphics/qcomicbook/files/patch-src__FrameDetect__CompareFrames.h
index e08e051be098..2a7ee4dd23e6 100644
--- a/graphics/qcomicbook/files/patch-src__FrameDetect__CompareFrames.h
+++ b/graphics/qcomicbook/files/patch-src__FrameDetect__CompareFrames.h
@@ -1,5 +1,5 @@
---- ./src/FrameDetect/CompareFrames.h.orig	2012-05-30 20:32:02.000000000 +0000
-+++ ./src/FrameDetect/CompareFrames.h	2014-05-13 08:15:11.199946861 +0000
+--- src/FrameDetect/CompareFrames.h.orig	2016-11-22 17:45:10 UTC
++++ src/FrameDetect/CompareFrames.h
 @@ -14,6 +14,7 @@
  #define __COMPARE_FRAMES_H
  
diff --git a/graphics/qcomicbook/pkg-plist b/graphics/qcomicbook/pkg-plist
index 9e1e5a5360e3..c60bb548ec5f 100644
--- a/graphics/qcomicbook/pkg-plist
+++ b/graphics/qcomicbook/pkg-plist
@@ -2,18 +2,18 @@ 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
+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_fi_FI.qm
+share/qcomicbook/i18n/qcomicbook_fr_CA.qm
+share/qcomicbook/i18n/qcomicbook_fr_FR.qm
+share/qcomicbook/i18n/qcomicbook_it_IT.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