Upgrade slimserver to version 6.5.0.

The biggest change is that the database is now MySQL instead of SQLite.
Slimserver starts it's own MySQL instance so you don't need to deal with
MySQL configuration, but both the client and server are now
dependencies.  For more info see the change log at:

	http://www.slimdevices.com/Changelog6.html

Most of the binary perl modules are now port dependencies.  YAML-Syck is
not yet because it didn't work.  I suspect a version issues (the ports
version is newer).

4 files changed, 125 insertions, 20 deletions

diff --git a/audio/squeezeboxserver/files/patch-Bin_build-perl-modules.pl b/audio/squeezeboxserver/files/patch-Bin_build-perl-modules.pl
index d7f42998f466..a2cbae114627 100644
--- a/audio/squeezeboxserver/files/patch-Bin_build-perl-modules.pl
+++ b/audio/squeezeboxserver/files/patch-Bin_build-perl-modules.pl
@@ -3,9 +3,32 @@ $FreeBSD$
 
 --- Bin/build-perl-modules.pl.orig
 +++ Bin/build-perl-modules.pl
-@@ -54,6 +54,13 @@
+@@ -24,14 +24,14 @@
  
- 		'env' => [qw(DBI-1.46/blib/lib: DBI-1.46/blib/arch)],
+ # The list of all the packages needed.
+ my %packages = (
+-	'Compress::Zlib'     => 'Compress-Zlib-1.41.tar.gz',
+-	'DBI'                => 'DBI-1.50.tar.gz',
+-	'DBD::mysql'         => 'DBD-mysql-3.0002.tar.gz',
+-	'Digest::SHA1'       => 'Digest-SHA1-2.11.tar.gz',
+-	'HTML::Parser'       => 'HTML-Parser-3.48.tar.gz',
+-	'Template'           => 'Template-Toolkit-2.14.tar.gz',
+-	'Time::HiRes'        => 'Time-HiRes-1.86.tar.gz',
+-	'XML::Parser::Expat' => 'XML-Parser-2.34.tar.gz',
++#	'Compress::Zlib'     => 'Compress-Zlib-1.41.tar.gz',
++#	'DBI'                => 'DBI-1.50.tar.gz',
++#	'DBD::mysql'         => 'DBD-mysql-3.0002.tar.gz',
++#	'Digest::SHA1'       => 'Digest-SHA1-2.11.tar.gz',
++#	'HTML::Parser'       => 'HTML-Parser-3.48.tar.gz',
++#	'Template'           => 'Template-Toolkit-2.14.tar.gz',
++#	'Time::HiRes'        => 'Time-HiRes-1.86.tar.gz',
++#	'XML::Parser::Expat' => 'XML-Parser-2.34.tar.gz',
+ 	'YAML::Syck'         => 'YAML-Syck-0.64.tar.gz',
+ );
+ 
+@@ -57,6 +57,13 @@
+ 
+ 		'env' => [qw(DBI-1.50/blib/lib: DBI-1.50/blib/arch)],
  	},
 +
 +	'XML-Parser-2.34' => {
@@ -17,7 +40,7 @@ $FreeBSD$
  );
  
  sub main {
-@@ -74,28 +81,14 @@
+@@ -73,28 +80,14 @@
  
  	print "*** Ignore any warnings about AppConfig. ***\n\n";
  
@@ -48,7 +71,7 @@ $FreeBSD$
  
  	unless (-d $slimServerPath) {
  		die "Couldn't find a valid SlimServer path. Exiting.\n";
-@@ -107,12 +100,7 @@
+@@ -109,12 +102,7 @@
  	# This is where the binaries will end up.
  	my $cpanDest = "$slimServerPath/CPAN/arch/$version/$archname/auto";
  
@@ -62,7 +85,7 @@ $FreeBSD$
  
  	# Remove trailing slash
  	$downloadPath =~ s|^(.+?)/$|$1|;
-@@ -125,32 +113,6 @@
+@@ -127,30 +115,6 @@
  
  	my $pwd = cwd();
  
@@ -74,10 +97,7 @@ $FreeBSD$
 -
 -		for my $cmd (qw(curl wget)) {
 -
--			system("which $cmd >/dev/null 2>&1");
--
--			unless ($? >> 8) {
--				$downloadUsing = $cmd;
+-			if ($downloadUsing = which($cmd)) {
 -				last;
 -			}
 -		}
@@ -92,13 +112,19 @@ $FreeBSD$
 -	} else {
 -		print "Downloads will use $downloadUsing to fetch tarballs.\n";
 -	}
+-
+ 	# Only download the packages that were passsed.
+ 	my @packages = ();
  
- 	for my $package (@packages) {
+@@ -189,30 +153,9 @@
  
-@@ -161,18 +123,7 @@
- 		# Remove any previous version.
- 		unlink $package;
+ 		chdir($pwd) or die "Couldn't change to $pwd : $!";
  
+-		print "\nDownloading $package to: $pwd\n";
+-
+-		# Remove any previous version.
+-		unlink $package;
+-
 -		if ($downloadUsing eq 'lwp') {
 -
 -			LWP::Simple::getstore("$SOURCE/$package?view=auto", $package);
@@ -111,7 +137,15 @@ $FreeBSD$
 -
 -			`$downloadUsing -q -O $package $SOURCE/$package?view=auto`;
 -		}
-+		`cp %%DISTDIR%%/$package .`;
+-
+-		unless (-r $package) {
+-			print "Something looks wrong - I couldn't read $pwd/$package, which I just downloaded.\n";
+-		}
++		print "\nExtracting $package in: $pwd\n";
+ 
+-		print "Uncompressing..\n";
+-		`gzip -d < $package | tar xvf -`;
++		`tar xfvz %%DISTDIR%%/$package`;
+ 
+ 		unlink $package;
  
- 		unless (-r $package) {
- 			print "Something looks wrong - I couldn't read $pwd/$package, which I just downloaded.\n";
diff --git a/audio/squeezeboxserver/files/patch-Slim_Utils_Misc.pm b/audio/squeezeboxserver/files/patch-Slim_Utils_Misc.pm
new file mode 100644
index 000000000000..16a2f1e07a1e
--- /dev/null
+++ b/audio/squeezeboxserver/files/patch-Slim_Utils_Misc.pm
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- Slim/Utils/Misc.pm.orig
++++ Slim/Utils/Misc.pm
+@@ -106,7 +106,7 @@
+ 
+ 	if (Slim::Utils::OSDetect::OS() ne "win") {
+ 
+-		push @paths, (split(/:/, $ENV{'PATH'}), qw(/usr/bin /usr/local/bin /sw/bin /usr/sbin));
++		push @paths, (split(/:/, $ENV{'PATH'}), qw(/usr/bin /usr/local/bin /usr/local/libexec /sw/bin /usr/sbin));
+ 
+ 	} else {
+ 
diff --git a/audio/squeezeboxserver/files/patch-Slim_Utils_Prefs.pm b/audio/squeezeboxserver/files/patch-Slim_Utils_Prefs.pm
index 131a26b0b1b2..9dab1f2b49fb 100644
--- a/audio/squeezeboxserver/files/patch-Slim_Utils_Prefs.pm
+++ b/audio/squeezeboxserver/files/patch-Slim_Utils_Prefs.pm
@@ -3,7 +3,7 @@ $FreeBSD$
 
 --- Slim/Utils/Prefs.pm.orig
 +++ Slim/Utils/Prefs.pm
-@@ -99,6 +99,10 @@
+@@ -392,6 +392,10 @@
  
  		$path = $Bin . '/Playlists';
  
@@ -14,16 +14,16 @@ $FreeBSD$
  	} else {
  
  		$path = '';
-@@ -131,7 +135,7 @@
+@@ -424,7 +428,7 @@
  
  	} elsif ($os eq 'unix') {
  
--		$CacheDir = $ENV{'HOME'};
+-		$CacheDir = catdir($ENV{'HOME'},'Cache');
 +		$CacheDir = "/var/db/slimserver/cache";
  	}
  
  	my @CacheDirs = splitdir($CacheDir);
-@@ -714,7 +718,7 @@
+@@ -1014,7 +1018,7 @@
  	} elsif (Slim::Utils::OSDetect::OS() eq 'win')  {
  		$prefsPath = $Bin;
  	} else {
diff --git a/audio/squeezeboxserver/files/patch-convert.conf b/audio/squeezeboxserver/files/patch-convert.conf
new file mode 100644
index 000000000000..1a147a86fd18
--- /dev/null
+++ b/audio/squeezeboxserver/files/patch-convert.conf
@@ -0,0 +1,57 @@
+
+$FreeBSD$
+
+--- convert.conf.orig
++++ convert.conf
+@@ -42,13 +42,13 @@
+ # 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 - -
+ 
+ alc mp3 * *
+ 	[alac] -r $FILE$ | [lame] --resample 44100 --silent -q $QUALITY$ -b $BITRATE$ -r -x - -
+ 
+ ogg mp3 * *
+-	[sox] -t ogg $FILE$ -t raw -r 44100 -c 2 -w -s $-x$ - | [lame] --resample 44100 --silent -q $QUALITY$ --abr $BITRATE$ -r - -
++	[oggdec] -Q -o - $FILE$ | [lame] --resample 44100 --silent -q $QUALITY$ --abr $BITRATE$ -r - -
+ 
+ wav mp3 * *
+ 	[lame] --resample 44100 --silent -q $QUALITY$ --abr $BITRATE$ $FILE$ -
+@@ -91,7 +91,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 @@
+ 
+ ## 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 *
+ 	-
+@@ -133,7 +133,7 @@
+ 	[shorten] -x $FILE$ - | [flac] -cs --totally-silent --compression-level-0 --endian little --sign signed --channels 2 --bps 16 --sample-rate 44100 -
+ 
+ ogg flc * *
+-	[sox] -t ogg $FILE$ -t raw -r 44100 -c 2 -w -s $-x$ - | [flac] -cs --compression-level-0 --totally-silent --endian big --channel 2 --bps 16 --sample-rate 44100 --sign signed -
++	[oggdec] -Q -o - $FILE$ | [flac] -cs --compression-level-0 --totally-silent --endian big --channel 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 -
+@@ -145,7 +145,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 -
+ 
+ alc flc * *
+ 	[alac] $FILE$ | [flac] -cs --totally-silent --compression-level-0 --endian big --sign signed --channels 2 --bps 16 --sample-rate 44100 -