git: 9489e768bf6b - main - multimedia/qmmp-qt5: update to 1.6.8 release (+)

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Dima Panov <fluffy_at_FreeBSD.org>
Date: Fri, 02 Aug 2024 15:49:39 UTC
The branch main has been updated by fluffy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=9489e768bf6b41f73d847ad01f4aadeea4109f2c

commit 9489e768bf6b41f73d847ad01f4aadeea4109f2c
Author:     Dima Panov <fluffy@FreeBSD.org>
AuthorDate: 2024-08-02 15:48:51 +0000
Commit:     Dima Panov <fluffy@FreeBSD.org>
CommitDate: 2024-08-02 15:48:51 +0000

    multimedia/qmmp-qt5: update to 1.6.8 release (+)
    
    * Reduce the amount of options, just make "free" options mandatory
    * Fix a few typos in Makefile
    * Rework Makefile to improve readability and follow Porters Handbook more closely
    
    Co-authored-by: diizzy
    PR:             276721 (based on)
---
 multimedia/qmmp-qt5/Makefile  | 384 +++++++++++++++++-------------------------
 multimedia/qmmp-qt5/distinfo  |   6 +-
 multimedia/qmmp-qt5/pkg-plist |  47 +++---
 3 files changed, 185 insertions(+), 252 deletions(-)

diff --git a/multimedia/qmmp-qt5/Makefile b/multimedia/qmmp-qt5/Makefile
index 5b90a36c59b4..9b37bbc3f2ad 100644
--- a/multimedia/qmmp-qt5/Makefile
+++ b/multimedia/qmmp-qt5/Makefile
@@ -1,9 +1,8 @@
 PORTNAME=	qmmp
-PORTVERSION=	1.6.6
-PORTREVISION=	1
+PORTVERSION=	1.6.8
 CATEGORIES=	multimedia
-MASTER_SITES=	http://qmmp.ylsoftware.com/files/${PORTNAME}/${PORTVERSION:R}/ \
-	SF/qmmp-dev/${PORTNAME}/${PORTVERSION:R}/
+MASTER_SITES=	http://qmmp.ylsoftware.com/files/${PORTNAME}/${DISTVERSION:R}/ \
+		SF/qmmp-dev/${PORTNAME}/${DISTVERSION:R}/
 PKGNAMESUFFIX=	-qt5
 
 MAINTAINER=	fluffy@FreeBSD.org
@@ -13,308 +12,243 @@ WWW=		https://qmmp.ylsoftware.com/
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+USES=		cmake desktop-file-utils gl gnome iconv:wchar_t pathfix \
+		pkgconfig qt:5 tar:bzip2 xorg
+USE_GL=		opengl
+PATHFIX_CMAKELISTSTXT=	src/qmmpui/CMakeLists.txt src/qmmp/CMakeLists.txt
+USE_QT=		core dbus gui network sql widgets x11extras xml \
+		buildtools:build linguisttools:build qmake:build
+USE_XORG=	x11 xcb
+USE_LDCONFIG=	yes
+
 CONFLICTS=	${PORTNAME}-qt6
 PORTSCOUT=	limit:^1\..*
 
