diff options
author | Dima Panov <fluffy@FreeBSD.org> | 2022-08-22 17:51:13 +0000 |
---|---|---|
committer | Dima Panov <fluffy@FreeBSD.org> | 2022-08-22 17:58:00 +0000 |
commit | f744e2f9cd0f434a3065bc4289c4d6f4b5a5d168 (patch) | |
tree | 8339f2df036c86915faacd672111d1970e3cfdc6 | |
parent | 60e6db227b951f6e6851fbddedf882c44a5f5920 (diff) |
multimedia/qmmp*-qt5: register conflicts with -qt6 versions (+)
While here, drop outdated dependencies from default options [1]
PR: 264681 [1]
-rw-r--r-- | multimedia/qmmp-plugin-pack-qt5/Makefile | 2 | ||||
-rw-r--r-- | multimedia/qmmp-qt5/Makefile | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/multimedia/qmmp-plugin-pack-qt5/Makefile b/multimedia/qmmp-plugin-pack-qt5/Makefile index c9a410e4e3e6..ccd4521b5101 100644 --- a/multimedia/qmmp-plugin-pack-qt5/Makefile +++ b/multimedia/qmmp-plugin-pack-qt5/Makefile @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libqmmpui-1.so:multimedia/qmmp-qt5 BUILD_DEPENDS= qmmp-qt5>=1.5.0:multimedia/qmmp-qt5 -CONFLICTS= ${PORTNAME}-0.* +CONFLICTS= ${PORTNAME}-qt6 PORTSCOUT= limit:^1\..* USES= cmake pkgconfig qt:5 tar:bzip2 diff --git a/multimedia/qmmp-qt5/Makefile b/multimedia/qmmp-qt5/Makefile index 2f75b4294371..d115be79bcd9 100644 --- a/multimedia/qmmp-qt5/Makefile +++ b/multimedia/qmmp-qt5/Makefile @@ -1,6 +1,6 @@ PORTNAME= qmmp PORTVERSION= 1.6.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia MASTER_SITES= http://qmmp.ylsoftware.com/files/${PORTNAME}/${PORTVERSION:R}/ \ SF/qmmp-dev/${PORTNAME}/${PORTVERSION:R}/ @@ -12,7 +12,7 @@ COMMENT= Qt5-based multimedia player LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -CONFLICTS= ${PORTNAME}-0.* +CONFLICTS= ${PORTNAME}-qt6 PORTSCOUT= limit:^1\..* USES= cmake gnome pathfix pkgconfig tar:bzip2 @@ -59,9 +59,9 @@ MISC_DESC= Other features OPTIONS_GROUP_MISC= CONVERTER CUE ENCA FILEWRITER MPLAYER MPRIS RGSCAN SID OPTIONS_DEFAULT= ALSA ANALYZER ARCHIVE BS2B CDDA CONVERTER COPYPASTE COVER \ - CROSSFADE CUE CURL DIR_ASSOC ENCA FAAD FFMPEG FILEOPS FILEWRITER FLAC \ - GNOMEHOTKEY GME HISTORY HOTKEY JACK KDENOTIFY LADSPA LYRICS MAD \ - MPG123 MPRIS MPLAYER MUSEPACK NOTIFIER NULLOUT \ + 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 PROJECTM PULSEAUDIO QMMP_DIALOG QSUI QTMULTIMEDIA RGSCAN \ SHOUTCAST SB SCROBBLER SID SKINNEDUI SNDFILE SOXR STATICON STEREO \ TRACKCHANGE TWOPANELDIALOG UDISKS VORBIS WAVPACK WILDMIDI XMP |