Attachment #151547 for bug #196302

Lines 7349-7351 Link Here

(-)MOVED (+1 lines)
7349	x11-fm/pbi-thumbnailer\|\|2014-12-27\|Has expired: Broken for more than 6 months	7349	x11-fm/pbi-thumbnailer\|\|2014-12-27\|Has expired: Broken for more than 6 months
7350	games/secretmaryochronicles\|\|2014-12-27\|Has expired: does not run, cegui 0.8 support still in development	7350	games/secretmaryochronicles\|\|2014-12-27\|Has expired: does not run, cegui 0.8 support still in development
7351	multimedia/ffmpeg24\|multimedia/ffmpeg25\|2014-12-27\|ffmpeg upstream now points to 2.5.x series	7351	multimedia/ffmpeg24\|multimedia/ffmpeg25\|2014-12-27\|ffmpeg upstream now points to 2.5.x series
		7352	www/qupzilla\|www/qupzilla-qt4\|2014-12-27\|Rename to make room for www/qupzilla-qt5

Lines 1717-1723 Link Here

(-)www/Makefile (-1 / +2 lines)
1717	SUBDIR += qdecoder	1717	SUBDIR += qdecoder
1718	SUBDIR += qooxdoo	1718	SUBDIR += qooxdoo
1719	SUBDIR += quickie	1719	SUBDIR += quickie
1720	SUBDIR += qupzilla	1720	SUBDIR += qupzilla-qt4
		1721	SUBDIR += qupzilla-qt5
1721	SUBDIR += radicale	1722	SUBDIR += radicale
1722	SUBDIR += red5	1723	SUBDIR += red5
1723	SUBDIR += redaxo	1724	SUBDIR += redaxo

Lines 1-10 Link Here

(-)www/qupzilla-qt4/Makefile (-3 / +5 lines)
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	DISTNAME= QupZilla-${PORTVERSION}	7	DISTNAME= QupZilla-${PORTVERSION}
		8	PKGNAMESUFFIX= -qt4
		9	CONFLICTS= ${PORTNAME}-qt5*
8		10
9	MAINTAINER= matthew@reztek.cz	11	MAINTAINER= matthew@reztek.cz
10	COMMENT= Web browser based on WebKit engine and Qt Framework	12	COMMENT= Web browser based on WebKit engine and Qt Framework
Lines 14-21 Link Here
14	LIB_DEPENDS= libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell	16	LIB_DEPENDS= libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell
15		17
16	USES= desktop-file-utils execinfo pkgconfig qmake tar:xz	18	USES= desktop-file-utils execinfo pkgconfig qmake tar:xz
17	USE_QT4= corelib gui moc_build rcc_build uic_build webkit \	19	USE_QT4= corelib gui imageformats_run network script sql webkit xml \
18	xml script sql network imageformats_run linguist_build	20	linguist_build moc_build rcc_build uic_build
19	CONFIGURE_ENV= QUPZILLA_PREFIX=${PREFIX}/	21	CONFIGURE_ENV= QUPZILLA_PREFIX=${PREFIX}/
20	USE_LDCONFIG= yes	22	USE_LDCONFIG= yes
21	INSTALLS_ICONS= yes	23	INSTALLS_ICONS= yes

Lines 1-2 Link Here

(-)www/qupzilla-qt4/distinfo (-2 / +2 lines)
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




# $FreeBSD$

PORTNAME=	qupzilla
PORTVERSION=	1.8.5
CATEGORIES=	www
MASTER_SITES=	https://github.com/QupZilla/${PORTNAME}/releases/download/v${PORTVERSION}/
DISTNAME=	QupZilla-${PORTVERSION}
PKGNAMESUFFIX=	-qt5
CONFLICTS=	${PORTNAME}-qt4*

MAINTAINER=	matthew@reztek.cz
COMMENT=	Web browser based on WebKit engine and Qt Framework

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

USES=		desktop-file-utils execinfo pkgconfig qmake tar:xz
USE_QT5=	core gui imageformats_run network script sql webkit xml \
		buildtools_build linguisttools_build
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=		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 yet in ports
#KWALLET_USE=		KDE5=kdelibs
#KWALLET_CONFIGURE_ENV=	KDE_INTEGRATION="true"
PLIST_SUB+=	KWALLET="@comment "

