Index: head/www/qupzilla-qt4/Makefile
===================================================================
--- head/www/qupzilla-qt4/Makefile	(revision 399338)
+++ head/www/qupzilla-qt4/Makefile	(revision 399339)
@@ -1,52 +1,52 @@
 # $FreeBSD$
 
 PORTNAME=	qupzilla
-PORTVERSION=	1.8.6
+PORTVERSION=	1.8.7
 CATEGORIES=	www
 MASTER_SITES=	https://github.com/QupZilla/${PORTNAME}/releases/download/v${PORTVERSION}/
 PKGNAMESUFFIX=	-qt4
 DISTNAME=	QupZilla-${PORTVERSION}
 
 MAINTAINER=	matthew@reztek.cz
 COMMENT=	Web browser based on WebKit engine and Qt Framework
 
 LICENSE=	GPLv3
 
 LIB_DEPENDS=	libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell
 
-CONFLICTS=	${PORTNAME}-qt5*
+CONFLICTS_INSTALL=	${PORTNAME}-qt5*
 
 USES=		desktop-file-utils execinfo pkgconfig qmake tar:xz
 USE_QT4=	corelib gui network script sql webkit xml \
 		linguisttools_build moc_build rcc_build uic_build \
 		imageformats_run sql-sqlite3_run
 USE_XORG=	x11
 USE_OPENSSL=	yes
 CONFIGURE_ENV=	QUPZILLA_PREFIX=${PREFIX}/
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
 PLIST_SUB=	VERSION=${PORTVERSION}
 
 OPTIONS_DEFINE=	DBUS DEBUG GNOMEKEYRING KWALLET
 OPTIONS_DEFAULT=DBUS
 OPTIONS_SUB=	yes
 
 DBUS_USE=		QT4=dbus
 DBUS_CONFIGURE_ENV_OFF=	DISABLE_DBUS="true"
 
 GNOMEKEYRING_LIB_DEPENDS=	libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring
 GNOMEKEYRING_CONFIGURE_ENV=	GNOME_INTEGRATION="true"
 
 KWALLET_USE=		KDE4=kdelibs
 KWALLET_CONFIGURE_ENV=	KDE_INTEGRATION="true"
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr|${LOCALBASE}|g' \
 		${WRKSRC}/tests/autotests/qztoolstest.cpp \
 		${WRKSRC}/src/lib/plugins/qtwebkit/spellcheck/speller.cpp
 	@${REINPLACE_CMD} -e 's|/usr|${PREFIX}|g' \
 		${WRKSRC}/src/install.pri \
 		${WRKSRC}/src/defines.pri \
 		${WRKSRC}/src/lib/plugins/plugins.cpp
 
 .include <bsd.port.mk>
Index: head/www/qupzilla-qt4/distinfo
===================================================================
--- head/www/qupzilla-qt4/distinfo	(revision 399338)
+++ head/www/qupzilla-qt4/distinfo	(revision 399339)
@@ -1,2 +1,2 @@
-SHA256 (QupZilla-1.8.6.tar.xz) = aecda29f8994c9dc4d6b5f76ce5b1ba947272a0d5a40b5d83a54023dd5d7a6a5
-SIZE (QupZilla-1.8.6.tar.xz) = 3205912
+SHA256 (QupZilla-1.8.7.tar.xz) = 1823f36520a3e5d0164f4ad185f29cd80600d3e8010e3acf9b33e536e61049fd
+SIZE (QupZilla-1.8.7.tar.xz) = 3212072
Index: head/www/qupzilla-qt4/pkg-plist
===================================================================
--- head/www/qupzilla-qt4/pkg-plist	(revision 399338)
+++ head/www/qupzilla-qt4/pkg-plist	(revision 399339)
@@ -1,300 +1,302 @@
 bin/qupzilla
 lib/libQupZilla.so
 lib/libQupZilla.so.1
 lib/libQupZilla.so.1.8
 lib/libQupZilla.so.%%VERSION%%
 lib/qupzilla/libAccessKeysNavigation.so
 lib/qupzilla/libAutoScroll.so
 lib/qupzilla/libFlashCookieManager.so
 %%GNOMEKEYRING%%lib/qupzilla/libGnomeKeyringPasswords.so
 lib/qupzilla/libGreaseMonkey.so
 %%KWALLET%%lib/qupzilla/libKWalletPasswords.so
 lib/qupzilla/libMouseGestures.so
 lib/qupzilla/libPIM.so
 lib/qupzilla/libStatusBarIcons.so
 lib/qupzilla/libTabManager.so
 %%DEBUG%%lib/qupzilla/libTestPlugin.so
 share/appdata/qupzilla.appdata.xml
 share/applications/qupzilla.desktop
 share/bash-completion/completions/qupzilla
 share/icons/hicolor/128x128/apps/qupzilla.png
 share/icons/hicolor/16x16/apps/qupzilla.png
 share/icons/hicolor/256x256/apps/qupzilla.png
 share/icons/hicolor/32x32/apps/qupzilla.png
 share/icons/hicolor/48x48/apps/qupzilla.png
 share/icons/hicolor/64x64/apps/qupzilla.png
 share/pixmaps/qupzilla.png
 %%DATADIR%%/locale/ar_SA.qm
 %%DATADIR%%/locale/bg_BG.qm
 %%DATADIR%%/locale/ca_ES.qm
 %%DATADIR%%/locale/cs_CZ.qm
