Upgrade to the Squeezecenter 7.3.1. [1]

Remove the ability to set the default skin using the port.  The current
implemenation breaks the install wizard and I don't want to hold this
commit up further. [2]

Submitted by:	Alex Varju <freebsd dash ports at varju dot ca> [1]
Reported by:	Nicolai Petri <nicolai at catpipe dot net> [2]

14 files changed, 309 insertions, 282 deletions

diff --git a/audio/squeezeboxserver/Makefile b/audio/squeezeboxserver/Makefile
index 9d16f5e7b21f..e8fc06cdc418 100644
--- a/audio/squeezeboxserver/Makefile
+++ b/audio/squeezeboxserver/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	squeezecenter
-PORTVERSION=	7.2.1
+PORTVERSION=	7.3.1
 CATEGORIES=	audio
 MASTER_SITES=	http://downloads.slimdevices.com/SqueezeCenter_v${PORTVERSION}/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.0//}-noCPAN
@@ -17,8 +17,7 @@ COMMENT=	Slim Devices audio streaming server
 
 # Defaults support playback of relativly unrestricted formats on SB2 or
 # SB3 devices and wired SB1 devices.
-OPTIONS=	CLASSIC "Default to the Classic skin" off \
-		APE "Support Monkey's Audio Codec input" on \
+OPTIONS=	APE "Support Monkey's Audio Codec input" on \
 		FAAD "Support AAC input via FAAD" on \
 		FLAC "Support FLAC output (and input on SliMP3 and SB1)" on \
 		LAME "Support MP3 output via LAME" off \
@@ -78,12 +77,6 @@ RUN_DEPENDS+=	shorten:${PORTSDIR}/audio/shorten
 RUN_DEPENDS+=	oggdec:${PORTSDIR}/audio/vorbis-tools
 .endif
 
-.if defined(WITH_CLASSIC)
-DEFAULT_SKIN=	Classic
-.else
-DEFAULT_SKIN?=	Default
-.endif
-
 USE_RC_SUBR=	squeezecenter.sh
 TMP_SLIMDIR=	${WRKDIR}/_squeezecenter
 TMP_DOCSDIR=	${WRKDIR}/doc
@@ -135,17 +128,14 @@ SLIMGROUP?=	${SLIMUSER}
 
 post-patch:
 	@${REINPLACE_CMD} \
-	    -e 's|/usr/bin/perl|${PERL}|' \
-	    -e 's|%%DISTDIR%%|${_DISTDIR}|' \
-	    -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
-	    -e 's|%%PREFIX%%|${PREFIX}|' \
-	    -e 's|%%SITE_PERL%%|${SITE_PERL}|' \
-	    -e 's|%%SLIMDBDIR%%|${SLIMDBDIR}|' \
-	    -e 's|%%TMP_SLIMDIR%%|${TMP_SLIMDIR}|' \
-	    -e 's|%%DEFAULT_SKIN%%|${DEFAULT_SKIN}|' \
-		${WRKSRC}/Slim/Utils/OSDetect.pm \
-		${WRKSRC}/Slim/Utils/Prefs.pm \
-		${WRKSRC}/Slim/Web/HTTP.pm \
+	    -e 's|/usr/bin/perl|${PERL}|g' \
+	    -e 's|%%DISTDIR%%|${_DISTDIR}|g' \
+	    -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
+	    -e 's|%%PREFIX%%|${PREFIX}|g' \
+	    -e 's|%%SITE_PERL%%|${SITE_PERL}|g' \
+	    -e 's|%%SLIMDBDIR%%|${SLIMDBDIR}|g' \
+	    -e 's|%%TMP_SLIMDIR%%|${TMP_SLIMDIR}|g' \
+		${WRKSRC}/Slim/Utils/OS/FreeBSD.pm \
 		${WRKSRC}/scanner.pl \
 		${WRKSRC}/slimserver.pl
 
@@ -170,13 +160,14 @@ pre-install:
 
 do-install:
 	@${MKDIR} -m 0755 ${PREFIX}/${SLIMDIR}
+	@${RM} -f ${PREFIX}/${SLIMDIR}/Cache
 	@${LN} -s ${SLIMDBDIR}/cache ${PREFIX}/${SLIMDIR}/Cache
 	@cd ${TMP_SLIMDIR} && ${COPYTREE_SHARE} . ${PREFIX}/${SLIMDIR}
-	@${CHMOD} 755 ${PREFIX}/${SLIMDIR}/slimserver.pl 
-	@${CHMOD} 755 ${PREFIX}/${SLIMDIR}/scanner.pl 
-	@${LN} -s ${LOCALBASE}/share/mysql/errmsg.txt \
+	@${CHMOD} 755 ${PREFIX}/${SLIMDIR}/slimserver.pl
+	@${CHMOD} 755 ${PREFIX}/${SLIMDIR}/scanner.pl
+	@${LN} -sf ${LOCALBASE}/share/mysql/errmsg.txt \
 	    ${PREFIX}/${SLIMDIR}/MySQL/
-	@${LN} -s ${LOCALBASE}/share/mysql/english/errmsg.sys \
+	@${LN} -sf ${LOCALBASE}/share/mysql/english/errmsg.sys \
 	    ${PREFIX}/${SLIMDIR}/MySQL/
 	@${INSTALL_SCRIPT} ${WRKDIR}/softsqueeze.sh ${PREFIX}/bin/softsqueeze
 .if !defined(NOPORTDOCS)
diff --git a/audio/squeezeboxserver/distinfo b/audio/squeezeboxserver/distinfo
index 48ba216c3c54..fa5b9fded415 100644
--- a/audio/squeezeboxserver/distinfo
+++ b/audio/squeezeboxserver/distinfo
@@ -1,3 +1,3 @@
-MD5 (squeezecenter-7.2.1-noCPAN.tgz) = 577b4a9c632266f689acf0de644c6c4b
-SHA256 (squeezecenter-7.2.1-noCPAN.tgz) = d603f9d4affad68a537230bf66cb170f691919d4696873b41452a88ba77480ae
-SIZE (squeezecenter-7.2.1-noCPAN.tgz) = 22681495
+MD5 (squeezecenter-7.3.1-noCPAN.tgz) = 77a253de38600c34936748be7c5528a1
+SHA256 (squeezecenter-7.3.1-noCPAN.tgz) = 7d4fceb8b0b87e10a849cc08237addec910e135e15094e911da6386036302cea
+SIZE (squeezecenter-7.3.1-noCPAN.tgz) = 23765464
diff --git a/audio/squeezeboxserver/files/patch-Slim_Formats_XML.pm b/audio/squeezeboxserver/files/patch-Slim_Formats_XML.pm
new file mode 100644
index 000000000000..19e9cc080855
--- /dev/null
+++ b/audio/squeezeboxserver/files/patch-Slim_Formats_XML.pm
@@ -0,0 +1,11 @@
+--- Slim/Formats/XML.pm.orig	2008-12-22 14:26:28.000000000 -0800
++++ Slim/Formats/XML.pm	2008-12-22 14:32:10.000000000 -0800
+@@ -13,7 +13,7 @@
+ use strict;
+ use File::Slurp;
+ use HTML::Entities;
+-use JSON::XS qw(from_json);
++use JSON::XS::VersionOneAndTwo;
+ use Scalar::Util qw(weaken);
+ use URI::Escape qw(uri_escape);
+ use XML::Simple;
diff --git a/audio/squeezeboxserver/files/patch-Slim_Plugin_LastFM_ProtocolHandler.pm b/audio/squeezeboxserver/files/patch-Slim_Plugin_LastFM_ProtocolHandler.pm
index a715f36e5f98..4544e7a9a693 100644
--- a/audio/squeezeboxserver/files/patch-Slim_Plugin_LastFM_ProtocolHandler.pm
+++ b/audio/squeezeboxserver/files/patch-Slim_Plugin_LastFM_ProtocolHandler.pm
@@ -1,23 +1,11 @@
-
-$FreeBSD$
-
---- Slim/Plugin/LastFM/ProtocolHandler.pm.orig
-+++ Slim/Plugin/LastFM/ProtocolHandler.pm
+--- Slim/Plugin/LastFM/ProtocolHandler.pm.orig	2008-12-22 14:26:28.000000000 -0800
++++ Slim/Plugin/LastFM/ProtocolHandler.pm	2008-12-22 14:32:41.000000000 -0800
 @@ -7,7 +7,7 @@
  use strict;
  use base qw(Slim::Player::Protocols::HTTP);
  
 -use JSON::XS qw(from_json);
-+use JSON::XS qw(decode_json);
++use JSON::XS::VersionOneAndTwo;
  use URI::Escape qw(uri_escape_utf8);
  
  use Slim::Player::Playlist;
