6 files changed, 164 insertions, 69 deletions

diff --git a/audio/squeezecenter/Makefile b/audio/squeezecenter/Makefile
index 96c325e1c18a..e03b14a5ba0f 100644
--- a/audio/squeezecenter/Makefile
+++ b/audio/squeezecenter/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	slimserver
-PORTVERSION=	6.3.1
+PORTVERSION=	6.5.0
 CATEGORIES=	audio
 MASTER_SITES=	http://www.slimdevices.com/downloads/SlimServer_v${PORTVERSION}/
 DISTNAME=	SlimServer_v${PORTVERSION}.no-cpan-arch
@@ -19,36 +19,41 @@ COMMENT=	Slim Devices audio streaming server
 # SB3 devices and wired SB1 devices.
 OPTIONS=	APE "Support Monkey's Audio Codec input" on \
 		FAAD "Support AAC input via FAAD" on \
-		FLAC "Support FLAC output (and inputs on older devices)" on \
+		FLAC "Support FLAC output (and input on SliMP3 and SB1)" on \
 		LAME "Support MP3 output via LAME" off \
 		MUSEPACK "Support musepack input" on \
 		SHORTEN "Support Shorten input" off \
-		VORBIS "Support OGG Vorbis input" on
+		VORBIS "Support OGG Vorbis input (SliMP3 and SB1)" on
 
 RESTRICTED=	Contains non-redistributable firmware, documentation, and images
 
 WRKSRC=		${WRKDIR}/SlimServer_v${PORTVERSION}
 