+%%DATADIR%%/locale/da_DK.qm
 %%DATADIR%%/locale/de_DE.qm
 %%DATADIR%%/locale/el_GR.qm
 %%DATADIR%%/locale/es_ES.qm
 %%DATADIR%%/locale/es_MX.qm
 %%DATADIR%%/locale/es_VE.qm
 %%DATADIR%%/locale/eu_ES.qm
 %%DATADIR%%/locale/fa_IR.qm
 %%DATADIR%%/locale/fi_FI.qm
 %%DATADIR%%/locale/fr_FR.qm
 %%DATADIR%%/locale/gl_ES.qm
 %%DATADIR%%/locale/he_IL.qm
 %%DATADIR%%/locale/hr_HR.qm
 %%DATADIR%%/locale/hu_HU.qm
 %%DATADIR%%/locale/id_ID.qm
 %%DATADIR%%/locale/it_IT.qm
 %%DATADIR%%/locale/ja_JP.qm
 %%DATADIR%%/locale/ka_GE.qm
 %%DATADIR%%/locale/lg.qm
+%%DATADIR%%/locale/lt.qm
 %%DATADIR%%/locale/lv_LV.qm
 %%DATADIR%%/locale/nl_NL.qm
 %%DATADIR%%/locale/nqo.qm
 %%DATADIR%%/locale/pl_PL.qm
 %%DATADIR%%/locale/pt_BR.qm
 %%DATADIR%%/locale/pt_PT.qm
 %%DATADIR%%/locale/qt_ca.qm
 %%DATADIR%%/locale/qt_el.qm
 %%DATADIR%%/locale/qt_nl.qm
 %%DATADIR%%/locale/qt_sr.qm
 %%DATADIR%%/locale/qt_sr@ijekavian.qm
 %%DATADIR%%/locale/qt_sr@ijekavianlatin.qm
 %%DATADIR%%/locale/qt_sr@latin.qm
 %%DATADIR%%/locale/ro_RO.qm
 %%DATADIR%%/locale/ru_RU.qm
 %%DATADIR%%/locale/sk_SK.qm
 %%DATADIR%%/locale/sr.qm
 %%DATADIR%%/locale/sr@ijekavian.qm
 %%DATADIR%%/locale/sr@ijekavianlatin.qm
 %%DATADIR%%/locale/sr@latin.qm
 %%DATADIR%%/locale/sv_SE.qm
 %%DATADIR%%/locale/tr_TR.qm
 %%DATADIR%%/locale/uk_UA.qm
 %%DATADIR%%/locale/uz@Latn.qm
 %%DATADIR%%/locale/zh_CN.qm
 %%DATADIR%%/locale/zh_TW.qm
 %%DATADIR%%/themes/breathe/images/add.png
 %%DATADIR%%/themes/breathe/images/find.png
 %%DATADIR%%/themes/breathe/images/flash.png
 %%DATADIR%%/themes/breathe/images/flashstart.png
 %%DATADIR%%/themes/breathe/images/goto.png
 %%DATADIR%%/themes/breathe/images/home.png
 %%DATADIR%%/themes/breathe/images/library-bg-left.png
 %%DATADIR%%/themes/breathe/images/library-bg-top-right.png
 %%DATADIR%%/themes/breathe/images/library-bg-top.png
 %%DATADIR%%/themes/breathe/images/library-search-bg.png
 %%DATADIR%%/themes/breathe/images/lineedit-bg.png
 %%DATADIR%%/themes/breathe/images/login.png
 %%DATADIR%%/themes/breathe/images/menu.png
 %%DATADIR%%/themes/breathe/images/navigation-dropdown.png
 %%DATADIR%%/themes/breathe/images/next.png
 %%DATADIR%%/themes/breathe/images/previous.png
 %%DATADIR%%/themes/breathe/images/reload.png
 %%DATADIR%%/themes/breathe/images/restore.png
 %%DATADIR%%/themes/breathe/images/rss.png
 %%DATADIR%%/themes/breathe/images/semi-transp.png
 %%DATADIR%%/themes/breathe/images/siteicon-bg-a.png
 %%DATADIR%%/themes/breathe/images/siteicon-bg-h.png
 %%DATADIR%%/themes/breathe/images/siteicon-bg.png
 %%DATADIR%%/themes/breathe/images/siteicon-secure-bg-a.png
 %%DATADIR%%/themes/breathe/images/siteicon-secure-bg-h.png
 %%DATADIR%%/themes/breathe/images/siteicon-secure-bg.png
 %%DATADIR%%/themes/breathe/images/star-a.png
 %%DATADIR%%/themes/breathe/images/star.png
 %%DATADIR%%/themes/breathe/images/stop.png
 %%DATADIR%%/themes/breathe/images/tab-left.png
 %%DATADIR%%/themes/breathe/images/tab-right.png
 %%DATADIR%%/themes/breathe/images/tabs-list.png
 %%DATADIR%%/themes/breathe/images/transp.png
 %%DATADIR%%/themes/breathe/images/trash.png
 %%DATADIR%%/themes/breathe/images/websearch-bg-a.png
 %%DATADIR%%/themes/breathe/images/websearch-bg-h.png
 %%DATADIR%%/themes/breathe/images/websearch-bg.png
 %%DATADIR%%/themes/breathe/main.css
 %%DATADIR%%/themes/breathe/rtl.css
 %%DATADIR%%/themes/breathe/theme.info
 %%DATADIR%%/themes/breathe/theme.png
 %%DATADIR%%/themes/chrome/images/flash.png
 %%DATADIR%%/themes/chrome/images/flashstart.png
 %%DATADIR%%/themes/chrome/images/gotoaddress.png
 %%DATADIR%%/themes/chrome/images/key.png
 %%DATADIR%%/themes/chrome/images/library-bg-left.png
 %%DATADIR%%/themes/chrome/images/library-bg-top-right.png
 %%DATADIR%%/themes/chrome/images/library-bg-top.png
 %%DATADIR%%/themes/chrome/images/library-search-bg.png
 %%DATADIR%%/themes/chrome/images/lineedit-bg.png
 %%DATADIR%%/themes/chrome/images/navigation-addtab.png
 %%DATADIR%%/themes/chrome/images/navigation-back.png
 %%DATADIR%%/themes/chrome/images/navigation-dropdown.png
 %%DATADIR%%/themes/chrome/images/navigation-forward.png
 %%DATADIR%%/themes/chrome/images/navigation-home.png
 %%DATADIR%%/themes/chrome/images/navigation-reload.png
 %%DATADIR%%/themes/chrome/images/navigation-stop.png
 %%DATADIR%%/themes/chrome/images/navigation-supermenu.png
 %%DATADIR%%/themes/chrome/images/rss.png
 %%DATADIR%%/themes/chrome/images/search-icon.png
 %%DATADIR%%/themes/chrome/images/searchbar-provider-bg.png
 %%DATADIR%%/themes/chrome/images/semi-transp.png
 %%DATADIR%%/themes/chrome/images/siteicon-bg.png
 %%DATADIR%%/themes/chrome/images/siteicon-secure-bg.png
 %%DATADIR%%/themes/chrome/images/star-a.png
 %%DATADIR%%/themes/chrome/images/star.png
 %%DATADIR%%/themes/chrome/images/tab-left-arrow.png
 %%DATADIR%%/themes/chrome/images/tab-right-arrow.png
 %%DATADIR%%/themes/chrome/images/tabbar-addtab.png
 %%DATADIR%%/themes/chrome/images/tabs-bg.png
 %%DATADIR%%/themes/chrome/images/tabs-list-button.png
 %%DATADIR%%/themes/chrome/images/toolbar-bg.png
 %%DATADIR%%/themes/chrome/images/toolbutton-a.png
 %%DATADIR%%/themes/chrome/images/toolbutton-h.png
 %%DATADIR%%/themes/chrome/images/toolbutton.png
 %%DATADIR%%/themes/chrome/linux.css
 %%DATADIR%%/themes/chrome/main.css
 %%DATADIR%%/themes/chrome/rtl.css
 %%DATADIR%%/themes/chrome/theme.info
 %%DATADIR%%/themes/chrome/theme.license
 %%DATADIR%%/themes/chrome/theme.png
 %%DATADIR%%/themes/chrome/windows.css
 %%DATADIR%%/themes/default/images/arrow-down.gif
 %%DATADIR%%/themes/default/images/background.png
 %%DATADIR%%/themes/default/images/flash.png
 %%DATADIR%%/themes/default/images/flashstart.png
 %%DATADIR%%/themes/default/images/gotoaddress.png
 %%DATADIR%%/themes/default/images/key.png
 %%DATADIR%%/themes/default/images/library-bg-left.png
 %%DATADIR%%/themes/default/images/library-bg-top-right.png
 %%DATADIR%%/themes/default/images/library-bg-top.png
 %%DATADIR%%/themes/default/images/lineedit-bg.png
 %%DATADIR%%/themes/default/images/navigation-addtab.png
 %%DATADIR%%/themes/default/images/navigation-back.png
 %%DATADIR%%/themes/default/images/navigation-forward.png
 %%DATADIR%%/themes/default/images/navigation-home.png
 %%DATADIR%%/themes/default/images/navigation-reload.png
 %%DATADIR%%/themes/default/images/navigation-stop.png
 %%DATADIR%%/themes/default/images/navigation-supmenu.png
 %%DATADIR%%/themes/default/images/rss.png
 %%DATADIR%%/themes/default/images/search.png
 %%DATADIR%%/themes/default/images/semi-transp.png
 %%DATADIR%%/themes/default/images/siteicon-bg-secure.png
 %%DATADIR%%/themes/default/images/siteicon-bg.png
 %%DATADIR%%/themes/default/images/star.png
 %%DATADIR%%/themes/default/images/starg.png
 %%DATADIR%%/themes/default/images/tab-left-arrow.png
 %%DATADIR%%/themes/default/images/tab-right-arrow.png
 %%DATADIR%%/themes/default/images/tabs-list-button.png
 %%DATADIR%%/themes/default/images/transp.png
 %%DATADIR%%/themes/default/images/websearchbar-bg.png
 %%DATADIR%%/themes/default/main.css
 %%DATADIR%%/themes/default/rtl.css
 %%DATADIR%%/themes/default/theme.info
 %%DATADIR%%/themes/default/theme.png
 %%DATADIR%%/themes/default/windows.css
 %%DATADIR%%/themes/linux/images/flash.png
 %%DATADIR%%/themes/linux/images/flashstart.png
 %%DATADIR%%/themes/linux/images/goto.png
 %%DATADIR%%/themes/linux/images/key.png
 %%DATADIR%%/themes/linux/images/library-bg-left.png
 %%DATADIR%%/themes/linux/images/library-bg-top-right.png
 %%DATADIR%%/themes/linux/images/library-bg-top.png
 %%DATADIR%%/themes/linux/images/library-search-bg.png
 %%DATADIR%%/themes/linux/images/menu.png
 %%DATADIR%%/themes/linux/images/navigation-dropdown.png
 %%DATADIR%%/themes/linux/images/rss.png
 %%DATADIR%%/themes/linux/images/semi-transp.png
 %%DATADIR%%/themes/linux/images/star-a.png
 %%DATADIR%%/themes/linux/images/star.png
 %%DATADIR%%/themes/linux/images/tab-left-arrow.png
 %%DATADIR%%/themes/linux/images/tab-right-arrow.png
 %%DATADIR%%/themes/linux/images/tabs-list-button.png
 %%DATADIR%%/themes/linux/images/transp.png
 %%DATADIR%%/themes/linux/images/websearch-bg.png
 %%DATADIR%%/themes/linux/main.css
 %%DATADIR%%/themes/linux/rtl.css
 %%DATADIR%%/themes/linux/theme.info
 %%DATADIR%%/themes/linux/theme.png
 %%DATADIR%%/themes/mac/images/feed-icon.png
 %%DATADIR%%/themes/mac/images/flash.png
 %%DATADIR%%/themes/mac/images/flashstart.png
 %%DATADIR%%/themes/mac/images/gotoaddress.png
 %%DATADIR%%/themes/mac/images/key.png
 %%DATADIR%%/themes/mac/images/library-bg-left.png
 %%DATADIR%%/themes/mac/images/library-bg-top-right.png
 %%DATADIR%%/themes/mac/images/library-bg-top.png
 %%DATADIR%%/themes/mac/images/library-search-bg.png
 %%DATADIR%%/themes/mac/images/lineedit-bg.png
 %%DATADIR%%/themes/mac/images/navigation-addtab.png
 %%DATADIR%%/themes/mac/images/navigation-back.png
 %%DATADIR%%/themes/mac/images/navigation-dropdown.png
 %%DATADIR%%/themes/mac/images/navigation-forward.png
 %%DATADIR%%/themes/mac/images/navigation-home.png
 %%DATADIR%%/themes/mac/images/navigation-reload.png
 %%DATADIR%%/themes/mac/images/navigation-stop.png
 %%DATADIR%%/themes/mac/images/navigation-supermenu.png
 %%DATADIR%%/themes/mac/images/search-icon.png
 %%DATADIR%%/themes/mac/images/searchbar-provider-bg.png
 %%DATADIR%%/themes/mac/images/semi-transp.png
 %%DATADIR%%/themes/mac/images/siteicon-bg.png
 %%DATADIR%%/themes/mac/images/siteicon-secure-bg.png
 %%DATADIR%%/themes/mac/images/splitter.png
 %%DATADIR%%/themes/mac/images/star-a.png
 %%DATADIR%%/themes/mac/images/star.png
 %%DATADIR%%/themes/mac/images/tab-left-arrow.png
 %%DATADIR%%/themes/mac/images/tab-right-arrow.png
 %%DATADIR%%/themes/mac/images/tabbar-addtab.png
 %%DATADIR%%/themes/mac/images/tabs-bg.png
 %%DATADIR%%/themes/mac/images/tabs-list-button.png
 %%DATADIR%%/themes/mac/images/tabs-list-button_rtl.png
 %%DATADIR%%/themes/mac/images/toolbar-bg.png
 %%DATADIR%%/themes/mac/images/transp.png
 %%DATADIR%%/themes/mac/images/user-trash-full.png
 %%DATADIR%%/themes/mac/linux.css
 %%DATADIR%%/themes/mac/main.css
 %%DATADIR%%/themes/mac/rtl.css
 %%DATADIR%%/themes/mac/theme.info
 %%DATADIR%%/themes/mac/theme.license
 %%DATADIR%%/themes/mac/theme.png
 %%DATADIR%%/themes/mac/windows.css
 %%DATADIR%%/themes/windows/images/flash.png
 %%DATADIR%%/themes/windows/images/flashstart.png
 %%DATADIR%%/themes/windows/images/gotoaddress.png
 %%DATADIR%%/themes/windows/images/key.png
 %%DATADIR%%/themes/windows/images/library-bg-left.png
 %%DATADIR%%/themes/windows/images/library-bg-top-right.png
 %%DATADIR%%/themes/windows/images/library-bg-top.png
 %%DATADIR%%/themes/windows/images/library-search-bg.png
 %%DATADIR%%/themes/windows/images/lineedit-bg.png
 %%DATADIR%%/themes/windows/images/navigation-addtab.png
 %%DATADIR%%/themes/windows/images/navigation-back.png
 %%DATADIR%%/themes/windows/images/navigation-dropdown.png
 %%DATADIR%%/themes/windows/images/navigation-forward.png
 %%DATADIR%%/themes/windows/images/navigation-home.png
 %%DATADIR%%/themes/windows/images/navigation-reload.png
 %%DATADIR%%/themes/windows/images/navigation-stop.png
 %%DATADIR%%/themes/windows/images/navigation-supermenu.png
 %%DATADIR%%/themes/windows/images/rss.png
 %%DATADIR%%/themes/windows/images/search-icon.png
 %%DATADIR%%/themes/windows/images/searchbar-provider-bg.png
 %%DATADIR%%/themes/windows/images/semi-transp.png
 %%DATADIR%%/themes/windows/images/siteicon-bg.png
 %%DATADIR%%/themes/windows/images/siteicon-secure-bg.png
 %%DATADIR%%/themes/windows/images/star-a.png
 %%DATADIR%%/themes/windows/images/star.png
 %%DATADIR%%/themes/windows/images/tab-active-bg.png
 %%DATADIR%%/themes/windows/images/tab-deactive-bg.png
 %%DATADIR%%/themes/windows/images/tab-deactive-hover-bg.png
 %%DATADIR%%/themes/windows/images/tab-left-arrow.png
 %%DATADIR%%/themes/windows/images/tab-right-arrow.png
 %%DATADIR%%/themes/windows/images/tabbar-addtab-outside.png
 %%DATADIR%%/themes/windows/images/tabbar-addtab.png
 %%DATADIR%%/themes/windows/images/tabbar-addtab_rtl.png
 %%DATADIR%%/themes/windows/images/tabs-bg.png
 %%DATADIR%%/themes/windows/images/tabs-list-button.png
 %%DATADIR%%/themes/windows/images/toolbar-bg.png
 %%DATADIR%%/themes/windows/images/transp.png
 %%DATADIR%%/themes/windows/images/user-trash-full.png
 %%DATADIR%%/themes/windows/linux.css
 %%DATADIR%%/themes/windows/main.css
 %%DATADIR%%/themes/windows/rtl.css
 %%DATADIR%%/themes/windows/theme.info
 %%DATADIR%%/themes/windows/theme.license
 %%DATADIR%%/themes/windows/theme.png
 %%DATADIR%%/themes/windows/windows.css
