From nobody@FreeBSD.org  Sun Sep 12 20:02:01 2010
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8FC91106566B
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 12 Sep 2010 20:02:01 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id 7CCD18FC08
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 12 Sep 2010 20:02:01 +0000 (UTC)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.3/8.14.3) with ESMTP id o8CK21cc076420
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 12 Sep 2010 20:02:01 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.3/8.14.3/Submit) id o8CK21MS076419;
	Sun, 12 Sep 2010 20:02:01 GMT
	(envelope-from nobody)
Message-Id: <201009122002.o8CK21MS076419@www.freebsd.org>
Date: Sun, 12 Sep 2010 20:02:01 GMT
From: Ganael Laplanche <ganael.laplanche@martymac.org>
To: freebsd-gnats-submit@FreeBSD.org
Subject: Port updates: depend on audio/musepack instead of audio/libmpcdec (when possible)
X-Send-Pr-Version: www-3.1
X-GNATS-Notify: shoesoft@gmx.net

>Number:         150510
>Category:       ports
>Synopsis:       Port updates: depend on audio/musepack instead of audio/libmpcdec (when possible)
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    martymac
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Sep 12 20:10:07 UTC 2010
>Closed-Date:    Tue Oct 05 05:58:45 UTC 2010
>Last-Modified:  Tue Oct  5 06:00:03 UTC 2010
>Originator:     Ganael Laplanche
>Release:        8.1-STABLE
>Organization:
http://contribs.martymac.org
>Environment:
FreeBSD home.martymac.com 8.1-STABLE FreeBSD 8.1-STABLE #7: Wed Sep  1 10:25:03 CEST 2010     root@home.martymac.com:/usr/obj/usr/src/sys/MYKERNEL  amd64
>Description:
Following a discussion on freebsd-multimedia@, here is a patch to switch dependencies from audio/musepack to audio/libmpcdec when possible.

This patch includes the following changes :

1) Fix audio/musepack build on 6.X by removing an unsupported compiler optimization option (-fvisibility=hidden)

2) Make the following ports depend on audio/musepack instead of audio/libmpcdec (those ones support both old and new mpcdec libraries out-of-the-box) :

* audio/xmms2 (patched detection)
* multimedia/gstreamer-plugins
* multimedia/vlc
* multimedia/quodlibet
* sysutils/k3b-kde4
* audio/aqualung
* audio/cmus (patched detection)

Their PORTREVISION have been bumped.

3) Patch audio/libtunepimp to support latest musepack's libmpcdec API (patch from Debian, see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=476378#39). This patch will allow us to keep the MUSEPACK option for multimedia/transkode which was failing because of a dependency CONFLICT.

4) Unfortunately, the following ports do not have support for musepack (only for older libmpcdec), so they currently remain unmodified :

audio/bmp-musepack
audio/cynthiune
audio/py-musepack
multimedia/mplayer
multimedia/gmerlin-avdecoder
sysutils/k3b

We may choose in a near future to either :
- leave them as-is and keep libmpcdec in ports
- deprecate their MUSEPACK option and remove libmpcdec from ports
- patch them and remove libmpcdec from ports

>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -aurN audio/moc.orig/Makefile audio/moc/Makefile
--- audio/moc.orig/Makefile	2010-09-10 10:56:48.852761847 +0200
+++ audio/moc/Makefile	2010-09-10 23:05:51.409572756 +0200
@@ -7,7 +7,7 @@
 
 PORTNAME=	moc
 PORTVERSION=	2.4.4
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.daper.net/pub/soft/moc/stable/
 
@@ -56,7 +56,7 @@
 .endif
 
 .if defined(WITH_MUSEPACK)
-LIB_DEPENDS+=	mpcdec.5:${PORTSDIR}/audio/libmpcdec \
+LIB_DEPENDS+=	mpcdec.7:${PORTSDIR}/audio/musepack \
 		tag_c.0:${PORTSDIR}/audio/taglib
 PLIST_FILES+=	lib/moc/decoder_plugins/libmusepack_decoder.a \
 		lib/moc/decoder_plugins/libmusepack_decoder.la \
diff -aurN audio/musicpd.orig/Makefile audio/musicpd/Makefile
--- audio/musicpd.orig/Makefile	2010-09-10 10:54:07.515574291 +0200
+++ audio/musicpd/Makefile	2010-09-10 23:07:25.490812993 +0200
@@ -7,6 +7,7 @@
 
 PORTNAME=	musicpd
 PORTVERSION=	0.15.12
+PORTREVISION=	1
 CATEGORIES=	audio ipv6
 MASTER_SITES=	SF/${PORTNAME}/mpd/${PORTVERSION}
 DISTNAME=	mpd-${PORTVERSION}
@@ -126,7 +127,7 @@
 .endif
 
 .if defined(WITH_MUSEPACK)
-LIB_DEPENDS+=	mpcdec.5:${PORTSDIR}/audio/libmpcdec
+LIB_DEPENDS+=	mpcdec.7:${PORTSDIR}/audio/musepack
 .else
 CONFIGURE_ARGS+=--disable-mpc
 .endif
diff -aurN audio/xmms2.orig/Makefile audio/xmms2/Makefile
--- audio/xmms2.orig/Makefile	2010-09-10 22:36:26.871318188 +0200
+++ audio/xmms2/Makefile	2010-09-10 23:08:59.529918205 +0200
@@ -7,7 +7,7 @@
 
 PORTNAME?=	xmms2
 PORTVERSION=	0.6
-PORTREVISION=	7
+PORTREVISION=	8
 DISTVERSIONSUFFIX=DrMattDestruction
 CATEGORIES?=	audio
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20DrMattDestruction
@@ -242,7 +242,7 @@
 .endif
 
 .if !defined(WITHOUT_MUSEPACK)
-LIB_DEPENDS+=	mpcdec.5:${PORTSDIR}/audio/libmpcdec
+LIB_DEPENDS+=	mpcdec.7:${PORTSDIR}/audio/musepack
 PLIST_SUB+=	MUSEPACK=""
 .else
 EXCLUDE+=	--without-plugins="musepack"
diff -aurN audio/xmms2.orig/files/patch-patch-src-plugins-musepack-wscript audio/xmms2/files/patch-patch-src-plugins-musepack-wscript
--- audio/xmms2.orig/files/patch-patch-src-plugins-musepack-wscript	1970-01-01 01:00:00.000000000 +0100
+++ audio/xmms2/files/patch-patch-src-plugins-musepack-wscript	2010-09-10 23:03:42.154230426 +0200
@@ -0,0 +1,11 @@
+--- src/plugins/musepack/wscript.orig	2010-09-10 22:55:03.412930402 +0200
++++ src/plugins/musepack/wscript	2010-09-10 23:02:05.738208553 +0200
+@@ -5,7 +5,7 @@
+         if not conf.check_cc(header_name="mpcdec/mpcdec.h", defines="HAVE_MPCDEC_OLD", uselib_store="mpcdec"):
+             return False
+ 
+-    if not conf.check_cc(lib="mpcdec", uselib_store="mpcdec"):
++    if not conf.check_cc(lib="mpcdec", uselib="math", uselib_store="mpcdec"):
+         return False
+ 
+     return True
diff -aurN multimedia/gstreamer-plugins.orig/Makefile multimedia/gstreamer-plugins/Makefile
--- multimedia/gstreamer-plugins.orig/Makefile	2010-09-10 22:23:28.299951736 +0200
+++ multimedia/gstreamer-plugins/Makefile	2010-09-10 22:24:34.108010487 +0200
@@ -8,7 +8,7 @@
 
 PORTNAME=	gstreamer
 PORTVERSION?=	${BASE_PORTVERSION}
-PORTREVISION?=	0
+PORTREVISION?=	1
 PORTEPOCH=	3
 CATEGORIES?=	multimedia audio
 MASTER_SITES=	http://gstreamer.freedesktop.org/src/gst-plugins-base/:base \
diff -aurN multimedia/gstreamer-plugins.orig/Makefile.common multimedia/gstreamer-plugins/Makefile.common
--- multimedia/gstreamer-plugins.orig/Makefile.common	2010-09-10 22:23:28.299951736 +0200
+++ multimedia/gstreamer-plugins/Makefile.common	2010-09-10 22:24:04.470032587 +0200
@@ -363,7 +363,7 @@
 gst_mpeg2dec_DIST=	ugly
 
 # musepack
-gst_musepack_LIB_DEPENDS+=	mpcdec.5:${PORTSDIR}/audio/libmpcdec
+gst_musepack_LIB_DEPENDS+=	mpcdec.7:${PORTSDIR}/audio/musepack
 gst_musepack_PLIST_FILES=	${GST_LIB_DIR}/libgstmusepack.la \
 		${GST_LIB_DIR}/libgstmusepack.so
 gst_musepack_DIST=	bad
diff -aurN multimedia/vlc.orig/Makefile multimedia/vlc/Makefile
--- multimedia/vlc.orig/Makefile	2010-09-10 22:28:52.430802304 +0200
+++ multimedia/vlc/Makefile	2010-09-10 22:29:51.481871493 +0200
@@ -7,7 +7,7 @@
 
 PORTNAME=	vlc
 DISTVERSION=	1.1.4
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	3
 CATEGORIES=	multimedia audio ipv6 net www
 MASTER_SITES=	http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION}/ \
@@ -401,7 +401,7 @@
 .if defined(WITHOUT_MUSEPACK)
 CONFIGURE_ARGS+=--disable-mpc
 .else
-LIB_DEPENDS+=	mpcdec.5:${PORTSDIR}/audio/libmpcdec
+LIB_DEPENDS+=	mpcdec.7:${PORTSDIR}/audio/musepack
 CONFIGURE_ARGS+=--enable-mpc
 .endif
 
diff -aurN multimedia/quodlibet.orig/Makefile multimedia/quodlibet/Makefile
--- multimedia/quodlibet.orig/Makefile	2010-09-10 22:15:23.240700508 +0200
+++ multimedia/quodlibet/Makefile	2010-09-10 23:12:14.611462351 +0200
@@ -7,7 +7,7 @@
 
 PORTNAME=	quodlibet
 PORTVERSION=	2.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	multimedia audio python gnome
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 
@@ -72,7 +72,7 @@
 .endif
 
 .if !defined(WITHOUT_MUSEPACK)
-LIB_DEPENDS+=	mpcdec.5:${PORTSDIR}/audio/libmpcdec
+LIB_DEPENDS+=	mpcdec.7:${PORTSDIR}/audio/musepack
 USE_GSTREAMER+=	musepack
 .endif
 
diff -aurN sysutils/k3b-kde4.orig/Makefile k3b-kde4/Makefile
--- sysutils/k3b-kde4.orig/Makefile	2010-09-10 23:13:37.118260185 +0200
+++ sysutils/k3b-kde4/Makefile	2010-09-10 23:14:58.067837429 +0200
@@ -7,7 +7,7 @@
 
 PORTNAME=	k3b
 PORTVERSION=	2.0.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils multimedia kde
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}
 
