Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/audio/slimserver/Makefile,v
retrieving revision 1.20
diff -u -u -r1.20 Makefile
--- Makefile	20 Nov 2005 02:32:13 -0000	1.20
+++ Makefile	30 Dec 2005 14:01:49 -0000
@@ -69,6 +69,10 @@
 		SLIMDIR=${SLIMDIR} \
 		CONFFILES="${CONFFILES}"
 
+.if !defined(WITHOUT_FAAD)
+RUN_DEPENDS+=	faad:${PORTSDIR}/audio/faad
+.endif
+
 pre-fetch:
 .if !defined(SLIMDIR)
 	@${ECHO_MSG} ""
Index: files/patch-convert.conf
===================================================================
RCS file: files/patch-convert.conf
diff -N files/patch-convert.conf
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-convert.conf	30 Dec 2005 14:01:49 -0000
@@ -0,0 +1,29 @@
+--- convert.conf.orig	Thu Dec 29 22:27:54 2005
++++ convert.conf	Thu Dec 29 22:33:20 2005
+@@ -34,7 +34,7 @@
+ # specific combinations match before wildcards
+ 
+ mov mp3 * *
+-	[mov123] $FILE$ | [lame] --resample 44100 --silent -q $QUALITY$ -b $BITRATE$ -r - -
++	[faad] -w -f 2 $FILE$ | [lame] --resample 44100 --silent -q $QUALITY$ -b $BITRATE$ -r - -
+ 
+ #ogg mp3 * *
+ #	[oggdec] -Q -o - -R $FILE$ | [lame] --resample 44100 --silent -q $QUALITY$ --abr $BITRATE$ -r -x - -
+@@ -100,7 +100,7 @@
+ 
+ ## you can comment this out if you want to use LAME to transcode AAC/MOV files to MP3.
+ mov aif * *
+-	[mov123] $FILE$
++	[faad] -w -f 2 $FILE$
+ 
+ wma wma squeezebox2 *
+ 	-
+@@ -138,7 +138,7 @@
+ 	[mac] $FILE$ - -d | [flac] -cs --totally-silent --compression-level-0 -
+ 
+ mov flc * *
+-	[mov123] $FILE$ | [flac] -cs --totally-silent --compression-level-0 --endian big --sign signed --channels 2 --bps 16 --sample-rate 44100 -
++	[faad] -w -f 2 $FILE$ | [flac] -cs --totally-silent --compression-level-0 --endian big --sign signed --channels 2 --bps 16 --sample-rate 44100 -
+ 
+ # special case for smart bitrates on mp3 input
+ mp3 mp3 transcode *