diff options
| author | Tobias C. Berner <tcberner@FreeBSD.org> | 2019-03-16 21:32:52 +0000 |
|---|---|---|
| committer | Tobias C. Berner <tcberner@FreeBSD.org> | 2019-03-16 21:32:52 +0000 |
| commit | b53285ebe2f4ceb577ea806ee03520222e238fdb (patch) | |
| tree | e04c628d26dec593dac73b7ce38acfa429fd6739 | |
| parent | b95f5efa6fa715d63b2fdeb2cfa2f28845071109 (diff) | |
| download | ports-b53285ebe2f4ceb577ea806ee03520222e238fdb.tar.gz ports-b53285ebe2f4ceb577ea806ee03520222e238fdb.zip | |
Notes
56 files changed, 74 insertions, 318 deletions
@@ -10225,9 +10225,6 @@ net/syncthing-cli|net/syncthing|2018-06-18|Has expired: Included in net/syncthin x11-themes/adwaita-common||2018-06-19|Move to flavored version net-p2p/qbittorrent-nox11|net-p2p/qbittorrent@nox|2018-06-20|Moved to a flavored version math/digitizer|graphics/engauge-digitizer|2018-06-20|The previously deleted port math/digitizer is now graphics/engauge-digitizer -multimedia/qt5-phonon4|multimedia/phonon@qt5|2018-06-21|Moved to a flavored version -multimedia/qt5-phonon4-designerplugin|multimedia/phonon-designerplugin@qt5|2018-06-21|Moved to a flavored version -multimedia/qt5-phonon4-gstreamer|multimedia/phonon-gstreamer@qt5|2018-06-21|Moved to a flavored version net/libproxy-gnome|net/libproxy-gnome2|2018-06-22|Renamed to make slave names consistent www/npapi-vlc||2018-06-22|Removed, depends on expired www/libxul www/libxul||2018-06-22|Has expired: NPAPI are no longer supported @@ -11687,3 +11684,9 @@ devel/eric6@qt4_py27||2019-03-16|Qt4 deprecation devel/eric6@qt4_py35||2019-03-16|Qt4 deprecation devel/eric6@qt4_py36||2019-03-16|Qt4 deprecation devel/eric6@qt4_py37||2019-03-16|Qt4 deprecation +multimedia/phonon@qt4||2019-03-16|Qt4 deprecation +multimedia/phonon@qt5|multimedia/phonon|2019-03-16|Flavor has been removed +multimedia/phonon-designerplugin@qt4||2019-03-16|Qt4 deprecation +multimedia/phonon-designerplugin@qt5|multimedia/phonon-designerplugin|2019-03-16|Flavor has been removed +multimedia/phonon-gstreamer@qt4||2019-03-16|Qt4 deprecation +multimedia/phonon-gstreamer@qt5|multimedia/phonon-gstreamer|2019-03-16|Flavor has been removed diff --git a/Mk/Uses/qt.mk b/Mk/Uses/qt.mk index 4bd87c901280..4e710a713c6b 100644 --- a/Mk/Uses/qt.mk +++ b/Mk/Uses/qt.mk @@ -304,13 +304,13 @@ paths_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/qtpaths pixeltool_PORT= graphics/${_QT_RELNAME}-pixeltool pixeltool_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/pixeltool -phonon_PORT= multimedia/phonon@${_QT_RELNAME} +phonon_PORT= multimedia/phonon phonon_LIB= libphonon.so -phonon4_PORT= multimedia/phonon@${_QT_RELNAME} +phonon4_PORT= multimedia/phonon phonon4_LIB= libphonon4${_QT_RELNAME}.so -phonon-gst_PORT= multimedia/phonon-gstreamer@${_QT_RELNAME} +phonon-gst_PORT= multimedia/phonon-gstreamer phonon-gst_PATH= ${LOCALBASE}/${QT_PLUGINDIR_REL}/phonon_backend/libphonon_gstreamer.so plugininfo_PORT= sysutils/${_QT_RELNAME}-qtplugininfo diff --git a/accessibility/kmousetool/Makefile b/accessibility/kmousetool/Makefile index 205a4e5b4731..b343fcc3492d 100644 --- a/accessibility/kmousetool/Makefile +++ b/accessibility/kmousetool/Makefile @@ -2,6 +2,7 @@ PORTNAME= kmousetool DISTVERSION= ${KDE_APPLICATIONS_VERSION} +PORTREVISION= 1 CATEGORIES= accessibility kde kde-applications MAINTAINER= kde@FreeBSD.org diff --git a/astro/marble/Makefile b/astro/marble/Makefile index fd351a65a5d7..1c54a488ce91 100644 --- a/astro/marble/Makefile +++ b/astro/marble/Makefile @@ -2,7 +2,7 @@ PORTNAME= marble DISTVERSION= ${KDE_APPLICATIONS_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= astro kde kde-applications MAINTAINER= kde@FreeBSD.org diff --git a/audio/amarok/Makefile b/audio/amarok/Makefile index 71371aafdc3b..0e1eb953ef32 100644 --- a/audio/amarok/Makefile +++ b/audio/amarok/Makefile @@ -4,7 +4,7 @@ PORTNAME= amarok DISTVERSIONPREFIX= v DISTVERSION= 2.9.0-277 DISTVERSIONSUFFIX= -gd50ecc430c -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= audio kde MAINTAINER= kde@FreeBSD.org diff --git a/audio/audiocd-kio/Makefile b/audio/audiocd-kio/Makefile index 5a94a6794916..5aa838f6c001 100644 --- a/audio/audiocd-kio/Makefile +++ b/audio/audiocd-kio/Makefile @@ -2,6 +2,7 @@ PORTNAME= audiocd-kio DISTVERSION= ${KDE_APPLICATIONS_VERSION} +PORTREVISION= 1 CATEGORIES= audio kde kde-applications MAINTAINER= kde@FreeBSD.org diff --git a/audio/juk/Makefile b/audio/juk/Makefile index cf1d2c1d108b..73267f8c5d26 100644 --- a/audio/juk/Makefile +++ b/audio/juk/Makefile @@ -2,6 +2,7 @@ PORTNAME= juk DISTVERSION= ${KDE_APPLICATIONS_VERSION} +PORTREVISION= 1 CATEGORIES= audio kde kde-applications MAINTAINER= kde@FreeBSD.org diff --git a/audio/libkcompactdisc/Makefile b/audio/libkcompactdisc/Makefile index 6abf91d1d082..375df59a78af 100644 --- a/audio/libkcompactdisc/Makefile +++ b/audio/libkcompactdisc/Makefile @@ -2,6 +2,7 @@ PORTNAME= libkcompactdisc DISTVERSION= ${KDE_APPLICATIONS_VERSION} +PORTREVISION= 1 CATEGORIES= audio kde kde-applications MAINTAINER= kde@FreeBSD.org diff --git a/audio/soundkonverter/Makefile b/audio/soundkonverter/Makefile index f1caf85bd7b0..75f07f442e66 100644 --- a/audio/soundkonverter/Makefile +++ b/audio/soundkonverter/Makefile @@ -4,7 +4,7 @@ PORTNAME= soundkonverter PORTVERSION= 3.0.1 DISTVERSIONPREFIX= v -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= audio kde MAINTAINER= dbn@FreeBSD.org @@ -14,7 +14,7 @@ LICENSE= GPLv2 LIB_DEPENDS= libtag.so:audio/taglib \ libcdda_paranoia.so:audio/cdparanoia \ - libphonon4qt5.so:multimedia/phonon@qt5 + libphonon4qt5.so:multimedia/phonon GH_ACCOUNT= HessiJames USES= cmake compiler:c++11-lang kde:5 qt:5 diff --git a/deskutils/basket/Makefile b/deskutils/basket/Makefile index 8ea702af1310..22426c4bfc6d 100644 --- a/deskutils/basket/Makefile +++ b/deskutils/basket/Makefile @@ -5,7 +5,7 @@ PORTNAME= basket DISTVERSIONPREFIX= v DISTVERSION= 2.49a-46 DISTVERSIONSUFFIX= -g60e38c6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= deskutils kde MAINTAINER= ports@FreeBSD.org diff --git a/deskutils/kalarm/Makefile b/deskutils/kalarm/Makefile index d1a2290fbc68..ffcd58e503c7 100644 --- a/deskutils/kalarm/Makefile +++ b/deskutils/kalarm/Makefile @@ -2,6 +2,7 @@ PORTNAME= kalarm DISTVERSION= ${KDE_APPLICATIONS_VERSION} +PORTREVISION= 1 CATEGORIES= deskutils kde kde-applications MAINTAINER= kde@FreeBSD.org diff --git a/deskutils/korganizer/Makefile b/deskutils/korganizer/Makefile index f54eeaeab717..79e496724225 100644 --- a/deskutils/korganizer/Makefile +++ b/deskutils/korganizer/Makefile @@ -2,6 +2,7 @@ PORTNAME= korganizer DISTVERSION= ${KDE_APPLICATIONS_VERSION} +PORTREVISION= 1 CATEGORIES= deskutils kde kde-applications MAINTAINER= kde@FreeBSD.org diff --git a/devel/kf5-knotifications/Makefile b/devel/kf5-knotifications/Makefile index ce797c07c16e..acbecd00cdc2 100644 --- a/devel/kf5-knotifications/Makefile +++ b/devel/kf5-knotifications/Makefile @@ -2,7 +2,7 @@ PORTNAME= knotifications DISTVERSION= ${KDE_FRAMEWORKS_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel kde kde-frameworks MAINTAINER= kde@FreeBSD.org diff --git a/devel/kf5-knotifyconfig/Makefile b/devel/kf5-knotifyconfig/Makefile index dda55dba3862..888a76de7753 100644 --- a/devel/kf5-knotifyconfig/Makefile +++ b/devel/kf5-knotifyconfig/Makefile @@ -2,6 +2,7 @@ PORTNAME= knotifyconfig DISTVERSION= ${KDE_FRAMEWORKS_VERSION} +PORTREVISION= 1 CATEGORIES= devel kde kde-frameworks MAINTAINER= kde@FreeBSD.org diff --git a/devel/kio-extras/Makefile b/devel/kio-extras/Makefile index b059d39a1761..bac3a03ffed3 100644 --- a/devel/kio-extras/Makefile +++ b/devel/kio-extras/Makefile @@ -2,6 +2,7 @@ PORTNAME= kio-extras DISTVERSION= ${KDE_APPLICATIONS_VERSION} +PORTREVISION= 1 CATEGORIES= devel kde kde-applications # kde kde-applications-plasma MAINTAINER= kde@FreeBSD.org diff --git a/devel/qt5/Makefile b/devel/qt5/Makefile index b512a838f373..4912fe816cf1 100644 --- a/devel/qt5/Makefile +++ b/devel/qt5/Makefile @@ -2,7 +2,7 @@ PORTNAME= qt5 DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MAINTAINER= kde@FreeBSD.org diff --git a/editors/calligra/Makefile b/editors/calligra/Makefile index 80f497ee7392..b13e3c1b1bba 100644 --- a/editors/calligra/Makefile +++ b/editors/calligra/Makefile @@ -2,7 +2,7 @@ PORTNAME= calligra DISTVERSION= 3.1.0 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= editors kde MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION} DIST_SUBDIR= KDE/${PORTNAME} diff --git a/games/auralquiz/Makefile b/games/auralquiz/Makefile index 4702ce7f84cc..61f517ea535b 100644 --- a/games/auralquiz/Makefile +++ b/games/auralquiz/Makefile @@ -4,7 +4,7 @@ PORTNAME= auralquiz PORTVERSION= 1.0.0 DISTVERSIONPREFIX= v -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= SAVANNAH diff --git a/games/blinken/Makefile b/games/blinken/Makefile index d49decaf77ec..a7e6de77b2a9 100644 --- a/games/blinken/Makefile +++ b/games/blinken/Makefile @@ -2,6 +2,7 @@ PORTNAME= blinken DISTVERSION= ${KDE_APPLICATIONS_VERSION} +PORTREVISION= 1 CATEGORIES= games kde kde-applications MAINTAINER= kde@FreeBSD.org diff --git a/games/bomber/Makefile b/games/bomber/Makefile index 5e57509bc211..711f6c900223 100644 --- a/games/bomber/Makefile +++ b/games/bomber/Makefile @@ -2,6 +2,7 @@ PORTNAME= bomber DISTVERSION= ${KDE_APPLICATIONS_VERSION} +PORTREVISION= 1 CATEGORIES= games kde kde-applications MAINTAINER= kde@FreeBSD.org diff --git a/games/kblocks/Makefile b/games/kblocks/Makefile index 144f2fd091df..cfd7fe899acb 100644 --- a/games/kblocks/Makefile +++ b/games/kblocks/Makefile @@ -2,6 +2,7 @@ PORTNAME= kblocks DISTVERSION= ${KDE_APPLICATIONS_VERSION} +PORTREVISION= 1 CATEGORIES= games kde kde-applications MAINTAINER= kde@FreeBSD.org diff --git a/games/kbounce/Makefile b/games/kbounce/Makefile index f16a1dd58a0e..32efde0c3aa6 100644 --- a/games/kbounce/Makefile +++ b/games/kbounce/Makefile @@ -2,6 +2,7 @@ PORTNAME= kbounce DISTVERSION= ${KDE_APPLICATIONS_VERSION} +PORTREVISION= 1 CATEGORIES= games kde kde-applications MAINTAINER= kde@FreeBSD.org diff --git a/games/kolf/Makefile b/games/kolf/Makefile index 706b3ac6b93f..e57dae7b4442 100644 --- a/games/kolf/Makefile +++ b/games/kolf/Makefile @@ -2,6 +2,7 @@ PORTNAME= kolf DISTVERSION= ${KDE_APPLICATIONS_VERSION} +PORTREVISION= 1 CATEGORIES= games kde kde-applications MAINTAINER= kde@FreeBSD.org diff --git a/games/kollision/Makefile b/games/kollision/Makefile index a6c295ee9501..3a18b908ca1d 100644 --- a/games/kollision/Makefile +++ b/games/kollision/Makefile @@ -2,6 +2,7 @@ PORTNAME= kollision DISTVERSION= ${KDE_APPLICATIONS_VERSION} +PORTREVISION= 1 CATEGORIES= games kde kde-applications MAINTAINER= kde@FreeBSD.org diff --git a/games/kpat/Makefile b/games/kpat/Makefile index 15c72fd84769..5fc9d2c1edab 100644 --- a/games/kpat/Makefile +++ b/games/kpat/Makefile @@ -2,6 +2,7 @@ PORTNAME= kpat DISTVERSION= ${KDE_APPLICATIONS_VERSION} +PORTREVISION= 1 CATEGORIES= games kde kde-applications MAINTAINER= kde@FreeBSD.org diff --git a/games/ksirk/Makefile b/games/ksirk/Makefile index 4f9db3a3e0a4..4cb380931fd2 100644 --- a/games/ksirk/Makefile +++ b/games/ksirk/Makefile @@ -2,7 +2,7 @@ PORTNAME= ksirk DISTVERSION= ${KDE_APPLICATIONS_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games kde kde-applications MAINTAINER= kde@FreeBSD.org diff --git a/games/ktuberling/Makefile b/games/ktuberling/Makefile index 2a02bbc43c91..abb6188a5613 100644 --- a/games/ktuberling/Makefile +++ b/games/ktuberling/Makefile @@ -2,6 +2,7 @@ PORTNAME= ktuberling DISTVERSION= ${KDE_APPLICATIONS_VERSION} +PORTREVISION= 1 CATEGORIES= games kde kde-applications MAINTAINER= kde@FreeBSD.org diff --git a/graphics/gwenview/Makefile b/graphics/gwenview/Makefile index 7802f08e55ab..18cf0471a918 100644 --- a/graphics/gwenview/Makefile +++ b/graphics/gwenview/Makefile @@ -2,7 +2,7 @@ PORTNAME= gwenview DISTVERSION= ${KDE_APPLICATIONS_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics kde kde-applications MAINTAINER= kde@FreeBSD.org diff --git a/graphics/kphotoalbum/Makefile b/graphics/kphotoalbum/Makefile index 5ed27d15b130..3ffde412846f 100644 --- a/graphics/kphotoalbum/Makefile +++ b/graphics/kphotoalbum/Makefile @@ -2,7 +2,7 @@ PORTNAME= kphotoalbum DISTVERSION= 5.4.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics kde MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION}/ DIST_SUBDIR= KDE diff --git a/graphics/okular/Makefile b/graphics/okular/Makefile index a43b2a0e6256..01ebc0b5c968 100644 --- a/graphics/okular/Makefile +++ b/graphics/okular/Makefile @@ -2,7 +2,7 @@ PORTNAME= okular DISTVERSION= ${KDE_APPLICATIONS_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics kde kde-applications MAINTAINER= kde@FreeBSD.org diff --git a/irc/konversation/Makefile b/irc/konversation/Makefile index f64b9f8b7410..68640be6dbe2 100644 --- a/irc/konversation/Makefile +++ b/irc/konversation/Makefile @@ -3,7 +3,7 @@ PORTNAME= konversation PORTVERSION= 1.7.5 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= irc kde MASTER_SITES= KDE/stable/${PORTNAME}/${DISTVERSION}/src diff --git a/irc/kvirc/Makefile b/irc/kvirc/Makefile index ca4bbf354e4d..2ad1cc97d81e 100644 --- a/irc/kvirc/Makefile +++ b/irc/kvirc/Makefile @@ -3,7 +3,7 @@ PORTNAME= KVIrc DISTVERSION= 5.0.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= irc kde MAINTAINER= kde@FreeBSD.org diff --git a/irc/quassel/Makefile b/irc/quassel/Makefile index ddba5488b241..d2aaa3d4b3a4 100644 --- a/irc/quassel/Makefile +++ b/irc/quassel/Makefile @@ -3,7 +3,7 @@ PORTNAME= quassel PORTVERSION= 0.13.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= irc MASTER_SITES= http://www.quassel-irc.org/pub/ diff --git a/misc/klettres/Makefile b/misc/klettres/Makefile index 1c06af043dc0..be699c9fa031 100644 --- a/misc/klettres/Makefile +++ b/misc/klettres/Makefile @@ -2,6 +2,7 @@ PORTNAME= klettres DISTVERSION= ${KDE_APPLICATIONS_VERSION} +PORTREVISION= 1 CATEGORIES= misc kde kde-applications MAINTAINER= kde@FreeBSD.org diff --git a/misc/kwordquiz/Makefile b/misc/kwordquiz/Makefile index e20cc3492797..c6cdf4824152 100644 --- a/misc/kwordquiz/Makefile +++ b/misc/kwordquiz/Makefile @@ -2,6 +2,7 @@ PORTNAME= kwordquiz DISTVERSION= ${KDE_APPLICATIONS_VERSION} +PORTREVISION= 1 CATEGORIES= misc kde kde-applications MAINTAINER= kde@FreeBSD.org diff --git a/multimedia/dragon/Makefile b/multimedia/dragon/Makefile index 2e6bc585f233..79892ee1290d 100644 --- a/multimedia/dragon/Makefile +++ b/multimedia/dragon/Makefile @@ -2,6 +2,7 @@ PORTNAME= dragon DISTVERSION= ${KDE_APPLICATIONS_VERSION} +PORTREVISION= 1 CATEGORIES= multimedia kde kde-applications PKGNAMESUFFIX= -player diff --git a/multimedia/kaffeine/Makefile b/multimedia/kaffeine/Makefile index 438703c536dd..b21893e79c0c 100644 --- a/multimedia/kaffeine/Makefile +++ b/multimedia/kaffeine/Makefile @@ -3,6 +3,7 @@ PORTNAME= kaffeine DISTVERSION= 2.0.16-2 +PORTREVISION= 1 CATEGORIES= multimedia kde MASTER_SITES= KDE/stable/${PORTNAME} diff --git a/multimedia/kmplayer/Makefile b/multimedia/kmplayer/Makefile index 899a2c9a88ae..9316a6ff2667 100644 --- a/multimedia/kmplayer/Makefile +++ b/multimedia/kmplayer/Makefile @@ -3,7 +3,7 @@ PORTNAME= kmplayer PORTVERSION= 0.12.0b -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 3 CATEGORIES= multimedia audio kde diff --git a/multimedia/minitube/Makefile b/multimedia/minitube/Makefile index 595a3cd39518..aad1f59ce7dc 100644 --- a/multimedia/minitube/Makefile +++ b/multimedia/minitube/Makefile @@ -2,7 +2,7 @@ PORTNAME= minitube DISTVERSION= 2.9 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= multimedia www MAINTAINER= ports@FreeBSD.org diff --git a/multimedia/phonon-designerplugin/Makefile b/multimedia/phonon-designerplugin/Makefile index 846f27b09f42..ae945d6e4f84 100644 --- a/multimedia/phonon-designerplugin/Makefile +++ b/multimedia/phonon-designerplugin/Makefile @@ -2,39 +2,23 @@ PORTNAME= phonon DISTVERSION= 4.10.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia kde MASTER_SITES= KDE/stable/${PORTNAME}/${DISTVERSION} DIST_SUBDIR= KDE/phonon +PKGNAMESUFFIX= -designerplugin-qt5 MAINTAINER= kde@FreeBSD.org COMMENT= Qt Designer plugin for Phonon LICENSE= LGPL21 -FLAVORS= qt5 qt4 -FLAVOR?= ${FLAVORS:[1]} - -qt4_PKGNAMESUFFIX= -designerplugin-qt4 -qt5_PKGNAMESUFFIX= -designerplugin-qt5 - -USES= cmake:insource tar:xz - -. if ${FLAVOR} == qt4 -DEPRECATED= Qt4 has been EOL since december 2015 -EXPIRATION_DATE=2019-03-15 -USES+= qt:4 -USE_QT= corelib designer gui phonon \ - qmake_build moc_build rcc_build uic_build -PLIST_FILES= ${QT_PLUGINDIR_REL}/designer/libphononwidgets.so -. else -USES+= compiler:c++11-lang kde:5 qt:5 +USES= cmake:insource compiler:c++11-lang kde:5 qt:5 tar:xz USE_KDE= ecm USE_QT= core designer gui phonon4 widgets xml \ buildtools_build qmake_build CMAKE_ON= PHONON_BUILD_PHONON4QT5 PLIST_FILES= ${QT_PLUGINDIR_REL}/designer/phononwidgets.so -. endif CMAKE_ARGS= -DPHONON_QT_PLUGIN_INSTALL_DIR=${PREFIX}/${QT_PLUGINDIR_REL}/designer diff --git a/multimedia/phonon-gstreamer/Makefile b/multimedia/phonon-gstreamer/Makefile index d58a4064193b..7b736f805dcc 100644 --- a/multimedia/phonon-gstreamer/Makefile +++ b/multimedia/phonon-gstreamer/Makefile @@ -3,44 +3,29 @@ PORTNAME= phonon PORTVERSION= 4.9.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= multimedia kde MASTER_SITES= KDE/stable/${PORTNAME}/${PORTNAME}-backend-${PHONON_PLUGIN}/${DISTVERSION} DISTNAME= ${PORTNAME}-backend-${PHONON_PLUGIN}-${DISTVERSION} DIST_SUBDIR= KDE/phonon +PKGNAMESUFFIX= -${PHONON_PLUGIN}-qt5 MAINTAINER= kde@FreeBSD.org COMMENT= GStreamer backend for Phonon LICENSE= LGPL21 -FLAVORS= qt5 qt4 -FLAVOR?= ${FLAVORS:[1]} - -qt4_PKGNAMESUFFIX= -${PHONON_PLUGIN}-qt4 -qt5_PKGNAMESUFFIX= -${PHONON_PLUGIN}-qt5 -qt4_PLIST= ${.CURDIR}/pkg-plist.qt4 -qt5_PLIST= ${.CURDIR}/pkg-plist.qt5 - -USES= cmake pkgconfig tar:xz +USES= cmake compiler:c++11-lang kde:5 pkgconfig qt:5 tar:xz USE_GL= gl USE_GNOME= glib20 libxml2 USE_GSTREAMER1= yes -USE_XORG= x11 - -. if ${FLAVOR} == qt4 -DEPRECATED= Qt4 has been EOL since december 2015 -EXPIRATION_DATE=2019-03-15 -USES+= qt:4 -USE_QT= corelib gui opengl phonon \ - qmake_build moc_build rcc_build uic_build -. else -USES+= compiler:c++11-lang kde:5 qt:5 USE_KDE= ecm USE_QT= core gui opengl phonon4 widgets x11extras \ buildtools_build qmake_build +USE_XORG= x11 + CMAKE_ON= PHONON_BUILD_PHONON4QT5 -. endif + SUB_FILES= pkg-message OPTIONS_DEFINE= GST_PLUGINS @@ -50,11 +35,4 @@ GST_PLUGINS_RUN_DEPENDS= gstreamer1-plugins-all>=0:multimedia/gstreamer1-plugins PHONON_PLUGIN= gstreamer WRKSRC= ${WRKDIR}/${PORTNAME}-${PHONON_PLUGIN}-${DISTVERSION} -. if ${FLAVOR} == qt4 -post-install: - ${MKDIR} ${STAGEDIR}${QT_PLUGINDIR}/phonon_backend - ${RLN} ${STAGEDIR}${PREFIX}/lib/kde4/plugins/phonon_backend/phonon_gstreamer.so \ - ${STAGEDIR}${QT_PLUGINDIR}/phonon_backend/libphonon_gstreamer.so -. endif - .include <bsd.port.mk> diff --git a/multimedia/phonon-gstreamer/pkg-plist.qt5 b/multimedia/phonon-gstreamer/pkg-plist index 86aad2fbc083..86aad2fbc083 100644 --- a/multimedia/phonon-gstreamer/pkg-plist.qt5 +++ b/multimedia/phonon-gstreamer/pkg-plist diff --git a/multimedia/phonon-gstreamer/pkg-plist.qt4 b/multimedia/phonon-gstreamer/pkg-plist.qt4 deleted file mode 100644 index bf3ee3915298..000000000000 --- a/multimedia/phonon-gstreamer/pkg-plist.qt4 +++ /dev/null @@ -1,9 +0,0 @@ -lib/kde4/plugins/phonon_backend/phonon_gstreamer.so -%%QT_PLUGINDIR%%/phonon_backend/libphonon_gstreamer.so -share/icons/hicolor/128x128/apps/phonon-gstreamer.png -share/icons/hicolor/16x16/apps/phonon-gstreamer.png -share/icons/hicolor/22x22/apps/phonon-gstreamer.png -share/icons/hicolor/48x48/apps/phonon-gstreamer.png -share/icons/hicolor/64x64/apps/phonon-gstreamer.png -share/icons/hicolor/scalable/apps/phonon-gstreamer.svgz -share/kde4/services/phononbackends/gstreamer.desktop diff --git a/multimedia/phonon-vlc/Makefile b/multimedia/phonon-vlc/Makefile index 6b54ebc25ef7..6fe359c38b1a 100644 --- a/multimedia/phonon-vlc/Makefile +++ b/multimedia/phonon-vlc/Makefile @@ -2,7 +2,7 @@ PORTNAME= phonon DISTVERSION= 0.10.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia kde MASTER_SITES= KDE/stable/${PORTNAME}/${PORTNAME}-backend-${PHONON_PLUGIN}/${DISTVERSION} PKGNAMESUFFIX= -${PHONON_PLUGIN} diff --git a/multimedia/phonon/Makefile b/multimedia/phonon/Makefile index fedc11b1a353..ac312e5772fd 100644 --- a/multimedia/phonon/Makefile +++ b/multimedia/phonon/Makefile @@ -3,10 +3,11 @@ PORTNAME= phonon DISTVERSION= 4.10.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= multimedia kde MASTER_SITES= KDE/stable/${PORTNAME}/${DISTVERSION} DIST_SUBDIR= KDE/phonon +PKGNAMESUFFIX= -qt5 MAINTAINER= kde@FreeBSD.org COMMENT= KDE multimedia framework @@ -14,36 +15,16 @@ COMMENT= KDE multimedia framework LICENSE= LGPL21+ LICENSE_FILE= ${WRKSRC}/COPYING.LIB -FLAVORS= qt5 qt4 -FLAVOR?= ${FLAVORS:[1]} - -qt4_BUILD_DEPENDS= automoc4:devel/automoc4 -qt4_LIB_DEPENDS= libqzeitgeist.so:sysutils/qzeitgeist -qt4_PKGNAMESUFFIX= -qt4 -qt5_PKGNAMESUFFIX= -qt5 -qt4_PLIST= ${.CURDIR}/pkg-plist.qt4 -qt5_PLIST= ${.CURDIR}/pkg-plist.qt5 - -USES= cmake compiler:c++11-lang pathfix tar:xz +USES= cmake compiler:c++11-lang kde:5 pathfix qt:5 tar:xz CMAKE_ON= PHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT \ - PHONON_NO_PLATFORMPLUGIN -CMAKE_OFF= PHONON_BUILD_DESIGNER_PLUGIN + PHONON_NO_PLATFORMPLUGIN \ + PHONON_BUILD_PHONON4QT5 +CMAKE_OFF= PHONON_BUILD_DESIGNER_PLUGIN \ + PHONON_BUILD_DECLARATIVE_PLUGIN USE_LDCONFIG= yes - -. if ${FLAVOR} == qt4 -DEPRECATED= Qt4 has been EOL since december 2015 -EXPIRATION_DATE=2019-03-15 -USES+= qt:4 -USE_QT= corelib dbus declarative gui testlib \ - qmake_build moc_build rcc_build uic_build -. else -USES+= kde:5 qt:5 USE_KDE= ecm USE_QT= core dbus gui opengl widgets \ buildtools_build qmake_build -CMAKE_OFF+= PHONON_BUILD_DECLARATIVE_PLUGIN -CMAKE_ON+= PHONON_BUILD_PHONON4QT5 -. endif PLIST_SUB= SHLIB_VER=${DISTVERSION} @@ -53,17 +34,4 @@ PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio PULSEAUDIO_USE= GNOME=glib20 PULSEAUDIO_CMAKE_BOOL= WITH_PulseAudio -. if ${FLAVOR} == qt4 -post-install: - ${MKDIR} ${STAGEDIR}${QT_INCDIR} - ${MKDIR} ${STAGEDIR}${QT_LIBDIR} - ${RLN} ${STAGEDIR}${PREFIX}/include/phonon ${STAGEDIR}${QT_INCDIR}/phonon - ${RLN} ${STAGEDIR}${PREFIX}/include/phonon ${STAGEDIR}${QT_INCDIR}/Phonon - ${RLN} ${STAGEDIR}${PREFIX}/include/KDE/Phonon ${STAGEDIR}${PREFIX}/include/phonon/Phonon -. for lib in phonon phononexperimental - ${RLN} ${STAGEDIR}${PREFIX}/lib/lib${lib}.so.${DISTVERSION} ${STAGEDIR}${QT_LIBDIR}/lib${lib}.so - ${RLN} ${STAGEDIR}${PREFIX}/lib/lib${lib}.so.${DISTVERSION} ${STAGEDIR}${QT_LIBDIR}/lib${lib}.so.4 -. endfor -. endif - .include <bsd.port.mk> diff --git a/multimedia/phonon/pkg-plist.qt5 b/multimedia/phonon/pkg-plist index 647a0859b634..647a0859b634 100644 --- a/multimedia/phonon/pkg-plist.qt5 +++ b/multimedia/phonon/pkg-plist diff --git a/multimedia/phonon/pkg-plist.qt4 b/multimedia/phonon/pkg-plist.qt4 deleted file mode 100644 index e55e0bf86996..000000000000 --- a/multimedia/phonon/pkg-plist.qt4 +++ /dev/null @@ -1,193 +0,0 @@ -include/KDE/Phonon/AbstractAudioOutput -include/KDE/Phonon/AbstractMediaStream -include/KDE/Phonon/AbstractVideoOutput -include/KDE/Phonon/AddonInterface -include/KDE/Phonon/AudioDevice -include/KDE/Phonon/AudioDeviceEnumerator -include/KDE/Phonon/AudioOutput -include/KDE/Phonon/AudioOutputDevice -include/KDE/Phonon/AudioOutputDeviceModel -include/KDE/Phonon/AudioOutputInterface -include/KDE/Phonon/BackendCapabilities -include/KDE/Phonon/BackendInterface -include/KDE/Phonon/Effect -include/KDE/Phonon/EffectDescription -include/KDE/Phonon/EffectDescriptionModel -include/KDE/Phonon/EffectInterface -include/KDE/Phonon/EffectParameter -include/KDE/Phonon/EffectWidget -include/KDE/Phonon/Experimental/AbstractVideoDataOutput -include/KDE/Phonon/Experimental/AudioDataOutput -include/KDE/Phonon/Experimental/SnapshotInterface -include/KDE/Phonon/Experimental/VideoDataOutput -include/KDE/Phonon/Experimental/VideoDataOutputInterface -include/KDE/Phonon/Experimental/VideoFrame -include/KDE/Phonon/Experimental/VideoFrame2 -include/KDE/Phonon/Experimental/Visualization -include/KDE/Phonon/Global -include/KDE/Phonon/MediaController -include/KDE/Phonon/MediaNode -include/KDE/Phonon/MediaObject -include/KDE/Phonon/MediaObjectInterface -include/KDE/Phonon/MediaSource -include/KDE/Phonon/ObjectDescription -include/KDE/Phonon/ObjectDescriptionModel -include/KDE/Phonon/Path -include/KDE/Phonon/PlatformPlugin -include/KDE/Phonon/SeekSlider -include/KDE/Phonon/StreamInterface -include/KDE/Phonon/VideoPlayer -include/KDE/Phonon/VideoWidget -include/KDE/Phonon/VideoWidgetInterface -include/KDE/Phonon/VolumeFaderEffect -include/KDE/Phonon/VolumeFaderInterface -include/KDE/Phonon/VolumeSlider -include/phonon/AbstractAudioOutput -include/phonon/AbstractMediaStream -include/phonon/AbstractVideoOutput -include/phonon/AddonInterface -include/phonon/AudioCaptureDevice -include/phonon/AudioCaptureDeviceModel -include/phonon/AudioChannelDescription -include/phonon/AudioChannelDescriptionModel -include/phonon/AudioDataOutput -include/phonon/AudioOutput -include/phonon/AudioOutputDevice -include/phonon/AudioOutputDeviceModel -include/phonon/AudioOutputInterface -include/phonon/AudioOutputInterface40 -include/phonon/AudioOutputInterface42 -include/phonon/AvCapture -include/phonon/BackendCapabilities -include/phonon/BackendInterface -include/phonon/Effect -include/phonon/EffectDescription -include/phonon/EffectDescriptionModel -include/phonon/EffectInterface -include/phonon/EffectParameter -include/phonon/EffectWidget -include/phonon/Global -include/phonon/GlobalDescriptionContainer -include/phonon/MediaController -include/phonon/MediaNode -include/phonon/MediaObject -include/phonon/MediaObjectInterface -include/phonon/MediaSource -include/phonon/Mrl -include/phonon/ObjectDescription -include/phonon/ObjectDescriptionData -include/phonon/ObjectDescriptionModel -include/phonon/ObjectDescriptionModelData -include/phonon/Path -include/phonon/Phonon -include/phonon/PlatformPlugin -include/phonon/SeekSlider -include/phonon/StreamInterface -include/phonon/SubtitleDescription -include/phonon/SubtitleDescriptionModel -include/phonon/VideoCaptureDevice -include/phonon/VideoCaptureDeviceModel -include/phonon/VideoPlayer -include/phonon/VideoWidget -include/phonon/VideoWidgetInterface -include/phonon/VideoWidgetInterface44 -include/phonon/VideoWidgetInterfaceLatest -include/phonon/VolumeFaderEffect -include/phonon/VolumeFaderInterface -include/phonon/VolumeSlider -include/phonon/abstractaudiooutput.h -include/phonon/abstractmediastream.h -include/phonon/abstractvideooutput.h -include/phonon/addoninterface.h -include/phonon/audiodataoutput.h -include/phonon/audiodataoutputinterface.h -include/phonon/audiooutput.h -include/phonon/audiooutputinterface.h -include/phonon/backendcapabilities.h -include/phonon/backendinterface.h -include/phonon/effect.h -include/phonon/effectinterface.h -include/phonon/effectparameter.h -include/phonon/effectwidget.h -include/phonon/experimental/abstractaudiodataoutput.h -include/phonon/experimental/abstractvideodataoutput.h -include/phonon/experimental/audiodataoutput.h -include/phonon/experimental/audiodataoutputinterface.h -include/phonon/experimental/audioformat.h -include/phonon/experimental/avcapture.h -include/phonon/experimental/avcaptureinterface.h -include/phonon/experimental/backendcapabilities.h -include/phonon/experimental/backendinterface.h -include/phonon/experimental/export.h -include/phonon/experimental/globalconfig.h -include/phonon/experimental/mediasource.h -include/phonon/experimental/objectdescription.h -include/phonon/experimental/packet.h -include/phonon/experimental/packetpool.h -include/phonon/experimental/phononnamespace.h -include/phonon/experimental/snapshotinterface.h -include/phonon/experimental/videodataoutput.h -include/phonon/experimental/videodataoutput2.h -include/phonon/experimental/videodataoutputinterface.h -include/phonon/experimental/videoframe.h -include/phonon/experimental/videoframe2.h -include/phonon/experimental/videowidget.h -include/phonon/experimental/visualization.h -include/phonon/globalconfig.h -include/phonon/globaldescriptioncontainer.h -include/phonon/mediacontroller.h -include/phonon/medianode.h -include/phonon/mediaobject.h -include/phonon/mediaobjectinterface.h -include/phonon/mediasource.h -include/phonon/mrl.h -include/phonon/objectdescription.h -include/phonon/objectdescriptionmodel.h -include/phonon/path.h -include/phonon/phonon_export.h -include/phonon/phonondefs.h -include/phonon/phononnamespace.h -include/phonon/platformplugin.h -include/phonon/pulsesupport.h -include/phonon/seekslider.h -include/phonon/streaminterface.h -include/phonon/videoplayer.h -include/phonon/videowidget.h -include/phonon/videowidgetinterface.h -include/phonon/volumefadereffect.h -include/phonon/volumefaderinterface.h -include/phonon/volumeslider.h -%%QT_INCDIR%%/Phonon -%%QT_INCDIR%%/phonon -lib/cmake/phonon/PhononConfig.cmake -lib/cmake/phonon/PhononConfigVersion.cmake -lib/cmake/phonon/PhononExperimentalConfig.cmake -lib/cmake/phonon/PhononExperimentalConfigVersion.cmake -lib/cmake/phonon/PhononExperimentalTargets-%%CMAKE_BUILD_TYPE%%.cmake -lib/cmake/phonon/PhononExperimentalTargets.cmake -lib/cmake/phonon/PhononTargets-%%CMAKE_BUILD_TYPE%%.cmake -lib/cmake/phonon/PhononTargets.cmake -lib/libphonon.so -lib/libphonon.so.4 -lib/libphonon.so.%%SHLIB_VER%% -lib/libphononexperimental.so -lib/libphononexperimental.so.4 -lib/libphononexperimental.so.%%SHLIB_VER%% -lib/qt4/libphonon.so -lib/qt4/libphonon.so.4 -lib/qt4/libphononexperimental.so -lib/qt4/libphononexperimental.so.4 -libdata/pkgconfig/phonon.pc -share/dbus-1/interfaces/org.kde.Phonon.AudioOutput.xml -%%DATADIR%%/buildsystem/COPYING-CMAKE-SCRIPTS -%%DATADIR%%/buildsystem/FindPackageHandleStandardArgs.cmake -%%DATADIR%%/buildsystem/FindPhononInternal.cmake -%%DATADIR%%/buildsystem/MacroEnsureVersion.cmake -%%DATADIR%%/buildsystem/MacroLogFeature.cmake -%%DATADIR%%/buildsystem/MacroOptionalFindPackage.cmake -%%DATADIR%%/buildsystem/MacroPushRequiredVars.cmake -%%DATADIR%%/buildsystem/PhononMacros.cmake -%%DATADIR%%/buildsystem/PhononQt4.cmake -%%DATADIR%%/buildsystem/PhononQt5.cmake -%%DATADIR%%/buildsystem/cmake_uninstall.cmake.in -%%QT_MKSPECDIR%%/modules/qt_phonon.pri diff --git a/multimedia/subtitlecomposer/Makefile b/multimedia/subtitlecomposer/Makefile index a6772414ca29..e88d7367ae08 100644 --- a/multimedia/subtitlecomposer/Makefile +++ b/multimedia/subtitlecomposer/Makefile @@ -3,7 +3,7 @@ PORTNAME= subtitlecomposer PORTVERSION= 0.6.6 DISTVERSIONPREFIX= v -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= multimedia kde MAINTAINER= makc@FreeBSD.org diff --git a/net-im/kopete/Makefile b/net-im/kopete/Makefile index 1fffd89f8377..02d152af855e 100644 --- a/net-im/kopete/Makefile +++ b/net-im/kopete/Makefile @@ -2,7 +2,7 @@ PORTNAME= kopete PORTVERSION= ${KDE_APPLICATIONS_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-im kde kde-applications MAINTAINER= kde@FreeBSD.org diff --git a/net-p2p/ktorrent/Makefile b/net-p2p/ktorrent/Makefile index 40d995c37f57..d4c971b733b3 100644 --- a/net-p2p/ktorrent/Makefile +++ b/net-p2p/ktorrent/Makefile @@ -4,7 +4,7 @@ PORTNAME= ktorrent DISTVERSION= 5.1.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-p2p kde MASTER_SITES= KDE/stable/${PORTNAME}/${DISTVERSION}/ diff --git a/net/mailcommon/Makefile b/net/mailcommon/Makefile index b4066f4e67ff..f16fd2d32b12 100644 --- a/net/mailcommon/Makefile +++ b/net/mailcommon/Makefile @@ -2,6 +2,7 @@ PORTNAME= mailcommon DISTVERSION= ${KDE_APPLICATIONS_VERSION} +PORTREVISION= 1 CATEGORIES= net kde kde-applications MAINTAINER= kde@FreeBSD.org diff --git a/www/kf5-khtml/Makefile b/www/kf5-khtml/Makefile index 4b1dc7ede6a1..fa7347e2fdb8 100644 --- a/www/kf5-khtml/Makefile +++ b/www/kf5-khtml/Makefile @@ -2,6 +2,7 @@ PORTNAME= khtml DISTVERSION= ${KDE_FRAMEWORKS_VERSION} +PORTREVISION= 1 CATEGORIES= www kde kde-frameworks MAINTAINER= kde@FreeBSD.org diff --git a/x11-fm/dolphin/Makefile b/x11-fm/dolphin/Makefile index a8fad7371b5a..38984effa662 100644 --- a/x11-fm/dolphin/Makefile +++ b/x11-fm/dolphin/Makefile @@ -2,6 +2,7 @@ PORTNAME= dolphin DISTVERSION= ${KDE_APPLICATIONS_VERSION} +PORTREVISION= 1 CATEGORIES= x11-fm kde kde-applications MAINTAINER= kde@FreeBSD.org diff --git a/x11/plasma5-plasma-desktop/Makefile b/x11/plasma5-plasma-desktop/Makefile index 7c69a533c3ee..905def1deb59 100644 --- a/x11/plasma5-plasma-desktop/Makefile +++ b/x11/plasma5-plasma-desktop/Makefile @@ -2,6 +2,7 @@ PORTNAME= plasma-desktop DISTVERSION= ${KDE_PLASMA_VERSION}.2 +PORTREVISION= 1 CATEGORIES= x11 kde kde-plasma MAINTAINER= kde@FreeBSD.org diff --git a/x11/plasma5-plasma-workspace/Makefile b/x11/plasma5-plasma-workspace/Makefile index 521f2541429d..7c8cf2c4babe 100644 --- a/x11/plasma5-plasma-workspace/Makefile +++ b/x11/plasma5-plasma-workspace/Makefile @@ -2,7 +2,7 @@ PORTNAME= plasma-workspace DISTVERSION= ${KDE_PLASMA_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 kde kde-plasma MAINTAINER= kde@FreeBSD.org diff --git a/x11/plasma5-plasma/Makefile b/x11/plasma5-plasma/Makefile index cf9f33b0662c..9b3fbcfe2fce 100644 --- a/x11/plasma5-plasma/Makefile +++ b/x11/plasma5-plasma/Makefile @@ -2,6 +2,7 @@ PORTNAME= plasma DISTVERSION= ${KDE_PLASMA_VERSION} +PORTREVISION= 1 CATEGORIES= x11 kde PKGNAMEPREFIX= plasma5- @@ -23,7 +24,7 @@ OPTIONS_DEFAULT= PHONON # Different from PHONON, because this is about the output plugins PHONON_DESC= Include phonon-gstreamer, for sound output -PHONON_RUN_DEPENDS= ${QT_PLUGINDIR}/phonon4qt5_backend/phonon_gstreamer.so:multimedia/phonon-gstreamer@qt5 +PHONON_RUN_DEPENDS= ${QT_PLUGINDIR}/phonon4qt5_backend/phonon_gstreamer.so:multimedia/phonon-gstreamer PULSEAUDIO_USE= KDE=plasma-pa_run .include <bsd.port.mk> |