@@ -38,7 +38,7 @@
 		FFMPEG "Decoder: various (multimedia/ffmpeg)" OFF \
 		FLAC "Decoder: flac (audio/flac)" ON \
 		MAD "Decoder: mp3 (audio/libmad)" ON \
-		MPC "Decoder: musepack (audio/libmpcdec)" OFF \
+		MUSEPACK "Decoder: musepack (audio/libmpcdec)" OFF \
 		SNDFILE "Decoder: various (audio/libsndfile)" ON \
 		VORBIS_DEC "Decoder: ogg/vorbis" ON \
 		LAME "Encoder: mp3 (audio/lame)" OFF \
@@ -92,13 +92,13 @@
 PLIST_SUB+=	MAD="@comment "
 .endif
 
-.if defined(WITH_MPC)
+.if defined(WITH_MUSEPACK)
 CMAKE_ARGS+=	-DCMAKE_REQUIRED_INCLUDES:STRING="${LOCALBASE}/include"
-LIB_DEPENDS+=	mpcdec:${PORTSDIR}/audio/libmpcdec
-PLIST_SUB+=	MPC=""
+LIB_DEPENDS+=	mpcdec:${PORTSDIR}/audio/musepack
+PLIST_SUB+=	MUSEPACK=""
 .else
 CMAKE_ARGS+=	-DK3B_BUILD_MUSE_DECODER_PLUGIN:BOOL=OFF
-PLIST_SUB+=	MPC="@comment "
+PLIST_SUB+=	MUSEPACK="@comment "
 .endif
 
 .if defined(WITH_SNDFILE)
diff -aurN sysutils/k3b-kde4.orig/pkg-plist k3b-kde4/pkg-plist
--- sysutils/k3b-kde4.orig/pkg-plist	2010-09-10 23:13:37.118260185 +0200
+++ sysutils/k3b-kde4/pkg-plist	2010-09-10 23:15:17.800713893 +0200
@@ -124,7 +124,7 @@
 %%LAME%%lib/kde4/k3blameencoder.so
 %%SNDFILE%%lib/kde4/k3blibsndfiledecoder.so
 %%MAD%%lib/kde4/k3bmaddecoder.so
-%%MPC%%lib/kde4/k3bmpcdecoder.so
+%%MUSEPACK%%lib/kde4/k3bmpcdecoder.so
 %%VORBIS_DEC%%lib/kde4/k3boggvorbisdecoder.so
 %%VORBIS_ENC%%lib/kde4/k3boggvorbisencoder.so
 %%SOX%%lib/kde4/k3bsoxencoder.so
@@ -319,7 +319,7 @@
 %%LAME%%share/kde4/services/k3blameencoder.desktop
 %%SNDFILE%%share/kde4/services/k3blibsndfiledecoder.desktop
 %%MAD%%share/kde4/services/k3bmaddecoder.desktop
-%%MPC%%share/kde4/services/k3bmpcdecoder.desktop
+%%MUSEPACK%%share/kde4/services/k3bmpcdecoder.desktop
 %%VORBIS_DEC%%share/kde4/services/k3boggvorbisdecoder.desktop
 %%VORBIS_ENC%%share/kde4/services/k3boggvorbisencoder.desktop
 %%SOX%%share/kde4/services/k3bsoxencoder.desktop
diff -aurN audio/aqualung.orig/Makefile audio/aqualung/Makefile
--- audio/aqualung.orig/Makefile	2010-09-10 23:21:49.185360459 +0200
+++ audio/aqualung/Makefile	2010-09-10 23:22:07.854509729 +0200
@@ -7,7 +7,7 @@
 
 PORTNAME=	aqualung
 DISTVERSION=	0.9beta11
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	audio
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${DISTVERSION} \
  		http://wickedmachine.net/mirror/
@@ -23,7 +23,7 @@
 		speex.1:${PORTSDIR}/audio/speex \
 		mad.2:${PORTSDIR}/audio/libmad \
 		modplug.1:${PORTSDIR}/audio/libmodplug \
-		mpcdec.5:${PORTSDIR}/audio/libmpcdec \
+		mpcdec.7:${PORTSDIR}/audio/musepack \
 		mac.2:${PORTSDIR}/audio/mac \
 		tag.1:${PORTSDIR}/audio/taglib \
 		lrdf.2:${PORTSDIR}/textproc/liblrdf \
diff -aurN audio/cmus.orig/Makefile audio/cmus/Makefile
--- audio/cmus.orig/Makefile	2010-09-10 23:33:52.988362100 +0200
+++ audio/cmus/Makefile	2010-09-10 23:34:21.313682230 +0200
@@ -7,7 +7,7 @@
 
 PORTNAME=	cmus
 PORTVERSION=	2.3.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -80,7 +80,7 @@
 .endif
 
 .if defined(WITH_MUSEPACK)
-LIB_DEPENDS+=	mpcdec:${PORTSDIR}/audio/libmpcdec
+LIB_DEPENDS+=	mpcdec:${PORTSDIR}/audio/musepack
 CONFIGURE_ARGS+=CONFIG_MPC=y
 PLIST_SUB+=	MPC=""
 .else
diff -aurN audio/cmus.orig/files/patch-configure audio/cmus/files/patch-configure
--- audio/cmus.orig/files/patch-configure	1970-01-01 01:00:00.000000000 +0100
+++ audio/cmus/files/patch-configure	2010-09-10 23:38:23.132616357 +0200
@@ -0,0 +1,11 @@
+--- configure.orig	2010-09-10 23:37:55.577146100 +0200
++++ configure	2010-09-10 23:38:07.609090631 +0200
+@@ -135,7 +135,7 @@
+ {
+ 	check_header mpc/mpcdec.h
+ 	MPC_SV7=$?
+-	check_library MPC "" "-lmpcdec"
++	check_library MPC "" "-lmpcdec -lm"
+ 	return $?
+ }
+ 
diff -aurN audio/libtunepimp.orig/Makefile audio/libtunepimp/Makefile
--- audio/libtunepimp.orig/Makefile	2010-09-10 23:41:04.997697784 +0200
+++ audio/libtunepimp/Makefile	2010-09-10 23:41:37.137649467 +0200
@@ -7,7 +7,7 @@
 
 PORTNAME=	libtunepimp
 PORTVERSION=	0.5.3
-PORTREVISION=	8
+PORTREVISION=	9
 PORTEPOCH=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://ftp.musicbrainz.org/pub/musicbrainz/ \
@@ -25,7 +25,7 @@
 		tag:${PORTSDIR}/audio/taglib \
 		vorbis:${PORTSDIR}/audio/libvorbis \
 		ofa:${PORTSDIR}/audio/libofa \
-		mpcdec:${PORTSDIR}/audio/libmpcdec
+		mpcdec:${PORTSDIR}/audio/musepack
 
 CONFLICTS=	trm-0*
 USE_GMAKE=	yes