-@@ -155,7 +155,7 @@
- 	my $client = $http->params->{client};
- 	my $params = $http->params->{params};
- 	
--	my $track = eval { from_json( $http->content ) };
-+	my $track = eval { decode_json( $http->content ) };
- 	
- 	if ( $@ || $track->{error} ) {
- 		# We didn't get the next track to play
diff --git a/audio/squeezeboxserver/files/patch-Slim_Plugin_Sirius_ProtocolHandler.pm b/audio/squeezeboxserver/files/patch-Slim_Plugin_Sirius_ProtocolHandler.pm
new file mode 100644
index 000000000000..0589e98abac4
--- /dev/null
+++ b/audio/squeezeboxserver/files/patch-Slim_Plugin_Sirius_ProtocolHandler.pm
@@ -0,0 +1,11 @@
+--- Slim/Plugin/Sirius/ProtocolHandler.pm.orig	2008-12-22 14:26:28.000000000 -0800
++++ Slim/Plugin/Sirius/ProtocolHandler.pm	2008-12-22 14:32:33.000000000 -0800
+@@ -19,7 +19,7 @@
+ use Slim::Utils::Timers;
+ 
+ use HTTP::Request;
+-use JSON::XS qw(from_json);
++use JSON::XS::VersionOneAndTwo;
+ use URI::Escape qw(uri_escape);
+ 
+ my $log = Slim::Utils::Log->addLogCategory( {
diff --git a/audio/squeezeboxserver/files/patch-Slim_Utils_OSDetect.pm b/audio/squeezeboxserver/files/patch-Slim_Utils_OSDetect.pm
index 624e06c084b6..70305f61f8c1 100644
--- a/audio/squeezeboxserver/files/patch-Slim_Utils_OSDetect.pm
+++ b/audio/squeezeboxserver/files/patch-Slim_Utils_OSDetect.pm
@@ -1,92 +1,14 @@
-
-$FreeBSD$
-
---- Slim/Utils/OSDetect.pm.orig
-+++ Slim/Utils/OSDetect.pm
-@@ -125,7 +125,7 @@
- 
- 	if ($detectedOS ne "win") {
- 
--		push @paths, (split(/:/, $ENV{'PATH'}), qw(/usr/bin /usr/local/bin /usr/libexec /sw/bin /usr/sbin));
-+		push @paths, (split(/:/, $ENV{'PATH'}), qw(/usr/bin /usr/local/bin /usr/local/libexec /usr/libexec /sw/bin /usr/sbin));
- 
- 	} else {
- 
-@@ -248,6 +248,48 @@
- 			warn "dirsFor: Didn't find a match request: [$dir]\n";
- 		}
- 
-+	} elsif (isFreeBSD()) {
-+
-+		if ($dir =~ /^(?:Firmware|Graphics|HTML|IR|MySQL|SQL|lib|Bin)$/) {
-+
-+			push @dirs, "%%PREFIX%%/squeezecenter/$dir";
-+
-+		} elsif ($dir eq 'Plugins') {
-+			push @dirs, "%%SITE_PERL%%", "%%PREFIX%%/squeezecenter/Plugins";
-+		
-+		} elsif ($dir eq 'strings' || $dir eq 'revision') {
-+
-+			push @dirs, "%%PREFIX%%/squeezecenter";
-+
-+		} elsif ($dir eq 'types' || $dir eq 'convert') {
-+
-+			push @dirs, "%%PREFIX%%/squeezecenter";
-+
-+		} elsif ($dir eq 'prefs') {
-+
-+			push @dirs, "%%SLIMDBDIR%%/prefs";
-+
-+		} elsif ($dir eq 'log') {
-+
-+			push @dirs, "/var/log/squeezecenter";
-+
-+		} elsif ($dir eq 'cache') {
-+
-+			push @dirs, "%%SLIMDBDIR%%/cache";
-+
-+		} elsif ($dir eq 'MySQL') {
-+
-+			# Do nothing - use the depended upon MySQL install.
-+
-+		} elsif ($dir =~ /^(?:music|playlists)$/) {
-+
-+			push @dirs, '';
-+
-+		} else {
-+
-+			warn "dirsFor: Didn't find a match request: [$dir]\n";
-+		}
-+
- 	# Red Hat/Fedora/SUSE RPM specific paths.
- 	} elsif (isRHorSUSE()) {
- 
-@@ -432,6 +474,28 @@
- 	return isReadyNAS();
- }
- 
-+=head2 isFreeBSD( )
-+
-+ The FreeBSD package has some specific differences for file locations.
-+ This routine needs no args, and returns 1 if FreeBSD is detected, with
-+ a clear sign that the port/package has been installed, 0 if not.
-+
-+=cut
-+
-+sub isFreeBSD {
-+
-+	# Initialize
-+	my $OS      = OS();
-+	my $details = details();
-+
-+	if ($details->{'osName'} eq 'freebsd' && $0 =~ m{^/usr/local/squeezecenter} ) {
-+	       return 1;
-+	}
-+
-+	return 0;
-+}
-+
-+
- sub isRHorSUSE {
- 
- 	# Initialize
+--- Slim/Utils/OSDetect.pm.orig	2008-12-11 14:13:33.000000000 -0800
++++ Slim/Utils/OSDetect.pm	2008-12-22 11:53:19.000000000 -0800
+@@ -121,6 +121,11 @@
+ 				$os = Slim::Utils::OS::Linux->new();
+ 			}
+ 	
++		} elsif ($^O =~ /freebsd/i) {
++
++			require Slim::Utils::OS::FreeBSD;
++			$os = Slim::Utils::OS::FreeBSD->new();
++
+ 		} else {
+ 	
+ 			require Slim::Utils::OS::Unix;
diff --git a/audio/squeezeboxserver/files/patch-Slim_Utils_OS_FreeBSD.pm b/audio/squeezeboxserver/files/patch-Slim_Utils_OS_FreeBSD.pm
new file mode 100644
index 000000000000..25d7e03e6911
--- /dev/null
+++ b/audio/squeezeboxserver/files/patch-Slim_Utils_OS_FreeBSD.pm
@@ -0,0 +1,85 @@
+--- /dev/null	2008-12-22 12:00:01.000000000 -0800
++++ Slim/Utils/OS/FreeBSD.pm	2008-12-22 12:00:05.000000000 -0800
+@@ -0,0 +1,82 @@
++package Slim::Utils::OS::FreeBSD;
++
++use strict;
++use base qw(Slim::Utils::OS::Unix);
++
++use Config;
++
++sub initDetails {
++	my $class = shift;
++
++	$class->{osDetails} = $class->SUPER::initDetails();
++	$class->{osDetails}->{'os'} = 'FreeBSD';
++	$class->{osDetails}->{osName} = 'FreeBSD';
++
++	return $class->{osDetails};
++}
++
++sub initSearchPath {
++	my $class = shift;
++
++	$class->SUPER::initSearchPath();
++
++	my @extra_paths = qw(/usr/local/libexec);
++	
++	Slim::Utils::Misc::addFindBinPaths(@extra_paths);
++}
++
++sub dirsFor {
++	my ($class, $dir) = @_;
++
++	my @dirs;
++	
++	if ($dir =~ /^(?:Firmware|Graphics|HTML|IR|MySQL|SQL|lib|Bin)$/) {
++
++		push @dirs, "%%PREFIX%%/squeezecenter/$dir";
++
++	} elsif ($dir eq 'Plugins') {
++
++		push @dirs, "%%SITE_PERL%%", "%%PREFIX%%/squeezecenter/Plugins", "%%PREFIX%%/squeezecenter/Slim/Plugin";
++
++	} elsif ($dir eq 'strings' || $dir eq 'revision') {
++
++		push @dirs, "%%PREFIX%%/squeezecenter";
++
++	} elsif ($dir eq 'types' || $dir eq 'convert') {
++
++		push @dirs, "%%PREFIX%%/squeezecenter";
++
++	} elsif ($dir eq 'prefs') {
++
++		push @dirs, "%%SLIMDBDIR%%/prefs";
++
++	} elsif ($dir eq 'log') {
++
++		push @dirs, "/var/log/squeezecenter";
++
++	} elsif ($dir eq 'cache') {
++
++		push @dirs, "%%SLIMDBDIR%%/cache";
++
++	} elsif ($dir =~ /^(?:libpath|mysql-language)$/) {
++
++		# Do nothing - use the depended upon MySQL install.
++
++	} elsif ($dir eq 'oldprefs') {
++
++		if (-r '/var/db/slimserver/slimserver.conf') {
++
++			push @dirs, '/var/db/slimserver/slimserver.conf';
++
++		}
++
++	} else {
++
++		warn "dirsFor: Didn't find a match request: [$dir]\n";
++
++	}
++
++	return wantarray() ? @dirs : $dirs[0];
++}
++
++1;
diff --git a/audio/squeezeboxserver/files/patch-Slim_Utils_OS_Unix.pm b/audio/squeezeboxserver/files/patch-Slim_Utils_OS_Unix.pm
new file mode 100644
index 000000000000..dd6116d1be38
--- /dev/null
+++ b/audio/squeezeboxserver/files/patch-Slim_Utils_OS_Unix.pm
@@ -0,0 +1,18 @@
+--- Slim/Utils/OS/Unix.pm.orig	2008-12-11 14:13:33.000000000 -0800
++++ Slim/Utils/OS/Unix.pm	2008-12-22 11:05:41.000000000 -0800
+@@ -27,7 +27,7 @@
+ 
+ 	$class->SUPER::initSearchPath();
+ 
+-	my @paths = (split(/:/, $ENV{'PATH'}), qw(/usr/bin /usr/local/bin /usr/libexec /sw/bin /usr/sbin));
++	my @paths = (split(/:/, $ENV{'PATH'}), qw(/usr/bin /usr/local/bin /usr/local/libexec /usr/libexec /sw/bin /usr/sbin));
+ 	
+ 	Slim::Utils::Misc::addFindBinPaths(@paths);
+ }
+@@ -101,4 +101,4 @@
+ # leave log rotation to the system
+ sub logRotate {}
+ 
+-1;
+\ No newline at end of file
++1;
diff --git a/audio/squeezeboxserver/files/patch-Slim_Utils_Prefs.pm b/audio/squeezeboxserver/files/patch-Slim_Utils_Prefs.pm
deleted file mode 100644
index f53ea9f04ff1..000000000000
--- a/audio/squeezeboxserver/files/patch-Slim_Utils_Prefs.pm
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- Slim/Utils/Prefs.pm.orig
-+++ Slim/Utils/Prefs.pm
-@@ -235,7 +235,7 @@
- 								   ],
- 		'titleFormatWeb'        => 1,
- 		# Server Settings - UserInterface
--		'skin'                  => 'Default',
-+		'skin'                  => '%%DEFAULT_SKIN%%',
- 		'itemsPerPage'          => 50,
- 		'refreshRate'           => 30,
- 		'coverArt'              => '',
diff --git a/audio/squeezeboxserver/files/patch-Slim_Utils_Prefs_OldPrefs.pm b/audio/squeezeboxserver/files/patch-Slim_Utils_Prefs_OldPrefs.pm
deleted file mode 100644
index 1cbb1e4c6806..000000000000
--- a/audio/squeezeboxserver/files/patch-Slim_Utils_Prefs_OldPrefs.pm
+++ /dev/null
@@ -1,18 +0,0 @@
-
-$FreeBSD$
-
---- Slim/Utils/Prefs/OldPrefs.pm.orig
-+++ Slim/Utils/Prefs/OldPrefs.pm
-@@ -117,7 +117,11 @@
- 
- 		$oldPrefs = catdir($ENV{'HOME'}, 'slimserver.pref');
- 
--	} else {
-+	} elsif (-r '/var/db/slimserver/slimserver.conf') {
-+
-+		$oldPrefs = '/var/db/slimserver/slimserver.conf';
-+
-+	}else {
- 
- 		$log->warn("no old preference file found - using default preferences");
- 
diff --git a/audio/squeezeboxserver/files/patch-Slim_Web_HTTP.pm b/audio/squeezeboxserver/files/patch-Slim_Web_HTTP.pm
deleted file mode 100644
index 0c3adf865339..000000000000
--- a/audio/squeezeboxserver/files/patch-Slim_Web_HTTP.pm
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- Slim/Web/HTTP.pm.orig
-+++ Slim/Web/HTTP.pm
-@@ -54,7 +54,7 @@
- 	$Template::Config::CONTEXT = 'Slim::Web::Template::Context';
- }
- 
--use constant defaultSkin => 'Default';
-+use constant defaultSkin => '%%DEFAULT_SKIN%%';
- use constant baseSkin	 => 'EN';
- use constant HALFYEAR	 => 60 * 60 * 24 * 180;
- 
diff --git a/audio/squeezeboxserver/files/patch-Slim_Web_Pages_Home.pm b/audio/squeezeboxserver/files/patch-Slim_Web_Pages_Home.pm
new file mode 100644
index 000000000000..f7ad2efb1834
--- /dev/null
+++ b/audio/squeezeboxserver/files/patch-Slim_Web_Pages_Home.pm
@@ -0,0 +1,10 @@
+--- Slim/Web/Pages/Home.pm.orig	2008-12-11 14:13:33.000000000 -0800
++++ Slim/Web/Pages/Home.pm	2008-12-22 13:11:18.000000000 -0800
+@@ -14,6 +14,7 @@
+ 
+ use base qw(Slim::Web::Pages);
+ 
++use Slim::Plugin::Base;
+ use Slim::Utils::Prefs;
+ use Slim::Utils::Strings;
+ use Slim::Networking::Discovery::Server;
diff --git a/audio/squeezeboxserver/files/patch-convert.conf b/audio/squeezeboxserver/files/patch-convert.conf
index 09a2e095ba3b..299438e1fbf1 100644
--- a/audio/squeezeboxserver/files/patch-convert.conf
+++ b/audio/squeezeboxserver/files/patch-convert.conf
@@ -1,57 +1,47 @@
-
-$FreeBSD$
-
---- convert.conf.orig
-+++ convert.conf
-@@ -42,13 +42,13 @@
- # specific combinations match before wildcards
+--- convert.conf.orig	2008-12-19 17:30:03.000000000 -0800
++++ convert.conf	2008-12-22 13:32:09.000000000 -0800
+@@ -75,7 +75,7 @@
  
  mov mp3 * *