-LIB_DEPENDS+=	expat.6:${PORTSDIR}/textproc/expat2
-RUN_DEPENDS+=	${LOCALBASE}/bin/mDNSResponderPosix:${PORTSDIR}/net/mDNSResponder
+RUN_DEPENDS+=	${LOCALBASE}/bin/mDNSResponderPosix:${PORTSDIR}/net/mDNSResponder \
+		${SITE_PERL}/${PERL_ARCH}/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-Compress-Zlib \
+		${SITE_PERL}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql \
+		${SITE_PERL}/${PERL_ARCH}/Digest/SHA1.pm:${PORTSDIR}/security/p5-Digest-SHA1 \
+		${SITE_PERL}/${PERL_ARCH}/HTML/Parser.pm:${PORTSDIR}/www/p5-HTML-Parser \
+		${SITE_PERL}/${PERL_ARCH}/Template.pm:${PORTSDIR}/www/p5-Template-Toolkit \
+		${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes \
+		${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser \
+		${SITE_PERL}/File/Which.pm:${PORTSDIR}/sysutils/p5-File-Which
 
 PKGINSTALL=	${WRKDIR}/pkg-install
 
 USE_PERL5=	yes
+USE_MYSQL=	yes
+WANT_MYSQL_VER=	50
 
-SLIMCPANPKGS=	Compress-Zlib-1.33.tar.gz \
-		DBI-1.46.tar.gz \
-		DBD-SQLite-1.08.tar.gz \
-		Digest-SHA1-2.11.tar.gz \
-		HTML-Parser-3.45.tar.gz \
-		Template-Toolkit-2.13.tar.gz \
-		Time-HiRes-1.66.tar.gz \
-		XML-Parser-2.34.tar.gz
-
+SLIMCPANPKGS=	YAML-Syck-0.64.tar.gz
 ALLFILES=	${DISTFILES} ${SLIMCPANPKGS}
 
 .include <bsd.port.pre.mk>
 
+# We need a dependency on the server because slimserver runs the binary
+# directly with a non-standard config.
+RUN_DEPENDS+=	${LOCALBASE}/libexec/mysqld:${PORTSDIR}/databases/mysql${MYSQL_VER}-server
+
 .if !defined(WITHOUT_APE)
 RUN_DEPENDS+=	mac:${PORTSDIR}/audio/mac
 .endif
@@ -71,8 +76,8 @@ RUN_DEPENDS+=	shorten:${PORTSDIR}/audio/shorten
 RUN_DEPENDS+=	oggdec:${PORTSDIR}/audio/vorbis-tools
 .endif
 
-.if ${PERL_LEVEL} < 500800
-IGNORE=		perl 5.8 or newer required. Install lang/perl5.8 and try again
+.if ${PERL_LEVEL} < 500803
+IGNORE=		perl 5.8.3 or newer required. Install lang/perl5.8 and try again
 .endif
 
 .if ${OSVERSION} < 502110
@@ -88,7 +93,7 @@ TMP_DOCSDIR=	${WRKDIR}/doc
 CPANWRKDIR=	${WRKDIR}/cpantemp
 DOCFILES=	Changelog.html Installation.txt License.txt
 CONFFILES=	convert.conf types.conf
-EXCEPTFILES=	${DOCFILES} ${CONFFILES}
+EXCEPTFILES=	${DOCFILES} ${CONFFILES} MySQL/errmsg.txt MySQL/errmsg.sys
 EXCEPTDIRS=	Bin \
 		CPAN/arch
 
@@ -119,11 +124,11 @@ post-fetch:
 
 post-patch:
 	@${REINPLACE_CMD} \
-		-e 's|%%PERL%%|${PERL}|' \
-		-e 's|%%LOCALBASE%%|${LOCALBASE}|' \
-		-e 's|%%TMP_SLIMDIR%%|${TMP_SLIMDIR}|' \
-		-e 's|%%CPANWRKDIR%%|${CPANWRKDIR}|' \
-		-e 's|%%DISTDIR%%|${_DISTDIR}|' ${WRKSRC}/Bin/build-perl-modules.pl
+	    -e 's|%%PERL%%|${PERL}|' \
+	    -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
+	    -e 's|%%TMP_SLIMDIR%%|${TMP_SLIMDIR}|' \
+	    -e 's|%%CPANWRKDIR%%|${CPANWRKDIR}|' \
+	    -e 's|%%DISTDIR%%|${_DISTDIR}|' ${WRKSRC}/Bin/build-perl-modules.pl
 
 do-build:
 	@${MKDIR} -m 0755 ${TMP_SLIMDIR}
@@ -155,6 +160,8 @@ post-build:
 	    ${SED} -e 's|${TMP_SLIMDIR}|%%SLIMDIR%%|' | \
 	    ${SORT} >> ${PLIST}
 	@${ECHO} "${SLIMDIR}/Cache" >> ${PLIST}
+	@${ECHO} "${SLIMDIR}/MySQL/errmsg.txt" >> ${PLIST}
+	@${ECHO} "${SLIMDIR}/MySQL/errmsg.sys" >> ${PLIST}
 	@${FIND} ${TMP_SLIMDIR} -type d | \
 	    ${SED} -e 's|${TMP_SLIMDIR}|@dirrm %%SLIMDIR%%|' | \
 	    ${SORT} -r >> ${PLIST}
@@ -177,6 +184,10 @@ do-install:
 	@cd ${TMP_SLIMDIR} && \
 	    ${FIND} . | \
 	    ${CPIO} ${CPIOARGS} ${BINOWN}:${BINGRP} ${PREFIX}/${SLIMDIR}
+	@${LN} -s ${LOCALBASE}/share/mysql/errmsg.txt \
+	    ${PREFIX}/${SLIMDIR}/MySQL/
+	@${LN} -s ${LOCALBASE}/share/mysql/english/errmsg.sys \
+	    ${PREFIX}/${SLIMDIR}/MySQL/
 	@${INSTALL_SCRIPT} ${WRKDIR}/softsqueeze.sh ${PREFIX}/bin/softsqueeze
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
diff --git a/audio/squeezecenter/distinfo b/audio/squeezecenter/distinfo
index fb317d65616a..7cfa8f84dfe2 100644
--- a/audio/squeezecenter/distinfo
+++ b/audio/squeezecenter/distinfo
@@ -1,27 +1,6 @@
-MD5 (slimserver/SlimServer_v6.3.1.no-cpan-arch.tar.gz) = df89f06ea6c194f3b9cd71c2a8b2d46e
-SHA256 (slimserver/SlimServer_v6.3.1.no-cpan-arch.tar.gz) = 3a361256e8a6c7038cba788d10a25ddc92b4747ed2abee1edc6dd7ddaeb13dc3
-SIZE (slimserver/SlimServer_v6.3.1.no-cpan-arch.tar.gz) = 11245163
-MD5 (slimserver/Compress-Zlib-1.33.tar.gz) = 724552bde7f380e8c8a9da00a9bbc3d2
-SHA256 (slimserver/Compress-Zlib-1.33.tar.gz) = 3def6cb52c566e8668dead15ab21193d2f38d923512ea4fc12a9f47136b0a456
-SIZE (slimserver/Compress-Zlib-1.33.tar.gz) = 113859
-MD5 (slimserver/DBI-1.46.tar.gz) = 863034a912ae56968e48d1c30d5954ef
-SHA256 (slimserver/DBI-1.46.tar.gz) = e6847494d88f8905e2ad636a70be1cd7c28b6c831ba648eb6fca53459780f269
-SIZE (slimserver/DBI-1.46.tar.gz) = 372247
-MD5 (slimserver/DBD-SQLite-1.08.tar.gz) = a4c44391cfa3452f782c403bd04b41a6
-SHA256 (slimserver/DBD-SQLite-1.08.tar.gz) = 855ec488a89c03e36302dc394da041d65773b56877193412895d371b388afaf1
-SIZE (slimserver/DBD-SQLite-1.08.tar.gz) = 470012
-MD5 (slimserver/Digest-SHA1-2.11.tar.gz) = 2449bfe21d6589c96eebf94dae24df6b
-SHA256 (slimserver/Digest-SHA1-2.11.tar.gz) = 3cebe0a6894daee3bfa5d9619fc90e7619cb6a77ac1b04d027341cd6033ae989
-SIZE (slimserver/Digest-SHA1-2.11.tar.gz) = 38723
-MD5 (slimserver/HTML-Parser-3.45.tar.gz) = b12d484853d96c4f045f49f91d50349f
-SHA256 (slimserver/HTML-Parser-3.45.tar.gz) = 2ee85c69262f3482ea334f323b27a6e5e760d90e1c03678bd75a57e58c8bcae0
-SIZE (slimserver/HTML-Parser-3.45.tar.gz) = 82466
-MD5 (slimserver/Template-Toolkit-2.13.tar.gz) = 64737793e053f0e684012918a6aa4701
-SHA256 (slimserver/Template-Toolkit-2.13.tar.gz) = f26fe5950804badd5173f4f1e5f3bbe989e2a172db0f1af4c4077b6660ff3600
-SIZE (slimserver/Template-Toolkit-2.13.tar.gz) = 834496
-MD5 (slimserver/Time-HiRes-1.66.tar.gz) = 57c0da44b48854b90b33c22a65336886
-SHA256 (slimserver/Time-HiRes-1.66.tar.gz) = d5b30c2c0183f91e89ee7aad40d75ac204d23d5d9fc05682ed0be18cc8905f92
-SIZE (slimserver/Time-HiRes-1.66.tar.gz) = 59740
-MD5 (slimserver/XML-Parser-2.34.tar.gz) = 2e44f9e6e6ed730e28b056d55e48413f
-SHA256 (slimserver/XML-Parser-2.34.tar.gz) = c81099114908da2e91377f8351f406a48542f8f0a767985b0c565d782ea5ae01
-SIZE (slimserver/XML-Parser-2.34.tar.gz) = 230102
+MD5 (slimserver/SlimServer_v6.5.0.no-cpan-arch.tar.gz) = 420e321577ed5b4f5fd61615cd01eb50
+SHA256 (slimserver/SlimServer_v6.5.0.no-cpan-arch.tar.gz) = 63bd2600efd70c4165b474dfab97e32085af80b155e99f944bbcc6937ed68ead
+SIZE (slimserver/SlimServer_v6.5.0.no-cpan-arch.tar.gz) = 12320425
+MD5 (slimserver/YAML-Syck-0.64.tar.gz) = 51054b5da582e381158f10276f82ae15
+SHA256 (slimserver/YAML-Syck-0.64.tar.gz) = 70ff201165020c7aeadeb4bd1a6233462994a07a7153c8f5570a3698b0207e07
+SIZE (slimserver/YAML-Syck-0.64.tar.gz) = 128255
diff --git a/audio/squeezecenter/files/patch-Bin_build-perl-modules.pl b/audio/squeezecenter/files/patch-Bin_build-perl-modules.pl
index d7f42998f466..a2cbae114627 100644
--- a/audio/squeezecenter/files/patch-Bin_build-perl-modules.pl
+++ b/audio/squeezecenter/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/squeezecenter/files/patch-Slim_Utils_Misc.pm b/audio/squeezecenter/files/patch-Slim_Utils_Misc.pm
new file mode 100644
index 000000000000..16a2f1e07a1e
--- /dev/null
+++ b/audio/squeezecenter/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/squeezecenter/files/patch-Slim_Utils_Prefs.pm b/audio/squeezecenter/files/patch-Slim_Utils_Prefs.pm
index 131a26b0b1b2..9dab1f2b49fb 100644
--- a/audio/squeezecenter/files/patch-Slim_Utils_Prefs.pm
+++ b/audio/squeezecenter/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/squeezecenter/files/patch-convert.conf b/audio/squeezecenter/files/patch-convert.conf
new file mode 100644
index 000000000000..1a147a86fd18
--- /dev/null
+++ b/audio/squeezecenter/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 -