Index: head/www/qupzilla-qt5/Makefile
===================================================================
--- head/www/qupzilla-qt5/Makefile	(revision 399338)
+++ head/www/qupzilla-qt5/Makefile	(revision 399339)
@@ -1,61 +1,59 @@
 # $FreeBSD$
 
 PORTNAME=	qupzilla
-PORTVERSION=	1.8.6
+PORTVERSION=	1.8.7
 CATEGORIES=	www
 MASTER_SITES=	https://github.com/QupZilla/${PORTNAME}/releases/download/v${PORTVERSION}/
 PKGNAMESUFFIX=	-qt5
 DISTNAME=	QupZilla-${PORTVERSION}
 
 MAINTAINER=	matthew@reztek.cz
 COMMENT=	Web browser based on WebKit engine and Qt Framework
 
 LICENSE=	GPLv3
 
 LIB_DEPENDS=	libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell
 
-CONFLICTS=	${PORTNAME}-qt4*
+CONFLICTS_INSTALL=	${PORTNAME}-qt4*
 
 USES=		desktop-file-utils execinfo pkgconfig qmake tar:xz
-USE_QT5=	core concurrent gui  network script webkit xml \
+USE_QT5=	core concurrent gui network script webkit x11extras xml \
 		buildtools_build linguisttools_build \
 		imageformats_run sql-sqlite3_run
 USE_XORG=	x11
 USE_OPENSSL=	yes
 CONFIGURE_ENV=	QUPZILLA_PREFIX=${PREFIX}/
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
 PLIST_SUB=	VERSION=${PORTVERSION}
 
