Upgrade to 6.2.1. Mostly a bugfix release.

Also, switch the style of patch to Bin/build-perl-modules.pl to remove
lines rather than commenting them out.

3 files changed, 11 insertions, 72 deletions

diff --git a/audio/slimserver/Makefile b/audio/slimserver/Makefile
index 092cbe3467b5..84d98efa6f2b 100644
--- a/audio/slimserver/Makefile
+++ b/audio/slimserver/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	slimserver
-DISTVERSION?=	6.2.0
+DISTVERSION?=	6.2.1
 CATEGORIES=	audio
 MASTER_SITES=	http://www.slimdevices.com/downloads/${NIGHTLY}SlimServer_v${DISTVERSION}/
 DISTNAME=	SlimServer_v${DISTVERSION}
diff --git a/audio/slimserver/distinfo b/audio/slimserver/distinfo
index f1b5f9ff18fc..cc7b74a606ef 100644
--- a/audio/slimserver/distinfo
+++ b/audio/slimserver/distinfo
@@ -1,6 +1,6 @@
-MD5 (slimserver/SlimServer_v6.2.0.no-cpan-arch.tar.gz) = a61d354b0e5717d0eef0862b787f1c37
-SHA256 (slimserver/SlimServer_v6.2.0.no-cpan-arch.tar.gz) = 38ad53550f7ada01f5be43be79a2772667dfc101d981e2cddaba414feb68e4ee
-SIZE (slimserver/SlimServer_v6.2.0.no-cpan-arch.tar.gz) = 7478901
+MD5 (slimserver/SlimServer_v6.2.1.no-cpan-arch.tar.gz) = 6f7195532b1934fb6090e99de501dd9d
+SHA256 (slimserver/SlimServer_v6.2.1.no-cpan-arch.tar.gz) = 15fc2583bc5d65ddc3d53da65c3e3e3a193960d656e223e23bac5ad773b18d99
+SIZE (slimserver/SlimServer_v6.2.1.no-cpan-arch.tar.gz) = 7142334
 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
diff --git a/audio/slimserver/files/patch-Bin_build-perl-modules.pl b/audio/slimserver/files/patch-Bin_build-perl-modules.pl
index 0c4f4afcf27f..d7f42998f466 100644
--- a/audio/slimserver/files/patch-Bin_build-perl-modules.pl
+++ b/audio/slimserver/files/patch-Bin_build-perl-modules.pl
@@ -17,7 +17,7 @@ $FreeBSD$
  );
  
  sub main {
-@@ -74,28 +81,30 @@
+@@ -74,28 +81,14 @@
  
  	print "*** Ignore any warnings about AppConfig. ***\n\n";
  
@@ -26,18 +26,13 @@ $FreeBSD$
 -	chomp($perlBinary = <STDIN>);
 -
 -	$perlBinary ||= '/usr/bin/perl';
-+#	print "Please enter a perl binary to use (defaults to /usr/bin/perl)\n";
-+#	print "This must be the same perl binary that you ran this program with --> ";
-+#	chomp($perlBinary = <STDIN>);
-+#
-+#	$perlBinary ||= '/usr/bin/perl';
 +	$perlBinary = '%%PERL%%';
  
- 	unless (-x $perlBinary) {
+ 	unless (-f $perlBinary && -x $perlBinary) {
  		die "Couldn't find a perl binary. Exiting.\n";
  	}
  
--	# Where does their slimserver live? Try to guess.
+ 	# Where does their slimserver live? Try to guess.
 -	if (-f 'slimserver.pl' && -d 'CPAN/arch') {
 -
 -		$slimServerPath = cwd();
@@ -49,23 +44,11 @@ $FreeBSD$
 -	}
 -
 -	$slimServerPath ||= '/usr/local/slimserver';
-+#	# Where does their slimserver live? Try to guess.
-+#	if (-f 'slimserver.pl' && -d 'CPAN/arch') {
-+#
-+#		$slimServerPath = cwd();
-+#
-+#	} else {
-+#
-+#		print "Please enter the path to your SlimServer directory (ex: /usr/local/slimserver) --> ";
-+#		chomp($slimServerPath = <STDIN>);
-+#	}
-+#
-+#	$slimServerPath ||= '/usr/local/slimserver';
-+	$slimServerPath = '%%TMP_SLIMDIR%%';
++	$slimServerPath ||= '%%TMP_SLIMDIR%%';
  
  	unless (-d $slimServerPath) {
  		die "Couldn't find a valid SlimServer path. Exiting.\n";
-@@ -107,12 +116,13 @@
+@@ -107,12 +100,7 @@
  	# This is where the binaries will end up.
  	my $cpanDest = "$slimServerPath/CPAN/arch/$version/$archname/auto";
  
@@ -75,17 +58,11 @@ $FreeBSD$
 -
 -	# Default to the current directory.
 -	$downloadPath ||= '.';
-+#	# Where do they want the downloads to go?
-+#	print "Please enter a directory to download files to --> ";
-+#	chomp($downloadPath = <STDIN>);
-+#
-+#	# Default to the current directory.
-+#	$downloadPath ||= '.';
 +	$downloadPath = '%%CPANWRKDIR%%';
  
  	# Remove trailing slash
  	$downloadPath =~ s|^(.+?)/$|$1|;
-@@ -125,32 +135,32 @@
+@@ -125,32 +113,6 @@
  
  	my $pwd = cwd();
  
@@ -115,36 +92,10 @@ $FreeBSD$
 -	} else {
 -		print "Downloads will use $downloadUsing to fetch tarballs.\n";
 -	}
-+#	# What do we want to download with?
-+#	eval { require LWP::Simple };
-+#
-+#	# No LWP - try a command line program.
-+#	if ($@) {
-+#
-+#		for my $cmd (qw(curl wget)) {
-+#
-+#			system("which $cmd >/dev/null 2>&1");
-+#
-+#			unless ($? >> 8) {
-+#				$downloadUsing = $cmd;
-+#				last;
-+#			}
-+#		}
-+#
-+#	} else {
-+#
-+#		$downloadUsing = 'lwp';
-+#	}
-+#
-+#	unless ($downloadUsing) {
-+#		die "Couldn't find any valid downloaders - install LWP, wget or curl.\n";
-+#	} else {
-+#		print "Downloads will use $downloadUsing to fetch tarballs.\n";
-+#	}
  
  	for my $package (@packages) {
  
-@@ -161,18 +171,19 @@
+@@ -161,18 +123,7 @@
  		# Remove any previous version.
  		unlink $package;
  
@@ -160,18 +111,6 @@ $FreeBSD$
 -
 -			`$downloadUsing -q -O $package $SOURCE/$package?view=auto`;
 -		}
-+#		if ($downloadUsing eq 'lwp') {
-+#
-+#			LWP::Simple::getstore("$SOURCE/$package?view=auto", $package);
-+#
-+#		} elsif ($downloadUsing eq 'curl') {
-+#
-+#			`$downloadUsing --silent -o $package $SOURCE/$package?view=auto`;
-+#
-+#		} else {
-+#
-+#			`$downloadUsing -q -O $package $SOURCE/$package?view=auto`;
-+#		}
 +		`cp %%DISTDIR%%/$package .`;
  
  		unless (-r $package) {