Index: audio/Makefile =================================================================== --- audio/Makefile +++ audio/Makefile @@ -609,6 +609,7 @@ SUBDIR += picard SUBDIR += pidgin-musictracker SUBDIR += pithos + SUBDIR += plasma5-plasma-pa SUBDIR += play SUBDIR += playgsf SUBDIR += playmidi Index: audio/audiocd-kio/Makefile =================================================================== --- audio/audiocd-kio/Makefile +++ audio/audiocd-kio/Makefile @@ -1,10 +1,9 @@ +# Created by: tcberner # $FreeBSD$ -PORTNAME= kio-audiocd -PORTVERSION= ${KDE4_VERSION} -PORTREVISION= 1 -CATEGORIES= audio kde kde-kde4 -DISTNAME= audiocd-kio-${PORTVERSION} +PORTNAME= audiocd-kio +PORTVERSION= ${KDE_APPLICATIONS_VERSION} +CATEGORIES= audio kde kde-applications MAINTAINER= kde@FreeBSD.org COMMENT= KDE IOSlave for accessing audio CDs @@ -14,12 +13,14 @@ LIB_DEPENDS= libFLAC.so:audio/flac \ libcdda_paranoia.so:audio/cdparanoia \ libogg.so:audio/libogg \ - libvorbis.so:audio/libvorbis + libvorbis.so:audio/libvorbis \ + libKF5Cddb.so:audio/libkcddb-kf5 \ + libKF5CompactDisc.so:audio/libkcompactdisc-kf5 + +USES= cmake:outsource gettext kde:5 tar:xz +USE_KDE= ecm +USE_QT5= buildtools_build core qmake_build -USES= cmake:outsource kde:4 tar:xz -USE_KDE= kdelibs libkcddb libkcompactdisc \ - automoc4 -USE_QT4= moc_build qmake_build rcc_build uic_build USE_LDCONFIG= yes OPTIONS_DEFINE= LAME Index: audio/audiocd-kio/distinfo =================================================================== --- audio/audiocd-kio/distinfo +++ audio/audiocd-kio/distinfo @@ -1,2 +1,3 @@ -SHA256 (KDE/4.14.3/audiocd-kio-4.14.3.tar.xz) = 635c017fe2d24d26442138913cadf29a1bd7de05828bd8471b8512fb2987e214 -SIZE (KDE/4.14.3/audiocd-kio-4.14.3.tar.xz) = 51648 +TIMESTAMP = 1486501515 +SHA256 (KDE/applications/16.12.2/audiocd-kio-16.12.2.tar.xz) = eaf5434602455afb00b026e3c1241a092edb96e96c9aa999d3695f6703ce8fa0 +SIZE (KDE/applications/16.12.2/audiocd-kio-16.12.2.tar.xz) = 53600 Index: audio/audiocd-kio/files/patch-audiocd.cpp =================================================================== --- audio/audiocd-kio/files/patch-audiocd.cpp +++ audio/audiocd-kio/files/patch-audiocd.cpp @@ -0,0 +1,43 @@ +--- audiocd.cpp.orig 2010-06-06 08:15:20.000000000 -0400 ++++ audiocd.cpp 2010-06-06 08:18:01.000000000 -0400 +@@ -229,20 +229,21 @@ + // name associated with the device, which throws the rest of audiocd + // for a loop. + // ++ QString devname; + if ( !(drive->dev) || (COOKED_IOCTL == drive->interface) ) + { + // For ATAPI devices, we have no real choice. Use the + // user selected value, even if there is none. + // + kWarning(7117) << "Found an ATAPI device, assuming it is the one specified by the user."; +- cd->setDevice( drive->cdda_device_name ); ++ devname = drive->cdda_device_name; + } + else + { + kDebug(7117) << "Found a SCSI or ATAPICAM device."; + if ( strlen(drive->dev->device_path) > 0 ) + { +- cd->setDevice( drive->dev->device_path ); ++ devname = drive->dev->device_path; + } + else + { +@@ -250,13 +251,14 @@ + // circumstances, so build a representation from + // the unit number and SCSI device name. + // +- QString devname = QString::fromLatin1( "/dev/%1%2" ) ++ devname = QString::fromLatin1( "/dev/%1%2" ) + .arg( drive->dev->given_dev_name ) + .arg( drive->dev->given_unit_number ) ; + kDebug(7117) << " Using derived name " << devname; +- cd->setDevice( devname ); + } + } ++ if ( cd->deviceName() != devname ) ++ cd->setDevice( devname ); + #else + #ifdef __GNUC__ + #warning audiocd ioslave is not going to work for you Index: audio/audiocd-kio/pkg-plist =================================================================== --- audio/audiocd-kio/pkg-plist +++ audio/audiocd-kio/pkg-plist @@ -1,18 +1,18 @@ -include/kde4/audiocdencoder.h -lib/kde4/kcm_audiocd.so -lib/kde4/kio_audiocd.so -lib/kde4/libaudiocd_encoder_flac.so -lib/kde4/libaudiocd_encoder_lame.so -lib/kde4/libaudiocd_encoder_wav.so +include/audiocdencoder.h +include/audiocdplugins_export.h lib/libaudiocdplugins.so -lib/libaudiocdplugins.so.4 -lib/libaudiocdplugins.so.%%KDE4_GENERIC_LIB_VERSION%% -share/apps/konqsidebartng/virtual_folders/services/audiocd.desktop -share/apps/solid/actions/solid_audiocd.desktop +lib/libaudiocdplugins.so.5 +lib/libaudiocdplugins.so.5.0.0 +%%QT_PLUGINDIR%%/libaudiocd_encoder_flac.so +%%QT_PLUGINDIR%%/libaudiocd_encoder_lame.so +%%QT_PLUGINDIR%%/libaudiocd_encoder_wav.so +%%QT_PLUGINDIR%%/libkcm_audiocd.so +%%QT_PLUGINDIR%%/libkio_audiocd.so share/config.kcfg/audiocd_flac_encoder.kcfg share/config.kcfg/audiocd_lame_encoder.kcfg -share/doc/HTML/en/kioslave/audiocd/common -share/doc/HTML/en/kioslave/audiocd/index.cache.bz2 -share/doc/HTML/en/kioslave/audiocd/index.docbook -share/kde4/services/audiocd.desktop -share/kde4/services/audiocd.protocol +share/doc/HTML/en/kioslave5/audiocd/index.cache.bz2 +share/doc/HTML/en/kioslave5/audiocd/index.docbook +share/konqsidebartng/virtual_folders/services/audiocd.desktop +share/kservices5/audiocd.desktop +share/kservices5/audiocd.protocol +share/solid/actions/solid_audiocd.desktop Index: audio/juk/Makefile =================================================================== --- audio/juk/Makefile +++ audio/juk/Makefile @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME= juk -PORTVERSION= ${KDE4_VERSION} -CATEGORIES= audio kde kde-kde4 +PORTVERSION= ${KDE_APPLICATIONS_VERSION} +CATEGORIES= audio kde kde-applications MAINTAINER= kde@FreeBSD.org COMMENT= Jukebox, tagger and music collection manager Index: audio/juk/distinfo =================================================================== --- audio/juk/distinfo +++ audio/juk/distinfo @@ -1,2 +1,3 @@ -SHA256 (KDE/4.14.3/juk-4.14.3.tar.xz) = 03f517c9b389ebd8a0bd153c5c0400682c34089ce102e92e4f4cad46c606bb09 -SIZE (KDE/4.14.3/juk-4.14.3.tar.xz) = 439436 +TIMESTAMP = 1486501515 +SHA256 (KDE/applications/16.12.2/juk-16.12.2.tar.xz) = 2cd8d1c557d2d0778564d048ac45fe8fb66e56c6eef4e142ea153fd53fd0a390 +SIZE (KDE/applications/16.12.2/juk-16.12.2.tar.xz) = 446228 Index: audio/juk/pkg-plist =================================================================== --- audio/juk/pkg-plist +++ audio/juk/pkg-plist @@ -1,6 +1,5 @@ bin/juk -share/appdata/juk.appdata.xml -share/applications/kde4/juk.desktop +share/applications/kde4/org.kde.juk.desktop share/apps/juk/juk.notifyrc share/apps/juk/jukui-rtl.rc share/apps/juk/jukui.rc @@ -28,3 +27,4 @@ share/icons/hicolor/48x48/apps/juk.png share/icons/hicolor/64x64/apps/juk.png share/kde4/services/ServiceMenus/jukservicemenu.desktop +share/metainfo/org.kde.juk.appdata.xml Index: audio/kio-audiocd/Makefile =================================================================== --- audio/kio-audiocd/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -# $FreeBSD$ - -PORTNAME= kio-audiocd -PORTVERSION= ${KDE4_VERSION} -PORTREVISION= 1 -CATEGORIES= audio kde kde-kde4 -DISTNAME= audiocd-kio-${PORTVERSION} - -MAINTAINER= kde@FreeBSD.org -COMMENT= KDE IOSlave for accessing audio CDs - -LICENSE= GPLv2 - -LIB_DEPENDS= libFLAC.so:audio/flac \ - libcdda_paranoia.so:audio/cdparanoia \ - libogg.so:audio/libogg \ - libvorbis.so:audio/libvorbis - -USES= cmake:outsource kde:4 tar:xz -USE_KDE= kdelibs libkcddb libkcompactdisc \ - automoc4 -USE_QT4= moc_build qmake_build rcc_build uic_build -USE_LDCONFIG= yes - -OPTIONS_DEFINE= LAME -LAME_DESC= Install LAME MP3 audio encoder -LAME_RUN_DEPENDS= lame:audio/lame - -.include Index: audio/kio-audiocd/distinfo =================================================================== --- audio/kio-audiocd/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (KDE/4.14.3/audiocd-kio-4.14.3.tar.xz) = 635c017fe2d24d26442138913cadf29a1bd7de05828bd8471b8512fb2987e214 -SIZE (KDE/4.14.3/audiocd-kio-4.14.3.tar.xz) = 51648 Index: audio/kio-audiocd/files/patch-audiocd.cpp =================================================================== --- audio/kio-audiocd/files/patch-audiocd.cpp +++ /dev/null @@ -1,43 +0,0 @@ ---- audiocd.cpp.orig 2014-10-09 07:07:27 UTC -+++ audiocd.cpp -@@ -228,20 +228,21 @@ static void setDeviceToCd(KCompactDisc * - // name associated with the device, which throws the rest of audiocd - // for a loop. - // -+ QString devname; - if ( !(drive->dev) || (COOKED_IOCTL == drive->interface) ) - { - // For ATAPI devices, we have no real choice. Use the - // user selected value, even if there is none. - // - kWarning(7117) << "Found an ATAPI device, assuming it is the one specified by the user."; -- cd->setDevice( drive->cdda_device_name ); -+ devname = drive->cdda_device_name; - } - else - { - kDebug(7117) << "Found a SCSI or ATAPICAM device."; - if ( strlen(drive->dev->device_path) > 0 ) - { -- cd->setDevice( drive->dev->device_path ); -+ devname = drive->dev->device_path; - } - else - { -@@ -249,13 +250,14 @@ static void setDeviceToCd(KCompactDisc * - // circumstances, so build a representation from - // the unit number and SCSI device name. - // -- QString devname = QString::fromLatin1( "/dev/%1%2" ) -+ devname = QString::fromLatin1( "/dev/%1%2" ) - .arg( drive->dev->given_dev_name ) - .arg( drive->dev->given_unit_number ) ; - kDebug(7117) << " Using derived name " << devname; -- cd->setDevice( devname ); - } - } -+ if ( cd->deviceName() != devname ) -+ cd->setDevice( devname ); - #else - #ifdef __GNUC__ - #warning audiocd ioslave is not going to work for you Index: audio/kio-audiocd/pkg-descr =================================================================== --- audio/kio-audiocd/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -KDE IOSlave for accessing audio CDs. - -WWW: http://www.kde.org/ Index: audio/kio-audiocd/pkg-plist =================================================================== --- audio/kio-audiocd/pkg-plist +++ /dev/null @@ -1,18 +0,0 @@ -include/kde4/audiocdencoder.h -lib/kde4/kcm_audiocd.so -lib/kde4/kio_audiocd.so -lib/kde4/libaudiocd_encoder_flac.so -lib/kde4/libaudiocd_encoder_lame.so -lib/kde4/libaudiocd_encoder_wav.so -lib/libaudiocdplugins.so -lib/libaudiocdplugins.so.4 -lib/libaudiocdplugins.so.%%KDE4_GENERIC_LIB_VERSION%% -share/apps/konqsidebartng/virtual_folders/services/audiocd.desktop -share/apps/solid/actions/solid_audiocd.desktop -share/config.kcfg/audiocd_flac_encoder.kcfg -share/config.kcfg/audiocd_lame_encoder.kcfg -share/doc/HTML/en/kioslave/audiocd/common -share/doc/HTML/en/kioslave/audiocd/index.cache.bz2 -share/doc/HTML/en/kioslave/audiocd/index.docbook -share/kde4/services/audiocd.desktop -share/kde4/services/audiocd.protocol Index: audio/kmix/Makefile =================================================================== --- audio/kmix/Makefile +++ audio/kmix/Makefile @@ -2,23 +2,30 @@ # $FreeBSD$ PORTNAME= kmix -PORTVERSION= ${KDE4_VERSION} -CATEGORIES= audio kde kde-kde4 +PORTVERSION= ${KDE_APPLICATIONS_VERSION} +CATEGORIES= audio kde kde-applications MAINTAINER= kde@FreeBSD.org COMMENT= Sound mixer for KDE LICENSE= GPLv2 -USES= cmake:outsource kde:4 tar:xz -USE_KDE= automoc4 kdelibs -USE_QT4= gui phonon xml \ - moc_build qmake_build rcc_build uic_build +LIB_DEPENDS= libasound.so:audio/alsa-lib -OPTIONS_DEFINE= ALSA PULSEAUDIO - -ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib -ALSA_EXTRA_PATCHES_OFF= ${FILESDIR}/extrapatch-no_alsa +USES= cmake:outsource gettext kde:5 tar:xz +USE_QT5= buildtools_build core gui qmake_build +USE_KDE= configwidgets dbusaddons ecm emoticons globalaccel i18n \ + iconthemes init itemmodels itemviews kcmutils kdelibs4support \ + plasma-framework xmlgui + +# we want the KF5 version of kmix +CMAKE_ARGS= -DKMIX_KF5_BUILD:BOOL=TRUE + +OPTIONS_DEFINE= PULSEAUDIO +# TODO: readd ALSA option +# +# ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib +# ALSA_EXTRA_PATCHES_OFF= ${FILESDIR}/extrapatch-no_alsa PULSEAUDIO_LIB_DEPENDS= libcanberra.so:audio/libcanberra \ libpulse.so:audio/pulseaudio Index: audio/kmix/distinfo =================================================================== --- audio/kmix/distinfo +++ audio/kmix/distinfo @@ -1,2 +1,3 @@ -SHA256 (KDE/4.14.3/kmix-4.14.3.tar.xz) = d7dd97ad5ee005fa039696d88ce21a6ede2b5d795001f1d023899f5a848b6e94 -SIZE (KDE/4.14.3/kmix-4.14.3.tar.xz) = 379220 +TIMESTAMP = 1486501516 +SHA256 (KDE/applications/16.12.2/kmix-16.12.2.tar.xz) = 1f163ea62341199ccf0f0c13faaca849c51ea5a29dd7eabaab4ab1b7e4880de9 +SIZE (KDE/applications/16.12.2/kmix-16.12.2.tar.xz) = 388780 Index: audio/kmix/files/extrapatch-no_alsa =================================================================== --- audio/kmix/files/extrapatch-no_alsa +++ /dev/null @@ -1,20 +0,0 @@ ---- CMakeLists.txt.orig 2014-07-16 08:24:17 UTC -+++ CMakeLists.txt -@@ -9,7 +9,7 @@ include(MacroLibrary) - # Do not yet REQUIRE Phonon. Hint: As long as we do not find_package(), ${KDE4_PHONON_LIBS} will be empty below, but that should not hurt. - #find_package(Phonon REQUIRED) - --find_package(Alsa) -+find_file(CONFIG_ALSA_H_CMAKE config-alsa.h.cmake ${CMAKE_MODULE_PATH}) - - set(PA_VER "0.9.16") - macro_optional_find_package(PulseAudio "${PA_VER}") -@@ -20,7 +20,7 @@ macro_optional_find_package(Canberra) - macro_log_feature(CANBERRA_FOUND "libcanberra" "libcanberra audio library" - "http://0pointer.de/lennart/projects/libcanberra/" FALSE "" "libcanberra is needed for kmix sound feedback") - --alsa_configure_file(${CMAKE_BINARY_DIR}/config-alsa.h) -+configure_file(${CONFIG_ALSA_H_CMAKE} ${CMAKE_BINARY_DIR}/config-alsa.h) - - - add_definitions (${QT_DEFINITIONS} ${QT_QTDBUS_DEFINITIONS} ${KDE4_DEFINITIONS} ) Index: audio/kmix/files/patch-backends_mixer__oss.cpp =================================================================== --- audio/kmix/files/patch-backends_mixer__oss.cpp +++ /dev/null @@ -1,25 +0,0 @@ -kmix assumes volume range 1:100 for oss mixer instead of 0:100. - -See https://bugs.kde.org/344468 -and https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=184996 - ---- backends/mixer_oss.cpp.orig 2014-07-16 08:24:17 UTC -+++ backends/mixer_oss.cpp -@@ -146,7 +146,7 @@ int Mixer_OSS::open() - { - if( devmask & ( 1 << idx ) ) // device active? - { -- Volume playbackVol( 100, 1, true, false ); -+ Volume playbackVol( 100, 0, true, false ); - playbackVol.addVolumeChannel(VolumeChannel(Volume::LEFT)); - if ( stereodevs & ( 1 << idx ) ) - playbackVol.addVolumeChannel(VolumeChannel(Volume::RIGHT)); -@@ -163,7 +163,7 @@ int Mixer_OSS::open() - // Tutorial: Howto add a simple capture switch - if ( recmask & ( 1 << idx ) ) { - // can be captured => add capture volume, with no capture volume -- Volume captureVol( 100, 1, true, true ); -+ Volume captureVol( 100, 0, true, true ); - md->addCaptureVolume(captureVol); - } - Index: audio/kmix/files/patch-mixer_oss =================================================================== --- /dev/null +++ audio/kmix/files/patch-mixer_oss @@ -0,0 +1,25 @@ +kmix assumes volume range 1:100 for oss mixer instead of 0:100. + +See https://bugs.kde.org/344468 +and https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=184996 + +--- backends/mixer_oss.cpp.orig 2014-07-16 08:24:17 UTC ++++ backends/mixer_oss.cpp +@@ -146,7 +146,7 @@ int Mixer_OSS::open() + { + if( devmask & ( 1 << idx ) ) // device active? + { +- Volume playbackVol( 100, 1, true, false ); ++ Volume playbackVol( 100, 0, true, false ); + playbackVol.addVolumeChannel(VolumeChannel(Volume::LEFT)); + if ( stereodevs & ( 1 << idx ) ) + playbackVol.addVolumeChannel(VolumeChannel(Volume::RIGHT)); +@@ -163,7 +163,7 @@ int Mixer_OSS::open() + // Tutorial: Howto add a simple capture switch + if ( recmask & ( 1 << idx ) ) { + // can be captured => add capture volume, with no capture volume +- Volume captureVol( 100, 1, true, true ); ++ Volume captureVol( 100, 0, true, true ); + md->addCaptureVolume(captureVol); + } + Index: audio/kmix/pkg-plist =================================================================== --- audio/kmix/pkg-plist +++ audio/kmix/pkg-plist @@ -1,56 +1,49 @@ bin/kmix bin/kmixctrl bin/kmixremote -lib/kde4/kded_kmixd.so -lib/kde4/plasma_engine_mixer.so -lib/libkdeinit4_kmix.so -lib/libkdeinit4_kmixctrl.so -share/applications/kde4/kmix.desktop -share/apps/kmix/kmixui.rc -share/apps/kmix/pics/kmixdocked.png -share/apps/kmix/pics/kmixdocked_error.png -share/apps/kmix/pics/kmixdocked_mute.png -share/apps/kmix/pics/mixer-ac97.png -share/apps/kmix/pics/mixer-capture.png -share/apps/kmix/pics/mixer-cd.png -share/apps/kmix/pics/mixer-digital.png -share/apps/kmix/pics/mixer-front.png -share/apps/kmix/pics/mixer-headset.png -share/apps/kmix/pics/mixer-lfe.png -share/apps/kmix/pics/mixer-line.png -share/apps/kmix/pics/mixer-master.png -share/apps/kmix/pics/mixer-microphone.png -share/apps/kmix/pics/mixer-midi.png -share/apps/kmix/pics/mixer-pcm-default.png -share/apps/kmix/pics/mixer-pcm.png -share/apps/kmix/pics/mixer-surround.png -share/apps/kmix/pics/mixer-video.png -share/apps/kmix/profiles/ALSA.TerraTec_DMX6Fire.1.default.xml -share/apps/kmix/profiles/ALSA.capture.xml -share/apps/kmix/profiles/ALSA.default.xml -share/apps/kmix/profiles/ALSA.playback.xml -share/apps/kmix/profiles/OSS.default.xml -share/apps/plasma/services/mixer.operations -share/autostart/kmix_autostart.desktop -share/autostart/restore_kmix_volumes.desktop +etc/xdg/autostart/kmix_autostart.desktop +etc/xdg/autostart/restore_kmix_volumes.desktop +lib/libkdeinit5_kmix.so +lib/libkdeinit5_kmixctrl.so +%%QT_PLUGINDIR%%/libkded_kmixd.so +%%QT_PLUGINDIR%%/plasma/dataengine/plasma_engine_mixer.so +share/applications/kmix.desktop share/dbus-1/interfaces/org.kde.kmix.control.xml share/dbus-1/interfaces/org.kde.kmix.mixer.xml share/dbus-1/interfaces/org.kde.kmix.mixset.xml -share/doc/HTML/en/kmix/common -share/doc/HTML/en/kmix/index.cache.bz2 -share/doc/HTML/en/kmix/index.docbook -share/doc/HTML/en/kmix/kmix-configure-general.png -share/doc/HTML/en/kmix/kmix-configure-sound-menu.png -share/doc/HTML/en/kmix/kmix-configure-start.png -share/doc/HTML/en/kmix/kmix-file.png -share/doc/HTML/en/kmix/kmix-master.png -share/doc/HTML/en/kmix/kmix-options.png -share/doc/HTML/en/kmix/kmix.png -share/icons/hicolor/128x128/apps/kmix.png -share/icons/hicolor/16x16/apps/kmix.png -share/icons/hicolor/32x32/apps/kmix.png -share/icons/hicolor/48x48/apps/kmix.png -share/icons/hicolor/64x64/apps/kmix.png -share/kde4/services/kded/kmixd.desktop -share/kde4/services/kmixctrl_restore.desktop -share/kde4/services/plasma-engine-mixer.desktop +share/icons/hicolor/128x128/actions/kmix.png +share/icons/hicolor/16x16/actions/kmix.png +share/icons/hicolor/32x32/actions/kmix.png +share/icons/hicolor/48x48/actions/kmix.png +share/icons/hicolor/64x64/actions/kmix.png +share/kservices5/plasma-dataengine-mixer.desktop +share/kxmlgui5/kmix/kmixui.rc +share/plasma/services/mixer.operations +%%DATADIR%%/pics/kmixdocked.png +%%DATADIR%%/pics/kmixdocked_error.png +%%DATADIR%%/pics/kmixdocked_mute.png +%%DATADIR%%/pics/mixer-ac97.png +%%DATADIR%%/pics/mixer-capture.png +%%DATADIR%%/pics/mixer-cd.png +%%DATADIR%%/pics/mixer-digital.png +%%DATADIR%%/pics/mixer-front.png +%%DATADIR%%/pics/mixer-headset.png +%%DATADIR%%/pics/mixer-lfe.png +%%DATADIR%%/pics/mixer-line.png +%%DATADIR%%/pics/mixer-master.png +%%DATADIR%%/pics/mixer-microphone.png +%%DATADIR%%/pics/mixer-midi.png +%%DATADIR%%/pics/mixer-pcm-default.png +%%DATADIR%%/pics/mixer-pcm.png +%%DATADIR%%/pics/mixer-surround.png +%%DATADIR%%/pics/mixer-video.png +%%DATADIR%%/profiles/ALSA.TerraTec_DMX6Fire.1.default.xml +%%DATADIR%%/profiles/ALSA.capture.xml +%%DATADIR%%/profiles/ALSA.default.xml +%%DATADIR%%/profiles/ALSA.playback.xml +%%DATADIR%%/profiles/MPRIS2.default.xml +%%DATADIR%%/profiles/OSS.default.xml +%%DATADIR%%/profiles/PulseAudio.default.xml +%%DATADIR%%/profiles/SUNAudio.default.xml +share/kservices5/kded/kmixd.desktop +share/kservices5/kmixctrl_restore.desktop Index: audio/kscd/Makefile =================================================================== --- audio/kscd/Makefile +++ audio/kscd/Makefile @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME= kscd -PORTVERSION= ${KDE4_VERSION} -CATEGORIES= audio kde kde-kde4 +PORTVERSION= ${KDE_APPLICATIONS_VERSION} +CATEGORIES= audio kde kde-applications MAINTAINER= kde@FreeBSD.org COMMENT= CD Player for KDE @@ -16,9 +16,4 @@ USE_KDE= kdelibs automoc4 USE_QT4= phonon moc_build qmake_build rcc_build uic_build -OPTIONS_DEFINE= ALSA - -ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib -ALSA_EXTRA_PATCHES_OFF= ${FILESDIR}/extrapatch-no_alsa - .include Index: audio/kscd/distinfo =================================================================== --- audio/kscd/distinfo +++ audio/kscd/distinfo @@ -1,2 +1,3 @@ -SHA256 (KDE/4.14.3/kscd-4.14.3.tar.xz) = cd2cb429d1d643b5ff0e384cf3a89e4fa29a2b7dd8cdfae0da5793758d87cc06 -SIZE (KDE/4.14.3/kscd-4.14.3.tar.xz) = 92428 +TIMESTAMP = 1486501516 +SHA256 (KDE/applications/16.12.2/kscd-16.12.2.tar.xz) = a05e058081bbaeb198cc323c04e447edce33d06ad788729dbc28e470b9632ff0 +SIZE (KDE/applications/16.12.2/kscd-16.12.2.tar.xz) = 93056 Index: audio/libkcddb/Makefile =================================================================== --- audio/libkcddb/Makefile +++ audio/libkcddb/Makefile @@ -1,19 +1,21 @@ -# Created by: Raphael Kubo da Costa +# Created by: tcberner # $FreeBSD$ PORTNAME= libkcddb -PORTVERSION= ${KDE4_VERSION} -PORTREVISION= 2 -CATEGORIES= audio kde kde-kde4 +PORTVERSION= ${KDE_APPLICATIONS_VERSION} +CATEGORIES= audio kde kde-applications MAINTAINER= kde@FreeBSD.org COMMENT= KDE CDDB library LIB_DEPENDS= libmusicbrainz5.so:audio/libmusicbrainz5 -USES= cmake:outsource kde:4 tar:xz -USE_KDE= automoc4 kdelibs -USE_QT4= qtestlib moc_build qmake_build rcc_build uic_build +USES= cmake:outsource gettext kde:5 tar:xz +USE_KDE= auth codecs completion config configwidgets \ + coreaddons ecm i18n jobwidgets kio service \ + widgetsaddons +USE_QT5= core gui network widgets xml \ + buildtools_build qmake_build USE_LDCONFIG= yes .include Index: audio/libkcddb/distinfo =================================================================== --- audio/libkcddb/distinfo +++ audio/libkcddb/distinfo @@ -1,2 +1,3 @@ -SHA256 (KDE/4.14.3/libkcddb-4.14.3.tar.xz) = c1e65df44c30659c32dfff0f18e167c9a9679549f0172aa8ca04d27247793577 -SIZE (KDE/4.14.3/libkcddb-4.14.3.tar.xz) = 157824 +TIMESTAMP = 1486501516 +SHA256 (KDE/applications/16.12.2/libkcddb-16.12.2.tar.xz) = 0279509f55eb63be8692dca689abf6a217a92b8ab8a4cb2d5b7fbdaca3ff403f +SIZE (KDE/applications/16.12.2/libkcddb-16.12.2.tar.xz) = 159080 Index: audio/libkcddb/pkg-plist =================================================================== --- audio/libkcddb/pkg-plist +++ audio/libkcddb/pkg-plist @@ -1,23 +1,36 @@ -include/kde4/libkcddb/cdinfo.h -include/kde4/libkcddb/cdinfodialog.h -include/kde4/libkcddb/client.h -include/kde4/libkcddb/configbase.h -include/kde4/libkcddb/genres.h -include/kde4/libkcddb/kcddb.h -include/kde4/libkcddb/kcddb_export.h -include/kde4/libkcddb/kcddbconfig.h -lib/cmake/libkcddb/LibkcddbConfig.cmake -lib/cmake/libkcddb/LibkcddbTargets.cmake -lib/cmake/libkcddb/LibkcddbTargets-%%CMAKE_BUILD_TYPE%%.cmake -lib/kde4/kcm_cddb.so -lib/libkcddb.so -lib/libkcddb.so.4 -lib/libkcddb.so.%%KDE4_GENERIC_LIB_VERSION%% -share/config.kcfg/libkcddb.kcfg -share/doc/HTML/en/kcontrol/cddbretrieval/common -share/doc/HTML/en/kcontrol/cddbretrieval/index.cache.bz2 -share/doc/HTML/en/kcontrol/cddbretrieval/index.docbook -share/doc/HTML/en/kcontrol/cddbretrieval/kscd13.png -share/doc/HTML/en/kcontrol/cddbretrieval/kscd14.png -share/doc/HTML/en/kcontrol/cddbretrieval/kscd16.png -share/kde4/services/libkcddb.desktop +include/KF5/KCddb/Categories +include/KF5/KCddb/Cdinfo +include/KF5/KCddb/CdinfoDialog +include/KF5/KCddb/Client +include/KF5/KCddb/Genres +include/KF5/KCddb/Kcddb +include/KF5/KCddb/KcddbConfig +include/KF5/KCddb/categories.h +include/KF5/KCddb/cdinfo.h +include/KF5/KCddb/cdinfodialog.h +include/KF5/KCddb/client.h +include/KF5/KCddb/configbase.h +include/KF5/KCddb/genres.h +include/KF5/KCddb/kcddb.h +include/KF5/KCddb/kcddb_export.h +include/KF5/KCddb/kcddbconfig.h +include/KF5/kcddb_version.h +lib/cmake/KF5Cddb/KF5CddbConfig.cmake +lib/cmake/KF5Cddb/KF5CddbConfigVersion.cmake +lib/cmake/KF5Cddb/KF5CddbTargets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/KF5Cddb/KF5CddbTargets.cmake +lib/libKF5Cddb.so +lib/libKF5Cddb.so.5 +lib/libKF5Cddb.so.5.0.0 +lib/libKF5CddbWidgets.so +lib/libKF5CddbWidgets.so.5 +lib/libKF5CddbWidgets.so.5.0.0 +%%QT_MKSPECDIR%%/modules/qt_KCddb.pri +%%QT_PLUGINDIR%%/kcm_cddb.so +share/config.kcfg/libkcddb5.kcfg +share/doc/HTML/en/kcontrol/cddbretrieval5/index.cache.bz2 +share/doc/HTML/en/kcontrol/cddbretrieval5/index.docbook +share/doc/HTML/en/kcontrol/cddbretrieval5/kscd13.png +share/doc/HTML/en/kcontrol/cddbretrieval5/kscd14.png +share/doc/HTML/en/kcontrol/cddbretrieval5/kscd16.png +share/kservices5/libkcddb.desktop Index: audio/libkcompactdisc/Makefile =================================================================== --- audio/libkcompactdisc/Makefile +++ audio/libkcompactdisc/Makefile @@ -1,17 +1,16 @@ -# Created by: Raphael Kubo da Costa +# Created by: tcberner # $FreeBSD$ PORTNAME= libkcompactdisc -PORTVERSION= ${KDE4_VERSION} -PORTREVISION= 2 -CATEGORIES= audio kde kde-kde4 +PORTVERSION= ${KDE_APPLICATIONS_VERSION} +CATEGORIES= audio kde kde-applications MAINTAINER= kde@FreeBSD.org COMMENT= KDE library for interfacing with audio CDs -USES= cmake:outsource kde:4 tar:xz -USE_KDE= automoc4 kdelibs -USE_QT4= phonon moc_build qmake_build rcc_build uic_build +USES= cmake:outsource gettext kde:5 tar:xz +USE_KDE= coreaddons ecm emoticons i18n itemmodels itemviews kdelibs4support +USE_QT5= buildtools_build core dbus qmake_build USE_LDCONFIG= yes OPTIONS_DEFINE= ALSA Index: audio/libkcompactdisc/distinfo =================================================================== --- audio/libkcompactdisc/distinfo +++ audio/libkcompactdisc/distinfo @@ -1,2 +1,3 @@ -SHA256 (KDE/4.14.3/libkcompactdisc-4.14.3.tar.xz) = afae7101cb16e2d52e3d05159f8170078378e5fe197cd8affbfaff1d28a61292 -SIZE (KDE/4.14.3/libkcompactdisc-4.14.3.tar.xz) = 75556 +TIMESTAMP = 1486501516 +SHA256 (KDE/applications/16.12.2/libkcompactdisc-16.12.2.tar.xz) = 6a9b7a018f76fbc8906a52d4b8a4d906534ef52deddb4a6d7a1f8c0b4774b0f9 +SIZE (KDE/applications/16.12.2/libkcompactdisc-16.12.2.tar.xz) = 77448 Index: audio/libkcompactdisc/files/patch-git_d6927712 =================================================================== --- audio/libkcompactdisc/files/patch-git_d6927712 +++ /dev/null @@ -1,33 +0,0 @@ -Makes the port build with clang when the ALSA option is on. - -commit d69277128afb60999e420c533e826b0061fc40eb -Author: Raphael Kubo da Costa -Date: Sat Nov 28 14:27:45 2015 +0100 - - Extend -std=c99 compiler flag to clang. - - The ALSA headers use features such as the `inline' keyword that require - C99 support. Commit e36c628 ("Fix compilation: ALSA no longer compiles - with -std=c90") started passing it to the compiler when GCC is used. - - We now do the same for clang with a better comment, and also append the - flag to the existing CMAKE_C_FLAGS, otherwise we lose several other - options which are set by FindKDE4Internal.cmake. - ---- CMakeLists.txt -+++ CMakeLists.txt -@@ -7,9 +7,12 @@ include(MacroLibrary) - add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS}) - - ## Compiler flags --if(CMAKE_COMPILER_IS_GNUCXX) -- set(CMAKE_C_FLAGS "-std=c99") ## ALSA no longer compiles with -std=c90, see https://bugzilla.novell.com/show_bug.cgi?id=817077 -+if (CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang") -+ # ALSA does not build with the default -std=iso9899:1990 from FindKDE4Internal.cmake. -+ # See https://bugzilla.novell.com/show_bug.cgi?id=817077 for more information. -+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99") - endif() -+ - find_package(Alsa) - alsa_configure_file(${CMAKE_CURRENT_BINARY_DIR}/config-alsa.h) - Index: audio/libkcompactdisc/pkg-plist =================================================================== --- audio/libkcompactdisc/pkg-plist +++ audio/libkcompactdisc/pkg-plist @@ -1,7 +1,12 @@ -include/kde4/libkcompactdisc/kcompactdisc.h -lib/cmake/libkcompactdisc/LibkcompactdiscConfig.cmake -lib/cmake/libkcompactdisc/LibkcompactdiscTargets.cmake -lib/cmake/libkcompactdisc/LibkcompactdiscTargets-%%CMAKE_BUILD_TYPE%%.cmake -lib/libkcompactdisc.so -lib/libkcompactdisc.so.4 -lib/libkcompactdisc.so.%%KDE4_GENERIC_LIB_VERSION%% +include/KF5/KCompactDisc/KCompactDisc +include/KF5/KCompactDisc/kcompactdisc.h +include/KF5/KCompactDisc/kcompactdisc_export.h +include/KF5/kcompactdisc_version.h +lib/cmake/KF5CompactDisc/KF5CompactDiscConfig.cmake +lib/cmake/KF5CompactDisc/KF5CompactDiscConfigVersion.cmake +lib/cmake/KF5CompactDisc/KF5CompactDiscTargets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/KF5CompactDisc/KF5CompactDiscTargets.cmake +lib/libKF5CompactDisc.so +lib/libKF5CompactDisc.so.5 +lib/libKF5CompactDisc.so.5.0.0 +lib/qt5/mkspecs/modules/qt_KCompactDisc.pri