<pre style='margin:0'>
Marko Käning (mkae) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/648c5dada023e09221457aa9e5cbad0267270496">https://github.com/macports/macports-ports/commit/648c5dada023e09221457aa9e5cbad0267270496</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 648c5da kchmviewer: upgrade to 7.7 based on qt5
</span>648c5da is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 648c5dada023e09221457aa9e5cbad0267270496
</span>Author: Marko Käning <mk@macports.org>
AuthorDate: Sat Jan 21 14:24:11 2017 +0100
<span style='display:block; white-space:pre;color:#404040;'> kchmviewer: upgrade to 7.7 based on qt5
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - pure Qt version of this application
</span><span style='display:block; white-space:pre;color:#404040;'> - KDE variant is skipped for now, as it requires KDE4
</span><span style='display:block; white-space:pre;color:#404040;'> - moved from category x11 to devel
</span><span style='display:block; white-space:pre;color:#404040;'> - use of qt5.depends_component not yet possible
</span><span style='display:block; white-space:pre;color:#404040;'> ( See: https://trac.macports.org/ticket/51619 )
</span><span style='display:block; white-space:pre;color:#404040;'> - use absolute paths for libzip & libchm ensuring using of correct libs
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/53097
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: #110
</span>---
devel/kchmviewer/Portfile | 94 ++++++++++++++++++++++
.../files/patch-avoid-private-member.diff | 11 +++
.../kchmviewer/files/patch-encoding-no-abort.diff | 13 +++
devel/kchmviewer/files/patch-libzip-incpath.diff | 12 +++
devel/kchmviewer/files/patch-main-mac.diff | 22 +++++
devel/kchmviewer/files/patch-release-build.diff | 10 +++
.../files/patch-use-webkit-and-dbus.diff | 71 ++++++++++++++++
x11/kchmviewer/Portfile | 31 -------
8 files changed, 233 insertions(+), 31 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/kchmviewer/Portfile b/devel/kchmviewer/Portfile
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..3793287
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/kchmviewer/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,94 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# kchmviewer's KDE variant still requires KDE4 and will thus not be shipped for now.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# The pure Qt variant is obtained by using QMake instead of CMake.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup qmake5 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name kchmviewer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 7.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description A CHM (Winhelp) files viewer written for Qt.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description kchmviewer is a reader for CHM (Winhelp) and EPUB \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ files using the Qt toolkit. \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ The main point of kchmviewer is compatibility with \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ non-English chm files, including most international charsets.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers gmail.com:rjvbertin mk openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platforms darwin linux
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license GPL-3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://sourceforge.net/projects/kchmviewer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distname ${name}-${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites sourceforge:project/${name}/${name}/${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 3b072a3225c5a4c796a9406232c3f696285d9aa4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 27cbac45c786b1718550a87e6f86010e161302b426c6396ff2a3091b913b17dd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:dos2unix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:libzip \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:chmlib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# kchmviewer is transitioning to QtWebEngine, but that adaptation is not yet functional.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[info exists qt5.using_kde] && ${qt5.using_kde}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qt5.depends_component \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qtwebkit
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # qt5.depends_component is not yet available (Ref. https://trac.macports.org/ticket/51619 )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} == 11} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:qt55-qtwebkit
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:qt5-qtwebkit
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-extract {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # force consistent line-endings
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath} "find . \\\( -name \"*.cpp\" -o -name \"*.h\" -o -name \"*.pro\" \\\) -exec dos2unix '{}' \";\""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patch.pre_args -Np1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# make it build and work as intended.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Some of these patches have been submitted upstream:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://sourceforge.net/p/kchmviewer/patches/9/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-release-build.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-libzip-incpath.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-use-webkit-and-dbus.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-avoid-private-member.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-main-mac.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-encoding-no-abort.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@PREFIX@|${prefix}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/lib/libebook/libebook.pro \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/src/src.pro
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cppflags-append -I${prefix}/lib/libzip/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default configure.dir {${workpath}/build}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.pre_args-append ../${worksrcdir}/${name}.pro
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append -nocache -recursive
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default build.dir {${workpath}/build}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platform darwin {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 755 -d ${destroot}${qt_apps_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file copy ${build.dir}/bin/kchmviewer.app ${destroot}${qt_apps_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[info procs qt5.add_app_wrapper] ne ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qt5.add_app_wrapper kchmviewer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platform linux {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 755 ${build.dir}/bin/kchmviewer ${destroot}${prefix}/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.regex /${name}-(\[0-9.\]+)${extract.suffix}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/kchmviewer/files/patch-avoid-private-member.diff b/devel/kchmviewer/files/patch-avoid-private-member.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..a0de158
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/kchmviewer/files/patch-avoid-private-member.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/kchmviewerapp.cpp b/src/kchmviewerapp.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 62dfb62..7a73570 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/kchmviewerapp.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/kchmviewerapp.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -63,5 +63,5 @@ void KchmviewerApp::onTimer()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ++m_nResend;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- main->loadFile(m_filePath);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ main->actionOpenRecentFile(m_filePath);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/kchmviewer/files/patch-encoding-no-abort.diff b/devel/kchmviewer/files/patch-encoding-no-abort.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..c006489
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/kchmviewer/files/patch-encoding-no-abort.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/lib/libebook/ebook_epub.cpp b/lib/libebook/ebook_epub.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 83a7773..28c384d 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/lib/libebook/ebook_epub.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/lib/libebook/ebook_epub.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -166,7 +166,7 @@ QString EBook_EPUB::currentEncoding() const
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bool EBook_EPUB::setCurrentEncoding(const char *)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- abort();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bool EBook_EPUB::isSupportedUrl(const QUrl &url)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/kchmviewer/files/patch-libzip-incpath.diff b/devel/kchmviewer/files/patch-libzip-incpath.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..b0a4606
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/kchmviewer/files/patch-libzip-incpath.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/lib/libebook/libebook.pro b/lib/libebook/libebook.pro
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 2a76452..86ce0b9 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/lib/libebook/libebook.pro
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/lib/libebook/libebook.pro
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -26,6 +26,7 @@ CONFIG += warn_on \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ staticlib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TEMPLATE = lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ INCLUDEPATH += ../../src
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++INCLUDEPATH += @PREFIX@/lib/libzip/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QT += widgets
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Only for Creator build
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/kchmviewer/files/patch-main-mac.diff b/devel/kchmviewer/files/patch-main-mac.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..78a50fc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/kchmviewer/files/patch-main-mac.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,22 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/main.cpp b/src/main.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index b17d203..ab8f089 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/main.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/main.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -31,7 +31,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <kaboutdata.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined (Q_WS_MAC)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined (Q_OS_OSX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "kchmviewerapp.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef QApplication KchmviewerApp;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -70,7 +70,7 @@ int main( int argc, char ** argv )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Configuration
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pConfig = new Config();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if !defined (WIN32) && !defined(Q_WS_MAC)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !defined (WIN32)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ( QDBusConnection::sessionBus().isConnected() )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ( QDBusConnection::sessionBus().registerService(SERVICE_NAME) )
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/kchmviewer/files/patch-release-build.diff b/devel/kchmviewer/files/patch-release-build.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..27a3afa
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/kchmviewer/files/patch-release-build.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/kchmviewer.pro b/kchmviewer.pro
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 5787499..196f8af 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/kchmviewer.pro
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/kchmviewer.pro
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SUBDIRS += lib src
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TEMPLATE = subdirs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CONFIG += debug
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CONFIG += release
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src.depends = lib
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/kchmviewer/files/patch-use-webkit-and-dbus.diff b/devel/kchmviewer/files/patch-use-webkit-and-dbus.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..04dbe4a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/kchmviewer/files/patch-use-webkit-and-dbus.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,71 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/src.pro b/src/src.pro
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 2524b5e..f9e7098 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/src.pro
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/src.pro
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -40,7 +40,7 @@ SOURCES += config.cpp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ textencodings.cpp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ treeitem_toc.cpp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ treeitem_index.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-LIBS += -lchm -lzip
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#LIBS += -lchm -lzip
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TARGET = ../bin/kchmviewer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CONFIG += threads \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ warn_on \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -81,7 +81,7 @@ macx: {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ HEADERS += kchmviewerapp.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SOURCES += kchmviewerapp.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QMAKE_INFO_PLIST=resources/Info.plist
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- QMAKE_POST_LINK += cp resources/*.icns ${DESTDIR}/kchmviewer.app/Contents/Resources;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ICON = resources/kchmviewer.icns
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBS += ../lib/libebook/libebook.a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ POST_TARGETDEPS += ../lib/libebook/libebook.a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -102,7 +102,7 @@ win32-*: {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBS += -lwsock32 -loleaut32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-unix:!macx: {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++unix: {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QT += dbus
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ HEADERS += dbus_interface.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -112,6 +111,9 @@ unix: {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ POST_TARGETDEPS += ../lib/libebook/libebook.a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++LIBS += @PREFIX@/lib/libchm.$$QMAKE_EXTENSION_SHLIB @PREFIX@/lib/libzip.$$QMAKE_EXTENSION_SHLIB
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ greaterThan(QT_MAJOR_VERSION, 4) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Qt 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ greaterThan(QT_MINOR_VERSION, 5) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -114,20 +114,20 @@ unix:!macx: {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ greaterThan(QT_MAJOR_VERSION, 4) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Qt 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- greaterThan(QT_MINOR_VERSION, 5) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # Qt 5.6+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- error("You use Qt5.6+ - QWebEngine is not yet suitable for kchmviewer and is not supported")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- QT += webengine webenginewidgets
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- DEFINES += USE_WEBENGINE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SOURCES += viewwindow_webengine.cpp dataprovider_qwebengine.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- HEADERS += dataprovider_qwebengine.h viewwindow_webengine.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# greaterThan(QT_MINOR_VERSION, 5) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# # Qt 5.6+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# error("You use Qt5.6+ - QWebEngine is not yet suitable for kchmviewer and is not supported")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# QT += webengine webenginewidgets
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# DEFINES += USE_WEBENGINE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# SOURCES += viewwindow_webengine.cpp dataprovider_qwebengine.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# HEADERS += dataprovider_qwebengine.h viewwindow_webengine.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Qt 5.0-5.5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QT += webkit webkitwidgets
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DEFINES += USE_WEBKIT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SOURCES += viewwindow_webkit.cpp dataprovider_qwebkit.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ HEADERS += dataprovider_qwebkit.h viewwindow_webkit.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ message("Qt4 is not supported anymore, please do not report any errors")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QT += webkit webkitwidgets
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/kchmviewer/Portfile b/x11/kchmviewer/Portfile
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index f06000b..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/kchmviewer/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,31 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-name kchmviewer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.1-2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-categories x11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers nomaintainer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-description A CHM (Winhelp) files viewer written on Qt/KDE.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description A CHM (Winhelp) files viewer written on Qt/KDE. It \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- can be build as a standalone Qt-based application, \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- or a KDE application. The main point of kchmviewer \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- is compatibility with non-English chm files, including \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- most international charsets.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://www.kchmviewer.net/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites sourceforge
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 bc376ce29784f33bf0b5f8d1ae5141bf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# for version 3.1-2 ...
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-worksrcdir kchmviewer-3.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:qt3 port:chmlib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --with-qt-dir=${prefix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-qt-includes=${prefix}/include/qt3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-extra-includes=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-extra-libs=${prefix}/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#Variant made stub on 2014/09/28
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant kde description "Stub variant" {}
</span></pre><pre style='margin:0'>
</pre>