From owner-svn-ports-all@freebsd.org Sat Mar 25 09:59:06 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 56650D1B8A2; Sat, 25 Mar 2017 09:59:06 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 152521B7; Sat, 25 Mar 2017 09:59:06 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2P9x5rD014764; Sat, 25 Mar 2017 09:59:05 GMT (envelope-from rene@FreeBSD.org) Received: (from rene@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2P9x5vo014762; Sat, 25 Mar 2017 09:59:05 GMT (envelope-from rene@FreeBSD.org) Message-Id: <201703250959.v2P9x5vo014762@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rene set sender to rene@FreeBSD.org using -f From: Rene Ladan Date: Sat, 25 Mar 2017 09:59:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r436890 - in head/multimedia: qmmp qmmp-qt5 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 25 Mar 2017 09:59:06 -0000 Author: rene Date: Sat Mar 25 09:59:04 2017 New Revision: 436890 URL: https://svnweb.freebsd.org/changeset/ports/436890 Log: multimedia/qmmp[-qt5]: remove expired optional dependency on multimedia/mplayer2 Modified: head/multimedia/qmmp-qt5/Makefile head/multimedia/qmmp/Makefile Modified: head/multimedia/qmmp-qt5/Makefile ============================================================================== --- head/multimedia/qmmp-qt5/Makefile Sat Mar 25 09:02:01 2017 (r436889) +++ head/multimedia/qmmp-qt5/Makefile Sat Mar 25 09:59:04 2017 (r436890) @@ -55,7 +55,7 @@ PLUGIN_NETWORKING_DESC= Features via the OPTIONS_GROUP_PLUGIN_NETWORKING= COVER CURL LYRICS MMS SB SCROBBLER MISC_DESC= Other features -OPTIONS_GROUP_MISC= CONVERTER CUE ENCA MPLAYER1 MPLAYER2 MPRIS RGSCAN SID +OPTIONS_GROUP_MISC= CONVERTER CUE ENCA MPLAYER1 MPRIS RGSCAN SID OPTIONS_DEFAULT= ALSA ANALYZER BS2B CDDA CONVERTER COPYPASTE COVER \ CROSSFADE CUE CURL DIR_ASSOC ENCA FAAD FFMPEG FILEOPS FLAC \ @@ -129,11 +129,7 @@ ENCA_LIB_DEPENDS= libenca.so:converters/ ENCA_CMAKE_BOOL= USE_ENCA MPLAYER1_DESC= mplayer-1.x (multimedia/mplayer) -MPLAYER2_DESC= mplayer-2.x (multimedia/mplayer2) MPLAYER1_RUN_DEPENDS= mplayer:multimedia/mplayer -MPLAYER2_RUN_DEPENDS= mplayer:multimedia/mplayer2 -MPLAYER1_PREVENTS= MPLAYER2 -MPLAYER2_PREVENTS= MPLAYER1 PROJECTM_DESC= Support the projectM music visualiser PROJECTM_LIB_DEPENDS= libprojectM.so.2:graphics/libprojectm @@ -267,7 +263,7 @@ TWOPANELDIALOG_CMAKE_BOOL= USE_TWO_PANEL .include -.if ${PORT_OPTIONS:MMPLAYER1} || ${PORT_OPTIONS:MMPLAYER2} +.if ${PORT_OPTIONS:MMPLAYER1} CMAKE_ARGS+= -DUSE_MPLAYER:BOOL=TRUE PLIST_SUB+= MPLAYER="" .else Modified: head/multimedia/qmmp/Makefile ============================================================================== --- head/multimedia/qmmp/Makefile Sat Mar 25 09:02:01 2017 (r436889) +++ head/multimedia/qmmp/Makefile Sat Mar 25 09:59:04 2017 (r436890) @@ -54,7 +54,7 @@ PLUGIN_NETWORKING_DESC= Features via the OPTIONS_GROUP_PLUGIN_NETWORKING= COVER CURL LYRICS MMS SB SCROBBLER MISC_DESC= Other features -OPTIONS_GROUP_MISC= CONVERTER CUE ENCA MPLAYER1 MPLAYER2 MPRIS RGSCAN SID +OPTIONS_GROUP_MISC= CONVERTER CUE ENCA MPLAYER1 MPRIS RGSCAN SID OPTIONS_DEFAULT= ALSA ANALYZER BS2B CDDA CONVERTER COPYPASTE COVER \ CROSSFADE CUE CURL DIR_ASSOC ENCA FAAD FFMPEG FILEOPS FLAC \ @@ -129,11 +129,7 @@ ENCA_LIB_DEPENDS= libenca.so:converters/ ENCA_CMAKE_BOOL= USE_ENCA MPLAYER1_DESC= mplayer-1.x (multimedia/mplayer) -MPLAYER2_DESC= mplayer-2.x (multimedia/mplayer2) MPLAYER1_RUN_DEPENDS= mplayer:multimedia/mplayer -MPLAYER2_RUN_DEPENDS= mplayer:multimedia/mplayer2 -MPLAYER1_PREVENTS= MPLAYER2 -MPLAYER2_PREVENTS= MPLAYER1 PROJECTM_DESC= Support the projectM music visualiser PROJECTM_LIB_DEPENDS= libprojectM.so.2:graphics/libprojectm @@ -270,7 +266,7 @@ TWOPANELDIALOG_CMAKE_BOOL= USE_TWO_PANEL .include -.if ${PORT_OPTIONS:MMPLAYER1} || ${PORT_OPTIONS:MMPLAYER2} +.if ${PORT_OPTIONS:MMPLAYER1} CMAKE_ARGS+= -DUSE_MPLAYER:BOOL=TRUE PLIST_SUB+= MPLAYER="" .else