misc/130994: [UPDATE] audio/moc

[Herbert J. Skuhra]

>Number:         130994
>Category:       misc
>Synopsis:       [UPDATE] audio/moc
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jan 26 00:00:01 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Herbert J. Skuhra
>Release:        FreeBSD 7.1-STABLE i386
>Organization:
>Environment:
FreeBSD oslo.ath.cx 7.1-STABLE FreeBSD 7.1-STABLE #2 r187593M: Thu Jan 22 19:09:45 CET 2009     root at oslo.ath.cx:/usr/obj/usr/src/sys/PC1  i386
>Description:
* Update audio/moc to latest stable version (2.4.4)
* Add OPTION for librcc (default OFF)
* Fix PLIST when WITH_FFMPEG is enabled
>How-To-Repeat:

>Fix:
Patch is attached

Patch attached with submission follows:

diff -ruN audio/moc.bak/Makefile audio/moc/Makefile
--- audio/moc.bak/Makefile	2009-01-25 23:52:18.000000000 +0100
+++ audio/moc/Makefile	2009-01-26 00:54:43.000000000 +0100
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	moc
-PORTVERSION=	2.4.3
-PORTREVISION=	1
+PORTVERSION=	2.4.4
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.daper.net/pub/soft/moc/stable/
 
@@ -16,6 +15,7 @@
 
 USE_GMAKE=	yes
 USE_BZIP2=	yes
+USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
@@ -33,7 +33,8 @@
 		SNDFILE "libsndfile support" off \
 		SPEEX "Speex support" off \
 		SAMPLERATE "libsamplerate support" off \
-		CURL "curl support (Internet streams)" on
+		CURL "curl support (Internet streams)" on \
+		RCC "RCC support" off
 
 .include <bsd.port.pre.mk>
 
@@ -46,7 +47,8 @@
 .if defined(WITH_MP3)
 LIB_DEPENDS+=	mad.2:${PORTSDIR}/audio/libmad \
 		id3tag.0:${PORTSDIR}/audio/libid3tag
-PLIST_FILES+=	lib/moc/decoder_plugins/libmp3_decoder.la \
+PLIST_FILES+=	lib/moc/decoder_plugins/libmp3_decoder.a \
+		lib/moc/decoder_plugins/libmp3_decoder.la \
 		lib/moc/decoder_plugins/libmp3_decoder.so
 .else
 CONFIGURE_ARGS+=	--without-mp3
@@ -55,7 +57,8 @@
 .if defined(WITH_MUSEPACK)
 LIB_DEPENDS+=	mpcdec.5:${PORTSDIR}/audio/libmpcdec \
 		tag_c.0:${PORTSDIR}/audio/taglib
-PLIST_FILES+=	lib/moc/decoder_plugins/libmusepack_decoder.la \
+PLIST_FILES+=	lib/moc/decoder_plugins/libmusepack_decoder.a \
+		lib/moc/decoder_plugins/libmusepack_decoder.la \
 		lib/moc/decoder_plugins/libmusepack_decoder.so
 .else
 CONFIGURE_ARGS+=	--without-musepack
@@ -63,7 +66,8 @@
 
 .if defined(WITH_VORBIS)
 LIB_DEPENDS+=	vorbis.4:${PORTSDIR}/audio/libvorbis
-PLIST_FILES+=	lib/moc/decoder_plugins/libvorbis_decoder.la \
+PLIST_FILES+=	lib/moc/decoder_plugins/libvorbis_decoder.a \
+		lib/moc/decoder_plugins/libvorbis_decoder.la \
 		lib/moc/decoder_plugins/libvorbis_decoder.so
 .else
 CONFIGURE_ARGS+=	--without-ogg
@@ -71,7 +75,8 @@
 
 .if defined(WITH_FLAC)
 LIB_DEPENDS+=	FLAC:${PORTSDIR}/audio/flac
-PLIST_FILES+=	lib/moc/decoder_plugins/libflac_decoder.la \
+PLIST_FILES+=	lib/moc/decoder_plugins/libflac_decoder.a \
+		lib/moc/decoder_plugins/libflac_decoder.la \
 		lib/moc/decoder_plugins/libflac_decoder.so
 .else
 CONFIGURE_ARGS+=	--without-flac
@@ -79,13 +84,17 @@
 
 .if defined(WITH_FFMPEG)
 LIB_DEPENDS+=	avcodec.1:${PORTSDIR}/multimedia/ffmpeg
+PLIST_FILES+=   lib/moc/decoder_plugins/libffmpeg_decoder.a \
+		lib/moc/decoder_plugins/libffmpeg_decoder.la \
+		lib/moc/decoder_plugins/libffmpeg_decoder.so
 .else
 CONFIGURE_ARGS+=	--without-ffmpeg
 .endif
 
 .if defined(WITH_SNDFILE)
 LIB_DEPENDS+=	sndfile.1:${PORTSDIR}/audio/libsndfile
-PLIST_FILES+=	lib/moc/decoder_plugins/libsndfile_formats_decoder.la \
+PLIST_FILES+=	lib/moc/decoder_plugins/libsndfile_formats_decoder.a \
+		lib/moc/decoder_plugins/libsndfile_formats_decoder.la \
 		lib/moc/decoder_plugins/libsndfile_formats_decoder.so
 .else
 CONFIGURE_ARGS+=	--without-sndfile
@@ -93,7 +102,8 @@
 
 .if defined(WITH_SPEEX)
 LIB_DEPENDS+=	speex.1:${PORTSDIR}/audio/speex
-PLIST_FILES+=	lib/moc/decoder_plugins/libspeex_decoder.la \
+PLIST_FILES+=	lib/moc/decoder_plugins/libspeex_decoder.a \
+		lib/moc/decoder_plugins/libspeex_decoder.la \
 		lib/moc/decoder_plugins/libspeex_decoder.so
 .else
 CONFIGURE_ARGS+=	--without-speex
@@ -111,4 +121,11 @@
 CONFIGURE_ARGS+=	--without-curl
 .endif
 
+.if defined(WITH_RCC)
+LIB_DEPENDS+=	rcc.2:${PORTSDIR}/devel/librcc \
+		rcd.1:${PORTSDIR}/devel/librcd
+.else
+CONFIGURE_ARGS+=	--without-rcc
+.endif
+
 .include <bsd.port.post.mk>
diff -ruN audio/moc.bak/distinfo audio/moc/distinfo
--- audio/moc.bak/distinfo	2009-01-25 23:52:18.000000000 +0100
+++ audio/moc/distinfo	2009-01-25 23:52:44.000000000 +0100
@@ -1,3 +1,3 @@
-MD5 (moc-2.4.3.tar.bz2) = 8808082848e90eeec5415baaec7e98ad
-SHA256 (moc-2.4.3.tar.bz2) = 8598bb4f65e0b7d2a669e06222e6ba5eb1127b52b9a30136b2a823ccee10929f
-SIZE (moc-2.4.3.tar.bz2) = 459706
+MD5 (moc-2.4.4.tar.bz2) = 647c770a5542a4ae5437386807a89796
+SHA256 (moc-2.4.4.tar.bz2) = 26bf5707128def20d8b69c0f0c3624a82b7f72c36280bcf86b9b5e8bf8d08b05
+SIZE (moc-2.4.4.tar.bz2) = 699724


>Release-Note:
>Audit-Trail:
>Unformatted: