- Upgrade to slimserver 6.1.1.

- Don't quote IGNORE message.
- Don't put pid file in /var/run/slimserver/.  It's now created early
  enough to put it directly in /var/run/.

11 files changed, 22 insertions, 47 deletions

diff --git a/audio/slimserver/Makefile b/audio/slimserver/Makefile
index c7a2d61394a4..5d054ed2b1f0 100644
--- a/audio/slimserver/Makefile
+++ b/audio/slimserver/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	slimserver
-PORTVERSION?=	6.0.2
+PORTVERSION?=	6.1.1
 PORTREVISION=	0
 CATEGORIES=	audio
 MASTER_SITES=	http://www.slimdevices.com/downloads/${NIGHTLY}SlimServer_v${DISTVERSION}/
@@ -41,7 +41,7 @@ SLIMCPANPKGS=	Compress-Zlib-1.33.tar.gz \
 ALLFILES=	${DISTFILES} ${SLIMCPANPKGS}
 
 .if ${PERL_LEVEL} < 500800
-IGNORE=	"Perl 5.8 or newer required. Install lang/perl5.8 and try again."
+IGNORE=		Perl 5.8 or newer required. Install lang/perl5.8 and try again.
 .endif
 
 .if ${OSVERSION} < 502110
diff --git a/audio/slimserver/distinfo b/audio/slimserver/distinfo
index bdd46f718a99..626a49ae17a2 100644
--- a/audio/slimserver/distinfo
+++ b/audio/slimserver/distinfo
@@ -1,5 +1,5 @@
-MD5 (slimserver/SlimServer_v6.0.2.no-cpan-arch.tar.gz) = 10e52b095ead3b88b1a126aab9812a7c
-SIZE (slimserver/SlimServer_v6.0.2.no-cpan-arch.tar.gz) = 6011445
+MD5 (slimserver/SlimServer_v6.1.1.no-cpan-arch.tar.gz) = 241e4ba20bc7a80baae94b4419e56352
+SIZE (slimserver/SlimServer_v6.1.1.no-cpan-arch.tar.gz) = 6149126
 MD5 (slimserver/Compress-Zlib-1.33.tar.gz) = 724552bde7f380e8c8a9da00a9bbc3d2
 SIZE (slimserver/Compress-Zlib-1.33.tar.gz) = 113859
 MD5 (slimserver/DBI-1.46.tar.gz) = 863034a912ae56968e48d1c30d5954ef
diff --git a/audio/slimserver/files/slimserver.sh.in b/audio/slimserver/files/slimserver.sh.in
index 91838a060462..d4617c1cc2a8 100644
--- a/audio/slimserver/files/slimserver.sh.in
+++ b/audio/slimserver/files/slimserver.sh.in
@@ -21,7 +21,7 @@ stop_cmd="slimserver_stop"
 rcvar=`set_rcvar`
 
 command=%%PREFIX%%/%%SLIMDIR%%/slimserver.pl
-pidfile=/var/run/slimserver/${name}.pid
+pidfile=/var/run/${name}.pid
 logfile=/var/log/slimserver.log
 statedir=/var/db/slimserver
 cachedir=${statedir}/cache
@@ -47,10 +47,6 @@ slimserver_start_precmd()
 		mkdir -p ${playlistdir}
 		chown -R ${u}:${g} ${playlistdir}
 	fi
-	if [ ! -d /var/run/slimserver ]; then
-		mkdir -p /var/run/slimserver
-		chown -R ${u}:${g} /var/run/slimserver
-	fi
 	if [ ! -f ${conffile} ]; then
 		touch ${conffile}
 		chown ${u}:${g} ${conffile}
@@ -82,10 +78,9 @@ slimserver_stop()
 	rm -f ${pidfile}
 }
 
-# set defaults
+load_rc_config ${name}
 
 slimserver_enable=${slimserver_enable:-"NO"}
 slimserver_flags=${slimserver_flags:-""}
 
-load_rc_config ${name}
 run_rc_command "$1"
diff --git a/audio/squeezeboxserver/Makefile b/audio/squeezeboxserver/Makefile
index c7a2d61394a4..5d054ed2b1f0 100644
--- a/audio/squeezeboxserver/Makefile
+++ b/audio/squeezeboxserver/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	slimserver
-PORTVERSION?=	6.0.2
+PORTVERSION?=	6.1.1
 PORTREVISION=	0
 CATEGORIES=	audio
 MASTER_SITES=	http://www.slimdevices.com/downloads/${NIGHTLY}SlimServer_v${DISTVERSION}/
@@ -41,7 +41,7 @@ SLIMCPANPKGS=	Compress-Zlib-1.33.tar.gz \
 ALLFILES=	${DISTFILES} ${SLIMCPANPKGS}
 
 .if ${PERL_LEVEL} < 500800
-IGNORE=	"Perl 5.8 or newer required. Install lang/perl5.8 and try again."
+IGNORE=		Perl 5.8 or newer required. Install lang/perl5.8 and try again.
 .endif
 
 .if ${OSVERSION} < 502110
diff --git a/audio/squeezeboxserver/distinfo b/audio/squeezeboxserver/distinfo
index bdd46f718a99..626a49ae17a2 100644
--- a/audio/squeezeboxserver/distinfo
+++ b/audio/squeezeboxserver/distinfo
@@ -1,5 +1,5 @@
-MD5 (slimserver/SlimServer_v6.0.2.no-cpan-arch.tar.gz) = 10e52b095ead3b88b1a126aab9812a7c
-SIZE (slimserver/SlimServer_v6.0.2.no-cpan-arch.tar.gz) = 6011445
+MD5 (slimserver/SlimServer_v6.1.1.no-cpan-arch.tar.gz) = 241e4ba20bc7a80baae94b4419e56352
+SIZE (slimserver/SlimServer_v6.1.1.no-cpan-arch.tar.gz) = 6149126
 MD5 (slimserver/Compress-Zlib-1.33.tar.gz) = 724552bde7f380e8c8a9da00a9bbc3d2
 SIZE (slimserver/Compress-Zlib-1.33.tar.gz) = 113859
 MD5 (slimserver/DBI-1.46.tar.gz) = 863034a912ae56968e48d1c30d5954ef
diff --git a/audio/squeezeboxserver/files/slimserver.sh.in b/audio/squeezeboxserver/files/slimserver.sh.in
index 91838a060462..d4617c1cc2a8 100644
--- a/audio/squeezeboxserver/files/slimserver.sh.in
+++ b/audio/squeezeboxserver/files/slimserver.sh.in
@@ -21,7 +21,7 @@ stop_cmd="slimserver_stop"
 rcvar=`set_rcvar`
 
 command=%%PREFIX%%/%%SLIMDIR%%/slimserver.pl
-pidfile=/var/run/slimserver/${name}.pid
+pidfile=/var/run/${name}.pid
 logfile=/var/log/slimserver.log
 statedir=/var/db/slimserver
 cachedir=${statedir}/cache
@@ -47,10 +47,6 @@ slimserver_start_precmd()
 		mkdir -p ${playlistdir}
 		chown -R ${u}:${g} ${playlistdir}
 	fi
-	if [ ! -d /var/run/slimserver ]; then
-		mkdir -p /var/run/slimserver
-		chown -R ${u}:${g} /var/run/slimserver
-	fi
 	if [ ! -f ${conffile} ]; then
 		touch ${conffile}
 		chown ${u}:${g} ${conffile}
@@ -82,10 +78,9 @@ slimserver_stop()
 	rm -f ${pidfile}
 }
 
-# set defaults
+load_rc_config ${name}
 
 slimserver_enable=${slimserver_enable:-"NO"}
 slimserver_flags=${slimserver_flags:-""}
 
-load_rc_config ${name}
 run_rc_command "$1"
diff --git a/audio/squeezeboxserver/files/squeezecenter.sh.in b/audio/squeezeboxserver/files/squeezecenter.sh.in
index 91838a060462..d4617c1cc2a8 100644
--- a/audio/squeezeboxserver/files/squeezecenter.sh.in
+++ b/audio/squeezeboxserver/files/squeezecenter.sh.in
@@ -21,7 +21,7 @@ stop_cmd="slimserver_stop"
 rcvar=`set_rcvar`
 
 command=%%PREFIX%%/%%SLIMDIR%%/slimserver.pl
-pidfile=/var/run/slimserver/${name}.pid
+pidfile=/var/run/${name}.pid
 logfile=/var/log/slimserver.log
 statedir=/var/db/slimserver
 cachedir=${statedir}/cache
@@ -47,10 +47,6 @@ slimserver_start_precmd()
 		mkdir -p ${playlistdir}
 		chown -R ${u}:${g} ${playlistdir}
 	fi
-	if [ ! -d /var/run/slimserver ]; then
-		mkdir -p /var/run/slimserver
-		chown -R ${u}:${g} /var/run/slimserver
-	fi
 	if [ ! -f ${conffile} ]; then
 		touch ${conffile}
 		chown ${u}:${g} ${conffile}
@@ -82,10 +78,9 @@ slimserver_stop()
 	rm -f ${pidfile}
 }
 
-# set defaults
+load_rc_config ${name}
 
 slimserver_enable=${slimserver_enable:-"NO"}
 slimserver_flags=${slimserver_flags:-""}
 
-load_rc_config ${name}
 run_rc_command "$1"
diff --git a/audio/squeezecenter/Makefile b/audio/squeezecenter/Makefile
index c7a2d61394a4..5d054ed2b1f0 100644
--- a/audio/squeezecenter/Makefile
+++ b/audio/squeezecenter/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	slimserver
-PORTVERSION?=	6.0.2
+PORTVERSION?=	6.1.1
 PORTREVISION=	0
 CATEGORIES=	audio
 MASTER_SITES=	http://www.slimdevices.com/downloads/${NIGHTLY}SlimServer_v${DISTVERSION}/
