12 files changed, 93 insertions, 68 deletions

diff --git a/MOVED b/MOVED
index 9ecd6e240e8f..2f6dbaa7c54c 100644
--- a/MOVED
+++ b/MOVED
@@ -4469,7 +4469,6 @@ deskutils/katapult||2013-07-26|Has expired: Depends on Qt 3.x
 deskutils/kbirthday||2013-07-26|Has expired: Depends on Qt 3.x
 deskutils/kblticker||2013-07-26|Has expired: Depends on Qt 3.x
 deskutils/kchm||2013-07-26|Has expired: Depends on Qt 3.x
-deskutils/kchmviewer||2013-07-26|Has expired: Depends on Qt 3.x
 deskutils/kdepim3||2013-07-26|Has expired: Depends on Qt 3.x
 deskutils/kdissert||2013-07-26|Has expired: Depends on Qt 3.x
 deskutils/kickpim||2013-07-26|Has expired: Depends on Qt 3.x
@@ -9169,3 +9168,4 @@ www/rubygem-jquery-rails4|www/rubygem-jquery-rails|2017-03-27|Remove PKGNAMESUFF
 devel/libytnef|converters/ytnef|2017-03-29|Merged into converters/ytnef
 databases/py-sqlalchemy08|databases/py-sqlalchemy10|2017-03-29|Has expired: Upstream has declared this version EoL: please migrate to databases/py-sqlalchemy10
 devel/py3-meson||2017-03-30|Removed
+deskutils/kchmviewer-kde4|deskutils/kchmviewer|2017-03-31|Renamed to drop the -kde4 suffix
diff --git a/deskutils/Makefile b/deskutils/Makefile
index 6036797ce426..a5410dbf77c1 100644
--- a/deskutils/Makefile
+++ b/deskutils/Makefile
@@ -123,7 +123,7 @@
     SUBDIR += jjclient
     SUBDIR += jlj
     SUBDIR += kcharselect
-    SUBDIR += kchmviewer-kde4
+    SUBDIR += kchmviewer
     SUBDIR += kdeconnect
     SUBDIR += kdepim4
     SUBDIR += kdepim4-runtime