-USES=		cmake gnome pathfix pkgconfig tar:bzip2
-USE_QT=		core gui network widgets xml \
-		buildtools:build linguisttools:build qmake:build
-USE_LDCONFIG=	yes
+PLIST_SUB=	SHLIB_VER=${DISTVERSION:C/-.*//} \
+		LIB_SUFFX=-${DISTVERSION:R} \
+		BIN_SUFFX=-${DISTVERSION:R:R}
 
-CMAKE_OFF=	USE_MMS
+PORTDOCS=	README README.RUS AUTHORS
+
+CMAKE_OFF=	USE_MAD \
+		USE_MMS \
+		USE_MPLAYER
+CMAKE_ON=	USE_ANALYZER \
+		USE_COPYPASTE \
+		USE_COVER \
+		USE_CROSSFADE \
+		USE_CUE \
+		USE_DIR_ASSOC \
+		USE_FILEOPS \
+		USE_GNOMEHOTKEY \
+		USE_HISTORY \
+		USE_KDENOTIFY \
+		USE_HOTKEY \
+		USE_MPRIS \
+		USE_NOTIFIER \
+		USE_NULL \
+		USE_SKINNED \
+		USE_STATICON \
+		USE_STEREO \
+		USE_TRACKCHANGE
 
 OPTIONS_SUB=	yes
 OPTIONS_GROUP=	DOCUMENTS PLUGIN_APPLICATION PLUGIN_FORMATS \
 		PLUGIN_DSP_EFFECTS PLUGIN_VISUAL_EFFECTS PLUGIN_OUTPUT \
 		PLUGIN_PLAYLIST PLUGIN_NETWORKING MISC
 
-PLUGIN_APPLICATION_DESC=	Main program view
-OPTIONS_GROUP_PLUGIN_APPLICATION=	GNOMEHOTKEY HISTORY HOTKEY KDENOTIFY \
-		NOTIFIER QMMP_DIALOG QSUI SKINNEDUI STATICON TWOPANELDIALOG
-
-DOCUMENTS_DESC=	Documentation and API Reference
-OPTIONS_GROUP_DOCUMENTS=	DOCS DOXYGEN
+OPTIONS_GROUP_DOCUMENTS=		DOCS DOXYGEN
 
-PLUGIN_FORMATS_DESC=	Support various media formats
-OPTIONS_GROUP_PLUGIN_FORMATS=	ARCHIVE CDDA FAAD FFMPEG FLAC GME \
-		MAD MPG123 MUSEPACK OPUS SNDFILE VORBIS WAVPACK WILDMIDI XMP
+OPTIONS_GROUP_MISC=			CONVERTER ENCA FILEWRITER \
+					RGSCAN SID
 
-PLUGIN_DSP_EFFECTS_DESC=	DSP effects
-OPTIONS_GROUP_PLUGIN_DSP_EFFECTS=	BS2B CROSSFADE LADSPA SOXR STEREO
+OPTIONS_GROUP_PLUGIN_APPLICATION=	QMMP_DIALOG QSUI TWOPANELDIALOG
 
-PLUGIN_VISUAL_EFFECTS_DESC=	Visual effects
-OPTIONS_GROUP_PLUGIN_VISUAL_EFFECTS=	ANALYZER PROJECTM
+OPTIONS_GROUP_PLUGIN_DSP_EFFECTS=	BS2B LADSPA SOXR
 
-PLUGIN_OUTPUT_DESC=	Output sound systems
-OPTIONS_GROUP_PLUGIN_OUTPUT=	ALSA JACK NULLOUT OSS OSS4 \
-		PIPEWIRE PULSEAUDIO QTMULTIMEDIA SHOUTCAST
+OPTIONS_GROUP_PLUGIN_FORMATS=		ARCHIVE CDDA FAAD FFMPEG FLAC GME \
+					MPG123 MUSEPACK OPUS SNDFILE \
+					VORBIS WAVPACK WILDMIDI XMP
 
-PLUGIN_PLAYLIST_DESC=	Playlist operation
-OPTIONS_GROUP_PLUGIN_PLAYLIST=	COPYPASTE DIR_ASSOC FILEOPS \
-		TRACKCHANGE UDISKS
+OPTIONS_GROUP_PLUGIN_NETWORKING=	CURL LYRICS SB SCROBBLER
 
-PLUGIN_NETWORKING_DESC=	Features via the Net
-OPTIONS_GROUP_PLUGIN_NETWORKING=	COVER CURL LYRICS SB SCROBBLER
+OPTIONS_GROUP_PLUGIN_OUTPUT=		ALSA JACK OSS OSS4 \
+					PIPEWIRE PULSEAUDIO QTMULTIMEDIA SHOUTCAST
 
-MISC_DESC=	Other features
-OPTIONS_GROUP_MISC=	CONVERTER CUE ENCA FILEWRITER MPLAYER MPRIS RGSCAN SID
+OPTIONS_GROUP_PLUGIN_PLAYLIST=		UDISKS
 
-OPTIONS_DEFAULT=	ALSA ANALYZER ARCHIVE BS2B CDDA CONVERTER COPYPASTE COVER \
-		CROSSFADE CUE CURL DIR_ASSOC ENCA FFMPEG FILEOPS FILEWRITER FLAC \
-		GNOMEHOTKEY GME HISTORY HOTKEY JACK KDENOTIFY LADSPA LYRICS \
-		MPRIS MPLAYER MUSEPACK NOTIFIER NULLOUT \
-		OPUS OSS4 PIPEWIRE PROJECTM PULSEAUDIO QMMP_DIALOG QSUI QTMULTIMEDIA RGSCAN \
-		SHOUTCAST SB SCROBBLER SID SKINNEDUI SNDFILE SOXR STATICON STEREO \
-		TRACKCHANGE TWOPANELDIALOG UDISKS VORBIS WAVPACK WILDMIDI XMP
+OPTIONS_GROUP_PLUGIN_VISUAL_EFFECTS=	PROJECTM
 
-DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
-
-QSUI_DESC=	Simple UI based on standard widgets set
-QSUI_CMAKE_BOOL=	USE_QSUI
+OPTIONS_DEFAULT=	ALSA ARCHIVE BS2B CDDA CONVERTER CURL ENCA \
+			FFMPEG FILEWRITER FLAC GME JACK LADSPA \
+			LYRICS MUSEPACK OPUS OSS4 PROJECTM PIPEWIRE \
+			PULSEAUDIO QMMP_DIALOG QSUI RGSCAN SHOUTCAST SB \
+			SCROBBLER SID SNDFILE SOXR TWOPANELDIALOG \
+			UDISKS VORBIS WAVPACK WILDMIDI XMP
 
-SKINNEDUI_DESC=	Skinned GUI
-SKINNEDUI_USES=	qt:5 xorg
-SKINNEDUI_USE=	QT=x11extras XORG=x11
-SKINNEDUI_CMAKE_BOOL=	USE_SKINNED
-
-DIR_ASSOC_DESC=	inode/directory mime type association
-DIR_ASSOC_CMAKE_BOOL=	USE_DIR_ASSOC
-DIR_ASSOC_USES=	desktop-file-utils
-
-JACK_LIB_DEPENDS=	libjack.so:audio/jack \
-		libsoxr.so:audio/libsoxr
-JACK_BUILD_DEPENDS=	jackit>=0.121.2:audio/jack
-JACK_CMAKE_BOOL=	USE_JACK
+ARCHIVE_DESC=			Read archived media file
+BS2B_DESC=			Support the Bauer stereophonic2binaural effect
+CONVERTER_DESC=			Support file type converter
+DOCUMENTS_DESC=			Documentation and API Reference
+ENCA_DESC=			Support automatic character set detection
+FILEWRITER_DESC=		Dump output sound into ogg audio file
+GME_DESC=			Support video game music files
+LYRICS_DESC=			Support to show lyrics using lyrics.wikia.com
+MISC_DESC=			Other features
+OPUS_DESC=			Enable reading opusfile tags
+OSS4_DESC=			Open Sound System (ver4) support
+PLUGIN_APPLICATION_DESC=	Main program view
+PLUGIN_DSP_EFFECTS_DESC=	DSP effects
+PLUGIN_FORMATS_DESC=		Support various media formats
+PLUGIN_NETWORKING_DESC=		Features via the Net
+PLUGIN_OUTPUT_DESC=		Output sound systems
+PLUGIN_PLAYLIST_DESC=		Playlist operation
+PLUGIN_VISUAL_EFFECTS_DESC=	Visual effects
+PROJECTM_DESC=			Support the projectM music visualiser
+QMMP_DIALOG_DESC=		An original dialog
+QSUI_DESC=			Simple UI based on standard widgets set
+QTMULTIMEDIA_DESC=		Support to use Qt low-level multimedia API
+RGSCAN_DESC=			ReplayGain scanner
+SB_DESC=			Browser for IceCast stream directory
+SCROBBLER_DESC=			Support Libre.fm/Last.fm scrobbler feature
+SID_DESC=			Support sid
+TWOPANELDIALOG_DESC=		File dialog by two-panel selector
+UDISKS_DESC=			Support removable disc detection using UDisks
+WILDMIDI_DESC=			Support to playback MIDI files
+XMP_DESC=			Support various module formats using libxmp
 
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_CMAKE_BOOL=	USE_ALSA
 
-BS2B_DESC=		Support the Bauer stereophonic2binaural effect
+ARCHIVE_USES=		libarchive
+ARCHIVE_CMAKE_BOOL=	USE_ARCHIVE
+
 BS2B_LIB_DEPENDS=	libbs2b.so:audio/libbs2b
 BS2B_CMAKE_BOOL=	USE_BS2B
 
-HISTORY_DESC=	Information about listened tracks
-HISTORY_USES=	qt:5
-HISTORY_USE=	QT=sql
-HISTORY_CMAKE_BOOL=	USE_HISTORY
-
-PIPEWIRE_LIB_DEPENDS=	libpipewire-0.3.so:multimedia/pipewire
-PIPEWIRE_CMAKE_BOOL=	USE_PIPEWIRE
-
-PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
-PULSEAUDIO_CMAKE_BOOL=	USE_PULSE
-
-QTMULTIMEDIA_DESC=	Support to use Qt low-level multimedia API
-QTMULTIMEDIA_USES=	qt:5
-QTMULTIMEDIA_USE=	QT=multimedia
-QTMULTIMEDIA_CMAKE_BOOL=	USE_QTMULTIMEDIA
-
-SHOUTCAST_LIB_DEPENDS=	libogg.so:audio/libogg \
-		libshout.so:audio/libshout \
-		libsoxr.so:audio/libsoxr \
-		libvorbis.so:audio/libvorbis
-SHOUTCAST_CMAKE_BOOL=	USE_SHOUT
+CDDA_LIB_DEPENDS=	libcdio.so:sysutils/libcdio \
+			libcddb.so:audio/libcddb \
+			libcdio_cdda.so:sysutils/libcdio-paranoia
+CDDA_CMAKE_BOOL=	USE_CDA
 
-FLAC_LIB_DEPENDS=	libFLAC.so:audio/flac \
-		libtag.so:audio/taglib
-FLAC_CMAKE_BOOL=	USE_FLAC
+CONVERTER_LIB_DEPENDS=	libtag.so:audio/taglib
+CONVERTER_CMAKE_BOOL=	USE_CONVERTER
 
-MUSEPACK_LIB_DEPENDS=	libmpcdec.so:audio/musepack \
-		libtag.so:audio/taglib
-MUSEPACK_CMAKE_BOOL=	USE_MPC
+CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
+CURL_CMAKE_BOOL=	USE_CURL
 
-GME_DESC=		Support video game music files
-GME_LIB_DEPENDS=	libgme.so:audio/libgme
-GME_CMAKE_BOOL=	USE_GME
+DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
 
-FFMPEG_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg
-FFMPEG_CMAKE_BOOL=	USE_FFMPEG
+ENCA_LIB_DEPENDS=	libenca.so:converters/enca
+ENCA_CMAKE_BOOL=	USE_ENCA
 
 FAAD_LIB_DEPENDS=	libfaad.so:audio/faad \
-		libtag.so:audio/taglib
+			libtag.so:audio/taglib
 FAAD_CMAKE_BOOL=	USE_AAC
 
-CDDA_LIB_DEPENDS=	libcdio.so:sysutils/libcdio \
-		libcddb.so:audio/libcddb \
-		libcdio_cdda.so:sysutils/libcdio-paranoia
-CDDA_CMAKE_BOOL=	USE_CDA
-
-ENCA_DESC=		Support automatic character set detection
-ENCA_LIB_DEPENDS=	libenca.so:converters/enca
-ENCA_CMAKE_BOOL=	USE_ENCA
+FFMPEG_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg
+FFMPEG_CMAKE_BOOL=	USE_FFMPEG
 
-FILEWRITER_DESC=	Dump output sound into ogg audio file
 FILEWRITER_LIB_DEPENDS=	libvorbisenc.so:audio/libvorbis
 FILEWRITER_CMAKE_BOOL=	USE_FILEWRITER
 
-MPLAYER_DESC=	Enable showing videos by mplayer
-MPLAYER_RUN_DEPENDS=	mplayer:multimedia/mplayer
-MPLAYER_CMAKE_BOOL=	USE_MPLAYER
-
-PROJECTM_DESC=	Support the projectM music visualiser
-PROJECTM_LIB_DEPENDS=	libprojectM.so:graphics/libprojectm
-PROJECTM_USES=		gl
-PROJECTM_USE=		GL=gl
-PROJECTM_CMAKE_BOOL=	USE_PROJECTM
+FLAC_LIB_DEPENDS=	libFLAC.so:audio/flac \
+			libtag.so:audio/taglib
+FLAC_CMAKE_BOOL=	USE_FLAC
 
-OSS_CMAKE_BOOL=	USE_OSS
+GME_LIB_DEPENDS=	libgme.so:audio/libgme
+GME_CMAKE_BOOL=		USE_GME
 
-OSS4_DESC=		Open Sound System (ver4) support
-OSS4_BUILD_DEPENDS=	${LOCALBASE}/lib/oss/include/sys/soundcard.h:audio/oss
-OSS4_CMAKE_BOOL=	USE_OSS4
+JACK_BUILD_DEPENDS=	jackit>=0.121.2:audio/jack
+JACK_LIB_DEPENDS=	libjack.so:audio/jack \
+			libsoxr.so:audio/libsoxr
+JACK_CMAKE_BOOL=	USE_JACK
 
 LADSPA_RUN_DEPENDS=	analyseplugin:audio/ladspa
 LADSPA_CMAKE_BOOL=	USE_LADSPA
 
-WILDMIDI_DESC=	Support to playback MIDI files
-WILDMIDI_LIB_DEPENDS=	libWildMidi.so:audio/wildmidi
-WILDMIDI_CMAKE_BOOL=	USE_MIDI
-
-MAD_LIB_DEPENDS=	libmad.so:audio/libmad \
-		libtag.so:audio/taglib
-MAD_CMAKE_BOOL=	USE_MAD
+LYRICS_CMAKE_BOOL=	USE_LYRICS
 
 MPG123_LIB_DEPENDS=	libmpg123.so:audio/mpg123 \
-		libtag.so:audio/taglib
+			libtag.so:audio/taglib
 MPG123_CMAKE_BOOL=	USE_MPG123
 
-OPUS_DESC=		Enable reading opusfile tags
+MUSEPACK_LIB_DEPENDS=	libmpcdec.so:audio/musepack \
+			libtag.so:audio/taglib
+MUSEPACK_CMAKE_BOOL=	USE_MPC
+
 OPUS_LIB_DEPENDS=	libopusfile.so:audio/opusfile \
-		libopus.so:audio/opus \
-		libtag.so:audio/taglib
+			libopus.so:audio/opus \
+			libtag.so:audio/taglib
 OPUS_CMAKE_BOOL=	USE_OPUS
 
-RGSCAN_DESC=	ReplayGain scanner
-RGSCAN_LIB_DEPENDS=	libtag.so:audio/taglib
-RGSCAN_CMAKE_BOOL=	USE_RGSCAN
-
-SNDFILE_LIB_DEPENDS=	libsndfile.so:audio/libsndfile
-SNDFILE_CMAKE_BOOL=	USE_SNDFILE
-
-VORBIS_LIB_DEPENDS=	libvorbis.so:audio/libvorbis \
-		libogg.so:audio/libogg \
-		libtag.so:audio/taglib
-VORBIS_CMAKE_BOOL=	USE_VORBIS
+OSS_CMAKE_BOOL=		USE_OSS
 
-WAVPACK_LIB_DEPENDS=	libwavpack.so:audio/wavpack
-WAVPACK_CMAKE_BOOL=	USE_WAVPACK
-
-XMP_DESC=		Support various module formats using libxmp
-XMP_LIB_DEPENDS=	libxmp.so:audio/libxmp
-XMP_CMAKE_BOOL=	USE_XMP
-
-CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
-CURL_CMAKE_BOOL=	USE_CURL
-
-CUE_CMAKE_BOOL=	USE_CUE
-
-NULLOUT_DESC=	Support null output
-NULLOUT_CMAKE_BOOL=	USE_NULL
+OSS4_BUILD_DEPENDS=	${LOCALBASE}/lib/oss/include/sys/soundcard.h:audio/oss
+OSS4_CMAKE_BOOL=	USE_OSS4
 
-SOXR_LIB_DEPENDS=	libsoxr.so:audio/libsoxr
-SOXR_CMAKE_BOOL=	USE_SOXR
+PIPEWIRE_LIB_DEPENDS=	libpipewire-0.3.so:multimedia/pipewire
+PIPEWIRE_CMAKE_BOOL=	USE_PIPEWIRE
 
-CROSSFADE_DESC=	Support cross-fade effect
-CROSSFADE_CMAKE_BOOL=	USE_CROSSFADE
+PROJECTM_LIB_DEPENDS=	libprojectM.so:graphics/libprojectm
+PROJECTM_CMAKE_BOOL=	USE_PROJECTM
 
-STEREO_DESC=	Support stereo effect
-STEREO_CMAKE_BOOL=	USE_STEREO
+PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
+PULSEAUDIO_CMAKE_BOOL=	USE_PULSE
 
-ANALYZER_DESC=	Support spectrum analyzer visualization
-ANALYZER_CMAKE_BOOL=	USE_ANALYZER
+QMMP_DIALOG_CMAKE_BOOL=	USE_QMMP_DIALOG
 
-ARCHIVE_DESC=	Read archived media file
-ARCHIVE_USES=	libarchive
-ARCHIVE_CMAKE_BOOL=	USE_ARCHIVE
+QSUI_CMAKE_BOOL=	USE_QSUI
 
-CONVERTER_DESC=	Support file type converter
-CONVERTER_LIB_DEPENDS=	libtag.so:audio/taglib
-CONVERTER_CMAKE_BOOL=	USE_CONVERTER
+QTMULTIMEDIA_USE=	QT=multimedia
+QTMULTIMEDIA_CMAKE_BOOL=USE_QTMULTIMEDIA
 
-COPYPASTE_DESC=	Enable copy/paste track infos between playlists
-COPYPASTE_CMAKE_BOOL=	USE_COPYPASTE
+RGSCAN_LIB_DEPENDS=	libtag.so:audio/taglib
+RGSCAN_CMAKE_BOOL=	USE_RGSCAN
 
-MPRIS_DESC=	Support the Media Player Remote
-MPRIS_USES=	qt:5
-MPRIS_USE=	QT=dbus
-MPRIS_CMAKE_BOOL=	USE_MPRIS
+SB_CMAKE_BOOL=		USE_SB
 
-SCROBBLER_DESC=	Support Libre.fm/Last.fm scrobbler feature
 SCROBBLER_CMAKE_BOOL=	USE_SCROBBLER
 
-SID_DESC=	Support sid
-SID_LIB_DEPENDS=	libsidplayfp.so:audio/libsidplayfp
-SID_CMAKE_BOOL=	USE_SID
-
-STATICON_DESC=	Support to show status icon
-STATICON_CMAKE_BOOL=	USE_STATICON
-
-SB_DESC=	Browser for IceCast stream directory
-SB_CMAKE_BOOL=	USE_SB
-
-NOTIFIER_DESC=	Support to popup notifier
-NOTIFIER_CMAKE_BOOL=	USE_NOTIFIER
-
-LYRICS_DESC=	Support to show lyrics using lyrics.wikia.com
-LYRICS_CMAKE_BOOL=	USE_LYRICS
-
-HOTKEY_DESC=	Support global shortcut keys
-HOTKEY_USES=	qt:5
-HOTKEY_USE=	QT=x11extras XORG=x11
-HOTKEY_CMAKE_BOOL=	USE_HOTKEY
-
-GNOMEHOTKEY_DESC=	Support GNOME/Cinnamon shortcut keys
-GNOMEHOTKEY_USES=	qt:5
-GNOMEHOTKEY_USE=	QT=dbus
-GNOMEHOTKEY_CMAKE_BOOL=	USE_GNOMEHOTKEY
+SHOUTCAST_LIB_DEPENDS=	libogg.so:audio/libogg \
+			libshout.so:audio/libshout \
+			libsoxr.so:audio/libsoxr \
+			libvorbis.so:audio/libvorbis
+SHOUTCAST_CMAKE_BOOL=	USE_SHOUT
 
-FILEOPS_DESC=	Support file operation
-FILEOPS_CMAKE_BOOL=	USE_FILEOPS
+SID_LIB_DEPENDS=	libsidplayfp.so:audio/libsidplayfp
+SID_CMAKE_BOOL=		USE_SID
 
-COVER_DESC=	Support to show cover images
-COVER_CMAKE_BOOL=	USE_COVER
+SNDFILE_LIB_DEPENDS=	libsndfile.so:audio/libsndfile
+SNDFILE_CMAKE_BOOL=	USE_SNDFILE
 
-KDENOTIFY_DESC=	Support to popup notifier for KDE
-KDENOTIFY_USES=	qt:5
-KDENOTIFY_USE=	QT=dbus
-KDENOTIFY_CMAKE_BOOL=	USE_KDENOTIFY
+SOXR_LIB_DEPENDS=	libsoxr.so:audio/libsoxr
+SOXR_CMAKE_BOOL=	USE_SOXR
 
-TRACKCHANGE_DESC=	Enable to run external command each track
-TRACKCHANGE_CMAKE_BOOL=	USE_TRACKCHANGE
+TWOPANELDIALOG_CMAKE_BOOL=	USE_TWO_PANEL_DIALOG
 
-UDISKS_DESC=	Support removable disc detection using UDisks
 UDISKS_RUN_DEPENDS=	bsdisks:sysutils/bsdisks
-UDISKS_USES=	qt:5
-UDISKS_USE=	QT=dbus
 UDISKS_CMAKE_BOOL=	USE_UDISKS
 
-QMMP_DIALOG_DESC=	An original dialog
-QMMP_DIALOG_CMAKE_BOOL=	USE_QMMP_DIALOG
-
-TWOPANELDIALOG_DESC=	File dialog by two-panel selector
-TWOPANELDIALOG_CMAKE_BOOL=	USE_TWO_PANEL_DIALOG
-
-PLIST_SUB+=	SHLIB_VER=${PORTVERSION:C/-.*//} LIB_SUFFX=-${PORTVERSION:R} BIN_SUFFX=-${PORTVERSION:R:R}
+VORBIS_LIB_DEPENDS=	libvorbis.so:audio/libvorbis \
+			libogg.so:audio/libogg \
+			libtag.so:audio/taglib
+VORBIS_CMAKE_BOOL=	USE_VORBIS
 
-PATHFIX_CMAKELISTSTXT=	\\"CMakeLists.txt -exec grep -l /pkgconfig {} +\\"
-PORTDOCS=	README README.RUS AUTHORS
+WAVPACK_LIB_DEPENDS=	libwavpack.so:audio/wavpack
+WAVPACK_CMAKE_BOOL=	USE_WAVPACK
 
-.include <bsd.port.options.mk>
+WILDMIDI_LIB_DEPENDS=	libWildMidi.so:audio/wildmidi
+WILDMIDI_CMAKE_BOOL=	USE_MIDI
 
-.if (${PORT_OPTIONS:MMAD} || ${PORT_OPTIONS:MMPG123})
-PLIST_SUB+=	MPEG=""
-.else
-PLIST_SUB+=	MPEG="@comment "
-.endif
+XMP_LIB_DEPENDS=	libxmp.so:audio/libxmp
+XMP_CMAKE_BOOL=		USE_XMP
 
 post-patch:
 	@${GREP} -L '${LOCALBASE}/lib/oss' \
 		${WRKSRC}/src/plugins/Output/oss4/CMakeLists.txt | ${XARGS} \
 		${REINPLACE_CMD} -e 's|/usr/local/|${LOCALBASE}/|'
 
-pre-configure:
-	@${RM} ${BUILD_WRKSRC}/CMakeCache.txt
-
 post-build-DOXYGEN-on:
 	cd ${WRKSRC}/doc && doxygen Doxyfile
 
diff --git a/multimedia/qmmp-qt5/distinfo b/multimedia/qmmp-qt5/distinfo
index 4d9d64d00566..5d77890d5f3c 100644
--- a/multimedia/qmmp-qt5/distinfo
+++ b/multimedia/qmmp-qt5/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1710190531
-SHA256 (qmmp-1.6.6.tar.bz2) = 2363877a876cd26520e84b0711ae1fa4d2ca8c7115a073946832989a86c68f52
-SIZE (qmmp-1.6.6.tar.bz2) = 1375699
+TIMESTAMP = 1722542474
+SHA256 (qmmp-1.6.8.tar.bz2) = 50da39f9d73ca385171ca4eda6a475613eb5409d5df0785e03108ead59fe1ecd
+SIZE (qmmp-1.6.8.tar.bz2) = 1375048
diff --git a/multimedia/qmmp-qt5/pkg-plist b/multimedia/qmmp-qt5/pkg-plist
index 874215066574..fbec7b7beff9 100644
--- a/multimedia/qmmp-qt5/pkg-plist
+++ b/multimedia/qmmp-qt5/pkg-plist
@@ -69,40 +69,39 @@ lib/qmmp%%LIB_SUFFX%%/CommandLineOptions/libstatusoption.so
 %%FILEWRITER%%lib/qmmp%%LIB_SUFFX%%/Effect/libfilewriter.so
 lib/qmmp%%LIB_SUFFX%%/Effect/libmonotostereo.so
 %%SOXR%%lib/qmmp%%LIB_SUFFX%%/Effect/libsoxr.so
-%%STEREO%%lib/qmmp%%LIB_SUFFX%%/Effect/libstereo.so
-%%CROSSFADE%%lib/qmmp%%LIB_SUFFX%%/Effect/libcrossfade.so
-%%MPLAYER%%lib/qmmp%%LIB_SUFFX%%/Engines/libmplayer.so
+lib/qmmp%%LIB_SUFFX%%/Effect/libstereo.so
+lib/qmmp%%LIB_SUFFX%%/Effect/libcrossfade.so
 %%QMMP_DIALOG%%lib/qmmp%%LIB_SUFFX%%/FileDialogs/libqmmpfiledialog.so
 %%TWOPANELDIALOG%%lib/qmmp%%LIB_SUFFX%%/FileDialogs/libtwopanelfiledialog.so
 %%CONVERTER%%lib/qmmp%%LIB_SUFFX%%/General/libconverter.so
-%%COPYPASTE%%lib/qmmp%%LIB_SUFFX%%/General/libcopypaste.so
-%%COVER%%lib/qmmp%%LIB_SUFFX%%/General/libcovermanager.so
-%%FILEOPS%%lib/qmmp%%LIB_SUFFX%%/General/libfileops.so
-%%GNOMEHOTKEY%%lib/qmmp%%LIB_SUFFX%%/General/libgnomehotkey.so
-%%HISTORY%%lib/qmmp%%LIB_SUFFX%%/General/libhistory.so
-%%HOTKEY%%lib/qmmp%%LIB_SUFFX%%/General/libhotkey.so
-%%KDENOTIFY%%lib/qmmp%%LIB_SUFFX%%/General/libkdenotify.so
+lib/qmmp%%LIB_SUFFX%%/General/libcopypaste.so
+lib/qmmp%%LIB_SUFFX%%/General/libcovermanager.so
+lib/qmmp%%LIB_SUFFX%%/General/libfileops.so
+lib/qmmp%%LIB_SUFFX%%/General/libgnomehotkey.so
+lib/qmmp%%LIB_SUFFX%%/General/libhistory.so
+lib/qmmp%%LIB_SUFFX%%/General/libhotkey.so
+lib/qmmp%%LIB_SUFFX%%/General/libkdenotify.so
 lib/qmmp%%LIB_SUFFX%%/General/liblibrary.so
 lib/qmmp%%LIB_SUFFX%%/General/liblistenbrainz.so
 %%LYRICS%%lib/qmmp%%LIB_SUFFX%%/General/liblyrics.so
-%%MPRIS%%lib/qmmp%%LIB_SUFFX%%/General/libmpris.so
-%%NOTIFIER%%lib/qmmp%%LIB_SUFFX%%/General/libnotifier.so
+lib/qmmp%%LIB_SUFFX%%/General/libmpris.so
+lib/qmmp%%LIB_SUFFX%%/General/libnotifier.so
 %%RGSCAN%%lib/qmmp%%LIB_SUFFX%%/General/librgscan.so
 lib/qmmp%%LIB_SUFFX%%/General/libsleepinhibitor.so
 %%SCROBBLER%%lib/qmmp%%LIB_SUFFX%%/General/libscrobbler.so
-%%STATICON%%lib/qmmp%%LIB_SUFFX%%/General/libstatusicon.so
+lib/qmmp%%LIB_SUFFX%%/General/libstatusicon.so
 %%SB%%lib/qmmp%%LIB_SUFFX%%/General/libstreambrowser.so
-%%TRACKCHANGE%%lib/qmmp%%LIB_SUFFX%%/General/libtrackchange.so
+lib/qmmp%%LIB_SUFFX%%/General/libtrackchange.so
 %%UDISKS%%lib/qmmp%%LIB_SUFFX%%/General/libudisks.so
 %%FAAD%%lib/qmmp%%LIB_SUFFX%%/Input/libaac.so
 %%ARCHIVE%%lib/qmmp%%LIB_SUFFX%%/Input/libarchive.so
 %%CDDA%%lib/qmmp%%LIB_SUFFX%%/Input/libcdaudio.so
-%%CUE%%lib/qmmp%%LIB_SUFFX%%/Input/libcue.so
+lib/qmmp%%LIB_SUFFX%%/Input/libcue.so
 %%FFMPEG%%lib/qmmp%%LIB_SUFFX%%/Input/libffmpeg.so
 %%FLAC%%lib/qmmp%%LIB_SUFFX%%/Input/libflac.so
 %%GME%%lib/qmmp%%LIB_SUFFX%%/Input/libgme.so
 %%MUSEPACK%%lib/qmmp%%LIB_SUFFX%%/Input/libmpc.so
-%%MPEG%%lib/qmmp%%LIB_SUFFX%%/Input/libmpeg.so
+%%MPG123%%lib/qmmp%%LIB_SUFFX%%/Input/libmpeg.so
 %%OPUS%%lib/qmmp%%LIB_SUFFX%%/Input/libopus.so
 %%SID%%lib/qmmp%%LIB_SUFFX%%/Input/libsid.so
 %%SNDFILE%%lib/qmmp%%LIB_SUFFX%%/Input/libsndfile.so
@@ -112,7 +111,7 @@ lib/qmmp%%LIB_SUFFX%%/General/libsleepinhibitor.so
 %%XMP%%lib/qmmp%%LIB_SUFFX%%/Input/libxmp.so
 %%JACK%%lib/qmmp%%LIB_SUFFX%%/Output/libjack.so
 %%ALSA%%lib/qmmp%%LIB_SUFFX%%/Output/libalsa.so
-%%NULLOUT%%lib/qmmp%%LIB_SUFFX%%/Output/libnull.so
+lib/qmmp%%LIB_SUFFX%%/Output/libnull.so
 %%OSS%%lib/qmmp%%LIB_SUFFX%%/Output/liboss.so
 %%OSS4%%lib/qmmp%%LIB_SUFFX%%/Output/liboss4.so
 %%PIPEWIRE%%lib/qmmp%%LIB_SUFFX%%/Output/libpipewire.so
@@ -123,15 +122,15 @@ lib/qmmp%%LIB_SUFFX%%/PlayListFormats/libm3uplaylistformat.so
 lib/qmmp%%LIB_SUFFX%%/PlayListFormats/libplsplaylistformat.so
 lib/qmmp%%LIB_SUFFX%%/PlayListFormats/libxspfplaylistformat.so
 %%CURL%%lib/qmmp%%LIB_SUFFX%%/Transports/libhttp.so
-%%SKINNEDUI%%lib/qmmp%%LIB_SUFFX%%/Ui/libskinned.so
+lib/qmmp%%LIB_SUFFX%%/Ui/libskinned.so
 %%QSUI%%lib/qmmp%%LIB_SUFFX%%/Ui/libqsui.so
-%%ANALYZER%%lib/qmmp%%LIB_SUFFX%%/Visual/libanalyzer.so
+lib/qmmp%%LIB_SUFFX%%/Visual/libanalyzer.so
 %%PROJECTM%%lib/qmmp%%LIB_SUFFX%%/Visual/libprojectm.so
 libdata/pkgconfig/qmmp%%BIN_SUFFX%%.pc
 libdata/pkgconfig/qmmpui%%BIN_SUFFX%%.pc
-%%DIR_ASSOC%%share/applications/qmmp%%BIN_SUFFX%%.desktop
-%%DIR_ASSOC%%share/applications/qmmp-dir%%BIN_SUFFX%%.desktop
-%%DIR_ASSOC%%share/applications/qmmp-enqueue%%BIN_SUFFX%%.desktop
+share/applications/qmmp%%BIN_SUFFX%%.desktop
+share/applications/qmmp-dir%%BIN_SUFFX%%.desktop
+share/applications/qmmp-enqueue%%BIN_SUFFX%%.desktop
 share/icons/hicolor/16x16/apps/qmmp%%BIN_SUFFX%%.png
 share/icons/hicolor/32x32/apps/qmmp%%BIN_SUFFX%%.png
 share/icons/hicolor/48x48/apps/qmmp%%BIN_SUFFX%%.png
@@ -142,8 +141,8 @@ share/icons/hicolor/256x256/apps/qmmp%%BIN_SUFFX%%.png
 share/icons/hicolor/scalable/apps/qmmp%%BIN_SUFFX%%.svgz
 share/icons/hicolor/scalable/apps/qmmp-simple%%BIN_SUFFX%%.svgz
 share/metainfo/qmmp%%BIN_SUFFX%%.appdata.xml
-%%KDENOTIFY%%%%DATADIR%%%%BIN_SUFFX%%/images/app_icon.png
-%%KDENOTIFY%%%%DATADIR%%%%BIN_SUFFX%%/images/empty_cover.png
+%%DATADIR%%%%BIN_SUFFX%%/images/app_icon.png
+%%DATADIR%%%%BIN_SUFFX%%/images/empty_cover.png
 %%DATADIR%%%%BIN_SUFFX%%/scripts/kwin.sh
 share/solid/actions/qmmp-opencda%%BIN_SUFFX%%.desktop
 @comment Insert PLIST.doc here