svn commit: r399339 - in head/www: qupzilla-qt4 qupzilla-qt5

[Mathieu Arnold]

Author: mat
Date: Thu Oct 15 14:14:06 2015
New Revision: 399339
URL: https://svnweb.freebsd.org/changeset/ports/399339

Log:
  Update to 1.8.7.
  
  PR:		203651
  Submitted by:	maintainer
  Sponsored by:	Absolight

Modified:
  head/www/qupzilla-qt4/Makefile
  head/www/qupzilla-qt4/distinfo
  head/www/qupzilla-qt4/pkg-plist
  head/www/qupzilla-qt5/Makefile
  head/www/qupzilla-qt5/distinfo
  head/www/qupzilla-qt5/pkg-plist

Modified: head/www/qupzilla-qt4/Makefile
==============================================================================
--- head/www/qupzilla-qt4/Makefile	Thu Oct 15 11:49:30 2015	(r399338)
+++ head/www/qupzilla-qt4/Makefile	Thu Oct 15 14:14:06 2015	(r399339)
@@ -1,7 +1,7 @@
 # $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
@@ -14,7 +14,7 @@ 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 \

Modified: head/www/qupzilla-qt4/distinfo
==============================================================================
--- head/www/qupzilla-qt4/distinfo	Thu Oct 15 11:49:30 2015	(r399338)
+++ head/www/qupzilla-qt4/distinfo	Thu Oct 15 14:14:06 2015	(r399339)
@@ -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

Modified: head/www/qupzilla-qt4/pkg-plist
==============================================================================
--- head/www/qupzilla-qt4/pkg-plist	Thu Oct 15 11:49:30 2015	(r399338)
+++ head/www/qupzilla-qt4/pkg-plist	Thu Oct 15 14:14:06 2015	(r399339)
@@ -28,6 +28,7 @@ share/pixmaps/qupzilla.png
 %%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
@@ -46,6 +47,7 @@ share/pixmaps/qupzilla.png
 %%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

Modified: head/www/qupzilla-qt5/Makefile
==============================================================================
--- head/www/qupzilla-qt5/Makefile	Thu Oct 15 11:49:30 2015	(r399338)
+++ head/www/qupzilla-qt5/Makefile	Thu Oct 15 14:14:06 2015	(r399339)
@@ -1,7 +1,7 @@
 # $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
@@ -14,10 +14,10 @@ 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
@@ -27,7 +27,7 @@ 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
 
@@ -37,10 +37,8 @@ DBUS_CONFIGURE_ENV_OFF=	DISABLE_DBUS="tr
 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>
 

Modified: head/www/qupzilla-qt5/distinfo
==============================================================================
--- head/www/qupzilla-qt5/distinfo	Thu Oct 15 11:49:30 2015	(r399338)
+++ head/www/qupzilla-qt5/distinfo	Thu Oct 15 14:14:06 2015	(r399339)
@@ -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

Modified: head/www/qupzilla-qt5/pkg-plist
==============================================================================
--- head/www/qupzilla-qt5/pkg-plist	Thu Oct 15 11:49:30 2015	(r399338)
+++ head/www/qupzilla-qt5/pkg-plist	Thu Oct 15 14:14:06 2015	(r399339)
@@ -28,6 +28,7 @@ share/pixmaps/qupzilla.png
 %%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
@@ -46,6 +47,7 @@ share/pixmaps/qupzilla.png
 %%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