-OPTIONS_DEFINE=	DBUS DEBUG GNOMEKEYRING # KWALLET
+OPTIONS_DEFINE=	DBUS DEBUG GNOMEKEYRING KWALLET
 OPTIONS_DEFAULT=DBUS
 OPTIONS_SUB=	yes
 
 DBUS_USE=		QT5=dbus
 DBUS_CONFIGURE_ENV_OFF=	DISABLE_DBUS="true"
 
 GNOMEKEYRING_LIB_DEPENDS=	libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring
 GNOMEKEYRING_CONFIGURE_ENV=	GNOME_INTEGRATION="true"
 
-# KWallet integration requires KF5 which is not available through ports
-#KWALLET_USE=		KDE5=kdelibs
-#KWALLET_CONFIGURE_ENV=	KDE_INTEGRATION="true"
-PLIST_SUB+=	KWALLET="@comment "
+KWALLET_USE=		KDE5=wallet
+KWALLET_CONFIGURE_ENV=	KDE_INTEGRATION="true"
 
 .include <bsd.port.options.mk>
 
 # work around for build failure in test plugin (single source file target)
 .if ${PORT_OPTIONS:MDEBUG}
 MAKE_JOBS_UNSAFE=	yes
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr|${LOCALBASE}|g' \
 		${WRKSRC}/tests/autotests/qztoolstest.cpp \
 		${WRKSRC}/src/lib/plugins/qtwebkit/spellcheck/speller.cpp
 	@${REINPLACE_CMD} -e 's|/usr|${PREFIX}|g' \
 		${WRKSRC}/src/install.pri \
 		${WRKSRC}/src/defines.pri \
 		${WRKSRC}/src/lib/plugins/plugins.cpp
 
 .include <bsd.port.mk>
