From owner-svn-ports-all@FreeBSD.ORG Tue Mar 4 07:46:28 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 094787A9; Tue, 4 Mar 2014 07:46:28 +0000 (UTC) Received: from shepard.synsport.net (mail.synsport.com [208.69.230.148]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D4EF8D57; Tue, 4 Mar 2014 07:46:27 +0000 (UTC) Received: from [10.31.10.76] (unknown [213.225.137.129]) (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by shepard.synsport.net (Postfix) with ESMTP id 59E54438EB; Tue, 4 Mar 2014 01:46:15 -0600 (CST) Message-ID: <531584BA.2000603@marino.st> Date: Tue, 04 Mar 2014 08:46:02 +0100 From: John Marino User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:24.0) Gecko/20100101 Thunderbird/24.3.0 MIME-Version: 1.0 To: Max Brazhnikov , ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r346996 - head/sysutils/k3b-kde4 References: <201403040711.s247BrQp068829@svn.freebsd.org> In-Reply-To: <201403040711.s247BrQp068829@svn.freebsd.org> X-Enigmail-Version: 1.6 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list Reply-To: marino@freebsd.org List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Mar 2014 07:46:28 -0000 On 3/4/2014 08:11, Max Brazhnikov wrote: > Author: makc > Date: Tue Mar 4 07:11:52 2014 > New Revision: 346996 > URL: http://svnweb.freebsd.org/changeset/ports/346996 > QAT: https://qat.redports.org/buildarchive/r346996/ > > Log: > sysutils/k3b-kde4: > - Mark BROKEN with MUSEPACK option > - Revert r346606 as unrelated to the problem. > > Modified: > head/sysutils/k3b-kde4/Makefile > > Modified: head/sysutils/k3b-kde4/Makefile > ============================================================================== > --- head/sysutils/k3b-kde4/Makefile Tue Mar 4 06:52:19 2014 (r346995) > +++ head/sysutils/k3b-kde4/Makefile Tue Mar 4 07:11:52 2014 (r346996) > @@ -16,7 +16,7 @@ RUN_DEPENDS= cdrecord:${PORTSDIR}/sysuti > BUILD_DEPENDS= cdrecord:${PORTSDIR}/sysutils/cdrtools > > USE_BZIP2= yes > -USES= cmake shared-mime-info pkgconfig > +USES= cmake shared-mime-info > CMAKE_ARGS= -DK3B_BUILD_K3BSETUP:BOOL=OFF \ > -DK3B_ENABLE_MUSICBRAINZ:BOOL=OFF > USE_KDE4= automoc4 kdeprefix kdelibs libkcddb > @@ -27,7 +27,7 @@ USE_LDCONFIG= yes > OPTIONS_DEFINE= CDRDAO DVDPLUSRW EMOVIX VCDIMAGER FFMPEG FLAC MAD \ > MUSEPACK SNDFILE VORBIS_DEC LAME SOX VORBIS_ENC \ > LIBDVDREAD NORMALIZE TAGLIB TRANSCODE > -OPTIONS_DEFAULT=CDRDAO DVDPLUSRW FFMPEG FLAC MAD MUSEPACK SNDFILE \ > +OPTIONS_DEFAULT=CDRDAO DVDPLUSRW FFMPEG FLAC MAD SNDFILE \ > VORBIS_DEC VORBIS_ENC LIBDVDREAD TAGLIB > NO_OPTIONS_SORT=yes > OPTIONS_SUB= yes # FFMPEG FLAC MAD MUSEPACK SNDFILE VORBIS_ENC VORBIS_DEC LIBDVDREAD TAGLIB > @@ -95,4 +95,10 @@ TAGLIB_CMAKE_OFF= -DK3B_ENABLE_TAGLIB:BO > TRANSCODE_DESC= Misc: Transcode (DVD ripping) > TRANSCODE_RUN_DEPENDS= transcode:${PORTSDIR}/multimedia/transcode > > +.include > + > +.if ${PORT_OPTIONS:MMUSEPACK} > +BROKEN= fails to detect Musepack libraries > +.endif > + > .include > I didn't know this was broken on FreeBSD too. Why not take the DPorts fix? https://raw.github.com/DragonFlyBSD/DPorts/master/sysutils/k3b-kde4/dragonfly/patch-cmake_modules_FindMuse.cmake https://raw.github.com/DragonFlyBSD/DPorts/master/sysutils/k3b-kde4/Makefile.DragonFly The line in Makefile.DragonFly would replace the current line in Makefile. Regards, John