View | Details | Raw Unified | Return to bug 196302 | Differences between
and this patch

Collapse All | Expand All

(-)MOVED (+1 lines)
Lines 7403-7405 Link Here
7403
x11/rxvt-devel||2015-01-17|Has expired: No longer developed nor maintained and deprecated by x11/xvt and x11/rxvt-unicode
7403
x11/rxvt-devel||2015-01-17|Has expired: No longer developed nor maintained and deprecated by x11/xvt and x11/rxvt-unicode
7404
comms/spandsp-devel|comms/spandsp|2015-01-17|Has expired: Use newer comms/spandsp
7404
comms/spandsp-devel|comms/spandsp|2015-01-17|Has expired: Use newer comms/spandsp
7405
multimedia/universal-media-server||2015-01-17|Has expired: RC script broken, especially prestart target
7405
multimedia/universal-media-server||2015-01-17|Has expired: RC script broken, especially prestart target
7406
www/qupzilla|www/qupzilla-qt4|2015-01-18|Renamed to differentiate from www/qupzilla-qt5 
(-)www/Makefile (-1 / +2 lines)
Lines 1723-1729 Link Here
1723
    SUBDIR += qdecoder
1723
    SUBDIR += qdecoder
1724
    SUBDIR += qooxdoo
1724
    SUBDIR += qooxdoo
1725
    SUBDIR += quickie
1725
    SUBDIR += quickie
1726
    SUBDIR += qupzilla
1726
    SUBDIR += qupzilla-qt4
1727
    SUBDIR += qupzilla-qt5
1727
    SUBDIR += radicale
1728
    SUBDIR += radicale
1728
    SUBDIR += red5
1729
    SUBDIR += red5
1729
    SUBDIR += redaxo
1730
    SUBDIR += redaxo
(-)www/qupzilla-qt4/Makefile (-3 / +7 lines)
Lines 1-9 Link Here
1
# $FreeBSD$
1
# $FreeBSD$
2
2
3
PORTNAME=	qupzilla
3
PORTNAME=	qupzilla
4
PORTVERSION=	1.8.3
4
PORTVERSION=	1.8.5
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
DISTNAME=	QupZilla-${PORTVERSION}
8
DISTNAME=	QupZilla-${PORTVERSION}
8
9
9
MAINTAINER=	matthew@reztek.cz
10
MAINTAINER=	matthew@reztek.cz
Lines 13-21 Link Here
13
14
14
LIB_DEPENDS=	libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell
15
LIB_DEPENDS=	libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell
15
16
17
CONFLICTS=	${PORTNAME}-qt5*
18
16
USES=		desktop-file-utils execinfo pkgconfig qmake tar:xz
19
USES=		desktop-file-utils execinfo pkgconfig qmake tar:xz
17
USE_QT4=	corelib gui moc_build rcc_build uic_build webkit \
20
USE_QT4=	corelib gui network script sql webkit xml \
18
		xml script sql network imageformats_run linguist_build
21
		linguist_build moc_build rcc_build uic_build \
22
		imageformats_run sql-sqlite3_run
19
CONFIGURE_ENV=	QUPZILLA_PREFIX=${PREFIX}/
23
CONFIGURE_ENV=	QUPZILLA_PREFIX=${PREFIX}/
20
USE_LDCONFIG=	yes
24
USE_LDCONFIG=	yes
21
INSTALLS_ICONS=	yes
25
INSTALLS_ICONS=	yes
(-)www/qupzilla-qt4/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (QupZilla-1.8.3.tar.xz) = d3551288b27af952bb6d9d0c8f3bf8d3e849722b23da0193433b1d0bb88469be
1
SHA256 (QupZilla-1.8.5.tar.xz) = 8ea7d3f9f9283e85b9ce0f7c86b4162a93c0cd68dfb3a7e70560dd7b8ded7d9c
2
SIZE (QupZilla-1.8.3.tar.xz) = 3093840
2
SIZE (QupZilla-1.8.5.tar.xz) = 3096640
(-)www/qupzilla-qt4/pkg-plist (+1 lines)
Lines 188-193 Link Here
188
%%DATADIR%%/themes/default/windows.css
188
%%DATADIR%%/themes/default/windows.css
189
%%DATADIR%%/themes/linux/images/flash.png
189
%%DATADIR%%/themes/linux/images/flash.png
190
%%DATADIR%%/themes/linux/images/flashstart.png
190
%%DATADIR%%/themes/linux/images/flashstart.png
191
%%DATADIR%%/themes/linux/images/goto.png
191
%%DATADIR%%/themes/linux/images/key.png
192
%%DATADIR%%/themes/linux/images/key.png
192
%%DATADIR%%/themes/linux/images/library-bg-left.png
193
%%DATADIR%%/themes/linux/images/library-bg-left.png
193
%%DATADIR%%/themes/linux/images/library-bg-top-right.png
194
%%DATADIR%%/themes/linux/images/library-bg-top-right.png
(-)www/qupzilla-qt5/Makefile (-7 / +20 lines)
Lines 1-9 Link Here
1
# $FreeBSD$
1
# $FreeBSD$
2
2
3
PORTNAME=	qupzilla
3
PORTNAME=	qupzilla
4
PORTVERSION=	1.8.3
4
PORTVERSION=	1.8.5
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
DISTNAME=	QupZilla-${PORTVERSION}
8
DISTNAME=	QupZilla-${PORTVERSION}
8
9
9
MAINTAINER=	matthew@reztek.cz
10
MAINTAINER=	matthew@reztek.cz
Lines 13-39 Link Here
13
14
14
LIB_DEPENDS=	libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell
15
LIB_DEPENDS=	libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell
15
16
17
CONFLICTS=	${PORTNAME}-qt4*
18
16
USES=		desktop-file-utils execinfo pkgconfig qmake tar:xz
19
USES=		desktop-file-utils execinfo pkgconfig qmake tar:xz
17
USE_QT4=	corelib gui moc_build rcc_build uic_build webkit \
20
USE_QT5=	core concurrent gui network script sql webkit xml \
18
		xml script sql network imageformats_run linguist_build