Index: head/www/qupzilla-qt5/distinfo
===================================================================
--- head/www/qupzilla-qt5/distinfo	(revision 399338)
+++ head/www/qupzilla-qt5/distinfo	(revision 399339)
@@ -1,2 +1,2 @@
-SHA256 (QupZilla-1.8.6.tar.xz) = aecda29f8994c9dc4d6b5f76ce5b1ba947272a0d5a40b5d83a54023dd5d7a6a5
-SIZE (QupZilla-1.8.6.tar.xz) = 3205912
+SHA256 (QupZilla-1.8.7.tar.xz) = 1823f36520a3e5d0164f4ad185f29cd80600d3e8010e3acf9b33e536e61049fd
+SIZE (QupZilla-1.8.7.tar.xz) = 3212072
Index: head/www/qupzilla-qt5/pkg-plist
===================================================================
--- head/www/qupzilla-qt5/pkg-plist	(revision 399338)
+++ head/www/qupzilla-qt5/pkg-plist	(revision 399339)
@@ -1,300 +1,302 @@
 bin/qupzilla
 lib/libQupZilla.so
 lib/libQupZilla.so.1
 lib/libQupZilla.so.1.8
 lib/libQupZilla.so.%%VERSION%%
 lib/qupzilla/libAccessKeysNavigation.so
 lib/qupzilla/libAutoScroll.so
 lib/qupzilla/libFlashCookieManager.so
 %%GNOMEKEYRING%%lib/qupzilla/libGnomeKeyringPasswords.so
 lib/qupzilla/libGreaseMonkey.so
 %%KWALLET%%lib/qupzilla/libKWalletPasswords.so
 lib/qupzilla/libMouseGestures.so
 lib/qupzilla/libPIM.so
 lib/qupzilla/libStatusBarIcons.so
 lib/qupzilla/libTabManager.so
 %%DEBUG%%lib/qupzilla/libTestPlugin.so
 share/appdata/qupzilla.appdata.xml
 share/applications/qupzilla.desktop
 share/bash-completion/completions/qupzilla
 share/icons/hicolor/128x128/apps/qupzilla.png
 share/icons/hicolor/16x16/apps/qupzilla.png
 share/icons/hicolor/256x256/apps/qupzilla.png
 share/icons/hicolor/32x32/apps/qupzilla.png
 share/icons/hicolor/48x48/apps/qupzilla.png
 share/icons/hicolor/64x64/apps/qupzilla.png
 share/pixmaps/qupzilla.png
 %%DATADIR%%/locale/ar_SA.qm
 %%DATADIR%%/locale/bg_BG.qm
 %%DATADIR%%/locale/ca_ES.qm
 %%DATADIR%%/locale/cs_CZ.qm
