svn commit: r346996 - head/sysutils/k3b-kde4

[Max Brazhnikov]

On Tue, 04 Mar 2014 08:46:02 +0100 John Marino wrote:
> 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 <bsd.port.options.mk>
> > +
> > +.if ${PORT_OPTIONS:MMUSEPACK}
> > +BROKEN=		fails to detect Musepack libraries
> > +.endif
> > +
> >  .include <bsd.port.mk>
> > 
> 
> 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.

Nice! Feel free to commit the fix.

Max