--	[mov123] $FILE$ | [lame] --resample 44100 --silent -q $QUALITY$ --abr $BITRATE$ -r --big-endian - -
+ 	# FRB:{BITRATE=-B %B}
+-	[mov123] $FILE$ | [lame] --resample 44100 --silent -q $QUALITY$ $RESAMPLE$ -v $BITRATE$ -r --big-endian - -
 +	[faad] $FILE$ | [lame] --resample 44100 --silent -q $QUALITY$ --abr $BITRATE$ -r --big-endian - -
  
  alc mp3 * *
- 	[alac] $FILE$ | [lame] --resample 44100 --silent -q $QUALITY$ --abr $BITRATE$ - -
+ 	# FB:{BITRATE=-B %B}D:{RESAMPLE=--resample %D}
+@@ -83,7 +83,7 @@
  
  ogg mp3 * *
--	[sox] -t ogg $FILE$ -t raw -r 44100 -c 2 -w -s $-x$ - | [lame] --resample 44100 --silent -q $QUALITY$ --abr $BITRATE$ -r --big-endian - -
+ 	# IFB:{BITRATE=-B %B}D:{RESAMPLE=--resample %D}
+-	[sox] -t ogg $FILE$ -t wav -w - | [lame] --silent -q $QUALITY$ $RESAMPLE$ -v $BITRATE$ - -
 +	[oggdec] -Q -o - $FILE$ | [lame] --resample 44100 --silent -q $QUALITY$ --abr $BITRATE$ -r --big-endian - -
  
  wav mp3 * *
- 	[lame] --resample 44100 --silent -q $QUALITY$ --abr $BITRATE$ $FILE$ -
-@@ -88,7 +88,7 @@
- 	-
- 
- ogg aif * *
--	[sox] -t ogg $FILE$ -t raw -r 44100 -c 2 -w -s $-x$ -
-+	[oggdec] -Q -o - $FILE$
- 
- wma wav * *
- 	[wmadec] -r 44100 -b 16 -n 2 $FILE$ 
-@@ -110,7 +110,7 @@
- 
+ 	# IFB:{BITRATE=-B %B}D:{RESAMPLE=--resample %D}
+@@ -160,7 +160,7 @@
  ## you can comment this out if you want to use LAME to transcode AAC/MOV files to MP3.
  mov aif * *
+ 	# FR
 -	[mov123] $FILE$
 +	[faad] -w -f 2 $FILE$
  
- wma wma squeezebox2 *
+ wma wma * *
  	-
-@@ -130,7 +130,7 @@
- 	[flac] -cs --totally-silent --compression-level-0 --skip=$START$ --until=$END$ -- $FILE$
+@@ -183,7 +183,7 @@
  
  ogg flc * *
--	[sox] -t ogg $FILE$ -t raw -r 44100 -c 2 -w -s $-x$ - | [flac] -cs --compression-level-0 --totally-silent --endian big --channels 2 --bps 16 --sample-rate 44100 --sign signed -
+ 	# IFRD:{RESAMPLE=-r %d}
+-	[sox] $RESAMPLE$ -t ogg $FILE$ -t wav - | [flac] -cs --compression-level-0 --totally-silent -
 +	[oggdec] -Q -o - $FILE$ | [flac] -cs --compression-level-0 --totally-silent --endian big --channels 2 --bps 16 --sample-rate 44100 --sign signed -
  
  wma flc * *
- 	[wmadec] -r 44100 -b 16 -n 2 $FILE$ | [flac] -cs --totally-silent --compression-level-0 --endian little --sign signed --channels 2 --bps 16 --sample-rate 44100 -
-@@ -142,7 +142,7 @@
- 	[mac] $FILE$ - -d | [flac] -cs --totally-silent --compression-level-0 -
+ 	# F:{PATH=%f}R:{PATH=%F}
+@@ -199,7 +199,7 @@
  
  mov flc * *
