From nobody Mon Aug 22 17:58:06 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MBKpQ68pwz4ZGmV; Mon, 22 Aug 2022 17:58:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MBKpQ5Jx1z3Y2W; Mon, 22 Aug 2022 17:58:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661191086; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6i2r9LgEw1wkCbwnOMGb6x6FQ4xgr7IuMUWrifCR0JM=; b=f3kgxEMxN0QNAurS6D2R9jUrk/mtL7S6hE9HOj1A/aIJ3CR/se1wFI8cISySqadExAnRUK kdsxMQC7tWmosV/soXvDymqatQOlfA0Q7R+QZHfIa760ZCtlir3X73o/FLD4f8KiIh2aTx ECciH4d6CMh48AgIK/1BOpW29dGhv9EHlLo7KazRUe3FvDw5O1XxTFhklzq+VbXs6ppkQl 6bxACKS5DgpUsvWD3/WwEsbbp47coUv29xDM6vzcRqirbmY5CtqOIpHWI4pQ7WVk+M/Hg1 HlksLOujx1oNU4i9bgSevye6HST+spqZfHpCP+x8TdLWVq3hE3/M6kAvHLVcGg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MBKpQ3x5Vzysq; Mon, 22 Aug 2022 17:58:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 27MHw63J083050; Mon, 22 Aug 2022 17:58:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27MHw6S1083049; Mon, 22 Aug 2022 17:58:06 GMT (envelope-from git) Date: Mon, 22 Aug 2022 17:58:06 GMT Message-Id: <202208221758.27MHw6S1083049@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dima Panov Subject: git: f744e2f9cd0f - main - multimedia/qmmp*-qt5: register conflicts with -qt6 versions (+) List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fluffy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f744e2f9cd0f434a3065bc4289c4d6f4b5a5d168 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661191086; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6i2r9LgEw1wkCbwnOMGb6x6FQ4xgr7IuMUWrifCR0JM=; b=hinYK54S5mvlYBAjPKHYt9eF37OnRqOY6bNURnJ2Y5A4sus+vPBORNbqRhzVPlEHyfCCw2 OmrzNFwGfZiABrAHGgGjHCYgSNoCLOjnFDu4cEMNUK/fFJh1x+fJZuhIA9yl2um7sz1gF4 qaTxHOB9eXTAJYQB3/MKE1jjoL8UB2oNzu5M7NFvYxyanDVxDNcCGv2ag0n3sRL07pdxbW pNvkX51lSH4TOLBpKBPkFJ2GIHbmhDaUt5cYuri4dIZiV+bWTbBk2cRa4O3wDtVSvmJifI iXBlaf8GbVXd+z0o4oZosvgAQQC0YasHMyONpuFoPldGB8XIesicc6G6jdhixA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661191086; a=rsa-sha256; cv=none; b=qXr3qZhyD6K3PKn69u8/VznRz7KcPtycqZQuE6886vyBVMJAuFZcG8g18NxEJ/p7Upmtc2 5bOqZMvMiIo1V/gjYi9vK7fcjQb4L4FbfHpLpDlQf2Cig99xTkNuM+RpurK7n9Wtw5qzvj IWr48te2uYNYg++Hd07B0PhskX3jsIlFjzOltsRhEN0PNPeKd2VWFApWBotx6dgxgwrHwn p02Jt7ZmLcWiXk8ylGIFHZ7bQfHcCcz7NW+Ue4NhaIAv7TSqyutK7h2WRxAPQTRYPmkify kSjMnh5kWIU++/FRVKnTWmoSaeui/ED0z+EypG8yIQTC1em3GcUExVXgCVXRhg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=f744e2f9cd0f434a3065bc4289c4d6f4b5a5d168 commit f744e2f9cd0f434a3065bc4289c4d6f4b5a5d168 Author: Dima Panov AuthorDate: 2022-08-22 17:51:13 +0000 Commit: Dima Panov CommitDate: 2022-08-22 17:58:00 +0000 multimedia/qmmp*-qt5: register conflicts with -qt6 versions (+) While here, drop outdated dependencies from default options [1] PR: 264681 [1] --- multimedia/qmmp-plugin-pack-qt5/Makefile | 2 +- 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