Date: Sun, 18 Jan 2015 20:21:33 +0000 (UTC) From: Guido Falsi <madpilot@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r377345 - in head: . www www/qupzilla www/qupzilla-qt4 www/qupzilla-qt5 Message-ID: <201501182021.t0IKLX8Q031683@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: madpilot Date: Sun Jan 18 20:21:32 2015 New Revision: 377345 URL: https://svnweb.freebsd.org/changeset/ports/377345 QAT: https://qat.redports.org/buildarchive/r377345/ Log: - Create separate QT4 and QT5 ports for www/qupzilla - Update to 1.8.5 PR: 196302 Submitted by: matthew at reztek.cz (maintainer) Added: head/www/qupzilla-qt4/ - copied from r377344, head/www/qupzilla/ head/www/qupzilla-qt5/ - copied from r377166, head/www/qupzilla/ Deleted: head/www/qupzilla/ Modified: head/MOVED head/www/Makefile 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/MOVED ============================================================================== --- head/MOVED Sun Jan 18 20:08:48 2015 (r377344) +++ head/MOVED Sun Jan 18 20:21:32 2015 (r377345) @@ -7402,3 +7402,4 @@ games/vdrift-data||2015-01-16|vdrift eng x11/rxvt-devel||2015-01-17|Has expired: No longer developed nor maintained and deprecated by x11/xvt and x11/rxvt-unicode comms/spandsp-devel|comms/spandsp|2015-01-17|Has expired: Use newer comms/spandsp multimedia/universal-media-server||2015-01-17|Has expired: RC script broken, especially prestart target +www/qupzilla|www/qupzilla-qt4|2015-01-18|Renamed to differentiate from www/qupzilla-qt5 Modified: head/www/Makefile ============================================================================== --- head/www/Makefile Sun Jan 18 20:08:48 2015 (r377344) +++ head/www/Makefile Sun Jan 18 20:21:32 2015 (r377345) @@ -1726,7 +1726,8 @@ SUBDIR += qdecoder SUBDIR += qooxdoo SUBDIR += quickie - SUBDIR += qupzilla + SUBDIR += qupzilla-qt4 + SUBDIR += qupzilla-qt5 SUBDIR += radicale SUBDIR += red5 SUBDIR += redaxo Modified: head/www/qupzilla-qt4/Makefile ============================================================================== --- head/www/qupzilla/Makefile Sun Jan 18 20:08:48 2015 (r377344) +++ head/www/qupzilla-qt4/Makefile Sun Jan 18 20:21:32 2015 (r377345) @@ -1,9 +1,10 @@ # $FreeBSD$ PORTNAME= qupzilla -PORTVERSION= 1.8.3 +PORTVERSION= 1.8.5 CATEGORIES= www MASTER_SITES= https://github.com/QupZilla/${PORTNAME}/releases/download/v${PORTVERSION}/ +PKGNAMESUFFIX= -qt4 DISTNAME= QupZilla-${PORTVERSION} MAINTAINER= matthew@reztek.cz @@ -13,9 +14,12 @@ LICENSE= GPLv3 LIB_DEPENDS= libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell +CONFLICTS= ${PORTNAME}-qt5* + USES= desktop-file-utils execinfo pkgconfig qmake tar:xz -USE_QT4= corelib gui moc_build rcc_build uic_build webkit \ - xml script sql network imageformats_run linguist_build +USE_QT4= corelib gui network script sql webkit xml \ + linguist_build moc_build rcc_build uic_build \ + imageformats_run sql-sqlite3_run CONFIGURE_ENV= QUPZILLA_PREFIX=${PREFIX}/ USE_LDCONFIG= yes INSTALLS_ICONS= yes Modified: head/www/qupzilla-qt4/distinfo ============================================================================== --- head/www/qupzilla/distinfo Sun Jan 18 20:08:48 2015 (r377344) +++ head/www/qupzilla-qt4/distinfo Sun Jan 18 20:21:32 2015 (r377345) @@ -1,2 +1,2 @@ -SHA256 (QupZilla-1.8.3.tar.xz) = d3551288b27af952bb6d9d0c8f3bf8d3e849722b23da0193433b1d0bb88469be -SIZE (QupZilla-1.8.3.tar.xz) = 3093840 +SHA256 (QupZilla-1.8.5.tar.xz) = 8ea7d3f9f9283e85b9ce0f7c86b4162a93c0cd68dfb3a7e70560dd7b8ded7d9c +SIZE (QupZilla-1.8.5.tar.xz) = 3096640 Modified: head/www/qupzilla-qt4/pkg-plist ============================================================================== --- head/www/qupzilla/pkg-plist Sun Jan 18 20:08:48 2015 (r377344) +++ head/www/qupzilla-qt4/pkg-plist Sun Jan 18 20:21:32 2015 (r377345) @@ -188,6 +188,7 @@ share/pixmaps/qupzilla.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 Modified: head/www/qupzilla-qt5/Makefile ============================================================================== --- head/www/qupzilla/Makefile Fri Jan 16 11:03:49 2015 (r377166) +++ head/www/qupzilla-qt5/Makefile Sun Jan 18 20:21:32 2015 (r377345) @@ -1,9 +1,10 @@ # $FreeBSD$ PORTNAME= qupzilla -PORTVERSION= 1.8.3 +PORTVERSION= 1.8.5 CATEGORIES= www MASTER_SITES= https://github.com/QupZilla/${PORTNAME}/releases/download/v${PORTVERSION}/ +PKGNAMESUFFIX= -qt5 DISTNAME= QupZilla-${PORTVERSION} MAINTAINER= matthew@reztek.cz @@ -13,26 +14,38 @@ LICENSE= GPLv3 LIB_DEPENDS= libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell +CONFLICTS= ${PORTNAME}-qt4* + USES= desktop-file-utils execinfo pkgconfig qmake tar:xz -USE_QT4= corelib gui moc_build rcc_build uic_build webkit \ - xml script sql network imageformats_run linguist_build +USE_QT5= core concurrent gui network script webkit xml \ + buildtools_build linguisttools_build \ + imageformats_run sql-sqlite3_run 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= QT4=dbus +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_USE= KDE4=kdelibs -KWALLET_CONFIGURE_ENV= KDE_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 " + +.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' \ Modified: head/www/qupzilla-qt5/distinfo ============================================================================== --- head/www/qupzilla/distinfo Fri Jan 16 11:03:49 2015 (r377166) +++ head/www/qupzilla-qt5/distinfo Sun Jan 18 20:21:32 2015 (r377345) @@ -1,2 +1,2 @@ -SHA256 (QupZilla-1.8.3.tar.xz) = d3551288b27af952bb6d9d0c8f3bf8d3e849722b23da0193433b1d0bb88469be -SIZE (QupZilla-1.8.3.tar.xz) = 3093840 +SHA256 (QupZilla-1.8.5.tar.xz) = 8ea7d3f9f9283e85b9ce0f7c86b4162a93c0cd68dfb3a7e70560dd7b8ded7d9c +SIZE (QupZilla-1.8.5.tar.xz) = 3096640 Modified: head/www/qupzilla-qt5/pkg-plist ============================================================================== --- head/www/qupzilla/pkg-plist Fri Jan 16 11:03:49 2015 (r377166) +++ head/www/qupzilla-qt5/pkg-plist Sun Jan 18 20:21:32 2015 (r377345) @@ -188,6 +188,7 @@ share/pixmaps/qupzilla.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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201501182021.t0IKLX8Q031683>