diff --git a/deskutils/kchmviewer-kde4/Makefile b/deskutils/kchmviewer-kde4/Makefile
deleted file mode 100644
index 7679b64983c6..000000000000
--- a/deskutils/kchmviewer-kde4/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# Created by: Markus Brueffer <markus@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME=	kchmviewer
-PORTVERSION=	7.2
-DISTVERSIONSUFFIX=	.1
-PORTREVISION=	1
-CATEGORIES=	deskutils kde
-MASTER_SITES=	SF
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	KDE viewer for CHM files
-
-LIB_DEPENDS=	libchm.so:misc/chmlib \
-		libzip.so:archivers/libzip
-
-USES=		cmake:outsource gettext-tools kde:4
-USE_KDE=	kdelibs automoc4
-USE_QT4=	webkit qmake_build moc_build rcc_build uic_build
-
-WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
-
-post-patch:
-	${REINPLACE_CMD} 's,/usr/bin/kate,${KDE_PREFIX}/bin/kate,' \
-		${WRKSRC}/src/config.cpp
-
-post-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps
-	${INSTALL_DATA} ${WRKSRC}/packages/kchmviewer.png ${STAGEDIR}${PREFIX}/share/pixmaps
-
-.include <bsd.port.mk>
diff --git a/deskutils/kchmviewer-kde4/distinfo b/deskutils/kchmviewer-kde4/distinfo
deleted file mode 100644
index 69a227f72d8f..000000000000
--- a/deskutils/kchmviewer-kde4/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (kchmviewer-7.2.1.tar.gz) = 91c5a74b26956e76400a02285d534d1eebbb51ee478dcaaab7beff7aa870772a
-SIZE (kchmviewer-7.2.1.tar.gz) = 342665
diff --git a/deskutils/kchmviewer-kde4/files/patch-packages__CMakeLists.txt b/deskutils/kchmviewer-kde4/files/patch-packages__CMakeLists.txt
deleted file mode 100644
index 20df4cc78b54..000000000000
--- a/deskutils/kchmviewer-kde4/files/patch-packages__CMakeLists.txt
+++ /dev/null
@@ -1,9 +0,0 @@
---- ./packages/CMakeLists.txt.orig	2009-12-15 09:27:57.000000000 +0300
-+++ ./packages/CMakeLists.txt	2009-12-15 22:51:58.000000000 +0300
-@@ -1,4 +1,4 @@
--INSTALL( FILES kchmviewer.desktop DESTINATION ${KDE4_XDG_APPS_INSTALL_DIR} )
--KDE4_INSTALL_ICONS( ${KDE4_ICON_INSTALL_DIR} )
-+INSTALL( FILES kchmviewer.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
-+KDE4_INSTALL_ICONS( ${ICON_INSTALL_DIR} )
- KDE4_UPDATE_ICONCACHE( )
- 
diff --git a/deskutils/kchmviewer-kde4/files/patch-src__CMakeLists.txt b/deskutils/kchmviewer-kde4/files/patch-src__CMakeLists.txt
deleted file mode 100644
index 88b44cf2ba6f..000000000000
--- a/deskutils/kchmviewer-kde4/files/patch-src__CMakeLists.txt
+++ /dev/null
@@ -1,9 +0,0 @@
---- ./src/CMakeLists.txt.orig	2011-12-19 07:16:43.000000000 +0000
-+++ ./src/CMakeLists.txt	2012-01-13 21:28:06.869127671 +0000
-@@ -53,5 +53,5 @@
- 	${QT_QTWEBKIT_LIBRARY}	
- 	${KDE4_KFILE_LIBS}  )
- 
--INSTALL( TARGETS kchmviewer DESTINATION ${KDE4_BIN_INSTALL_DIR} )
-+INSTALL( TARGETS kchmviewer DESTINATION ${BIN_INSTALL_DIR} )
- 
diff --git a/deskutils/kchmviewer-kde4/pkg-plist b/deskutils/kchmviewer-kde4/pkg-plist
deleted file mode 100644
index cd0066f14a0a..000000000000
--- a/deskutils/kchmviewer-kde4/pkg-plist
+++ /dev/null
@@ -1,15 +0,0 @@
-bin/kchmviewer
-share/applications/kde4/kchmviewer.desktop
-share/locale/cs/LC_MESSAGES/kchmviewer.mo
-share/locale/fr/LC_MESSAGES/kchmviewer.mo
-share/locale/hu/LC_MESSAGES/kchmviewer.mo
-share/locale/it/LC_MESSAGES/kchmviewer.mo
-share/locale/nl/LC_MESSAGES/kchmviewer.mo
-share/locale/pt_BR/LC_MESSAGES/kchmviewer.mo
-share/locale/ru/LC_MESSAGES/kchmviewer.mo
-share/locale/sv/LC_MESSAGES/kchmviewer.mo
-share/locale/tr/LC_MESSAGES/kchmviewer.mo
-share/locale/uk/LC_MESSAGES/kchmviewer.mo
-share/locale/zh_CN/LC_MESSAGES/kchmviewer.mo
-share/locale/zh_TW/LC_MESSAGES/kchmviewer.mo
-share/pixmaps/kchmviewer.png
diff --git a/deskutils/kchmviewer/Makefile b/deskutils/kchmviewer/Makefile
new file mode 100644
index 000000000000..8cfeaa739491
--- /dev/null
+++ b/deskutils/kchmviewer/Makefile
@@ -0,0 +1,20 @@
+# Created by: Markus Brueffer <markus@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	kchmviewer
+PORTVERSION=	7.7
+CATEGORIES=	deskutils kde
+MASTER_SITES=	SF
+
+MAINTAINER=	kde@FreeBSD.org
+COMMENT=	KDE viewer for CHM files
+
+LIB_DEPENDS=	libchm.so:misc/chmlib \
+		libzip.so:archivers/libzip
+
+USES=		dos2unix qmake:outsource 
+USE_QT5=	core dbus gui network printsupport webkit widgets xml \
+		buildtools_build qmake_build
+USE_XORG=	x11
+
+.include <bsd.port.mk>
diff --git a/deskutils/kchmviewer/distinfo b/deskutils/kchmviewer/distinfo
new file mode 100644
index 000000000000..e3a6ccad7695
--- /dev/null
+++ b/deskutils/kchmviewer/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1490818978
+SHA256 (kchmviewer-7.7.tar.gz) = 27cbac45c786b1718550a87e6f86010e161302b426c6396ff2a3091b913b17dd
+SIZE (kchmviewer-7.7.tar.gz) = 345952
diff --git a/deskutils/kchmviewer/files/patch-src_src.pro b/deskutils/kchmviewer/files/patch-src_src.pro
new file mode 100644
index 000000000000..168d09062aaa
--- /dev/null
+++ b/deskutils/kchmviewer/files/patch-src_src.pro
@@ -0,0 +1,65 @@
+This patch contains the following (by hunks)
+  1) also link against libX11 on FreeBSD
+  2) this is obtained from arch, to fix underlinking
+        and
+     remove the wrong Qt5 version check
+  4) create installation targets
+
+--- src/src.pro.orig	2017-03-29 21:21:13 UTC
++++ src/src.pro
+@@ -67,7 +67,7 @@ QT += webkit \
+     webkitwidgets \
+     printsupport
+
+-linux-g++*:{
++unix:{
+     LIBS += -lX11
+ }
+
+@@ -108,26 +108,16 @@ unix:!macx: {
+     HEADERS += dbus_interface.h
+     SOURCES += dbus_interface.cpp
+     CONFIG += dbus
+-    LIBS += ../lib/libebook/libebook.a
++    LIBS += ../lib/libebook/libebook.a -lchm -lzip
+     POST_TARGETDEPS += ../lib/libebook/libebook.a
+ }
+
+ greaterThan(QT_MAJOR_VERSION, 4) {
+     # Qt 5
+-    greaterThan(QT_MINOR_VERSION, 5) {
+-        # Qt 5.6+
+-        error("You use Qt5.6+ - QWebEngine is not yet suitable for kchmviewer and is not supported")
+-        QT += webengine webenginewidgets
+-        DEFINES += USE_WEBENGINE
+-        SOURCES += viewwindow_webengine.cpp dataprovider_qwebengine.cpp
+-        HEADERS += dataprovider_qwebengine.h viewwindow_webengine.h
+-    } else {
+-        # Qt 5.0-5.5
+-        QT += webkit webkitwidgets
+-        DEFINES += USE_WEBKIT
+-        SOURCES += viewwindow_webkit.cpp dataprovider_qwebkit.cpp
+-        HEADERS += dataprovider_qwebkit.h viewwindow_webkit.h
+-    }
++    QT += webkit webkitwidgets
++    DEFINES += USE_WEBKIT
++    SOURCES += viewwindow_webkit.cpp dataprovider_qwebkit.cpp
++    HEADERS += dataprovider_qwebkit.h viewwindow_webkit.h
+ } else {
+     message("Qt4 is not supported anymore, please do not report any errors")
+     QT += webkit webkitwidgets
+@@ -135,3 +125,14 @@ greaterThan(QT_MAJOR_VERSION, 4) {
+     SOURCES += viewwindow_webkit.cpp dataprovider_qwebkit.cpp
+     HEADERS += dataprovider_qwebkit.h viewwindow_webkit.h
+ }
++
++# Define installation target for the binary
++target.path = $$PREFIX/bin
++# ... and for the icon
++icons.files = ../packages/kchmviewer.png
++icons.path = $$PREFIX/share/pixmaps
++# ... and the desktop file
++desktop.files = ../packages/kchmviewer.desktop
++desktop.path = $$PREFIX/share/applications
++
++INSTALLS += desktop icons target
diff --git a/deskutils/kchmviewer-kde4/pkg-descr b/deskutils/kchmviewer/pkg-descr
index 024ef4d9f03c..024ef4d9f03c 100644
--- a/deskutils/kchmviewer-kde4/pkg-descr
+++ b/deskutils/kchmviewer/pkg-descr
diff --git a/deskutils/kchmviewer/pkg-plist b/deskutils/kchmviewer/pkg-plist
new file mode 100644
index 000000000000..37ff10dba463
--- /dev/null
+++ b/deskutils/kchmviewer/pkg-plist
@@ -0,0 +1,3 @@
+bin/kchmviewer
+share/applications/kchmviewer.desktop
+share/pixmaps/kchmviewer.png