+%%DATADIR%%/locale/da_DK.qm
 %%DATADIR%%/locale/de_DE.qm
 %%DATADIR%%/locale/el_GR.qm
 %%DATADIR%%/locale/es_ES.qm
 %%DATADIR%%/locale/es_MX.qm
 %%DATADIR%%/locale/es_VE.qm
 %%DATADIR%%/locale/eu_ES.qm
 %%DATADIR%%/locale/fa_IR.qm
 %%DATADIR%%/locale/fi_FI.qm
 %%DATADIR%%/locale/fr_FR.qm
 %%DATADIR%%/locale/gl_ES.qm
 %%DATADIR%%/locale/he_IL.qm
 %%DATADIR%%/locale/hr_HR.qm
 %%DATADIR%%/locale/hu_HU.qm
 %%DATADIR%%/locale/id_ID.qm
 %%DATADIR%%/locale/it_IT.qm
 %%DATADIR%%/locale/ja_JP.qm
 %%DATADIR%%/locale/ka_GE.qm
 %%DATADIR%%/locale/lg.qm
+%%DATADIR%%/locale/lt.qm
 %%DATADIR%%/locale/lv_LV.qm
 %%DATADIR%%/locale/nl_NL.qm
 %%DATADIR%%/locale/nqo.qm
 %%DATADIR%%/locale/pl_PL.qm
 %%DATADIR%%/locale/pt_BR.qm
 %%DATADIR%%/locale/pt_PT.qm
 %%DATADIR%%/locale/qt_ca.qm
 %%DATADIR%%/locale/qt_el.qm
 %%DATADIR%%/locale/qt_nl.qm
 %%DATADIR%%/locale/qt_sr.qm
 %%DATADIR%%/locale/qt_sr@ijekavian.qm
 %%DATADIR%%/locale/qt_sr@ijekavianlatin.qm
 %%DATADIR%%/locale/qt_sr@latin.qm
 %%DATADIR%%/locale/ro_RO.qm
 %%DATADIR%%/locale/ru_RU.qm
 %%DATADIR%%/locale/sk_SK.qm
 %%DATADIR%%/locale/sr.qm
 %%DATADIR%%/locale/sr@ijekavian.qm
 %%DATADIR%%/locale/sr@ijekavianlatin.qm
 %%DATADIR%%/locale/sr@latin.qm
 %%DATADIR%%/locale/sv_SE.qm
 %%DATADIR%%/locale/tr_TR.qm
 %%DATADIR%%/locale/uk_UA.qm
 %%DATADIR%%/locale/uz@Latn.qm
 %%DATADIR%%/locale/zh_CN.qm
 %%DATADIR%%/locale/zh_TW.qm
 %%DATADIR%%/themes/breathe/images/add.png
 %%DATADIR%%/themes/breathe/images/find.png
 %%DATADIR%%/themes/breathe/images/flash.png
 %%DATADIR%%/themes/breathe/images/flashstart.png
 %%DATADIR%%/themes/breathe/images/goto.png
 %%DATADIR%%/themes/breathe/images/home.png
 %%DATADIR%%/themes/breathe/images/library-bg-left.png
 %%DATADIR%%/themes/breathe/images/library-bg-top-right.png
 %%DATADIR%%/themes/breathe/images/library-bg-top.png
 %%DATADIR%%/themes/breathe/images/library-search-bg.png
 %%DATADIR%%/themes/breathe/images/lineedit-bg.png
 %%DATADIR%%/themes/breathe/images/login.png
 %%DATADIR%%/themes/breathe/images/menu.png
 %%DATADIR%%/themes/breathe/images/navigation-dropdown.png
 %%DATADIR%%/themes/breathe/images/next.png
 %%DATADIR%%/themes/breathe/images/previous.png
 %%DATADIR%%/themes/breathe/images/reload.png
 %%DATADIR%%/themes/breathe/images/restore.png
 %%DATADIR%%/themes/breathe/images/rss.png
 %%DATADIR%%/themes/breathe/images/semi-transp.png
 %%DATADIR%%/themes/breathe/images/siteicon-bg-a.png
 %%DATADIR%%/themes/breathe/images/siteicon-bg-h.png
 %%DATADIR%%/themes/breathe/images/siteicon-bg.png
 %%DATADIR%%/themes/breathe/images/siteicon-secure-bg-a.png
 %%DATADIR%%/themes/breathe/images/siteicon-secure-bg-h.png
 %%DATADIR%%/themes/breathe/images/siteicon-secure-bg.png
 %%DATADIR%%/themes/breathe/images/star-a.png
 %%DATADIR%%/themes/breathe/images/star.png
 %%DATADIR%%/themes/breathe/images/stop.png
 %%DATADIR%%/themes/breathe/images/tab-left.png
 %%DATADIR%%/themes/breathe/images/tab-right.png
 %%DATADIR%%/themes/breathe/images/tabs-list.png
 %%DATADIR%%/themes/breathe/images/transp.png
 %%DATADIR%%/themes/breathe/images/trash.png
 %%DATADIR%%/themes/breathe/images/websearch-bg-a.png
 %%DATADIR%%/themes/breathe/images/websearch-bg-h.png
 %%DATADIR%%/themes/breathe/images/websearch-bg.png
 %%DATADIR%%/themes/breathe/main.css
 %%DATADIR%%/themes/breathe/rtl.css
 %%DATADIR%%/themes/breathe/theme.info
 %%DATADIR%%/themes/breathe/theme.png
 %%DATADIR%%/themes/chrome/images/flash.png
 %%DATADIR%%/themes/chrome/images/flashstart.png
 %%DATADIR%%/themes/chrome/images/gotoaddress.png
 %%DATADIR%%/themes/chrome/images/key.png
 %%DATADIR%%/themes/chrome/images/library-bg-left.png
 %%DATADIR%%/themes/chrome/images/library-bg-top-right.png
 %%DATADIR%%/themes/chrome/images/library-bg-top.png
 %%DATADIR%%/themes/chrome/images/library-search-bg.png
 %%DATADIR%%/themes/chrome/images/lineedit-bg.png
 %%DATADIR%%/themes/chrome/images/navigation-addtab.png
 %%DATADIR%%/themes/chrome/images/navigation-back.png
 %%DATADIR%%/themes/chrome/images/navigation-dropdown.png
 %%DATADIR%%/themes/chrome/images/navigation-forward.png
 %%DATADIR%%/themes/chrome/images/navigation-home.png
 %%DATADIR%%/themes/chrome/images/navigation-reload.png
 %%DATADIR%%/themes/chrome/images/navigation-stop.png
 %%DATADIR%%/themes/chrome/images/navigation-supermenu.png
 %%DATADIR%%/themes/chrome/images/rss.png
 %%DATADIR%%/themes/chrome/images/search-icon.png
 %%DATADIR%%/themes/chrome/images/searchbar-provider-bg.png
 %%DATADIR%%/themes/chrome/images/semi-transp.png
 %%DATADIR%%/themes/chrome/images/siteicon-bg.png
 %%DATADIR%%/themes/chrome/images/siteicon-secure-bg.png
 %%DATADIR%%/themes/chrome/images/star-a.png
 %%DATADIR%%/themes/chrome/images/star.png
 %%DATADIR%%/themes/chrome/images/tab-left-arrow.png
 %%DATADIR%%/themes/chrome/images/tab-right-arrow.png
 %%DATADIR%%/themes/chrome/images/tabbar-addtab.png
 %%DATADIR%%/themes/chrome/images/tabs-bg.png
 %%DATADIR%%/themes/chrome/images/tabs-list-button.png
 %%DATADIR%%/themes/chrome/images/toolbar-bg.png
 %%DATADIR%%/themes/chrome/images/toolbutton-a.png
 %%DATADIR%%/themes/chrome/images/toolbutton-h.png
 %%DATADIR%%/themes/chrome/images/toolbutton.png
 %%DATADIR%%/themes/chrome/linux.css
 %%DATADIR%%/themes/chrome/main.css
 %%DATADIR%%/themes/chrome/rtl.css
 %%DATADIR%%/themes/chrome/theme.info
 %%DATADIR%%/themes/chrome/theme.license
 %%DATADIR%%/themes/chrome/theme.png
 %%DATADIR%%/themes/chrome/windows.css
 %%DATADIR%%/themes/default/images/arrow-down.gif
 %%DATADIR%%/themes/default/images/background.png
 %%DATADIR%%/themes/default/images/flash.png
 %%DATADIR%%/themes/default/images/flashstart.png
 %%DATADIR%%/themes/default/images/gotoaddress.png
 %%DATADIR%%/themes/default/images/key.png
 %%DATADIR%%/themes/default/images/library-bg-left.png
 %%DATADIR%%/themes/default/images/library-bg-top-right.png
 %%DATADIR%%/themes/default/images/library-bg-top.png
 %%DATADIR%%/themes/default/images/lineedit-bg.png
 %%DATADIR%%/themes/default/images/navigation-addtab.png
 %%DATADIR%%/themes/default/images/navigation-back.png
 %%DATADIR%%/themes/default/images/navigation-forward.png
 %%DATADIR%%/themes/default/images/navigation-home.png
 %%DATADIR%%/themes/default/images/navigation-reload.png
 %%DATADIR%%/themes/default/images/navigation-stop.png
 %%DATADIR%%/themes/default/images/navigation-supmenu.png
 %%DATADIR%%/themes/default/images/rss.png
 %%DATADIR%%/themes/default/images/search.png
 %%DATADIR%%/themes/default/images/semi-transp.png
 %%DATADIR%%/themes/default/images/siteicon-bg-secure.png
 %%DATADIR%%/themes/default/images/siteicon-bg.png
 %%DATADIR%%/themes/default/images/star.png
 %%DATADIR%%/themes/default/images/starg.png
 %%DATADIR%%/themes/default/images/tab-left-arrow.png
 %%DATADIR%%/themes/default/images/tab-right-arrow.png
 %%DATADIR%%/themes/default/images/tabs-list-button.png
 %%DATADIR%%/themes/default/images/transp.png
 %%DATADIR%%/themes/default/images/websearchbar-bg.png
 %%DATADIR%%/themes/default/main.css
 %%DATADIR%%/themes/default/rtl.css
 %%DATADIR%%/themes/default/theme.info
 %%DATADIR%%/themes/default/theme.png
 %%DATADIR%%/themes/default/windows.css
 %%DATADIR%%/themes/linux/images/flash.png
 %%DATADIR%%/themes/linux/images/flashstart.png
 %%DATADIR%%/themes/linux/images/goto.png
 %%DATADIR%%/themes/linux/images/key.png
 %%DATADIR%%/themes/linux/images/library-bg-left.png
 %%DATADIR%%/themes/linux/images/library-bg-top-right.png
 %%DATADIR%%/themes/linux/images/library-bg-top.png
 %%DATADIR%%/themes/linux/images/library-search-bg.png
 %%DATADIR%%/themes/linux/images/menu.png
 %%DATADIR%%/themes/linux/images/navigation-dropdown.png
 %%DATADIR%%/themes/linux/images/rss.png
 %%DATADIR%%/themes/linux/images/semi-transp.png
 %%DATADIR%%/themes/linux/images/star-a.png
 %%DATADIR%%/themes/linux/images/star.png
 %%DATADIR%%/themes/linux/images/tab-left-arrow.png
 %%DATADIR%%/themes/linux/images/tab-right-arrow.png
 %%DATADIR%%/themes/linux/images/tabs-list-button.png
 %%DATADIR%%/themes/linux/images/transp.png
 %%DATADIR%%/themes/linux/images/websearch-bg.png
 %%DATADIR%%/themes/linux/main.css
 %%DATADIR%%/themes/linux/rtl.css
 %%DATADIR%%/themes/linux/theme.info
 %%DATADIR%%/themes/linux/theme.png
 %%DATADIR%%/themes/mac/images/feed-icon.png
 %%DATADIR%%/themes/mac/images/flash.png
 %%DATADIR%%/themes/mac/images/flashstart.png
 %%DATADIR%%/themes/mac/images/gotoaddress.png
 %%DATADIR%%/themes/mac/images/key.png
 %%DATADIR%%/themes/mac/images/library-bg-left.png
 %%DATADIR%%/themes/mac/images/library-bg-top-right.png
 %%DATADIR%%/themes/mac/images/library-bg-top.png
 %%DATADIR%%/themes/mac/images/library-search-bg.png
 %%DATADIR%%/themes/mac/images/lineedit-bg.png
 %%DATADIR%%/themes/mac/images/navigation-addtab.png
 %%DATADIR%%/themes/mac/images/navigation-back.png
 %%DATADIR%%/themes/mac/images/navigation-dropdown.png
 %%DATADIR%%/themes/mac/images/navigation-forward.png
 %%DATADIR%%/themes/mac/images/navigation-home.png
 %%DATADIR%%/themes/mac/images/navigation-reload.png
 %%DATADIR%%/themes/mac/images/navigation-stop.png
 %%DATADIR%%/themes/mac/images/navigation-supermenu.png
 %%DATADIR%%/themes/mac/images/search-icon.png
 %%DATADIR%%/themes/mac/images/searchbar-provider-bg.png
 %%DATADIR%%/themes/mac/images/semi-transp.png
 %%DATADIR%%/themes/mac/images/siteicon-bg.png
 %%DATADIR%%/themes/mac/images/siteicon-secure-bg.png
 %%DATADIR%%/themes/mac/images/splitter.png
 %%DATADIR%%/themes/mac/images/star-a.png
 %%DATADIR%%/themes/mac/images/star.png
 %%DATADIR%%/themes/mac/images/tab-left-arrow.png
 %%DATADIR%%/themes/mac/images/tab-right-arrow.png
 %%DATADIR%%/themes/mac/images/tabbar-addtab.png
 %%DATADIR%%/themes/mac/images/tabs-bg.png
 %%DATADIR%%/themes/mac/images/tabs-list-button.png
 %%DATADIR%%/themes/mac/images/tabs-list-button_rtl.png
 %%DATADIR%%/themes/mac/images/toolbar-bg.png
 %%DATADIR%%/themes/mac/images/transp.png
 %%DATADIR%%/themes/mac/images/user-trash-full.png
 %%DATADIR%%/themes/mac/linux.css
 %%DATADIR%%/themes/mac/main.css
 %%DATADIR%%/themes/mac/rtl.css
 %%DATADIR%%/themes/mac/theme.info
 %%DATADIR%%/themes/mac/theme.license
 %%DATADIR%%/themes/mac/theme.png
 %%DATADIR%%/themes/mac/windows.css
 %%DATADIR%%/themes/windows/images/flash.png
 %%DATADIR%%/themes/windows/images/flashstart.png
 %%DATADIR%%/themes/windows/images/gotoaddress.png
 %%DATADIR%%/themes/windows/images/key.png
 %%DATADIR%%/themes/windows/images/library-bg-left.png
 %%DATADIR%%/themes/windows/images/library-bg-top-right.png
 %%DATADIR%%/themes/windows/images/library-bg-top.png
 %%DATADIR%%/themes/windows/images/library-search-bg.png
 %%DATADIR%%/themes/windows/images/lineedit-bg.png
 %%DATADIR%%/themes/windows/images/navigation-addtab.png
 %%DATADIR%%/themes/windows/images/navigation-back.png
 %%DATADIR%%/themes/windows/images/navigation-dropdown.png
 %%DATADIR%%/themes/windows/images/navigation-forward.png
 %%DATADIR%%/themes/windows/images/navigation-home.png
 %%DATADIR%%/themes/windows/images/navigation-reload.png
 %%DATADIR%%/themes/windows/images/navigation-stop.png
 %%DATADIR%%/themes/windows/images/navigation-supermenu.png
 %%DATADIR%%/themes/windows/images/rss.png
 %%DATADIR%%/themes/windows/images/search-icon.png
 %%DATADIR%%/themes/windows/images/searchbar-provider-bg.png
 %%DATADIR%%/themes/windows/images/semi-transp.png
 %%DATADIR%%/themes/windows/images/siteicon-bg.png
 %%DATADIR%%/themes/windows/images/siteicon-secure-bg.png
 %%DATADIR%%/themes/windows/images/star-a.png
 %%DATADIR%%/themes/windows/images/star.png
 %%DATADIR%%/themes/windows/images/tab-active-bg.png
 %%DATADIR%%/themes/windows/images/tab-deactive-bg.png
 %%DATADIR%%/themes/windows/images/tab-deactive-hover-bg.png
 %%DATADIR%%/themes/windows/images/tab-left-arrow.png
 %%DATADIR%%/themes/windows/images/tab-right-arrow.png
 %%DATADIR%%/themes/windows/images/tabbar-addtab-outside.png
 %%DATADIR%%/themes/windows/images/tabbar-addtab.png
 %%DATADIR%%/themes/windows/images/tabbar-addtab_rtl.png
 %%DATADIR%%/themes/windows/images/tabs-bg.png
 %%DATADIR%%/themes/windows/images/tabs-list-button.png
 %%DATADIR%%/themes/windows/images/toolbar-bg.png
 %%DATADIR%%/themes/windows/images/transp.png
 %%DATADIR%%/themes/windows/images/user-trash-full.png
 %%DATADIR%%/themes/windows/linux.css
 %%DATADIR%%/themes/windows/main.css
 %%DATADIR%%/themes/windows/rtl.css
 %%DATADIR%%/themes/windows/theme.info
 %%DATADIR%%/themes/windows/theme.license
 %%DATADIR%%/themes/windows/theme.png
 %%DATADIR%%/themes/windows/windows.css