+ 	# FR
 -	[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 -
  
  alc flc * *
- 	[alac] $FILE$ | [flac] -cs --totally-silent --compression-level-0 --endian big --sign signed --channels 2 --bps 16 --sample-rate 44100 -
+ 	# F
diff --git a/audio/squeezeboxserver/pkg-plist b/audio/squeezeboxserver/pkg-plist
index d0324ea750d1..4ca50bf093a5 100644
--- a/audio/squeezeboxserver/pkg-plist
+++ b/audio/squeezeboxserver/pkg-plist
@@ -9,7 +9,6 @@ bin/softsqueeze
 %%SLIMDIR%%/CPAN/Archive/Zip/Archive.pm
 %%SLIMDIR%%/CPAN/Archive/Zip/BufferedFileHandle.pm
 %%SLIMDIR%%/CPAN/Archive/Zip/DirectoryMember.pm
-%%SLIMDIR%%/CPAN/Archive/Zip/FAQ.pod
 %%SLIMDIR%%/CPAN/Archive/Zip/FileMember.pm
 %%SLIMDIR%%/CPAN/Archive/Zip/Member.pm
 %%SLIMDIR%%/CPAN/Archive/Zip/MemberRead.pm
@@ -53,15 +52,6 @@ bin/softsqueeze
 %%SLIMDIR%%/CPAN/DBIx/Class/DB.pm
 %%SLIMDIR%%/CPAN/DBIx/Class/InflateColumn.pm
 %%SLIMDIR%%/CPAN/DBIx/Class/InflateColumn/DateTime.pm
-%%SLIMDIR%%/CPAN/DBIx/Class/Manual.pod
-%%SLIMDIR%%/CPAN/DBIx/Class/Manual/Component.pod
-%%SLIMDIR%%/CPAN/DBIx/Class/Manual/Cookbook.pod
-%%SLIMDIR%%/CPAN/DBIx/Class/Manual/DocMap.pod
-%%SLIMDIR%%/CPAN/DBIx/Class/Manual/Example.pod
-%%SLIMDIR%%/CPAN/DBIx/Class/Manual/FAQ.pod
-%%SLIMDIR%%/CPAN/DBIx/Class/Manual/Glossary.pod
-%%SLIMDIR%%/CPAN/DBIx/Class/Manual/Intro.pod
-%%SLIMDIR%%/CPAN/DBIx/Class/Manual/Troubleshooting.pod
 %%SLIMDIR%%/CPAN/DBIx/Class/Ordered.pm
 %%SLIMDIR%%/CPAN/DBIx/Class/PK.pm
 %%SLIMDIR%%/CPAN/DBIx/Class/PK/Auto.pm
@@ -148,11 +138,14 @@ bin/softsqueeze
 %%SLIMDIR%%/CPAN/HTML/Entities.pm
 %%SLIMDIR%%/CPAN/HTML/Filter.pm
 %%SLIMDIR%%/CPAN/HTML/Form.pm
+%%SLIMDIR%%/CPAN/HTML/FormatText.pm
+%%SLIMDIR%%/CPAN/HTML/Formatter.pm
 %%SLIMDIR%%/CPAN/HTML/HeadParser.pm
 %%SLIMDIR%%/CPAN/HTML/LinkExtor.pm
 %%SLIMDIR%%/CPAN/HTML/Parser.pm
 %%SLIMDIR%%/CPAN/HTML/PullParser.pm
 %%SLIMDIR%%/CPAN/HTML/TokeParser.pm
+%%SLIMDIR%%/CPAN/HTML/TreeBuilder.pm
 %%SLIMDIR%%/CPAN/HTTP/Cookies.pm
 %%SLIMDIR%%/CPAN/HTTP/Cookies/Microsoft.pm
 %%SLIMDIR%%/CPAN/HTTP/Cookies/Netscape.pm
@@ -250,7 +243,6 @@ bin/softsqueeze
 %%SLIMDIR%%/CPAN/Log/Log4perl/Util.pm
 %%SLIMDIR%%/CPAN/Math/VecStat.pm
 %%SLIMDIR%%/CPAN/Net/DNS.pm
-%%SLIMDIR%%/CPAN/Net/DNS/FAQ.pod
 %%SLIMDIR%%/CPAN/Net/DNS/Header.pm
 %%SLIMDIR%%/CPAN/Net/DNS/Nameserver.pm
 %%SLIMDIR%%/CPAN/Net/DNS/Packet.pm
@@ -264,6 +256,7 @@ bin/softsqueeze
 %%SLIMDIR%%/CPAN/Net/DNS/RR/DNAME.pm
 %%SLIMDIR%%/CPAN/Net/DNS/RR/EID.pm
 %%SLIMDIR%%/CPAN/Net/DNS/RR/HINFO.pm
+%%SLIMDIR%%/CPAN/Net/DNS/RR/IPSECKEY.pm
 %%SLIMDIR%%/CPAN/Net/DNS/RR/ISDN.pm
 %%SLIMDIR%%/CPAN/Net/DNS/RR/LOC.pm
 %%SLIMDIR%%/CPAN/Net/DNS/RR/MB.pm
@@ -598,7 +591,6 @@ bin/softsqueeze
 %%SLIMDIR%%/CPAN/XML/SAX/Base.pm
 %%SLIMDIR%%/CPAN/XML/SAX/DocumentLocator.pm
 %%SLIMDIR%%/CPAN/XML/SAX/Exception.pm
-%%SLIMDIR%%/CPAN/XML/SAX/Intro.pod
 %%SLIMDIR%%/CPAN/XML/SAX/ParserDetails.ini
 %%SLIMDIR%%/CPAN/XML/SAX/ParserFactory.pm
 %%SLIMDIR%%/CPAN/XML/SAX/PurePerl.pm
@@ -635,16 +627,16 @@ bin/softsqueeze
 %%SLIMDIR%%/Changelog7.html
 %%SLIMDIR%%/Firmware/boom.version
 %%SLIMDIR%%/Firmware/boom_30.bin
-%%SLIMDIR%%/Firmware/boom_33.bin
+%%SLIMDIR%%/Firmware/boom_41.bin
 %%SLIMDIR%%/Firmware/receiver.version
-%%SLIMDIR%%/Firmware/receiver_48.bin
+%%SLIMDIR%%/Firmware/receiver_56.bin
 %%SLIMDIR%%/Firmware/squeezebox.version
 %%SLIMDIR%%/Firmware/squeezebox2.version
-%%SLIMDIR%%/Firmware/squeezebox2_113.bin
+%%SLIMDIR%%/Firmware/squeezebox2_121.bin
 %%SLIMDIR%%/Firmware/squeezebox_10.bin
 %%SLIMDIR%%/Firmware/squeezebox_40.bin
 %%SLIMDIR%%/Firmware/transporter.version
-%%SLIMDIR%%/Firmware/transporter_63.bin
+%%SLIMDIR%%/Firmware/transporter_71.bin
 %%SLIMDIR%%/Graphics/CODE2000.HTM
 %%SLIMDIR%%/Graphics/CODE2000.TTF
 %%SLIMDIR%%/Graphics/FreeSans.ttf
@@ -716,6 +708,7 @@ bin/softsqueeze
 %%SLIMDIR%%/HTML/Default/html/Settings.js
 %%SLIMDIR%%/HTML/Default/html/Wizard.js
 %%SLIMDIR%%/HTML/Default/html/docs/help.html
+%%SLIMDIR%%/HTML/Default/html/ext/ext-browse.js
 %%SLIMDIR%%/HTML/Default/html/images/albumlist0.gif
 %%SLIMDIR%%/HTML/Default/html/images/albumlist0_on.gif
 %%SLIMDIR%%/HTML/Default/html/images/albumlist1.gif
@@ -775,7 +768,6 @@ bin/softsqueeze
 %%SLIMDIR%%/HTML/Default/html/images/inner_edges.gif
 %%SLIMDIR%%/HTML/Default/html/images/logitech.gif
 %%SLIMDIR%%/HTML/Default/html/images/playlist.png
-%%SLIMDIR%%/HTML/Default/html/images/pointer.gif
 %%SLIMDIR%%/HTML/Default/html/images/progress.gif
 %%SLIMDIR%%/HTML/Default/html/images/questionmark.gif
 %%SLIMDIR%%/HTML/Default/html/images/radio.png
@@ -783,16 +775,22 @@ bin/softsqueeze
 %%SLIMDIR%%/HTML/Default/html/images/selector_bottom_right.gif
 %%SLIMDIR%%/HTML/Default/html/images/selector_top_left.gif
 %%SLIMDIR%%/HTML/Default/html/images/selector_top_right.gif
+%%SLIMDIR%%/HTML/Default/html/images/signup/container_bg.gif
+%%SLIMDIR%%/HTML/Default/html/images/signup/form_footer.gif
+%%SLIMDIR%%/HTML/Default/html/images/signup/form_header.gif
 %%SLIMDIR%%/HTML/Default/html/images/slim-ext/btn-arrow.gif
 %%SLIMDIR%%/HTML/Default/html/images/slim-ext/btn-generic-ie6.png
 %%SLIMDIR%%/HTML/Default/html/images/slim-ext/btn-generic.png
 %%SLIMDIR%%/HTML/Default/html/images/slim-ext/btn-small.gif
 %%SLIMDIR%%/HTML/Default/html/images/slim-ext/dlg-bg.gif
+%%SLIMDIR%%/HTML/Default/html/images/slim-ext/grid3-hrow-over.gif
 %%SLIMDIR%%/HTML/Default/html/images/slim-ext/group-checked.gif
 %%SLIMDIR%%/HTML/Default/html/images/slim-ext/hd-sprite.gif
 %%SLIMDIR%%/HTML/Default/html/images/slim-ext/menu.gif
 %%SLIMDIR%%/HTML/Default/html/images/slim-ext/se-handle.gif
 %%SLIMDIR%%/HTML/Default/html/images/slim-ext/slider-thumb.png
+%%SLIMDIR%%/HTML/Default/html/images/slim-ext/sort_asc.gif
+%%SLIMDIR%%/HTML/Default/html/images/slim-ext/sort_desc.gif
 %%SLIMDIR%%/HTML/Default/html/images/slim-ext/tab-scroll-left.gif
 %%SLIMDIR%%/HTML/Default/html/images/slim-ext/tab-scroll-right.gif
 %%SLIMDIR%%/HTML/Default/html/images/slim-ext/tab-sprite.gif
@@ -800,6 +798,8 @@ bin/softsqueeze
 %%SLIMDIR%%/HTML/Default/html/images/squeezecenter.gif
 %%SLIMDIR%%/HTML/Default/html/images/track_info.gif
 %%SLIMDIR%%/HTML/Default/html/images/volume_levels.gif
+%%SLIMDIR%%/HTML/Default/html/js-browse.html
+%%SLIMDIR%%/HTML/Default/html/js.html
 %%SLIMDIR%%/HTML/Default/ie.css
 %%SLIMDIR%%/HTML/Default/ie7.css
 %%SLIMDIR%%/HTML/Default/index.html
@@ -811,7 +811,6 @@ bin/softsqueeze
 %%SLIMDIR%%/HTML/Default/settings/header.html
 %%SLIMDIR%%/HTML/Default/settings/index.html
 %%SLIMDIR%%/HTML/Default/skinconfig.yml
-%%SLIMDIR%%/HTML/Default/slim-ext.css
 %%SLIMDIR%%/HTML/Default/slimserver.css
 %%SLIMDIR%%/HTML/Default/status_header.html
 %%SLIMDIR%%/HTML/Default/status_list.html
@@ -928,18 +927,16 @@ bin/softsqueeze
 %%SLIMDIR%%/HTML/EN/html/ext/resources/images/default/dd/drop-no.gif
 %%SLIMDIR%%/HTML/EN/html/ext/resources/images/default/dd/drop-yes.gif
 %%SLIMDIR%%/HTML/EN/html/ext/resources/images/default/editor/tb-sprite.gif
+%%SLIMDIR%%/HTML/EN/html/ext/resources/images/default/form/checkbox.gif
 %%SLIMDIR%%/HTML/EN/html/ext/resources/images/default/form/clear-trigger.gif
-%%SLIMDIR%%/HTML/EN/html/ext/resources/images/default/form/clear-trigger.psd
 %%SLIMDIR%%/HTML/EN/html/ext/resources/images/default/form/date-trigger.gif
-%%SLIMDIR%%/HTML/EN/html/ext/resources/images/default/form/date-trigger.psd
 %%SLIMDIR%%/HTML/EN/html/ext/resources/images/default/form/error-tip-corners.gif
 %%SLIMDIR%%/HTML/EN/html/ext/resources/images/default/form/exclamation.gif
+%%SLIMDIR%%/HTML/EN/html/ext/resources/images/default/form/radio.gif
 %%SLIMDIR%%/HTML/EN/html/ext/resources/images/default/form/search-trigger.gif
-%%SLIMDIR%%/HTML/EN/html/ext/resources/images/default/form/search-trigger.psd
 %%SLIMDIR%%/HTML/EN/html/ext/resources/images/default/form/text-bg.gif
 %%SLIMDIR%%/HTML/EN/html/ext/resources/images/default/form/trigger-tpl.gif
 %%SLIMDIR%%/HTML/EN/html/ext/resources/images/default/form/trigger.gif
-%%SLIMDIR%%/HTML/EN/html/ext/resources/images/default/form/trigger.psd
 %%SLIMDIR%%/HTML/EN/html/ext/resources/images/default/gradient-bg.gif
 %%SLIMDIR%%/HTML/EN/html/ext/resources/images/default/grid/arrow-left-white.gif
 %%SLIMDIR%%/HTML/EN/html/ext/resources/images/default/grid/arrow-right-white.gif
@@ -1107,17 +1104,22 @@ bin/softsqueeze
 %%SLIMDIR%%/HTML/EN/html/ext/resources/images/default/window/icon-question.gif
 %%SLIMDIR%%/HTML/EN/html/ext/resources/images/default/window/icon-warning.gif
 %%SLIMDIR%%/HTML/EN/html/ext/resources/images/default/window/left-corners.png
-%%SLIMDIR%%/HTML/EN/html/ext/resources/images/default/window/left-corners.psd
 %%SLIMDIR%%/HTML/EN/html/ext/resources/images/default/window/left-right.png
-%%SLIMDIR%%/HTML/EN/html/ext/resources/images/default/window/left-right.psd
 %%SLIMDIR%%/HTML/EN/html/ext/resources/images/default/window/right-corners.png
-%%SLIMDIR%%/HTML/EN/html/ext/resources/images/default/window/right-corners.psd
 %%SLIMDIR%%/HTML/EN/html/ext/resources/images/default/window/top-bottom.png
-%%SLIMDIR%%/HTML/EN/html/ext/resources/images/default/window/top-bottom.psd
 %%SLIMDIR%%/HTML/EN/html/ext/resources/license.txt
 %%SLIMDIR%%/HTML/EN/html/fileselector.js
 %%SLIMDIR%%/HTML/EN/html/global.js
 %%SLIMDIR%%/HTML/EN/html/home.js
+%%SLIMDIR%%/HTML/EN/html/images/Players/boom.png
+%%SLIMDIR%%/HTML/EN/html/images/Players/controller.png
+%%SLIMDIR%%/HTML/EN/html/images/Players/receiver.png
+%%SLIMDIR%%/HTML/EN/html/images/Players/slimp3.png
+%%SLIMDIR%%/HTML/EN/html/images/Players/softsqueeze.png
+%%SLIMDIR%%/HTML/EN/html/images/Players/squeezebox.png
+%%SLIMDIR%%/HTML/EN/html/images/Players/squeezebox3.png
+%%SLIMDIR%%/HTML/EN/html/images/Players/squeezeplay.png
+%%SLIMDIR%%/HTML/EN/html/images/Players/transporter.png
 %%SLIMDIR%%/HTML/EN/html/images/ServiceProviders/squeezecenter.png
 %%SLIMDIR%%/HTML/EN/html/images/ServiceProviders/squeezenetwork.png
 %%SLIMDIR%%/HTML/EN/html/images/ServiceProviders/tuneinurl.png
@@ -1655,6 +1657,10 @@ bin/softsqueeze
 %%SLIMDIR%%/HTML/Nokia770/status_list.html
 %%SLIMDIR%%/HTML/Nokia770/status_noclients.html
 %%SLIMDIR%%/HTML/README.txt
+%%SLIMDIR%%/HTML/ScreenReader/browsedb.html
+%%SLIMDIR%%/HTML/ScreenReader/cmdwrappers_ScreenReader
+%%SLIMDIR%%/HTML/ScreenReader/skinconfig.yml
+%%SLIMDIR%%/HTML/ScreenReader/xmlbrowser_redirect.html
 %%SLIMDIR%%/HTML/Touch/browsedb_artwork.html
 %%SLIMDIR%%/HTML/Touch/html/about.html
 %%SLIMDIR%%/HTML/Touch/searchinput.html
@@ -1704,6 +1710,10 @@ bin/softsqueeze
 %%SLIMDIR%%/SQL/mysql/schema_5_up.sql
 %%SLIMDIR%%/SQL/mysql/schema_6_down.sql
 %%SLIMDIR%%/SQL/mysql/schema_6_up.sql
+%%SLIMDIR%%/SQL/mysql/schema_7_down.sql
+%%SLIMDIR%%/SQL/mysql/schema_7_up.sql
+%%SLIMDIR%%/SQL/mysql/schema_8_down.sql
+%%SLIMDIR%%/SQL/mysql/schema_8_up.sql
 %%SLIMDIR%%/SQL/mysql/schema_clear.sql
 %%SLIMDIR%%/SQL/mysql/schema_optimize.sql
 %%SLIMDIR%%/Slim/Buttons/Alarm.pm
@@ -1735,6 +1745,8 @@ bin/softsqueeze
 %%SLIMDIR%%/Slim/Control/Queries.pm
 %%SLIMDIR%%/Slim/Control/Request.pm
 %%SLIMDIR%%/Slim/Control/Stdio.pm
+%%SLIMDIR%%/Slim/Control/XMLBrowser.pm
+%%SLIMDIR%%/Slim/DO_NOT_INSTALL_YOUR_PLUGINS_HERE.txt
 %%SLIMDIR%%/Slim/Display/Boom.pm
 %%SLIMDIR%%/Slim/Display/Display.pm
 %%SLIMDIR%%/Slim/Display/EmulatedSqueezebox2.pm
@@ -1765,6 +1777,8 @@ bin/softsqueeze
 %%SLIMDIR%%/Slim/Formats/Playlists/WPL.pm
 %%SLIMDIR%%/Slim/Formats/Playlists/XML.pm
 %%SLIMDIR%%/Slim/Formats/Playlists/XSPF.pm
+%%SLIMDIR%%/Slim/Formats/RemoteMetadata.pm
+%%SLIMDIR%%/Slim/Formats/RemoteMetadata/YALP.pm
 %%SLIMDIR%%/Slim/Formats/RemoteStream.pm
 %%SLIMDIR%%/Slim/Formats/WMA.pm
 %%SLIMDIR%%/Slim/Formats/Wav.pm
@@ -1775,6 +1789,8 @@ bin/softsqueeze
 %%SLIMDIR%%/Slim/Hardware/TriLED.pm
 %%SLIMDIR%%/Slim/Hardware/mas3507d.pm
 %%SLIMDIR%%/Slim/Hardware/mas35x9.pm
+%%SLIMDIR%%/Slim/Menu/Base.pm
+%%SLIMDIR%%/Slim/Menu/SystemInfo.pm
 %%SLIMDIR%%/Slim/Menu/TrackInfo.pm
 %%SLIMDIR%%/Slim/Music/Artwork.pm
 %%SLIMDIR%%/Slim/Music/Import.pm
@@ -1808,24 +1824,34 @@ bin/softsqueeze
 %%SLIMDIR%%/Slim/Networking/mDNS.pm
 %%SLIMDIR%%/Slim/Player/Boom.pm
 %%SLIMDIR%%/Slim/Player/Client.pm
+%%SLIMDIR%%/Slim/Player/Controller.pm
 %%SLIMDIR%%/Slim/Player/HTTP.pm
 %%SLIMDIR%%/Slim/Player/Pipeline.pm
 %%SLIMDIR%%/Slim/Player/Player.pm
 %%SLIMDIR%%/Slim/Player/Playlist.pm
 %%SLIMDIR%%/Slim/Player/ProtocolHandlers.pm
+%%SLIMDIR%%/Slim/Player/Protocols/File.pm
 %%SLIMDIR%%/Slim/Player/Protocols/HTTP.pm
 %%SLIMDIR%%/Slim/Player/Protocols/MMS.pm
 %%SLIMDIR%%/Slim/Player/Receiver.pm
 %%SLIMDIR%%/Slim/Player/ReplayGain.pm
 %%SLIMDIR%%/Slim/Player/SLIMP3.pm
 %%SLIMDIR%%/Slim/Player/SoftSqueeze.pm
+%%SLIMDIR%%/Slim/Player/Song.pm
+%%SLIMDIR%%/Slim/Player/SongStreamController.pm
 %%SLIMDIR%%/Slim/Player/Source.pm
+%%SLIMDIR%%/Slim/Player/SqueezePlay.pm
 %%SLIMDIR%%/Slim/Player/SqueezeSlave.pm
 %%SLIMDIR%%/Slim/Player/Squeezebox.pm
+%%SLIMDIR%%/Slim/Player/Squeezebox1.pm
 %%SLIMDIR%%/Slim/Player/Squeezebox2.pm
+%%SLIMDIR%%/Slim/Player/StreamingController.pm
 %%SLIMDIR%%/Slim/Player/Sync.pm
 %%SLIMDIR%%/Slim/Player/TranscodingHelper.pm
 %%SLIMDIR%%/Slim/Player/Transporter.pm
+%%SLIMDIR%%/Slim/Plugin/Amazon/Plugin.pm
+%%SLIMDIR%%/Slim/Plugin/Amazon/install.xml
+%%SLIMDIR%%/Slim/Plugin/Amazon/strings.txt
 %%SLIMDIR%%/Slim/Plugin/AudioScrobbler/HTML/EN/plugins/AudioScrobbler/settings/basic.html
 %%SLIMDIR%%/Slim/Plugin/AudioScrobbler/HTML/EN/plugins/AudioScrobbler/settings/player.html
 %%SLIMDIR%%/Slim/Plugin/AudioScrobbler/PlayerSettings.pm
@@ -1844,12 +1870,23 @@ bin/softsqueeze
 %%SLIMDIR%%/Slim/Plugin/DateTime/Settings.pm
 %%SLIMDIR%%/Slim/Plugin/DateTime/install.xml
 %%SLIMDIR%%/Slim/Plugin/DateTime/strings.txt
+%%SLIMDIR%%/Slim/Plugin/Deezer/HTML/EN/plugins/Deezer/html/images/icon.png
+%%SLIMDIR%%/Slim/Plugin/Deezer/Plugin.pm
+%%SLIMDIR%%/Slim/Plugin/Deezer/ProtocolHandler.pm
+%%SLIMDIR%%/Slim/Plugin/Deezer/install.xml
+%%SLIMDIR%%/Slim/Plugin/Deezer/strings.txt
 %%SLIMDIR%%/Slim/Plugin/DigitalInput/HTML/EN/plugins/DigitalInput/html/images/icon.png
 %%SLIMDIR%%/Slim/Plugin/DigitalInput/HTML/EN/plugins/DigitalInput/list.html
 %%SLIMDIR%%/Slim/Plugin/DigitalInput/Plugin.pm
 %%SLIMDIR%%/Slim/Plugin/DigitalInput/ProtocolHandler.pm
 %%SLIMDIR%%/Slim/Plugin/DigitalInput/install.xml
 %%SLIMDIR%%/Slim/Plugin/DigitalInput/strings.txt
+%%SLIMDIR%%/Slim/Plugin/Extensions/HTML/EN/plugins/Extensions/settings/basic.html
+%%SLIMDIR%%/Slim/Plugin/Extensions/Plugin.pm
+%%SLIMDIR%%/Slim/Plugin/Extensions/PluginDownloader.pm
+%%SLIMDIR%%/Slim/Plugin/Extensions/Settings.pm
+%%SLIMDIR%%/Slim/Plugin/Extensions/install.xml
+%%SLIMDIR%%/Slim/Plugin/Extensions/strings.txt
 %%SLIMDIR%%/Slim/Plugin/Favorites/HTML/Default/plugins/Favorites/html/Favorites.js
 %%SLIMDIR%%/Slim/Plugin/Favorites/HTML/EN/html/images/favorites.png
 %%SLIMDIR%%/Slim/Plugin/Favorites/HTML/EN/html/images/favorites_remove.png
@@ -1879,6 +1916,9 @@ bin/softsqueeze
 %%SLIMDIR%%/Slim/Plugin/InfoBrowser/Settings.pm
 %%SLIMDIR%%/Slim/Plugin/InfoBrowser/install.xml
 %%SLIMDIR%%/Slim/Plugin/InfoBrowser/strings.txt
+%%SLIMDIR%%/Slim/Plugin/InternetRadio/Plugin.pm
+%%SLIMDIR%%/Slim/Plugin/InternetRadio/install.xml
+%%SLIMDIR%%/Slim/Plugin/InternetRadio/strings.txt
 %%SLIMDIR%%/Slim/Plugin/JiveExtras/HTML/EN/plugins/JiveExtras/settings/basic.html
 %%SLIMDIR%%/Slim/Plugin/JiveExtras/Plugin.pm
 %%SLIMDIR%%/Slim/Plugin/JiveExtras/Settings.pm
@@ -1901,6 +1941,10 @@ bin/softsqueeze
 %%SLIMDIR%%/Slim/Plugin/LineIn/ProtocolHandler.pm
 %%SLIMDIR%%/Slim/Plugin/LineIn/install.xml
 %%SLIMDIR%%/Slim/Plugin/LineIn/strings.txt
+%%SLIMDIR%%/Slim/Plugin/LineOut/HTML/EN/plugins/LineOut/html/images/icon.png
+%%SLIMDIR%%/Slim/Plugin/LineOut/Plugin.pm
+%%SLIMDIR%%/Slim/Plugin/LineOut/install.xml
+%%SLIMDIR%%/Slim/Plugin/LineOut/strings.txt
 %%SLIMDIR%%/Slim/Plugin/Live365/HTML/EN/plugins/Live365/html/images/icon.png
 %%SLIMDIR%%/Slim/Plugin/Live365/Plugin.pm
 %%SLIMDIR%%/Slim/Plugin/Live365/ProtocolHandler.pm
@@ -1934,10 +1978,6 @@ bin/softsqueeze
 %%SLIMDIR%%/Slim/Plugin/Pandora/ProtocolHandler.pm
 %%SLIMDIR%%/Slim/Plugin/Pandora/install.xml
 %%SLIMDIR%%/Slim/Plugin/Pandora/strings.txt
-%%SLIMDIR%%/Slim/Plugin/Picks/HTML/EN/plugins/Picks/html/images/icon.png
-%%SLIMDIR%%/Slim/Plugin/Picks/Plugin.pm
-%%SLIMDIR%%/Slim/Plugin/Picks/install.xml
-%%SLIMDIR%%/Slim/Plugin/Picks/strings.txt
 %%SLIMDIR%%/Slim/Plugin/Podcast/HTML/EN/plugins/Podcast/html/images/icon.png
 %%SLIMDIR%%/Slim/Plugin/Podcast/HTML/EN/plugins/Podcast/settings/basic.html
 %%SLIMDIR%%/Slim/Plugin/Podcast/Plugin.pm
@@ -1954,14 +1994,8 @@ bin/softsqueeze
 %%SLIMDIR%%/Slim/Plugin/RSSNews/Settings.pm
 %%SLIMDIR%%/Slim/Plugin/RSSNews/install.xml
 %%SLIMDIR%%/Slim/Plugin/RSSNews/strings.txt
-%%SLIMDIR%%/Slim/Plugin/RadioIO/HTML/EN/plugins/RadioIO/html/images/icon.png
-%%SLIMDIR%%/Slim/Plugin/RadioIO/Plugin.pm
-%%SLIMDIR%%/Slim/Plugin/RadioIO/install.xml
-%%SLIMDIR%%/Slim/Plugin/RadioIO/strings.txt
-%%SLIMDIR%%/Slim/Plugin/RadioTime/HTML/EN/plugins/RadioTime/html/images/icon.png
-%%SLIMDIR%%/Slim/Plugin/RadioTime/HTML/EN/plugins/RadioTime/settings/basic.html
+%%SLIMDIR%%/Slim/Plugin/RadioTime/Metadata.pm
 %%SLIMDIR%%/Slim/Plugin/RadioTime/Plugin.pm
-%%SLIMDIR%%/Slim/Plugin/RadioTime/Settings.pm
 %%SLIMDIR%%/Slim/Plugin/RadioTime/install.xml
 %%SLIMDIR%%/Slim/Plugin/RadioTime/strings.txt
 %%SLIMDIR%%/Slim/Plugin/RandomPlay/HTML/EN/plugins/RandomPlay/html/images/icon.png
@@ -1978,16 +2012,11 @@ bin/softsqueeze
 %%SLIMDIR%%/Slim/Plugin/RhapsodyDirect/HTML/EN/plugins/RhapsodyDirect/html/images/icon.png
 %%SLIMDIR%%/Slim/Plugin/RhapsodyDirect/Plugin.pm
 %%SLIMDIR%%/Slim/Plugin/RhapsodyDirect/ProtocolHandler.pm
-%%SLIMDIR%%/Slim/Plugin/RhapsodyDirect/RPDS.pm
 %%SLIMDIR%%/Slim/Plugin/RhapsodyDirect/install.xml
 %%SLIMDIR%%/Slim/Plugin/RhapsodyDirect/strings.txt
 %%SLIMDIR%%/Slim/Plugin/SavePlaylist/Plugin.pm
 %%SLIMDIR%%/Slim/Plugin/SavePlaylist/install.xml
 %%SLIMDIR%%/Slim/Plugin/SavePlaylist/strings.txt
-%%SLIMDIR%%/Slim/Plugin/ShoutcastBrowser/HTML/EN/plugins/ShoutcastBrowser/html/images/icon.png
-%%SLIMDIR%%/Slim/Plugin/ShoutcastBrowser/Plugin.pm
-%%SLIMDIR%%/Slim/Plugin/ShoutcastBrowser/install.xml
-%%SLIMDIR%%/Slim/Plugin/ShoutcastBrowser/strings.txt
 %%SLIMDIR%%/Slim/Plugin/Sirius/HTML/EN/plugins/Sirius/html/images/icon.png
 %%SLIMDIR%%/Slim/Plugin/Sirius/Plugin.pm
 %%SLIMDIR%%/Slim/Plugin/Sirius/ProtocolHandler.pm
@@ -2024,6 +2053,9 @@ bin/softsqueeze
 %%SLIMDIR%%/Slim/Plugin/iTunes/Common.pm
 %%SLIMDIR%%/Slim/Plugin/iTunes/HTML/EN/plugins/iTunes/settings/itunes.html
 %%SLIMDIR%%/Slim/Plugin/iTunes/Importer.pm
+%%SLIMDIR%%/Slim/Plugin/iTunes/Importer/Artwork.pm
+%%SLIMDIR%%/Slim/Plugin/iTunes/Importer/Artwork/OSX.pm
+%%SLIMDIR%%/Slim/Plugin/iTunes/Importer/Artwork/Win32.pm
 %%SLIMDIR%%/Slim/Plugin/iTunes/Plugin.pm
 %%SLIMDIR%%/Slim/Plugin/iTunes/Settings.pm
 %%SLIMDIR%%/Slim/Plugin/iTunes/install.xml
@@ -2069,6 +2101,7 @@ bin/softsqueeze
 %%SLIMDIR%%/Slim/Utils/ChangeNotify.pm
 %%SLIMDIR%%/Slim/Utils/ChangeNotify/Linux.pm
 %%SLIMDIR%%/Slim/Utils/ChangeNotify/Win32.pm
+%%SLIMDIR%%/Slim/Utils/CleanupGUI.pm
 %%SLIMDIR%%/Slim/Utils/DateTime.pm
 %%SLIMDIR%%/Slim/Utils/Errno.pm
 %%SLIMDIR%%/Slim/Utils/Favorites.pm
@@ -2079,6 +2112,17 @@ bin/softsqueeze
 %%SLIMDIR%%/Slim/Utils/Misc.pm
 %%SLIMDIR%%/Slim/Utils/MySQLHelper.pm
 %%SLIMDIR%%/Slim/Utils/Network.pm
+%%SLIMDIR%%/Slim/Utils/OS.pm
+%%SLIMDIR%%/Slim/Utils/OS/Debian.pm
+%%SLIMDIR%%/Slim/Utils/OS/FreeBSD.pm
+%%SLIMDIR%%/Slim/Utils/OS/Linux.pm
+%%SLIMDIR%%/Slim/Utils/OS/OSX.pm
+%%SLIMDIR%%/Slim/Utils/OS/ReadyNAS.pm
+%%SLIMDIR%%/Slim/Utils/OS/RedHat.pm
+%%SLIMDIR%%/Slim/Utils/OS/SlimService.pm
+%%SLIMDIR%%/Slim/Utils/OS/Suse.pm
+%%SLIMDIR%%/Slim/Utils/OS/Unix.pm
+%%SLIMDIR%%/Slim/Utils/OS/Win32.pm
 %%SLIMDIR%%/Slim/Utils/OSDetect.pm
 %%SLIMDIR%%/Slim/Utils/PerfMon.pm
 %%SLIMDIR%%/Slim/Utils/PerlRunTime.pm
@@ -2101,7 +2145,6 @@ bin/softsqueeze
 %%SLIMDIR%%/Slim/Utils/Unicode.pm
 %%SLIMDIR%%/Slim/Utils/Validate.pm
 %%SLIMDIR%%/Slim/Utils/Versions.pm
-%%SLIMDIR%%/Slim/Utils/Win32.pm
 %%SLIMDIR%%/Slim/Web/Cometd.pm
 %%SLIMDIR%%/Slim/Web/Cometd/Manager.pm
 %%SLIMDIR%%/Slim/Web/Graphics.pm
@@ -2148,6 +2191,7 @@ bin/softsqueeze
 %%SLIMDIR%%/Slim/Web/UPnPMediaServer.pm
 %%SLIMDIR%%/Slim/Web/XMLBrowser.pm
 %%SLIMDIR%%/Slim/bootstrap.pm
+%%SLIMDIR%%/cleanup.pl
 %%SLIMDIR%%/convert.conf.sample
 %%SLIMDIR%%/lib/Audio/APE.pm
 %%SLIMDIR%%/lib/Audio/APETags.pm
@@ -2167,6 +2211,7 @@ bin/softsqueeze
 %%SLIMDIR%%/lib/Net/UPnP/Service.pm
 %%SLIMDIR%%/lib/Ogg/Vorbis/Header/PurePerl.pm
 %%SLIMDIR%%/lib/README
+%%SLIMDIR%%/lib/Template/Provider.pm
 %%SLIMDIR%%/modules.conf
 %%SLIMDIR%%/revision.txt
 %%SLIMDIR%%/scanner.pl
@@ -2179,6 +2224,7 @@ bin/softsqueeze
 squeezecenter/Cache
 squeezecenter/MySQL/errmsg.txt
 squeezecenter/MySQL/errmsg.sys
+@dirrm %%SLIMDIR%%/lib/Template
 @dirrm %%SLIMDIR%%/lib/Ogg/Vorbis/Header
 @dirrm %%SLIMDIR%%/lib/Ogg/Vorbis
 @dirrm %%SLIMDIR%%/lib/Ogg
@@ -2206,6 +2252,7 @@ squeezecenter/MySQL/errmsg.sys
 @dirrm %%SLIMDIR%%/Slim/Web
 @dirrm %%SLIMDIR%%/Slim/Utils/Scanner
 @dirrm %%SLIMDIR%%/Slim/Utils/Prefs
+@dirrm %%SLIMDIR%%/Slim/Utils/OS
 @dirrm %%SLIMDIR%%/Slim/Utils/ChangeNotify
 @dirrm %%SLIMDIR%%/Slim/Utils
 @dirrm %%SLIMDIR%%/Slim/Schema/ResultSet
@@ -2216,6 +2263,8 @@ squeezecenter/MySQL/errmsg.sys
 @dirrm %%SLIMDIR%%/Slim/Plugin/xPL/HTML/EN
 @dirrm %%SLIMDIR%%/Slim/Plugin/xPL/HTML
 @dirrm %%SLIMDIR%%/Slim/Plugin/xPL
+@dirrm %%SLIMDIR%%/Slim/Plugin/iTunes/Importer/Artwork
+@dirrm %%SLIMDIR%%/Slim/Plugin/iTunes/Importer
 @dirrm %%SLIMDIR%%/Slim/Plugin/iTunes/HTML/EN/plugins/iTunes/settings
 @dirrm %%SLIMDIR%%/Slim/Plugin/iTunes/HTML/EN/plugins/iTunes
 @dirrm %%SLIMDIR%%/Slim/Plugin/iTunes/HTML/EN/plugins
@@ -2251,13 +2300,6 @@ squeezecenter/MySQL/errmsg.sys
 @dirrm %%SLIMDIR%%/Slim/Plugin/Sirius/HTML/EN
 @dirrm %%SLIMDIR%%/Slim/Plugin/Sirius/HTML
 @dirrm %%SLIMDIR%%/Slim/Plugin/Sirius
-@dirrm %%SLIMDIR%%/Slim/Plugin/ShoutcastBrowser/HTML/EN/plugins/ShoutcastBrowser/html/images
-@dirrm %%SLIMDIR%%/Slim/Plugin/ShoutcastBrowser/HTML/EN/plugins/ShoutcastBrowser/html
-@dirrm %%SLIMDIR%%/Slim/Plugin/ShoutcastBrowser/HTML/EN/plugins/ShoutcastBrowser
-@dirrm %%SLIMDIR%%/Slim/Plugin/ShoutcastBrowser/HTML/EN/plugins
-@dirrm %%SLIMDIR%%/Slim/Plugin/ShoutcastBrowser/HTML/EN
-@dirrm %%SLIMDIR%%/Slim/Plugin/ShoutcastBrowser/HTML
-@dirrm %%SLIMDIR%%/Slim/Plugin/ShoutcastBrowser
 @dirrm %%SLIMDIR%%/Slim/Plugin/SavePlaylist
 @dirrm %%SLIMDIR%%/Slim/Plugin/RhapsodyDirect/HTML/EN/plugins/RhapsodyDirect/html/images
 @dirrm %%SLIMDIR%%/Slim/Plugin/RhapsodyDirect/HTML/EN/plugins/RhapsodyDirect/html
@@ -2279,21 +2321,7 @@ squeezecenter/MySQL/errmsg.sys
 @dirrm %%SLIMDIR%%/Slim/Plugin/RandomPlay/HTML/EN
 @dirrm %%SLIMDIR%%/Slim/Plugin/RandomPlay/HTML
 @dirrm %%SLIMDIR%%/Slim/Plugin/RandomPlay
-@dirrm %%SLIMDIR%%/Slim/Plugin/RadioTime/HTML/EN/plugins/RadioTime/settings
-@dirrm %%SLIMDIR%%/Slim/Plugin/RadioTime/HTML/EN/plugins/RadioTime/html/images
-@dirrm %%SLIMDIR%%/Slim/Plugin/RadioTime/HTML/EN/plugins/RadioTime/html
-@dirrm %%SLIMDIR%%/Slim/Plugin/RadioTime/HTML/EN/plugins/RadioTime
-@dirrm %%SLIMDIR%%/Slim/Plugin/RadioTime/HTML/EN/plugins
-@dirrm %%SLIMDIR%%/Slim/Plugin/RadioTime/HTML/EN
-@dirrm %%SLIMDIR%%/Slim/Plugin/RadioTime/HTML
 @dirrm %%SLIMDIR%%/Slim/Plugin/RadioTime
-@dirrm %%SLIMDIR%%/Slim/Plugin/RadioIO/HTML/EN/plugins/RadioIO/html/images
-@dirrm %%SLIMDIR%%/Slim/Plugin/RadioIO/HTML/EN/plugins/RadioIO/html
-@dirrm %%SLIMDIR%%/Slim/Plugin/RadioIO/HTML/EN/plugins/RadioIO
-@dirrm %%SLIMDIR%%/Slim/Plugin/RadioIO/HTML/EN/plugins
-@dirrm %%SLIMDIR%%/Slim/Plugin/RadioIO/HTML/EN
-@dirrm %%SLIMDIR%%/Slim/Plugin/RadioIO/HTML
-@dirrm %%SLIMDIR%%/Slim/Plugin/RadioIO
 @dirrm %%SLIMDIR%%/Slim/Plugin/RSSNews/HTML/EN/plugins/RSSNews/settings
 @dirrm %%SLIMDIR%%/Slim/Plugin/RSSNews/HTML/EN/plugins/RSSNews
 @dirrm %%SLIMDIR%%/Slim/Plugin/RSSNews/HTML/EN/plugins
@@ -2314,13 +2342,6 @@ squeezecenter/MySQL/errmsg.sys
 @dirrm %%SLIMDIR%%/Slim/Plugin/Podcast/HTML/EN
 @dirrm %%SLIMDIR%%/Slim/Plugin/Podcast/HTML
 @dirrm %%SLIMDIR%%/Slim/Plugin/Podcast
-@dirrm %%SLIMDIR%%/Slim/Plugin/Picks/HTML/EN/plugins/Picks/html/images
-@dirrm %%SLIMDIR%%/Slim/Plugin/Picks/HTML/EN/plugins/Picks/html
-@dirrm %%SLIMDIR%%/Slim/Plugin/Picks/HTML/EN/plugins/Picks
-@dirrm %%SLIMDIR%%/Slim/Plugin/Picks/HTML/EN/plugins
-@dirrm %%SLIMDIR%%/Slim/Plugin/Picks/HTML/EN
-@dirrm %%SLIMDIR%%/Slim/Plugin/Picks/HTML
-@dirrm %%SLIMDIR%%/Slim/Plugin/Picks
 @dirrm %%SLIMDIR%%/Slim/Plugin/Pandora/HTML/EN/plugins/Pandora/html/images
 @dirrm %%SLIMDIR%%/Slim/Plugin/Pandora/HTML/EN/plugins/Pandora/html
 @dirrm %%SLIMDIR%%/Slim/Plugin/Pandora/HTML/EN/plugins/Pandora
@@ -2353,6 +2374,13 @@ squeezecenter/MySQL/errmsg.sys
 @dirrm %%SLIMDIR%%/Slim/Plugin/Live365/HTML/EN
 @dirrm %%SLIMDIR%%/Slim/Plugin/Live365/HTML
 @dirrm %%SLIMDIR%%/Slim/Plugin/Live365
+@dirrm %%SLIMDIR%%/Slim/Plugin/LineOut/HTML/EN/plugins/LineOut/html/images
+@dirrm %%SLIMDIR%%/Slim/Plugin/LineOut/HTML/EN/plugins/LineOut/html
+@dirrm %%SLIMDIR%%/Slim/Plugin/LineOut/HTML/EN/plugins/LineOut
+@dirrm %%SLIMDIR%%/Slim/Plugin/LineOut/HTML/EN/plugins
+@dirrm %%SLIMDIR%%/Slim/Plugin/LineOut/HTML/EN
+@dirrm %%SLIMDIR%%/Slim/Plugin/LineOut/HTML
+@dirrm %%SLIMDIR%%/Slim/Plugin/LineOut
 @dirrm %%SLIMDIR%%/Slim/Plugin/LineIn/HTML/EN/plugins/LineIn/html/images
 @dirrm %%SLIMDIR%%/Slim/Plugin/LineIn/HTML/EN/plugins/LineIn/html
 @dirrm %%SLIMDIR%%/Slim/Plugin/LineIn/HTML/EN/plugins/LineIn
@@ -2383,6 +2411,7 @@ squeezecenter/MySQL/errmsg.sys
 @dirrm %%SLIMDIR%%/Slim/Plugin/JiveExtras/HTML/EN
 @dirrm %%SLIMDIR%%/Slim/Plugin/JiveExtras/HTML
 @dirrm %%SLIMDIR%%/Slim/Plugin/JiveExtras
+@dirrm %%SLIMDIR%%/Slim/Plugin/InternetRadio
 @dirrm %%SLIMDIR%%/Slim/Plugin/InfoBrowser/HTML/EN/plugins/InfoBrowser/settings
 @dirrm %%SLIMDIR%%/Slim/Plugin/InfoBrowser/HTML/EN/plugins/InfoBrowser/html/images
 @dirrm %%SLIMDIR%%/Slim/Plugin/InfoBrowser/HTML/EN/plugins/InfoBrowser/html
@@ -2410,6 +2439,12 @@ squeezecenter/MySQL/errmsg.sys
 @dirrm %%SLIMDIR%%/Slim/Plugin/Favorites/HTML/Default
 @dirrm %%SLIMDIR%%/Slim/Plugin/Favorites/HTML
 @dirrm %%SLIMDIR%%/Slim/Plugin/Favorites
+@dirrm %%SLIMDIR%%/Slim/Plugin/Extensions/HTML/EN/plugins/Extensions/settings
+@dirrm %%SLIMDIR%%/Slim/Plugin/Extensions/HTML/EN/plugins/Extensions
+@dirrm %%SLIMDIR%%/Slim/Plugin/Extensions/HTML/EN/plugins
+@dirrm %%SLIMDIR%%/Slim/Plugin/Extensions/HTML/EN
+@dirrm %%SLIMDIR%%/Slim/Plugin/Extensions/HTML
+@dirrm %%SLIMDIR%%/Slim/Plugin/Extensions
 @dirrm %%SLIMDIR%%/Slim/Plugin/DigitalInput/HTML/EN/plugins/DigitalInput/html/images
 @dirrm %%SLIMDIR%%/Slim/Plugin/DigitalInput/HTML/EN/plugins/DigitalInput/html
 @dirrm %%SLIMDIR%%/Slim/Plugin/DigitalInput/HTML/EN/plugins/DigitalInput
@@ -2417,6 +2452,13 @@ squeezecenter/MySQL/errmsg.sys
 @dirrm %%SLIMDIR%%/Slim/Plugin/DigitalInput/HTML/EN
 @dirrm %%SLIMDIR%%/Slim/Plugin/DigitalInput/HTML
 @dirrm %%SLIMDIR%%/Slim/Plugin/DigitalInput
+@dirrm %%SLIMDIR%%/Slim/Plugin/Deezer/HTML/EN/plugins/Deezer/html/images
+@dirrm %%SLIMDIR%%/Slim/Plugin/Deezer/HTML/EN/plugins/Deezer/html
+@dirrm %%SLIMDIR%%/Slim/Plugin/Deezer/HTML/EN/plugins/Deezer
+@dirrm %%SLIMDIR%%/Slim/Plugin/Deezer/HTML/EN/plugins
+@dirrm %%SLIMDIR%%/Slim/Plugin/Deezer/HTML/EN
+@dirrm %%SLIMDIR%%/Slim/Plugin/Deezer/HTML
+@dirrm %%SLIMDIR%%/Slim/Plugin/Deezer
 @dirrm %%SLIMDIR%%/Slim/Plugin/DateTime/HTML/EN/plugins/DateTime/settings
 @dirrm %%SLIMDIR%%/Slim/Plugin/DateTime/HTML/EN/plugins/DateTime
 @dirrm %%SLIMDIR%%/Slim/Plugin/DateTime/HTML/EN/plugins
@@ -2435,6 +2477,7 @@ squeezecenter/MySQL/errmsg.sys
 @dirrm %%SLIMDIR%%/Slim/Plugin/AudioScrobbler/HTML/EN
 @dirrm %%SLIMDIR%%/Slim/Plugin/AudioScrobbler/HTML
 @dirrm %%SLIMDIR%%/Slim/Plugin/AudioScrobbler
+@dirrm %%SLIMDIR%%/Slim/Plugin/Amazon
 @dirrm %%SLIMDIR%%/Slim/Plugin
 @dirrm %%SLIMDIR%%/Slim/Player/Protocols
 @dirrm %%SLIMDIR%%/Slim/Player
@@ -2449,6 +2492,7 @@ squeezecenter/MySQL/errmsg.sys
 @dirrm %%SLIMDIR%%/Slim/Music
 @dirrm %%SLIMDIR%%/Slim/Menu
 @dirrm %%SLIMDIR%%/Slim/Hardware
+@dirrm %%SLIMDIR%%/Slim/Formats/RemoteMetadata
 @dirrm %%SLIMDIR%%/Slim/Formats/Playlists
 @dirrm %%SLIMDIR%%/Slim/Formats
 @dirrm %%SLIMDIR%%/Slim/Display/Lib
@@ -2465,6 +2509,7 @@ squeezecenter/MySQL/errmsg.sys
 @dirrm %%SLIMDIR%%/HTML/xml
 @dirrm %%SLIMDIR%%/HTML/Touch/html
 @dirrm %%SLIMDIR%%/HTML/Touch
+@dirrm %%SLIMDIR%%/HTML/ScreenReader
 @dirrm %%SLIMDIR%%/HTML/Nokia770/html/images/smaller
 @dirrm %%SLIMDIR%%/HTML/Nokia770/html/images/larger
 @dirrm %%SLIMDIR%%/HTML/Nokia770/html/images
@@ -2485,6 +2530,7 @@ squeezecenter/MySQL/errmsg.sys
 @dirrm %%SLIMDIR%%/HTML/EN/html/softsqueeze
 @dirrm %%SLIMDIR%%/HTML/EN/html/scriptaculous
 @dirrm %%SLIMDIR%%/HTML/EN/html/images/ServiceProviders
+@dirrm %%SLIMDIR%%/HTML/EN/html/images/Players
 @dirrm %%SLIMDIR%%/HTML/EN/html/images
 @dirrm %%SLIMDIR%%/HTML/EN/html/ext/resources/images/default/window
 @dirrm %%SLIMDIR%%/HTML/EN/html/ext/resources/images/default/tree
@@ -2520,7 +2566,9 @@ squeezecenter/MySQL/errmsg.sys
 @dirrm %%SLIMDIR%%/HTML/EN
 @dirrm %%SLIMDIR%%/HTML/Default/settings
 @dirrm %%SLIMDIR%%/HTML/Default/html/images/slim-ext
+@dirrm %%SLIMDIR%%/HTML/Default/html/images/signup
 @dirrm %%SLIMDIR%%/HTML/Default/html/images
+@dirrm %%SLIMDIR%%/HTML/Default/html/ext
 @dirrm %%SLIMDIR%%/HTML/Default/html/docs
 @dirrm %%SLIMDIR%%/HTML/Default/html
 @dirrm %%SLIMDIR%%/HTML/Default
@@ -2620,7 +2668,6 @@ squeezecenter/MySQL/errmsg.sys
 @dirrm %%SLIMDIR%%/CPAN/DBIx/Class/Relationship
 @dirrm %%SLIMDIR%%/CPAN/DBIx/Class/PK/Auto
 @dirrm %%SLIMDIR%%/CPAN/DBIx/Class/PK
-@dirrm %%SLIMDIR%%/CPAN/DBIx/Class/Manual
 @dirrm %%SLIMDIR%%/CPAN/DBIx/Class/InflateColumn
 @dirrm %%SLIMDIR%%/CPAN/DBIx/Class/ClassResolver
 @dirrm %%SLIMDIR%%/CPAN/DBIx/Class