21
		buildtools_build linguisttools_build \
22
		imageformats_run sql-sqlite3_run
19
CONFIGURE_ENV=	QUPZILLA_PREFIX=${PREFIX}/
23
CONFIGURE_ENV=	QUPZILLA_PREFIX=${PREFIX}/
20
USE_LDCONFIG=	yes
24
USE_LDCONFIG=	yes
21
INSTALLS_ICONS=	yes
25
INSTALLS_ICONS=	yes
22
PLIST_SUB=	VERSION=${PORTVERSION}
26
PLIST_SUB=	VERSION=${PORTVERSION}
23
27
24
OPTIONS_DEFINE=	DBUS DEBUG GNOMEKEYRING KWALLET
28
OPTIONS_DEFINE=	DBUS DEBUG GNOMEKEYRING # KWALLET
25
OPTIONS_DEFAULT=DBUS
29
OPTIONS_DEFAULT=DBUS
26
OPTIONS_SUB=	yes
30
OPTIONS_SUB=	yes
27
31
28
DBUS_USE=		QT4=dbus
32
DBUS_USE=		QT5=dbus
29
DBUS_CONFIGURE_ENV_OFF=	DISABLE_DBUS="true"
33
DBUS_CONFIGURE_ENV_OFF=	DISABLE_DBUS="true"
30
34
31
GNOMEKEYRING_LIB_DEPENDS=	libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring
35
GNOMEKEYRING_LIB_DEPENDS=	libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring
32
GNOMEKEYRING_CONFIGURE_ENV=	GNOME_INTEGRATION="true"
36
GNOMEKEYRING_CONFIGURE_ENV=	GNOME_INTEGRATION="true"
33
37
34
KWALLET_USE=		KDE4=kdelibs
38
# KWallet integration requires KF5 which is not yet available through ports
35
KWALLET_CONFIGURE_ENV=	KDE_INTEGRATION="true"
39
#KWALLET_USE=		KDE5=kdelibs
40
#KWALLET_CONFIGURE_ENV=	KDE_INTEGRATION="true"
41
PLIST_SUB+=	KWALLET="@comment "
36
42
43
.include <bsd.port.options.mk>
44
45
# work around for build failure in test plugin (single source file target)
46
.if ${PORT_OPTIONS:MDEBUG}
47
MAKE_JOBS_UNSAFE=yes
48
.endif
49
37
post-patch:
50
post-patch:
38
	@${REINPLACE_CMD} -e 's|/usr|${LOCALBASE}|g' \
51
	@${REINPLACE_CMD} -e 's|/usr|${LOCALBASE}|g' \
39
		${WRKSRC}/tests/autotests/qztoolstest.cpp \
52
		${WRKSRC}/tests/autotests/qztoolstest.cpp \
(-)www/qupzilla-qt5/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (QupZilla-1.8.3.tar.xz) = d3551288b27af952bb6d9d0c8f3bf8d3e849722b23da0193433b1d0bb88469be
1
SHA256 (QupZilla-1.8.5.tar.xz) = 8ea7d3f9f9283e85b9ce0f7c86b4162a93c0cd68dfb3a7e70560dd7b8ded7d9c
2
SIZE (QupZilla-1.8.3.tar.xz) = 3093840
2
SIZE (QupZilla-1.8.5.tar.xz) = 3096640
(-)www/qupzilla-qt5/pkg-plist (+1 lines)
Lines 188-193 Link Here
188
%%DATADIR%%/themes/default/windows.css
188
%%DATADIR%%/themes/default/windows.css
189
%%DATADIR%%/themes/linux/images/flash.png
189
%%DATADIR%%/themes/linux/images/flash.png
190
%%DATADIR%%/themes/linux/images/flashstart.png
190
%%DATADIR%%/themes/linux/images/flashstart.png
191
%%DATADIR%%/themes/linux/images/goto.png
191
%%DATADIR%%/themes/linux/images/key.png
192
%%DATADIR%%/themes/linux/images/key.png
192
%%DATADIR%%/themes/linux/images/library-bg-left.png
193
%%DATADIR%%/themes/linux/images/library-bg-left.png
193
%%DATADIR%%/themes/linux/images/library-bg-top-right.png
194
%%DATADIR%%/themes/linux/images/library-bg-top-right.png

Return to bug 196302