diff -aurN audio/libtunepimp.orig/files/patch-configure audio/libtunepimp/files/patch-configure
--- audio/libtunepimp.orig/files/patch-configure	1970-01-01 01:00:00.000000000 +0100
+++ audio/libtunepimp/files/patch-configure	2010-09-11 11:47:55.338901654 +0200
@@ -0,0 +1,56 @@
+--- configure.orig	2006-11-28 21:34:18.000000000 +0100
++++ configure	2010-09-11 11:46:56.333821556 +0200
+@@ -21669,9 +21669,9 @@
+   fi
+ 
+ 
+-{ echo "$as_me:$LINENO: checking for mpc_decoder_decode in -lmpcdec" >&5
+-echo $ECHO_N "checking for mpc_decoder_decode in -lmpcdec... $ECHO_C" >&6; }
+-if test "${ac_cv_lib_mpcdec_mpc_decoder_decode+set}" = set; then
++{ echo "$as_me:$LINENO: checking for mpc_demux_decode in -lmpcdec" >&5
++echo $ECHO_N "checking for mpc_demux_decode in -lmpcdec... $ECHO_C" >&6; }
++if test "${ac_cv_lib_mpcdec_mpc_demux_decode+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -21689,11 +21689,11 @@
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-char mpc_decoder_decode ();
++char mpc_demux_decode ();
+ int
+ main ()
+ {
+-return mpc_decoder_decode ();
++return mpc_demux_decode ();
+   ;
+   return 0;
+ }
+@@ -21732,21 +21732,21 @@
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  ac_cv_lib_mpcdec_mpc_decoder_decode=yes
++  ac_cv_lib_mpcdec_mpc_demux_decode=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-	ac_cv_lib_mpcdec_mpc_decoder_decode=no
++	ac_cv_lib_mpcdec_mpc_demux_decode=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ echo "$as_me:$LINENO: result: $ac_cv_lib_mpcdec_mpc_decoder_decode" >&5
+-echo "${ECHO_T}$ac_cv_lib_mpcdec_mpc_decoder_decode" >&6; }
+-if test $ac_cv_lib_mpcdec_mpc_decoder_decode = yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_mpcdec_mpc_demux_decode" >&5
++echo "${ECHO_T}$ac_cv_lib_mpcdec_mpc_demux_decode" >&6; }
++if test $ac_cv_lib_mpcdec_mpc_demux_decode = yes; then
+   have_mpcdec=yes
+ fi
+ 
diff -aurN audio/libtunepimp.orig/files/patch-plugins-mpc-mpcdecode.cpp audio/libtunepimp/files/patch-plugins-mpc-mpcdecode.cpp
--- audio/libtunepimp.orig/files/patch-plugins-mpc-mpcdecode.cpp	1970-01-01 01:00:00.000000000 +0100
+++ audio/libtunepimp/files/patch-plugins-mpc-mpcdecode.cpp	2010-09-11 11:47:23.049478324 +0200
@@ -0,0 +1,165 @@
+--- plugins/mpc/mpcdecode.cpp.orig	2006-11-18 11:51:08.000000000 +0100
++++ plugins/mpc/mpcdecode.cpp	2010-09-11 11:46:56.335821789 +0200
+@@ -29,8 +29,9 @@
+ #include <assert.h>
+ #include <time.h>
+ #include "fileio.h"
++#include "config.h"
+ 
+-#include <mpcdec/mpcdec.h> 
++#include <mpc/mpcdec.h>
+ 
+ extern char *mpcErrorString;
+ 
+@@ -40,35 +41,35 @@
+ } reader_data;
+ 
+ static mpc_int32_t
+-read_impl(void *data, void *ptr, mpc_int32_t size)
++read_impl(mpc_reader *data, void *ptr, mpc_int32_t size)
+ {
+-    reader_data *d = (reader_data *) data;
++    reader_data *d = (reader_data *) data->data;
+     return tread(ptr, 1, size, d->file);
+ }
+ 
+ static mpc_bool_t
+-seek_impl(void *data, mpc_int32_t offset)
++seek_impl(mpc_reader *data, mpc_int32_t offset)
+ {
+-    reader_data *d = (reader_data *) data;
++    reader_data *d = (reader_data *) data->data;
+     return !tseek(d->file, offset, SEEK_SET);
+ }
+ 
+ static mpc_int32_t
+-tell_impl(void *data)
++tell_impl(mpc_reader *data)
+ {
+-    reader_data *d = (reader_data *) data;
++    reader_data *d = (reader_data *) data->data;
+     return ttell(d->file);
+ }
+ 
+ static mpc_int32_t
+-get_size_impl(void *data)
++get_size_impl(mpc_reader *data)
+ {
+-    reader_data *d = (reader_data *) data;
++    reader_data *d = (reader_data *) data->data;
+     return d->size;
+ }
+ 
+ static mpc_bool_t
+-canseek_impl(void *data)
++canseek_impl(mpc_reader *data)
+ {
+     return true;
+ } 
+@@ -76,7 +77,7 @@
+ typedef struct mpc_decode_struct_t {
+     TFILE *file;
+     reader_data rdata;
+-    mpc_decoder decoder;
++    mpc_demux *decoder;
+     mpc_reader reader;
+     mpc_streaminfo info;
+     MPC_SAMPLE_FORMAT buffer[MPC_DECODER_BUFFER_LENGTH];
+@@ -114,27 +115,21 @@
+     ds->reader.canseek = canseek_impl;
+     ds->reader.data = &ds->rdata;     
+     
+-    /* read file's streaminfo data */
+-    mpc_streaminfo_init(&ds->info);
+-    if (mpc_streaminfo_read(&ds->info, &ds->reader) != ERROR_CODE_OK) {
+-        mpcErrorString = "Not a valid Musepack file.";
+-        goto error;
+-    }     
+-    
+-    /* instantiate a decoder with our file reader */
+-    mpc_decoder_setup(&ds->decoder, &ds->reader);
+-    if (!mpc_decoder_initialize(&ds->decoder, &ds->info)) {
+-        mpcErrorString = "Error initializing decoder.";
+-        goto error;
+-    }     
+-    
++    ds->decoder = mpc_demux_init(&ds->reader);
++    if (!ds->decoder) {
++	mpcErrorString = "Error initializing decoder.";
++	goto error;
++    }
++
++    mpc_demux_get_info(ds->decoder, &ds->info);
++
+     return ds;
+     
+ error:
+-    if (ds)
+-        delete ds;
+-    
+-    return NULL;
++    if (ds) {
++      mpc_demux_exit(ds->decoder);
++      delete ds;
++    }
+ }
+ 
+ extern "C" int
+@@ -144,7 +139,8 @@
+         return 0;
+         
+     if (duration)
+-        *duration = (ds->info.pcm_samples * 1000) / ds->info.sample_freq;
++        *duration = ((ds->info.samples - ds->info.beg_silence) * 1000)
++	  / ds->info.sample_freq;
+     if (samplesPerSecond)
+         *samplesPerSecond = ds->info.sample_freq;
+     if (bitsPerSample)
+@@ -173,6 +169,8 @@
+         return -1;
+         
+     unsigned status, maxSamples = maxBytes / 2 / ds->info.channels, samples, offset;
++    mpc_frame_info frame;
++    mpc_status err;
+     
+     if (ds->samples > 0) {
+         samples = ds->samples;
+@@ -182,15 +180,18 @@
+         goto convert;
+     }
+     
+-    status = mpc_decoder_decode(&ds->decoder, ds->buffer, 0, 0);
+-    
+-    if (status == (unsigned)(-1)) { //decode error
+-        mpcErrorString = "Error decoding file.";
+-        return -1;
++    frame.buffer = ds->buffer;
++    err = mpc_demux_decode(ds->decoder, &frame);
++
++    if (err != MPC_STATUS_OK) { //decode error
++	mpcErrorString = "Error decoding file.";
++	return -1;
+     }
+-    else if (status == 0) { //EOF
+-        return 0;
++    else if (frame.bits == -1) { //EOF
++	return 0;
+     }
++
++    status = frame.samples;
+     
+     if (status > maxSamples) {
+         ds->samples = status - maxSamples;
+@@ -230,8 +231,10 @@
+ extern "C" void
+ mpcDecodeEnd(mpc_decode_struct_t *ds)
+ {
+-    if (ds) 
+-        delete ds;
++  if (ds) {
++      mpc_demux_exit(ds->decoder);
++      delete ds;
++  }
+ }
+ 
+ 
diff -aurN audio/musepack.orig/Makefile audio/musepack/Makefile
--- audio/musepack.orig/Makefile	2010-09-12 12:36:01.104802565 +0000
+++ audio/musepack/Makefile	2010-09-12 12:41:27.985441864 +0000
@@ -23,8 +23,9 @@
 
 .include <bsd.port.pre.mk>
 
+post-patch:
 .if ${OSVERSION} < 700000
-BROKEN=		does not build on 6.X
+	@${REINPLACE_CMD} '/^AM_CFLAGS =/s/-fvisibility=hidden//' ${WRKSRC}/libmpcdec/Makefile.am
 .endif
 
 .include <bsd.port.post.mk>


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Sun Sep 12 20:10:13 UTC 2010 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=150510 

From: Edwin Groothuis <edwin@FreeBSD.org>
To: shoesoft@gmx.net
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/150510: Port updates: depend on audio/musepack instead of audio/libmpcdec (when possible)
Date: Sun, 12 Sep 2010 20:10:10 UT

 Maintainer of audio/musepack,
 
 Please note that PR ports/150510 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/150510
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org
Responsible-Changed-From-To: freebsd-ports-bugs->makc 
Responsible-Changed-By: makc 
Responsible-Changed-When: Sun Sep 12 20:31:35 UTC 2010 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=150510 

From: Koop Mast <kwm@FreeBSD.org>
To: bug-followup@FreeBSD.org, ganael.laplanche@martymac.org
Cc:  
Subject: Re: ports/150510: Port updates: depend on audio/musepack instead
 of audio/libmpcdec (when possible)
Date: Mon, 13 Sep 2010 08:34:19 +0200

 Small note on the gstreamer patch.
 Don't bump portrevision of multimedia/gstreamer-plugins. Instead bump
 the portrevision in audio/gstreamer-plugins-musepack.
 
 Thanks for picking up this task!
 
 -Koop
 

From: "Ganael LAPLANCHE" <ganael.laplanche@martymac.org>
To: Koop Mast <kwm@FreeBSD.org>
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/150510: Port updates: depend on audio/musepack instead of audio/libmpcdec (when possible)
Date: Mon, 13 Sep 2010 08:38:44 +0200 (CEST)

 On Mon, 13 Sep 2010 08:34:19 +0200, Koop Mast wrote
 
 Hi Koop,
 
 > Small note on the gstreamer patch.
 > Don't bump portrevision of multimedia/gstreamer-plugins. Instead bump
 > the portrevision in audio/gstreamer-plugins-musepack.
 
 Ok, thanks for this advice. Should I update the patch ?
 
 > Thanks for picking up this task!
 
 You're welcome :)
 
 Ganael LAPLANCHE
 ganael.laplanche@martymac.org
 http://www.martymac.org | http://contribs.martymac.org

From: Stefan Ehmann <shoesoft@gmx.net>
To: bug-followup@freebsd.org,
 ganael.laplanche@martymac.org
Cc:  
Subject: Re: ports/150510: Port updates: depend on audio/musepack instead of audio/libmpcdec (when possible)
Date: Mon, 13 Sep 2010 19:38:45 +0200

 Thanks for picking up the task. I've abondoned working on it when I noticed 
 that converting to the new API required more work than just changing a few 
 lines of code.
 
 The audio/musepack patch goes fine with me... I just no longer have a 6.x box.
 
 The only problem I see with your patch is that musepack and libmpcdec are in 
 conflict. I don't know of any easy way to resolve the conflict. Renaming the 
 old library comes to mind... But I don't know if it's worth the hassle.
 
 So, for instance, you cannot have both vlc and mplayer installed with musepack 
 support. Fortunately, musepack support is off by default, so not all users 
 will be hit by this.
 
 At least an UPDATING entry must be prepared, because a normal upgrade will 
 fail because of the conflict.

From: "Ganael LAPLANCHE" <ganael.laplanche@martymac.org>
To: Stefan Ehmann <shoesoft@gmx.net>
Cc: bug-followup@freebsd.org
Subject: Re: ports/150510: Port updates: depend on audio/musepack instead of audio/libmpcdec (when possible)
Date: Mon, 13 Sep 2010 20:21:55 +0200 (CEST)

 On Mon, 13 Sep 2010 19:38:45 +0200, Stefan Ehmann wrote
 
 Hi Stefan,
 
 Thank you very much for your answer.
 
 > Thanks for picking up the task. I've abondoned working on it when I 
 > noticed that converting to the new API required more work than just 
 > changing a few lines of code.
 
 Yes, that's a quite complicated task. Linux distros have (had) the same
 migration problem :/
 
 > The audio/musepack patch goes fine with me... I just no longer have a 
 > 6.x box.
 
 Ok, good.
 
 > The only problem I see with your patch is that musepack and libmpcdec 
 > are in conflict. I don't know of any easy way to resolve the conflict. 
 > Renaming the old library comes to mind... But I don't know if it's 
 > worth the hassle.
 > 
 > So, for instance, you cannot have both vlc and mplayer installed with 
 > musepack support. Fortunately, musepack support is off by default, so 
 > not all users will be hit by this.
 
 I have also thought to try to make both libraries installable and patch
 dependent ports, but as you tell, I am not sure it is worth it.
 
 As read on freebsd-multimedia@, the best would be to remove the option where
 possible and deprecate the remaining ports. I'll post a patch ASAP to handle
 that. The following ports still depend on libmpcdec and will have to be checked :
 
 * audio/bmp-musepack
 * audio/cynthiune
 * audio/py-musepack
 * multimedia/mplayer
 * multimedia/gmerlin-avdecoder
 * sysutils/k3b
 
 Finally, this also implies, of course, deprecating libmpcdec.
 
 > At least an UPDATING entry must be prepared, because a normal upgrade 
 > will fail because of the conflict.
 
 Yes, I put that on my TODO list :)
 
 Best regards,
 
 Ganael LAPLANCHE
 ganael.laplanche@martymac.org
 http://www.martymac.org | http://contribs.martymac.org

From: "Ganael LAPLANCHE" <ganael.laplanche@martymac.org>
To: Max Brazhnikov <makc@freebsd.org>
Cc: bug-followup@freebsd.org, Stefan Ehmann <shoesoft@gmx.net>, Pav Lucistnik <pav@freebsd.org>, Koop Mast <kwm@FreeBSD.org>
Subject: Re: ports/150510: Port updates: depend on audio/musepack instead of audio/libmpcdec (when possible)
Date: Tue, 14 Sep 2010 21:20:17 +0200 (CEST)

 This is a multi-part message in MIME format.
 
 ------=OPENWEBMAIL_ATT_0.20251757030292
 Content-Type: text/plain; charset=iso-8859-15
 
 Hi Max,
 
 Here is the second (and last) part of the patch that handles the remaining ports
 (as discussed on freebsd-multimedia@).
 
 The following ports will loose musepack support :
 
 * audio/cynthiune (musepack bundle was always enabled)
 * multimedia/gmerlin-avdecoder (option was on by default)
 * multimedia/mplayer (option was off by default)
 * sysutils/k3b (option was off by default)
 
 And the following ones have been set DEPRECATED with an EXPIRATION_DATE to
 2010-11-15 :
 
 * audio/bmp-musepack
 * audio/py-musepack
 * audio/libmpcdec
 
 Also, I have checked that there is no dependence on audio/bmp-musepack or
 audio/py-musepack.
 
 I suggest the following entry in UPDATING :
 
 ----
 20100914
   AFFECTS: users of audio/libmpcdec and dependent ports
   AUTHOR: ganael.laplanche@martymac.org
 
   audio/libmpcdec, no more maintained upstream, has been replaced
   by audio/musepack (which includes a newer version of libmpcdec)
   and is now deprecated.
 
   As a consequence, the following ports have switched from
   using audio/libmpcdec to audio/musepack and must be rebuilt :
 
   o audio/aqualung
   o audio/cmus
   o audio/gstreamer-plugins-musepack
   o audio/libtunepimp
   o audio/xmms2
   o multimedia/quodlibet
   o multimedia/vlc
   o sysutils/k3b-kde4
 
   The following ports will no longer have musepack support :
 
   o audio/cynthiune
   o multimedia/gmerlin-avdecoder
   o multimedia/mplayer
   o sysutils/k3b
 
   And those ones have been deprecated and will be removed soon :
 
   o audio/bmp-musepack
   o audio/py-musepack
 
   To update your system, do the following :
 
   # pkg_delete bmp-musepack-\* py-musepack-\*
   # portmaster -o audio/musepack audio/libmpcdec
   # portmaster -a
 ----
 
 Best regards,
 
 Ganael LAPLANCHE
 ganael.laplanche@martymac.org
 http://www.martymac.org | http://contribs.martymac.org
 
 ------=OPENWEBMAIL_ATT_0.20251757030292
 Content-Type: text/plain;
 	name="patch-musepack-2.txt"
 Content-Disposition: attachment; filename="patch-musepack-2.txt"
 Content-Transfer-Encoding: base64
 
 ZGlmZiAtYXVyTiBtdWx0aW1lZGlhL21wbGF5ZXIub3JpZy9NYWtlZmlsZSBtdWx0aW1lZGlhL21w
 bGF5ZXIvTWFrZWZpbGUKLS0tIG11bHRpbWVkaWEvbXBsYXllci5vcmlnL01ha2VmaWxlCTIwMTAt
 MDktMTQgMDY6MDY6MTEuMjQyMTg2NjQ2ICswMDAwCisrKyBtdWx0aW1lZGlhL21wbGF5ZXIvTWFr
 ZWZpbGUJMjAxMC0wOS0xNCAwNjowNzo1MC41NzU3NzU5MDEgKzAwMDAKQEAgLTcsNyArNyw3IEBA
 CiAKIFBPUlROQU1FPQltcGxheWVyCiBQT1JUVkVSU0lPTj0JJHtNUExBWUVSX1BPUlRfVkVSU0lP
 Tn0KLVBPUlRSRVZJU0lPTj0JMQorUE9SVFJFVklTSU9OPQkyCiBDT01NRU5UPQlIaWdoIHBlcmZv
 cm1hbmNlIG1lZGlhIHBsYXllciBzdXBwb3J0aW5nIG1hbnkgZm9ybWF0cwogCiAuaW5jbHVkZSAi
 JHsuQ1VSRElSfS9NYWtlZmlsZS5zaGFyZWQiCkBAIC00Myw3ICs0Myw2IEBACiBPUFRJT05TKz0J
 TElCRFYgIkVuYWJsZSBsaWJkdiBzdXBwb3J0IiBvZmYKIE9QVElPTlMrPQlNQUQgIkVuYWJsZSBt
 YWQgTVBFRyBhdWRpbyBlbmdpbmUgc3VwcG9ydCIgb2ZmCiBPUFRJT05TKz0JQU1SICJFbmFibGUg
 b3BlbmNvcmUgQU1SIGF1ZGlvIGNvZGVjIHN1cHBvcnQiIG9mZgotT1BUSU9OUys9CUxJQk1QQ0RF
 QyAiRW5hYmxlIGxpYm1wY2RlYyBzdXBwb3J0IiBvZmYKIE9QVElPTlMrPQlMQURTUEEgIkVuYWJs
 ZSBMQURTUEEgcGx1Z2luIHN1cHBvcnQiIG9mZgogT1BUSU9OUys9CVNQRUVYICJFbmFibGUgc3Bl
 ZXggYXVkaW8gY29kZWMgc3VwcG9ydCIgb24KIE9QVElPTlMrPQlUSEVPUkEgIkVuYWJsZSBvZ2cg
 dGhlb3JhIHZpZGVvIHN1cHBvcnQiIG9mZgpAQCAtODQsNyArODMsOCBAQAogCQkJLS1kaXNhYmxl
 LXgyNjQgXAogCQkJLS1kaXNhYmxlLXh2aWQgXAogCQkJLS1kaXNhYmxlLWxpYmRpcmFjLWxhdmMg
 XAotCQkJLS1kaXNhYmxlLW1lbmNvZGVyCisJCQktLWRpc2FibGUtbWVuY29kZXIgXAorCQkJLS1k
 aXNhYmxlLW11c2VwYWNrCiAKIC5pbmNsdWRlICIkey5DVVJESVJ9L01ha2VmaWxlLm9wdGlvbnMi
 CiAKZGlmZiAtYXVyTiBtdWx0aW1lZGlhL21wbGF5ZXIub3JpZy9NYWtlZmlsZS5vcHRpb25zIG11
 bHRpbWVkaWEvbXBsYXllci9NYWtlZmlsZS5vcHRpb25zCi0tLSBtdWx0aW1lZGlhL21wbGF5ZXIu
 b3JpZy9NYWtlZmlsZS5vcHRpb25zCTIwMTAtMDktMTQgMDY6MDY6MTEuMjczMTg5NTM5ICswMDAw
 CisrKyBtdWx0aW1lZGlhL21wbGF5ZXIvTWFrZWZpbGUub3B0aW9ucwkyMDEwLTA5LTE0IDA2OjA3
 OjEwLjU0Mjc0ODEwMCArMDAwMApAQCAtOTYsMTIgKzk2LDYgQEAKIENPTkZJR1VSRV9BUkdTKz0J
 LS1kaXNhYmxlLWxpYnNjaHJvZWRpbmdlci1sYXZjCiAuZW5kaWYKIAotLmlmIGRlZmluZWQoV0lU
 SF9MSUJNUENERUMpCi1MSUJfREVQRU5EUys9CW1wY2RlYy41OiR7UE9SVFNESVJ9L2F1ZGlvL2xp
 Ym1wY2RlYwotLmVsc2UKLUNPTkZJR1VSRV9BUkdTKz0JLS1kaXNhYmxlLW11c2VwYWNrCi0uZW5k
 aWYKLQogLmlmICFkZWZpbmVkKFdJVEhPVVRfU1BFRVgpCiBMSUJfREVQRU5EUys9CXNwZWV4LjE6
 JHtQT1JUU0RJUn0vYXVkaW8vc3BlZXgKIC5lbHNlCmRpZmYgLWF1ck4gc3lzdXRpbHMvazNiLm9y
 aWcvTWFrZWZpbGUgc3lzdXRpbHMvazNiL01ha2VmaWxlCi0tLSBzeXN1dGlscy9rM2Iub3JpZy9N
 YWtlZmlsZQkyMDEwLTA5LTE0IDA2OjA5OjQ1LjMyNzc1MTc4MSArMDAwMAorKysgc3lzdXRpbHMv
 azNiL01ha2VmaWxlCTIwMTAtMDktMTQgMDY6MTg6MzkuMzYyNjc0NTE1ICswMDAwCkBAIC03LDcg
 KzcsNyBAQAogCiBQT1JUTkFNRT0JazNiCiBQT1JUVkVSU0lPTj0JMS4wLjUKLVBPUlRSRVZJU0lP
 Tj0JOAorUE9SVFJFVklTSU9OPQk5CiBDQVRFR09SSUVTPQlzeXN1dGlscyBtdWx0aW1lZGlhIGtk
 ZQogTUFTVEVSX1NJVEVTPQlTRgogCkBAIC0yMCw3ICsyMCwxMCBAQAogCiBVU0VfQlpJUDI9CXll
 cwogVVNFX0FVVE9UT09MUz0JbGlidG9vbDoyMgotQ09ORklHVVJFX0FSR1M9CS0td2l0aC1rM2Jz
 ZXR1cD1ubyAtLXdpdGhvdXQtcmVzbWdyIC0td2l0aG91dC1oYWwKK0NPTkZJR1VSRV9BUkdTPQkt
 LXdpdGgtazNic2V0dXA9bm8gXAorCQkJLS13aXRob3V0LXJlc21nciBcCisJCQktLXdpdGhvdXQt
 aGFsIFwKKwkJCS0td2l0aG91dC1tdXNlcGFjawogVVNFX0dNQUtFPQl5ZXMKIFVTRV9DRFJUT09M
 Uz0JeWVzCiBVU0VfTERDT05GSUc9CXllcwpAQCAtMzAsNyArMzMsNiBAQAogCQlMQU1FICJBZGQg
 YXVkaW8vbGFtZSBlbmNvZGVyIChmb3IgbXAzIGZpbGVzKSIgT24gXAogCQlGRk1QRUcgIkFkZCBt
 dWx0aW1lZGlhL2ZmbXBlZyBkZWNvZGVyIChmb3Igd21hIGZpbGVzKSIgT2ZmIFwKIAkJTVVTSUNC
 UkFJTlogIlVzZSBhdWRpby9saWJtdXNpY2JyYWlueiBtdXNpYyBtZXRhIGRhdGFiYXNlIiBPZmYg
 XAotCQlNUEMgIkFkZCBhdWRpby9saWJtcGNkZWMgZGVjb2RlciAoZm9yIG11c2VwYWNrIGZpbGUp
 IiBPZmYgXAogCQlMSUJEVkRSRUFEICJVc2UgbGliZHZkcmVhZCAoZm9yIHZpZGVvIGR2ZCByaXBw
 aW5nKSIgT24gXAogCQlEVkRQTFVTUlcgIkFkZCBEVkQrUlcgVG9vbHMgKGZvciBEVkQrLy1SKFcp
 IGJ1cm5pbmcpIiBPbiBcCiAJCVRSQU5TQ09ERSAiQWRkIFRyYW5zY29kZSAoZm9yIERWRCByaXBw
 aW5nKSIgT2ZmIFwKQEAgLTg4LDE0ICs5MCw2IEBACiBDT05GSUdVUkVfQVJHUys9CS0td2l0aG91
 dC1tdXNpY2JyYWluegogLmVuZGlmCiAKLS5pZiBkZWZpbmVkKFdJVEhfTVBDKQotUExJU1RfU1VC
 Kz0JTVBDPSIiCi1MSUJfREVQRU5EUys9CW1wY2RlYzoke1BPUlRTRElSfS9hdWRpby9saWJtcGNk
 ZWMKLS5lbHNlCi1QTElTVF9TVUIrPQlNUEM9IkBjb21tZW50ICIKLUNPTkZJR1VSRV9BUkdTKz0J
 LS13aXRob3V0LW11c2VwYWNrCi0uZW5kaWYKLQogLmlmIGRlZmluZWQoV0lUSF9MSUJEVkRSRUFE
 KQogUExJU1RfU1VCKz0JTElCRFZEUkVBRD0iIgogTElCX0RFUEVORFMrPQlkdmRyZWFkLjQ6JHtQ
 T1JUU0RJUn0vbXVsdGltZWRpYS9saWJkdmRyZWFkCmRpZmYgLWF1ck4gc3lzdXRpbHMvazNiLm9y
 aWcvcGtnLXBsaXN0IHN5c3V0aWxzL2szYi9wa2ctcGxpc3QKLS0tIHN5c3V0aWxzL2szYi5vcmln
 L3BrZy1wbGlzdAkyMDEwLTA5LTE0IDA2OjA5OjQ1LjM2MTc1MjEyMSArMDAwMAorKysgc3lzdXRp
 bHMvazNiL3BrZy1wbGlzdAkyMDEwLTA5LTE0IDA2OjExOjIzLjQyMTMyODMzOSArMDAwMApAQCAt
 MTYwLDkgKzE2MCw2IEBACiBsaWIva2RlMy9saWJrM2JtYWRkZWNvZGVyLmEKIGxpYi9rZGUzL2xp
 YmszYm1hZGRlY29kZXIubGEKIGxpYi9rZGUzL2xpYmszYm1hZGRlY29kZXIuc28KLSUlTVBDJSVs
 aWIva2RlMy9saWJrM2JtcGNkZWNvZGVyLmEKLSUlTVBDJSVsaWIva2RlMy9saWJrM2JtcGNkZWNv
 ZGVyLmxhCi0lJU1QQyUlbGliL2tkZTMvbGliazNibXBjZGVjb2Rlci5zbwogbGliL2tkZTMvbGli
 azNib2dndm9yYmlzZGVjb2Rlci5hCiBsaWIva2RlMy9saWJrM2JvZ2d2b3JiaXNkZWNvZGVyLmxh
 CiBsaWIva2RlMy9saWJrM2JvZ2d2b3JiaXNkZWNvZGVyLnNvCkBAIC0zNjUsNyArMzYyLDYgQEAK
 ICUlTEFNRSUlc2hhcmUvYXBwcy9rM2IvcGx1Z2lucy9rM2JsYW1lZW5jb2Rlci5wbHVnaW4KIHNo
 YXJlL2FwcHMvazNiL3BsdWdpbnMvazNibGlic25kZmlsZWRlY29kZXIucGx1Z2luCiBzaGFyZS9h
 cHBzL2szYi9wbHVnaW5zL2szYm1hZGRlY29kZXIucGx1Z2luCi0lJU1QQyUlc2hhcmUvYXBwcy9r
 M2IvcGx1Z2lucy9rM2JtcGNkZWNvZGVyLnBsdWdpbgogc2hhcmUvYXBwcy9rM2IvcGx1Z2lucy9r
 M2JvZ2d2b3JiaXNkZWNvZGVyLnBsdWdpbgogc2hhcmUvYXBwcy9rM2IvcGx1Z2lucy9rM2JvZ2d2
 b3JiaXNlbmNvZGVyLnBsdWdpbgogc2hhcmUvYXBwcy9rM2IvcGx1Z2lucy9rM2Jzb3hlbmNvZGVy
 LnBsdWdpbgpkaWZmIC1hdXJOIG11bHRpbWVkaWEvZ21lcmxpbi1hdmRlY29kZXIub3JpZy9NYWtl
 ZmlsZSBtdWx0aW1lZGlhL2dtZXJsaW4tYXZkZWNvZGVyL01ha2VmaWxlCi0tLSBtdWx0aW1lZGlh
 L2dtZXJsaW4tYXZkZWNvZGVyLm9yaWcvTWFrZWZpbGUJMjAxMC0wOS0xNCAwNjoxNDoxMS4xNTQ3
 NjY0NTcgKzAwMDAKKysrIG11bHRpbWVkaWEvZ21lcmxpbi1hdmRlY29kZXIvTWFrZWZpbGUJMjAx
 MC0wOS0xNCAwNjoxNjowMy4zMTY2NDkxMTMgKzAwMDAKQEAgLTcsNyArNyw3IEBACiAKIFBPUlRO
 QU1FPQlnbWVybGluLWF2ZGVjb2RlcgogUE9SVFZFUlNJT049CTEuMC4xCi1QT1JUUkVWSVNJT049
 CTgKK1BPUlRSRVZJU0lPTj0JOQogQ0FURUdPUklFUz0JbXVsdGltZWRpYQogTUFTVEVSX1NJVEVT
 PQlTRi9nbWVybGluLyR7UE9SVE5BTUV9LyR7UE9SVFZFUlNJT059CiAKQEAgLTE4LDcgKzE4LDkg
 QEAKIAogR05VX0NPTkZJR1VSRT0JeWVzCiBVU0VfR0VUVEVYVD0JeWVzCi1DT05GSUdVUkVfQVJH
 Uz0JLS13aXRob3V0LWNwdWZsYWdzIC0td2l0aG91dC1kb3h5Z2VuCitDT05GSUdVUkVfQVJHUz0J
 LS13aXRob3V0LWNwdWZsYWdzIFwKKwkJCS0td2l0aG91dC1kb3h5Z2VuIFwKKwkJCS0tZGlzYWJs
 ZS1tdXNlcGFjawogVVNFX0dOT01FPQlnbm9tZWhhY2sgcGtnY29uZmlnCiBVU0VfTERDT05GSUc9
 CXllcwogCkBAIC0zOSw3ICs0MSw2IEBACiAJCUZBQUQJIkVuYWJsZWQgRkFBRDIgc3VwcG9ydCIg
 b24gXAogCQlEVkRSRUFEICJFbmFibGUgbGliZHZkcmVhZCBzdXBwb3J0IiBvbiBcCiAJCUZMQUMJ
 IkVuYWJsZSBGTEFDIHN1cHBvcnQiIG9uIFwKLQkJTVVTRVBBQ0sgIkVuYWJsZSBtdXNlcGFjayAo
 bXBjKSBzdXBwb3J0IiBvbiBcCiAJCU1BRAkiRW5hYmxlIG1wMyBzdXBwb3J0IiBvbiBcCiAJCUE1
 MgkiRW5hYmxlIEE1MiBzdXBwb3J0IiBvbiBcCiAJCURDQQkiRW5hYmxlIERUUyBDb2hlcmVudCBB
 Y291c3RpY3MgZGVjb2RlciIgb24gXApAQCAtMTQ0LDEyICsxNDUsNiBAQAogQ09ORklHVVJFX0FS
 R1MrPS0tZGlzYWJsZS1mbGFjCiAuZW5kaWYKIAotLmlmICFkZWZpbmVkKFdJVEhPVVRfTVVTRVBB
 Q0spCi1MSUJfREVQRU5EUys9CW1wY2RlYy41OiR7UE9SVFNESVJ9L2F1ZGlvL2xpYm1wY2RlYwot
 LmVsc2UKLUNPTkZJR1VSRV9BUkdTKz0tLWRpc2FibGUtbXVzZXBhY2sKLS5lbmRpZgotCiAuaWYg
 IWRlZmluZWQoV0lUSE9VVF9NQUQpCiBMSUJfREVQRU5EUys9CW1hZC4yOiR7UE9SVFNESVJ9L2F1
 ZGlvL2xpYm1hZAogLmVsc2UKZGlmZiAtYXVyTiBhdWRpby9jeW50aGl1bmUub3JpZy9NYWtlZmls
 ZSBhdWRpby9jeW50aGl1bmUvTWFrZWZpbGUKLS0tIGF1ZGlvL2N5bnRoaXVuZS5vcmlnL01ha2Vm
 aWxlCTIwMTAtMDktMTQgMDY6MjE6MjIuNzI4Mjc2Nzc4ICswMDAwCisrKyBhdWRpby9jeW50aGl1
 bmUvTWFrZWZpbGUJMjAxMC0wOS0xNCAwNjoyNjowNy4zMjc1NDA3OTAgKzAwMDAKQEAgLTcsNyAr
 Nyw3IEBACiAKIFBPUlROQU1FPQljeW50aGl1bmUKIFBPUlRWRVJTSU9OPQkwLjkuNQotUE9SVFJF
 VklTSU9OPQk4CitQT1JUUkVWSVNJT049CTkKIENBVEVHT1JJRVM9CWF1ZGlvIGdudXN0ZXAKIE1B
 U1RFUl9TSVRFUz0JJHtNQVNURVJfU0lURV9ERUJJQU59CiBNQVNURVJfU0lURV9TVUJESVI9CXBv
 b2wvbWFpbi9jL2N5bnRoaXVuZS5hcHAKQEAgLTE4LDcgKzE4LDYgQEAKIAogTElCX0RFUEVORFMr
 PQlGTEFDOiR7UE9SVFNESVJ9L2F1ZGlvL2ZsYWMKIExJQl9ERVBFTkRTKz0JdGFnLjE6JHtQT1JU
 U0RJUn0vYXVkaW8vdGFnbGliCi1MSUJfREVQRU5EUys9CW1wY2RlYy41OiR7UE9SVFNESVJ9L2F1
 ZGlvL2xpYm1wY2RlYwogTElCX0RFUEVORFMrPQltdXNpY2JyYWluei40OiR7UE9SVFNESVJ9L2F1
 ZGlvL2xpYm11c2ljYnJhaW56CiBMSUJfREVQRU5EUys9CW1vZHBsdWcuMToke1BPUlRTRElSfS9h
 dWRpby9saWJtb2RwbHVnCiBMSUJfREVQRU5EUys9CWFydHNjLjA6JHtQT1JUU0RJUn0vYXVkaW8v
 YXJ0cwpAQCAtMzcsNiArMzYsNiBAQAogQURESVRJT05BTF9JTkNMVURFX0RJUlMrPQktSSR7TE9D
 QUxCQVNFfS9pbmNsdWRlL2xpYm1vZHBsdWcKIEFERElUSU9OQUxfTElCX0RJUlMrPQktTCR7V1JL
 U1JDfS9GcmFtZXdvcmtzL0N5bnRoaXVuZS9DeW50aGl1bmUuZnJhbWV3b3JrL1ZlcnNpb25zL0N1
 cnJlbnQKIE1BS0VfRU5WKz0JR05VU1RFUF9JTlNUQUxMQVRJT05fRElSPSR7R05VU1RFUF9MT0NB
 TF9ST09UfQotTUFLRV9GTEFHUz0JZGlzYWJsZS13aW5kb3dzbWVkaWE9eWVzIGRlYnVnPW5vCitN
 QUtFX0ZMQUdTPQlkaXNhYmxlLXdpbmRvd3NtZWRpYT15ZXMgZGlzYWJsZS1tdXNlcGFjaz15ZXMg
 ZGVidWc9bm8KIAogLmluY2x1ZGUgPGJzZC5wb3J0Lm1rPgpkaWZmIC1hdXJOIGF1ZGlvL2N5bnRo
 aXVuZS5vcmlnL3BrZy1wbGlzdCBhdWRpby9jeW50aGl1bmUvcGtnLXBsaXN0Ci0tLSBhdWRpby9j
 eW50aGl1bmUub3JpZy9wa2ctcGxpc3QJMjAxMC0wOS0xNCAwNjoyMToyMi43NDUyNzczMzIgKzAw
 MDAKKysrIGF1ZGlvL2N5bnRoaXVuZS9wa2ctcGxpc3QJMjAxMC0wOS0xNCAwNjoyODoyMC44Njcx
 NTE5NzAgKzAwMDAKQEAgLTk5LDkgKzk5LDYgQEAKIEdOVXN0ZXAvTG9jYWwvTGlicmFyeS9DeW50
 aGl1bmUvTW9kLmZvcm1hdC9Nb2QKIEdOVXN0ZXAvTG9jYWwvTGlicmFyeS9DeW50aGl1bmUvTW9k
 LmZvcm1hdC9SZXNvdXJjZXMvSW5mby1nbnVzdGVwLnBsaXN0CiBHTlVzdGVwL0xvY2FsL0xpYnJh
 cnkvQ3ludGhpdW5lL01vZC5mb3JtYXQvc3RhbXAubWFrZQotR05Vc3RlcC9Mb2NhbC9MaWJyYXJ5
 L0N5bnRoaXVuZS9NdXNlcGFjay5mb3JtYXQvTXVzZXBhY2sKLUdOVXN0ZXAvTG9jYWwvTGlicmFy
 eS9DeW50aGl1bmUvTXVzZXBhY2suZm9ybWF0L1Jlc291cmNlcy9JbmZvLWdudXN0ZXAucGxpc3QK
 LUdOVXN0ZXAvTG9jYWwvTGlicmFyeS9DeW50aGl1bmUvTXVzZXBhY2suZm9ybWF0L3N0YW1wLm1h
 a2UKIEdOVXN0ZXAvTG9jYWwvTGlicmFyeS9DeW50aGl1bmUvT1NTLm91dHB1dC9PU1MKIEdOVXN0
 ZXAvTG9jYWwvTGlicmFyeS9DeW50aGl1bmUvT1NTLm91dHB1dC9SZXNvdXJjZXMvRW5nbGlzaC5s
 cHJvai9Mb2NhbGl6YWJsZS5zdHJpbmdzCiBHTlVzdGVwL0xvY2FsL0xpYnJhcnkvQ3ludGhpdW5l
 L09TUy5vdXRwdXQvUmVzb3VyY2VzL0ZyZW5jaC5scHJvai9Mb2NhbGl6YWJsZS5zdHJpbmdzCkBA
 IC0xNzMsOCArMTcwLDYgQEAKIEBkaXJybSBHTlVzdGVwL0xvY2FsL0xpYnJhcnkvQ3ludGhpdW5l
 L09TUy5vdXRwdXQvUmVzb3VyY2VzL0VuZ2xpc2gubHByb2oKIEBkaXJybSBHTlVzdGVwL0xvY2Fs
 L0xpYnJhcnkvQ3ludGhpdW5lL09TUy5vdXRwdXQvUmVzb3VyY2VzCiBAZGlycm0gR05Vc3RlcC9M
 b2NhbC9MaWJyYXJ5L0N5bnRoaXVuZS9PU1Mub3V0cHV0Ci1AZGlycm0gR05Vc3RlcC9Mb2NhbC9M
 aWJyYXJ5L0N5bnRoaXVuZS9NdXNlcGFjay5mb3JtYXQvUmVzb3VyY2VzCi1AZGlycm0gR05Vc3Rl
 cC9Mb2NhbC9MaWJyYXJ5L0N5bnRoaXVuZS9NdXNlcGFjay5mb3JtYXQKIEBkaXJybSBHTlVzdGVw
 L0xvY2FsL0xpYnJhcnkvQ3ludGhpdW5lL01vZC5mb3JtYXQvUmVzb3VyY2VzCiBAZGlycm0gR05V
 c3RlcC9Mb2NhbC9MaWJyYXJ5L0N5bnRoaXVuZS9Nb2QuZm9ybWF0CiBAZGlycm0gR05Vc3RlcC9M
 b2NhbC9MaWJyYXJ5L0N5bnRoaXVuZS9NUDMuZm9ybWF0L1Jlc291cmNlcwpkaWZmIC1hdXJOIGF1
 ZGlvL2JtcC1tdXNlcGFjay5vcmlnL01ha2VmaWxlIGF1ZGlvL2JtcC1tdXNlcGFjay9NYWtlZmls
 ZQotLS0gYXVkaW8vYm1wLW11c2VwYWNrLm9yaWcvTWFrZWZpbGUJMjAxMC0wOS0xNCAwNzozODow
 MC40MDgyMDg3MjQgKzAwMDAKKysrIGF1ZGlvL2JtcC1tdXNlcGFjay9NYWtlZmlsZQkyMDEwLTA5
 LTE0IDA3OjQxOjUwLjc2NDM3NjA1OCArMDAwMApAQCAtMTUsNiArMTUsOSBAQAogTUFJTlRBSU5F
 Uj0JcG9ydHNARnJlZUJTRC5vcmcKIENPTU1FTlQ9CU11c2VwYWNrIGRlY29kZXIgZm9yIGJlZXAt
 bWVkaWEtcGxheWVyCiAKK0RFUFJFQ0FURUQ9CURvZXMgbm90IGJ1aWxkIHdpdGggYXVkaW8vbXVz
 ZXBhY2sKK0VYUElSQVRJT05fREFURT0yMDEwLTExLTE1CisKIExJQl9ERVBFTkRTPQliZWVwLjI6
 JHtQT1JUU0RJUn0vbXVsdGltZWRpYS9iZWVwLW1lZGlhLXBsYXllciBcCiAJCW1wY2RlYzoke1BP
 UlRTRElSfS9hdWRpby9saWJtcGNkZWMgXAogCQl0YWc6JHtQT1JUU0RJUn0vYXVkaW8vdGFnbGli
 CmRpZmYgLWF1ck4gYXVkaW8vcHktbXVzZXBhY2sub3JpZy9NYWtlZmlsZSBhdWRpby9weS1tdXNl
 cGFjay9NYWtlZmlsZQotLS0gYXVkaW8vcHktbXVzZXBhY2sub3JpZy9NYWtlZmlsZQkyMDEwLTA5
 LTE0IDA3OjM4OjA3LjUyMzQxMTA3NSArMDAwMAorKysgYXVkaW8vcHktbXVzZXBhY2svTWFrZWZp
 bGUJMjAxMC0wOS0xNCAwNzo0MjowNy42MjE4NDA2MjQgKzAwMDAKQEAgLTE1LDYgKzE1LDkgQEAK
 IE1BSU5UQUlORVI9CXBvcnRzQEZyZWVCU0Qub3JnCiBDT01NRU5UPQlQeXRob24gbW9kdWxlIHRo
 YXQgcHJvdmlkZXMgdGhlIE11c2VwYWNrIGRlY29kaW5nIGludGVyZmFjZQogCitERVBSRUNBVEVE
 PQlEb2VzIG5vdCBidWlsZCB3aXRoIGF1ZGlvL211c2VwYWNrCitFWFBJUkFUSU9OX0RBVEU9MjAx
 MC0xMS0xNQorCiBMSUJfREVQRU5EUz0JbXBjZGVjOiR7UE9SVFNESVJ9L2F1ZGlvL2xpYm1wY2Rl
 YwogCiBVU0VfUFlUSE9OPQl5ZXMKZGlmZiAtYXVyTiBhdWRpby9saWJtcGNkZWMub3JpZy9NYWtl
 ZmlsZSBhdWRpby9saWJtcGNkZWMvTWFrZWZpbGUKLS0tIGF1ZGlvL2xpYm1wY2RlYy5vcmlnL01h
 a2VmaWxlCTIwMTAtMDktMTQgMDc6Mzg6MjAuMTgyNzUwNDYxICswMDAwCisrKyBhdWRpby9saWJt
 cGNkZWMvTWFrZWZpbGUJMjAxMC0wOS0xNCAwNzo0MTowMi41NDYwMTc4NTkgKzAwMDAKQEAgLTEz
 LDYgKzEzLDkgQEAKIE1BSU5UQUlORVI9CW11bHRpbWVkaWFARnJlZUJTRC5vcmcKIENPTU1FTlQ9
 CUhpZ2ggcXVhbGl0eSBhdWRpbyBjb21wcmVzc2lvbiBmb3JtYXQKIAorREVQUkVDQVRFRD0JUmVw
 bGFjZWQgYnkgYXVkaW8vbXVzZXBhY2sKK0VYUElSQVRJT05fREFURT0yMDEwLTExLTE1CisKIENP
 TkZMSUNUUz0JbXVzZXBhY2stWzAtOV0qCiAKIFVTRV9CWklQMj0JeWVzCg==
 
 ------=OPENWEBMAIL_ATT_0.20251757030292--

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/150510: commit references a PR
Date: Fri, 17 Sep 2010 19:24:54 +0000 (UTC)

 makc        2010-09-17 19:24:49 UTC
 
   FreeBSD ports repository
 
   Modified files:
     audio/libmpcdec      Makefile 
   Log:
   Deprecate: superseded by audio/musepack
   Set expiration date to 2010-11-15
   
   PR:             ports/150510
   Submitted by:   Ganael Laplanche <ganael.laplanche at martymac.org>
   
   Revision  Changes    Path
   1.15      +3 -0      ports/audio/libmpcdec/Makefile
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/150510: commit references a PR
Date: Fri, 17 Sep 2010 19:26:00 +0000 (UTC)

 makc        2010-09-17 19:25:57 UTC
 
   FreeBSD ports repository
 
   Modified files:
     audio/bmp-musepack   Makefile 
     audio/py-musepack    Makefile 
   Log:
   Set expiration date to 2010-11-15: depends on deprecated audio/libmpcdec
   
   PR:             ports/150510
   Submitted by:   Ganael Laplanche <ganael.laplanche at martymac.org>
   
   Revision  Changes    Path
   1.16      +3 -0      ports/audio/bmp-musepack/Makefile
   1.5       +3 -0      ports/audio/py-musepack/Makefile
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/150510: commit references a PR
Date: Fri, 17 Sep 2010 19:31:54 +0000 (UTC)

 makc        2010-09-17 19:31:50 UTC
 
   FreeBSD ports repository
 
   Modified files:
     audio/musepack       Makefile 
   Log:
   Unbreak on 6.x
   
   PR:             ports/150510
   Submitted by:   Ganael Laplanche <ganael.laplanche at martymac.org>
   Approved by:    Stefan Ehmann (maintainer)
   
   Revision  Changes    Path
   1.14      +2 -1      ports/audio/musepack/Makefile
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/150510: commit references a PR
Date: Tue, 21 Sep 2010 16:48:09 +0000 (UTC)

 makc        2010-09-21 16:48:04 UTC
 
   FreeBSD ports repository
 
   Modified files:
     audio/libtunepimp    Makefile 
     audio/aqualung       Makefile 
     audio/cmus           Makefile 
     multimedia/vlc       Makefile 
   Added files:
     audio/libtunepimp/files patch-configure 
                             patch-plugins-mpc-mpcdecode.cpp 
     audio/cmus/files     patch-configure 
   Log:
   Switch to audio/musepack from deprecated audio/libmpcdec
   
   PR:             ports/150510
   Submitted by:   Ganael Laplanche <ganael.laplanche at martymac.org>
   Approved by:    maintainer
   
   Revision  Changes    Path
   1.34      +2 -2      ports/audio/aqualung/Makefile
   1.36      +2 -2      ports/audio/cmus/Makefile
   1.1       +11 -0     ports/audio/cmus/files/patch-configure (new)
   1.30      +2 -2      ports/audio/libtunepimp/Makefile
   1.3       +56 -0     ports/audio/libtunepimp/files/patch-configure (new)
   1.1       +165 -0    ports/audio/libtunepimp/files/patch-plugins-mpc-mpcdecode.cpp (new)
   1.243     +4 -4      ports/multimedia/vlc/Makefile
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/150510: commit references a PR
Date: Tue, 21 Sep 2010 16:49:50 +0000 (UTC)

 makc        2010-09-21 16:49:16 UTC
 
   FreeBSD ports repository
 
   Modified files:
     audio/gstreamer-plugins-musepack Makefile 
     multimedia/gstreamer-plugins Makefile.common 
   Log:
   Switch to audio/musepack from deprecated audio/libmpcdec
   
   PR:             ports/150510
   Submitted by:   Ganael Laplanche <ganael.laplanche at martymac.org>
   Approved by:    multimedia (kwm)
   
   Revision  Changes    Path
   1.15      +1 -1      ports/audio/gstreamer-plugins-musepack/Makefile
   1.113     +2 -2      ports/multimedia/gstreamer-plugins/Makefile.common
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/150510: commit references a PR
Date: Tue, 21 Sep 2010 16:50:17 +0000 (UTC)

 makc        2010-09-21 16:50:12 UTC
 
   FreeBSD ports repository
 
   Modified files:
     sysutils/k3b-kde4    Makefile pkg-plist 
   Log:
   Switch to audio/musepack from deprecated audio/libmpcdec
   
   PR:             ports/150510
   Submitted by:   Ganael Laplanche <ganael.laplanche at martymac.org>
   
   Revision  Changes    Path
   1.71      +6 -6      ports/sysutils/k3b-kde4/Makefile
   1.21      +2 -2      ports/sysutils/k3b-kde4/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/150510: commit references a PR
Date: Tue, 21 Sep 2010 16:51:24 +0000 (UTC)

 makc        2010-09-21 16:51:17 UTC
 
   FreeBSD ports repository
 
   Modified files:
     audio/xmms2          Makefile 
   Added files:
     audio/xmms2/files    patch-patch-src-plugins-musepack-wscript 
   Log:
   Switch to audio/musepack from deprecated audio/libmpcdec
   
   PR:             ports/150510
   Submitted by:   Ganael Laplanche <ganael.laplanche at martymac.org>
   
   Revision  Changes    Path
   1.57      +1 -1      ports/audio/xmms2/Makefile
   1.1       +11 -0     ports/audio/xmms2/files/patch-patch-src-plugins-musepack-wscript (new)
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 

From: Chris Rees <utisoft@gmail.com>
To: Max Brazhnikov <makc@freebsd.org>, bug-followup@freebsd.org
Cc:  
Subject: Re: ports/150510: Port updates: depend on audio/musepack instead of
 audio/libmpcdec (when possible)
Date: Sun, 26 Sep 2010 12:40:06 +0100

 On 16 September 2010 12:46, Max Brazhnikov <makc@freebsd.org> wrote:
 >
 > Hi,
 >
 > audio/libmpcdec is deprecated (and will be removed soon) in favour of
 > audio/musepack. The following ports will be switched to musepack:
 >
 > audio/aqualung
 > audio/cmus
 > audio/gstreamer-plugins-musepack
 > audio/libtunepimp
 > audio/moc
 > audio/musicpd
 > audio/xmms2
 > multimedia/quodlibet
 > multimedia/vlc
 > sysutils/k3b-kde4
 >
 > Please review/approve the patch enclosed.
 >
 > Greetings,
 > Max
 >
 
 
 Checked for musicpd, works fine. Maintainer approves. Thanks Max!
 
 Chris

From: dirk.meyer@dinoex.sub.org (Dirk Meyer)
To: FreeBSD-gnats-submit@FreeBSD.org
Cc:  
Subject: Re: ports/150510: Port updates: depend on audio/musepack
	instead of audio/libmpcdec (when possible)
Date: Mon, 27 Sep 2010 03:25:01 +0200

 cynthiune approved.
 
 kind regards Dirk
 
 - Dirk Meyer, Im Grund 4, 34317 Habichtswald, Germany
 - [dirk.meyer@dinoex.sub.org],[dirk.meyer@guug.de],[dinoex@FreeBSD.org]

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/150510: commit references a PR
Date: Fri,  1 Oct 2010 21:46:07 +0000 (UTC)

 makc        2010-10-01 21:46:01 UTC
 
   FreeBSD ports repository
 
   Modified files:
     audio/cynthiune      Makefile pkg-plist 
     multimedia/mplayer   Makefile Makefile.options 
   Log:
   Remove dependency on deprecated audio/libmpcdec
   
   PR:             ports/150510
   Submitted by:   Ganael Laplanche <ganael.laplanche at martymac.org>
   Approved by:    maintainer
   
   Revision  Changes    Path
   1.21      +2 -3      ports/audio/cynthiune/Makefile
   1.6       +0 -5      ports/audio/cynthiune/pkg-plist
   1.198     +3 -3      ports/multimedia/mplayer/Makefile
   1.14      +0 -6      ports/multimedia/mplayer/Makefile.options
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/150510: commit references a PR
Date: Fri,  1 Oct 2010 21:47:13 +0000 (UTC)

 makc        2010-10-01 21:47:10 UTC
 
   FreeBSD ports repository
 
   Modified files:
     sysutils/k3b         Makefile pkg-plist 
   Log:
   Remove dependency on deprecated audio/libmpcdec
   
   PR:             ports/150510
   Submitted by:   Ganael Laplanche <ganael.laplanche at martymac.org>
   Approved by:    maintainer timeout (> 2 weeks)
   
   Revision  Changes    Path
   1.65      +5 -11     ports/sysutils/k3b/Makefile
   1.16      +0 -4      ports/sysutils/k3b/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/150510: commit references a PR
Date: Fri,  1 Oct 2010 21:49:13 +0000 (UTC)

 makc        2010-10-01 21:49:09 UTC
 
   FreeBSD ports repository
 
   Modified files:
     audio/musicpd        Makefile 
   Log:
   Switch to audio/musepack from deprecated audio/libmpcdec
   
   PR:             ports/150510
   Submitted by:   Ganael Laplanche <ganael.laplanche at martymac.org>
   Approved by:    maintainer
   
   Revision  Changes    Path
   1.56      +2 -1      ports/audio/musicpd/Makefile
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/150510: commit references a PR
Date: Fri,  1 Oct 2010 21:49:50 +0000 (UTC)

 makc        2010-10-01 21:49:43 UTC
 
   FreeBSD ports repository
 
   Modified files:
     audio/moc            Makefile 
     multimedia/quodlibet Makefile 
   Log:
   Switch to audio/musepack from deprecated audio/libmpcdec
   
   PR:             ports/150510
   Submitted by:   Ganael Laplanche <ganael.laplanche at martymac.org>
   Approved by:    maintainer timeout (> 2 weeks)
   
   Revision  Changes    Path
   1.30      +2 -2      ports/audio/moc/Makefile
   1.35      +2 -2      ports/multimedia/quodlibet/Makefile
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: feedback->closed 
State-Changed-By: makc 
State-Changed-When: Fri Oct 1 21:58:59 UTC 2010 
State-Changed-Why:  
Everything committed finally. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=150510 

From: "Ganael LAPLANCHE" <ganael.laplanche@martymac.org>
To: makc@FreeBSD.org
Cc: bug-followup@FreeBSD.org, Zahemszky =?ISO-8859-15?Q?G=E1bor?= <Gabor@Zahemszky.HU>
Subject: Re: ports/150510: Port updates: depend on audio/musepack instead of audio/libmpcdec (when possible)
Date: Mon,  4 Oct 2010 10:06:54 +0200 (CEST)

 This is a multi-part message in MIME format.
 
 ------=OPENWEBMAIL_ATT_0.792153085888462
 Content-Type: text/plain; charset=iso-8859-15
 
 On Fri, 1 Oct 2010 21:58:59 GMT, makc wrote
 
 > Everything committed finally. Thanks!
 
 Seems like I've forgotten to patch mencoder, see :
 
 http://lists.freebsd.org/pipermail/freebsd-ports/2010-October/063928.html
 
 Here is a patch to fix mencoder port.
 
 Best regards,
 
 --
 Ganael LAPLANCHE <ganael.laplanche@martymac.org>
 http://www.martymac.org | http://contribs.martymac.org
 FreeBSD: martymac <martymac@FreeBSD.org>, http://www.FreeBSD.org
 
 ------=OPENWEBMAIL_ATT_0.792153085888462
 Content-Type: text/plain;
 	name="patch-mencoder.txt"
 Content-Disposition: attachment; filename="patch-mencoder.txt"
 Content-Transfer-Encoding: base64
 
 ZGlmZiAtYXVyTiBtZW5jb2Rlci5vcmlnL01ha2VmaWxlIG1lbmNvZGVyL01ha2VmaWxlCi0tLSBt
 ZW5jb2Rlci5vcmlnL01ha2VmaWxlCTIwMTAtMDktMTcgMTE6MjI6NTQuMDAwMDAwMDAwICswMjAw
 CisrKyBtZW5jb2Rlci9NYWtlZmlsZQkyMDEwLTEwLTA0IDA5OjU3OjE0LjAwMDAwMDAwMCArMDIw
 MApAQCAtNiw3ICs2LDcgQEAKIAogUE9SVE5BTUU9CW1lbmNvZGVyCiBQT1JUVkVSU0lPTj0JJHtN
 UExBWUVSX1BPUlRfVkVSU0lPTn0KLVBPUlRSRVZJU0lPTj0JMQorUE9SVFJFVklTSU9OPQkyCiBD
 T01NRU5UPQlDb252ZW5pZW50IHZpZGVvIGZpbGUgYW5kIG1vdmllIGVuY29kZXIKIFJFU1RSSUNU
 RUQ9CVBvcnQgaGFzIHJlc3RyaWN0ZWQgZGVwZW5kZW5jaWVzCiAKQEAgLTI3LDcgKzI3LDYgQEAK
 IE9QVElPTlMrPQlNQUQgIkVuYWJsZSBtYWQgTVBFRyBhdWRpbyBlbmdpbmUgc3VwcG9ydCIgb2Zm
 CiBPUFRJT05TKz0JQU1SICJFbmFibGUgb3BlbmNvcmUgQU1SIGF1ZGlvIGNvZGVjIHN1cHBvcnQi
 IG9mZgogT1BUSU9OUys9CVRXT0xBTUUgIkVuYWJsZSB0d29sYW1lIE1QRUcgYXVkaW8gY29kZWMg
 c3VwcG9ydCIgb2ZmCi1PUFRJT05TKz0JTElCTVBDREVDICJFbmFibGUgbGlibXBjZGVjIHN1cHBv
 cnQiIG9mZgogT1BUSU9OUys9CUZBQUMgIkVuYWJsZSBGQUFDIGF1ZGlvIGNvZGVjIHN1cHBvcnQi
 IG9mZgogT1BUSU9OUys9CUxBRFNQQSAiRW5hYmxlIExBRFNQQSBwbHVnaW4gc3VwcG9ydCIgb2Zm
 CiBPUFRJT05TKz0JU1BFRVggIkVuYWJsZSBzcGVleCBhdWRpbyBjb2RlYyBzdXBwb3J0IiBvZmYK
 QEAgLTc5LDcgKzc4LDggQEAKIAkJCS0tZGlzYWJsZS1hYSBcCiAJCQktLWRpc2FibGUtam95c3Rp
 Y2sgXAogCQkJLS1kaXNhYmxlLWRpcmVjdGZiIFwKLQkJCS0tZGlzYWJsZS1zc3NlMworCQkJLS1k
 aXNhYmxlLXNzc2UzIFwKKwkJCS0tZGlzYWJsZS1tdXNlcGFjawogCiBBTExfVEFSR0VUPQltZW5j
 b2RlcgogCg==
 
 ------=OPENWEBMAIL_ATT_0.792153085888462--
State-Changed-From-To: closed->open 
State-Changed-By: martymac 
State-Changed-When: Mon Oct 4 14:50:41 UTC 2010 
State-Changed-Why:  
I'll handle the remaining patch 

http://www.freebsd.org/cgi/query-pr.cgi?pr=150510 
Responsible-Changed-From-To: makc->martymac 
Responsible-Changed-By: martymac 
Responsible-Changed-When: Mon Oct 4 14:51:21 UTC 2010 
Responsible-Changed-Why:  
I'll handle the remaining patch 

http://www.freebsd.org/cgi/query-pr.cgi?pr=150510 

From: "Ganael LAPLANCHE" <martymac@FreeBSD.org>
To: riggs@rrr.de
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/150510: Port updates: depend on audio/musepack instead of audio/libmpcdec (when possible)
Date: Mon,  4 Oct 2010 17:02:38 +0200 (CEST)

 This is a multi-part message in MIME format.
 
 ------=OPENWEBMAIL_ATT_0.0672145454018427
 Content-Type: text/plain; charset=iso-8859-15
 
 Dear maintainer of multimedia/mencoder,
 
 It seems like I've forgotten to patch mencoder regarding libmpcdec
 removal, see :
 
 http://lists.freebsd.org/pipermail/freebsd-ports/2010-October/063928.html
 
 Find attached to this e-mail a patch to fix mencoder port and remove
 libmpcdec support.
 
 Could you take a look at it and approve or disapprove it, please ?
 
 Best regards,
 
 --
 Ganael LAPLANCHE <ganael.laplanche@martymac.org>
 http://www.martymac.org | http://contribs.martymac.org
 FreeBSD: martymac <martymac@FreeBSD.org>, http://www.FreeBSD.org
 
 ------=OPENWEBMAIL_ATT_0.0672145454018427
 Content-Type: text/plain;
 	name="patch-mencoder.txt"
 Content-Disposition: attachment; filename="patch-mencoder.txt"
 Content-Transfer-Encoding: base64
 
 ZGlmZiAtYXVyTiBtZW5jb2Rlci5vcmlnL01ha2VmaWxlIG1lbmNvZGVyL01ha2VmaWxlCi0tLSBt
 ZW5jb2Rlci5vcmlnL01ha2VmaWxlCTIwMTAtMDktMTcgMTE6MjI6NTQuMDAwMDAwMDAwICswMjAw
 CisrKyBtZW5jb2Rlci9NYWtlZmlsZQkyMDEwLTEwLTA0IDA5OjU3OjE0LjAwMDAwMDAwMCArMDIw
 MApAQCAtNiw3ICs2LDcgQEAKIAogUE9SVE5BTUU9CW1lbmNvZGVyCiBQT1JUVkVSU0lPTj0JJHtN
 UExBWUVSX1BPUlRfVkVSU0lPTn0KLVBPUlRSRVZJU0lPTj0JMQorUE9SVFJFVklTSU9OPQkyCiBD
 T01NRU5UPQlDb252ZW5pZW50IHZpZGVvIGZpbGUgYW5kIG1vdmllIGVuY29kZXIKIFJFU1RSSUNU
 RUQ9CVBvcnQgaGFzIHJlc3RyaWN0ZWQgZGVwZW5kZW5jaWVzCiAKQEAgLTI3LDcgKzI3LDYgQEAK
 IE9QVElPTlMrPQlNQUQgIkVuYWJsZSBtYWQgTVBFRyBhdWRpbyBlbmdpbmUgc3VwcG9ydCIgb2Zm
 CiBPUFRJT05TKz0JQU1SICJFbmFibGUgb3BlbmNvcmUgQU1SIGF1ZGlvIGNvZGVjIHN1cHBvcnQi
 IG9mZgogT1BUSU9OUys9CVRXT0xBTUUgIkVuYWJsZSB0d29sYW1lIE1QRUcgYXVkaW8gY29kZWMg
 c3VwcG9ydCIgb2ZmCi1PUFRJT05TKz0JTElCTVBDREVDICJFbmFibGUgbGlibXBjZGVjIHN1cHBv
 cnQiIG9mZgogT1BUSU9OUys9CUZBQUMgIkVuYWJsZSBGQUFDIGF1ZGlvIGNvZGVjIHN1cHBvcnQi
 IG9mZgogT1BUSU9OUys9CUxBRFNQQSAiRW5hYmxlIExBRFNQQSBwbHVnaW4gc3VwcG9ydCIgb2Zm
 CiBPUFRJT05TKz0JU1BFRVggIkVuYWJsZSBzcGVleCBhdWRpbyBjb2RlYyBzdXBwb3J0IiBvZmYK
 QEAgLTc5LDcgKzc4LDggQEAKIAkJCS0tZGlzYWJsZS1hYSBcCiAJCQktLWRpc2FibGUtam95c3Rp
 Y2sgXAogCQkJLS1kaXNhYmxlLWRpcmVjdGZiIFwKLQkJCS0tZGlzYWJsZS1zc3NlMworCQkJLS1k
 aXNhYmxlLXNzc2UzIFwKKwkJCS0tZGlzYWJsZS1tdXNlcGFjawogCiBBTExfVEFSR0VUPQltZW5j
 b2RlcgogCg==
 
 
 ------=OPENWEBMAIL_ATT_0.0672145454018427--

From: Thomas Zander <thomas.e.zander@googlemail.com>
To: bug-followup@freebsd.org, martymac@freebsd.org
Cc:  
Subject: Re: ports/150510: Port updates: depend on audio/musepack instead of
 audio/libmpcdec (when possible)
Date: Mon, 4 Oct 2010 20:59:09 +0200

 Hi,
 
 On Mon, Oct 4, 2010 at 17:02, Ganael LAPLANCHE <martymac@freebsd.org> wrote:
 
 > It seems like I've forgotten to patch mencoder regarding libmpcdec
 > removal, see :
 > http://lists.freebsd.org/pipermail/freebsd-ports/2010-October/063928.html
 > Find attached to this e-mail a patch to fix mencoder port and remove
 > libmpcdec support.
 
 Well, I seem to be unable to see a patch attached to this message in
 the link, but you are correct in that mencoder should get its MPCDEC
 option removed as well. It's not spectacularly urgent since mencoder
 uses mplayer's Makefiles so it does not introduce a faulty dependence.
 It should be sufficient to just remove MPCDEC from mencoder's options.
 Please go ahead, I am fine with this change.
 
 Cheers,
 Riggs

From: "Ganael LAPLANCHE" <martymac@FreeBSD.org>
To: Thomas Zander <thomas.e.zander@googlemail.com>
Cc: bug-followup@freebsd.org
Subject: Re: ports/150510: Port updates: depend on audio/musepack instead of audio/libmpcdec (when possible)
Date: Mon,  4 Oct 2010 21:45:41 +0200 (CEST)

 On Mon, 4 Oct 2010 20:59:09 +0200, Thomas Zander wrote
 
 Hi Thomas,
 
 Thanks for your answer !
 
 > Well, I seem to be unable to see a patch attached to this 
 > message in the link,
 
 The patch was not in the link, but attached to my previous e-mail :p
 
 > It should be sufficient to just remove MPCDEC from mencoder's options. 
 > Please go ahead, I am fine with this change.
 
 I have noticed you agree with this change, thank you very much !
 
 Best regards,
 
 --
 Ganael LAPLANCHE <ganael.laplanche@martymac.org>
 http://www.martymac.org | http://contribs.martymac.org
 FreeBSD: martymac <martymac@FreeBSD.org>, http://www.FreeBSD.org
State-Changed-From-To: open->closed 
State-Changed-By: martymac 
State-Changed-When: Tue Oct 5 05:58:44 UTC 2010 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=150510 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/150510: commit references a PR
Date: Tue,  5 Oct 2010 05:57:33 +0000 (UTC)

 martymac    2010-10-05 05:57:28 UTC
 
   FreeBSD ports repository
 
   Modified files:
     multimedia/mencoder  Makefile 
   Log:
   Remove support for deprecated libmpcdec
   
   PR:             150510
   Approved by:    Thomas Zander <thomas.e.zander@googlemail.com> (maintainer),
                   ehaupt (mentor)
   
   Revision  Changes    Path
   1.19      +3 -3      ports/multimedia/mencoder/Makefile
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