@@ -41,7 +41,7 @@ SLIMCPANPKGS=	Compress-Zlib-1.33.tar.gz \
 ALLFILES=	${DISTFILES} ${SLIMCPANPKGS}
 
 .if ${PERL_LEVEL} < 500800
-IGNORE=	"Perl 5.8 or newer required. Install lang/perl5.8 and try again."
+IGNORE=		Perl 5.8 or newer required. Install lang/perl5.8 and try again.
 .endif
 
 .if ${OSVERSION} < 502110
diff --git a/audio/squeezecenter/distinfo b/audio/squeezecenter/distinfo
index bdd46f718a99..626a49ae17a2 100644
--- a/audio/squeezecenter/distinfo
+++ b/audio/squeezecenter/distinfo
@@ -1,5 +1,5 @@
-MD5 (slimserver/SlimServer_v6.0.2.no-cpan-arch.tar.gz) = 10e52b095ead3b88b1a126aab9812a7c
-SIZE (slimserver/SlimServer_v6.0.2.no-cpan-arch.tar.gz) = 6011445
+MD5 (slimserver/SlimServer_v6.1.1.no-cpan-arch.tar.gz) = 241e4ba20bc7a80baae94b4419e56352
+SIZE (slimserver/SlimServer_v6.1.1.no-cpan-arch.tar.gz) = 6149126
 MD5 (slimserver/Compress-Zlib-1.33.tar.gz) = 724552bde7f380e8c8a9da00a9bbc3d2
 SIZE (slimserver/Compress-Zlib-1.33.tar.gz) = 113859
 MD5 (slimserver/DBI-1.46.tar.gz) = 863034a912ae56968e48d1c30d5954ef
diff --git a/audio/squeezecenter/files/slimserver.sh.in b/audio/squeezecenter/files/slimserver.sh.in
index 91838a060462..d4617c1cc2a8 100644
--- a/audio/squeezecenter/files/slimserver.sh.in
+++ b/audio/squeezecenter/files/slimserver.sh.in
@@ -21,7 +21,7 @@ stop_cmd="slimserver_stop"
 rcvar=`set_rcvar`
 
 command=%%PREFIX%%/%%SLIMDIR%%/slimserver.pl
-pidfile=/var/run/slimserver/${name}.pid
+pidfile=/var/run/${name}.pid
 logfile=/var/log/slimserver.log
 statedir=/var/db/slimserver
 cachedir=${statedir}/cache
@@ -47,10 +47,6 @@ slimserver_start_precmd()
 		mkdir -p ${playlistdir}
 		chown -R ${u}:${g} ${playlistdir}
 	fi
-	if [ ! -d /var/run/slimserver ]; then
-		mkdir -p /var/run/slimserver
-		chown -R ${u}:${g} /var/run/slimserver
-	fi
 	if [ ! -f ${conffile} ]; then
 		touch ${conffile}
 		chown ${u}:${g} ${conffile}
@@ -82,10 +78,9 @@ slimserver_stop()
 	rm -f ${pidfile}
 }
 
-# set defaults
+load_rc_config ${name}
 
 slimserver_enable=${slimserver_enable:-"NO"}
 slimserver_flags=${slimserver_flags:-""}
 
-load_rc_config ${name}
 run_rc_command "$1"
diff --git a/audio/squeezecenter/files/squeezecenter.sh.in b/audio/squeezecenter/files/squeezecenter.sh.in
index 91838a060462..d4617c1cc2a8 100644
--- a/audio/squeezecenter/files/squeezecenter.sh.in
+++ b/audio/squeezecenter/files/squeezecenter.sh.in
@@ -21,7 +21,7 @@ stop_cmd="slimserver_stop"
 rcvar=`set_rcvar`
 
 command=%%PREFIX%%/%%SLIMDIR%%/slimserver.pl
-pidfile=/var/run/slimserver/${name}.pid
+pidfile=/var/run/${name}.pid
 logfile=/var/log/slimserver.log
 statedir=/var/db/slimserver
 cachedir=${statedir}/cache
@@ -47,10 +47,6 @@ slimserver_start_precmd()
 		mkdir -p ${playlistdir}
 		chown -R ${u}:${g} ${playlistdir}
 	fi
-	if [ ! -d /var/run/slimserver ]; then
-		mkdir -p /var/run/slimserver
-		chown -R ${u}:${g} /var/run/slimserver
-	fi
 	if [ ! -f ${conffile} ]; then
 		touch ${conffile}
 		chown ${u}:${g} ${conffile}
@@ -82,10 +78,9 @@ slimserver_stop()
 	rm -f ${pidfile}
 }
 
-# set defaults
+load_rc_config ${name}
 
 slimserver_enable=${slimserver_enable:-"NO"}
 slimserver_flags=${slimserver_flags:-""}
 
-load_rc_config ${name}
 run_rc_command "$1"