.include <bsd.port.options.mk>

# work around for build failure in test plugin (single source file target)
.if ${PORT_OPTIONS:MDEBUG}
MAKE_JOBS_UNSAFE=1
.endif

post-patch:
	@${REINPLACE_CMD} -e 's|/usr|${LOCALBASE}|g' \
		${WRKSRC}/tests/autotests/qztoolstest.cpp \

Lines 1-2 Link Here

(-)www/qupzilla-qt5/distinfo (-2 / +2 lines)
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

Return to bug 196302

Lines 1-10 Link Here

(-)www/qupzilla-qt5/Makefile (-7 / +18 lines)
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	DISTNAME= QupZilla-${PORTVERSION}	7	DISTNAME= QupZilla-${PORTVERSION}
		8	PKGNAMESUFFIX= -qt5
		9	CONFLICTS= ${PORTNAME}-qt4*
8		10
9	MAINTAINER= matthew@reztek.cz	11	MAINTAINER= matthew@reztek.cz
10	COMMENT= Web browser based on WebKit engine and Qt Framework	12	COMMENT= Web browser based on WebKit engine and Qt Framework
Lines 14-39 Link Here
14	LIB_DEPENDS= libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell	16	LIB_DEPENDS= libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell
15		17
16	USES= desktop-file-utils execinfo pkgconfig qmake tar:xz	18	USES= desktop-file-utils execinfo pkgconfig qmake tar:xz
17	USE_QT4= corelib gui moc_build rcc_build uic_build webkit \	19	USE_QT5= core gui imageformats_run network script sql webkit xml \
18	xml script sql network imageformats_run linguist_build	20	buildtools_build linguisttools_build
19	CONFIGURE_ENV= QUPZILLA_PREFIX=${PREFIX}/	21	CONFIGURE_ENV= QUPZILLA_PREFIX=${PREFIX}/
20	USE_LDCONFIG= yes	22	USE_LDCONFIG= yes
21	INSTALLS_ICONS= yes	23	INSTALLS_ICONS= yes
22	PLIST_SUB= VERSION=${PORTVERSION}	24	PLIST_SUB= VERSION=${PORTVERSION}
23		25
24	OPTIONS_DEFINE= DBUS DEBUG GNOMEKEYRING KWALLET	26	OPTIONS_DEFINE= DBUS DEBUG GNOMEKEYRING # KWALLET
25	OPTIONS_DEFAULT=DBUS	27	OPTIONS_DEFAULT=DBUS
26	OPTIONS_SUB= yes	28	OPTIONS_SUB= yes
27		29
28	DBUS_USE= QT4=dbus	30	DBUS_USE= QT5=dbus
29	DBUS_CONFIGURE_ENV_OFF= DISABLE_DBUS="true"	31	DBUS_CONFIGURE_ENV_OFF= DISABLE_DBUS="true"
30		32
31	GNOMEKEYRING_LIB_DEPENDS= libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring	33	GNOMEKEYRING_LIB_DEPENDS= libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring
32	GNOMEKEYRING_CONFIGURE_ENV= GNOME_INTEGRATION="true"	34	GNOMEKEYRING_CONFIGURE_ENV= GNOME_INTEGRATION="true"
33		35
34	KWALLET_USE= KDE4=kdelibs	36	# KWallet integration requires KF5 which is not yet in ports
35	KWALLET_CONFIGURE_ENV= KDE_INTEGRATION="true"	37	#KWALLET_USE= KDE5=kdelibs
		38	#KWALLET_CONFIGURE_ENV= KDE_INTEGRATION="true"
		39	PLIST_SUB+= KWALLET="@comment "
36		40
		41	.include <bsd.port.options.mk>
		42
		43	# work around for build failure in test plugin (single source file target)
		44	.if ${PORT_OPTIONS:MDEBUG}
		45	MAKE_JOBS_UNSAFE=1
		46	.endif
		47
37	post-patch:	48	post-patch:
38	@${REINPLACE_CMD} -e 's\|/usr\|${LOCALBASE}\|g' \	49	@${REINPLACE_CMD} -e 's\|/usr\|${LOCALBASE}\|g' \
39	${WRKSRC}/tests/autotests/qztoolstest.cpp \	50	${WRKSRC}/tests/autotests/qztoolstest.cpp \