Attachment #162057 for bug #203651

Lines 1-7 Link Here

(-)www/qupzilla-qt4/Makefile (-2 / +2 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= qupzilla	3	PORTNAME= qupzilla
4	PORTVERSION= 1.8.6	4	PORTVERSION= 1.8.7
5	CATEGORIES= www	5	CATEGORIES= www
6	MASTER_SITES= https://github.com/QupZilla/${PORTNAME}/releases/download/v${PORTVERSION}/	6	MASTER_SITES= https://github.com/QupZilla/${PORTNAME}/releases/download/v${PORTVERSION}/
7	PKGNAMESUFFIX= -qt4	7	PKGNAMESUFFIX= -qt4
Lines 14-20 Link Here
14		14
15	LIB_DEPENDS= libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell	15	LIB_DEPENDS= libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell
16		16
17	CONFLICTS= ${PORTNAME}-qt5*	17	CONFLICTS_INSTALL= ${PORTNAME}-qt5*
18		18
19	USES= desktop-file-utils execinfo pkgconfig qmake tar:xz	19	USES= desktop-file-utils execinfo pkgconfig qmake tar:xz
20	USE_QT4= corelib gui network script sql webkit xml \	20	USE_QT4= corelib gui network script sql webkit xml \

Lines 1-2 Link Here

(-)www/qupzilla-qt4/distinfo (-2 / +2 lines)
1	SHA256 (QupZilla-1.8.6.tar.xz) = aecda29f8994c9dc4d6b5f76ce5b1ba947272a0d5a40b5d83a54023dd5d7a6a5	1	SHA256 (QupZilla-1.8.7.tar.xz) = 1823f36520a3e5d0164f4ad185f29cd80600d3e8010e3acf9b33e536e61049fd
2	SIZE (QupZilla-1.8.6.tar.xz) = 3205912	2	SIZE (QupZilla-1.8.7.tar.xz) = 3212072

Lines 28-33 Link Here

(-)www/qupzilla-qt4/pkg-plist (+2 lines)
28	%%DATADIR%%/locale/bg_BG.qm	28	%%DATADIR%%/locale/bg_BG.qm
29	%%DATADIR%%/locale/ca_ES.qm	29	%%DATADIR%%/locale/ca_ES.qm
30	%%DATADIR%%/locale/cs_CZ.qm	30	%%DATADIR%%/locale/cs_CZ.qm
		31	%%DATADIR%%/locale/da_DK.qm
31	%%DATADIR%%/locale/de_DE.qm	32	%%DATADIR%%/locale/de_DE.qm
32	%%DATADIR%%/locale/el_GR.qm	33	%%DATADIR%%/locale/el_GR.qm
33	%%DATADIR%%/locale/es_ES.qm	34	%%DATADIR%%/locale/es_ES.qm
Lines 46-51 Link Here
46	%%DATADIR%%/locale/ja_JP.qm	47	%%DATADIR%%/locale/ja_JP.qm
47	%%DATADIR%%/locale/ka_GE.qm	48	%%DATADIR%%/locale/ka_GE.qm
48	%%DATADIR%%/locale/lg.qm	49	%%DATADIR%%/locale/lg.qm
		50	%%DATADIR%%/locale/lt.qm
49	%%DATADIR%%/locale/lv_LV.qm	51	%%DATADIR%%/locale/lv_LV.qm
50	%%DATADIR%%/locale/nl_NL.qm	52	%%DATADIR%%/locale/nl_NL.qm
51	%%DATADIR%%/locale/nqo.qm	53	%%DATADIR%%/locale/nqo.qm




# $FreeBSD$

PORTNAME=	qupzilla
PORTVERSION=	1.8.7
CATEGORIES=	www
MASTER_SITES=	https://github.com/QupZilla/${PORTNAME}/releases/download/v${PORTVERSION}/
PKGNAMESUFFIX=	-qt5


LIB_DEPENDS=	libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell

CONFLICTS_INSTALL=	${PORTNAME}-qt4*

USES=		desktop-file-utils execinfo pkgconfig qmake tar:xz
USE_QT5=	core concurrent gui network script webkit x11extras xml \
		buildtools_build linguisttools_build \
		imageformats_run sql-sqlite3_run
USE_XORG=	x11

INSTALLS_ICONS=	yes
PLIST_SUB=	VERSION=${PORTVERSION}

OPTIONS_DEFINE=	DBUS DEBUG GNOMEKEYRING KWALLET
OPTIONS_DEFAULT=DBUS
OPTIONS_SUB=	yes


GNOMEKEYRING_LIB_DEPENDS=	libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring
GNOMEKEYRING_CONFIGURE_ENV=	GNOME_INTEGRATION="true"

KWALLET_USE=		KDE5=wallet
KWALLET_CONFIGURE_ENV=	KDE_INTEGRATION="true"
#KWALLET_CONFIGURE_ENV=	KDE_INTEGRATION="true"
PLIST_SUB+=	KWALLET="@comment "

.include <bsd.port.options.mk>


Lines 1-2 Link Here

(-)www/qupzilla-qt5/distinfo (-2 / +2 lines)
1	SHA256 (QupZilla-1.8.6.tar.xz) = aecda29f8994c9dc4d6b5f76ce5b1ba947272a0d5a40b5d83a54023dd5d7a6a5	1	SHA256 (QupZilla-1.8.7.tar.xz) = 1823f36520a3e5d0164f4ad185f29cd80600d3e8010e3acf9b33e536e61049fd
2	SIZE (QupZilla-1.8.6.tar.xz) = 3205912	2	SIZE (QupZilla-1.8.7.tar.xz) = 3212072

Lines 28-33 Link Here

(-)www/qupzilla-qt5/pkg-plist (+2 lines)
28	%%DATADIR%%/locale/bg_BG.qm	28	%%DATADIR%%/locale/bg_BG.qm
29	%%DATADIR%%/locale/ca_ES.qm	29	%%DATADIR%%/locale/ca_ES.qm
30	%%DATADIR%%/locale/cs_CZ.qm	30	%%DATADIR%%/locale/cs_CZ.qm
		31	%%DATADIR%%/locale/da_DK.qm
31	%%DATADIR%%/locale/de_DE.qm	32	%%DATADIR%%/locale/de_DE.qm
32	%%DATADIR%%/locale/el_GR.qm	33	%%DATADIR%%/locale/el_GR.qm
33	%%DATADIR%%/locale/es_ES.qm	34	%%DATADIR%%/locale/es_ES.qm
Lines 46-51 Link Here
46	%%DATADIR%%/locale/ja_JP.qm	47	%%DATADIR%%/locale/ja_JP.qm
47	%%DATADIR%%/locale/ka_GE.qm	48	%%DATADIR%%/locale/ka_GE.qm
48	%%DATADIR%%/locale/lg.qm	49	%%DATADIR%%/locale/lg.qm
		50	%%DATADIR%%/locale/lt.qm
49	%%DATADIR%%/locale/lv_LV.qm	51	%%DATADIR%%/locale/lv_LV.qm
50	%%DATADIR%%/locale/nl_NL.qm	52	%%DATADIR%%/locale/nl_NL.qm
51	%%DATADIR%%/locale/nqo.qm	53	%%DATADIR%%/locale/nqo.qm

Return to bug 203651

Lines 1-7 Link Here

(-)www/qupzilla-qt5/Makefile (-8 / +6 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= qupzilla	3	PORTNAME= qupzilla
4	PORTVERSION= 1.8.6	4	PORTVERSION= 1.8.7
5	CATEGORIES= www	5	CATEGORIES= www
6	MASTER_SITES= https://github.com/QupZilla/${PORTNAME}/releases/download/v${PORTVERSION}/	6	MASTER_SITES= https://github.com/QupZilla/${PORTNAME}/releases/download/v${PORTVERSION}/
7	PKGNAMESUFFIX= -qt5	7	PKGNAMESUFFIX= -qt5
Lines 14-23 Link Here
14		14
15	LIB_DEPENDS= libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell	15	LIB_DEPENDS= libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell
16		16
17	CONFLICTS= ${PORTNAME}-qt4*	17	CONFLICTS_INSTALL= ${PORTNAME}-qt4*
18		18
19	USES= desktop-file-utils execinfo pkgconfig qmake tar:xz	19	USES= desktop-file-utils execinfo pkgconfig qmake tar:xz
20	USE_QT5= core concurrent gui network script webkit xml \	20	USE_QT5= core concurrent gui network script webkit x11extras xml \
21	buildtools_build linguisttools_build \	21	buildtools_build linguisttools_build \
22	imageformats_run sql-sqlite3_run	22	imageformats_run sql-sqlite3_run
23	USE_XORG= x11	23	USE_XORG= x11
Lines 27-33 Link Here
27	INSTALLS_ICONS= yes	27	INSTALLS_ICONS= yes
28	PLIST_SUB= VERSION=${PORTVERSION}	28	PLIST_SUB= VERSION=${PORTVERSION}
29		29
30	OPTIONS_DEFINE= DBUS DEBUG GNOMEKEYRING # KWALLET	30	OPTIONS_DEFINE= DBUS DEBUG GNOMEKEYRING KWALLET
31	OPTIONS_DEFAULT=DBUS	31	OPTIONS_DEFAULT=DBUS
32	OPTIONS_SUB= yes	32	OPTIONS_SUB= yes
33		33
Lines 37-46 Link Here
37	GNOMEKEYRING_LIB_DEPENDS= libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring	37	GNOMEKEYRING_LIB_DEPENDS= libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring
38	GNOMEKEYRING_CONFIGURE_ENV= GNOME_INTEGRATION="true"	38	GNOMEKEYRING_CONFIGURE_ENV= GNOME_INTEGRATION="true"
39		39
40	# KWallet integration requires KF5 which is not available through ports	40	KWALLET_USE= KDE5=wallet
41	#KWALLET_USE= KDE5=kdelibs	41	KWALLET_CONFIGURE_ENV= KDE_INTEGRATION="true"
42	#KWALLET_CONFIGURE_ENV= KDE_INTEGRATION="true"
43	PLIST_SUB+= KWALLET="@comment "
44		42
45	.include <bsd.port.options.mk>	43	.include <bsd.port.options.mk>
46		44