Upgrade to slimserver 6.5.3 see change log for details.

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

Add largely untested support for changing the slimserver user, group,
and database/cache directory with the SLIMUSER, SLIMGROUP, and SLIMDBDIR
make variables.  Make sure the user/group exists before install if you
use a non-standard one.

6 files changed, 34 insertions, 23 deletions

diff --git a/audio/squeezecenter/Makefile b/audio/squeezecenter/Makefile
index a945392f69b5..2438f51870f3 100644
--- a/audio/squeezecenter/Makefile
+++ b/audio/squeezecenter/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	slimserver
-PORTVERSION=	6.5.2
+PORTVERSION=	6.5.3
 CATEGORIES=	audio
 MASTER_SITES=	http://www.slimdevices.com/downloads/SlimServer_v${PORTVERSION}/
 DISTNAME=	SlimServer_v${PORTVERSION}.no-cpan-arch
@@ -27,7 +27,9 @@ OPTIONS=	APE "Support Monkey's Audio Codec input" on \
 
 RESTRICTED=	Contains non-redistributable firmware, documentation, and images
 
-WRKSRC=		${WRKDIR}/SlimServer_v${PORTVERSION}
+# XXX: someone botched the 6.5.3 tarball
+#WRKSRC=	${WRKDIR}/SlimServer_v${PORTVERSION}
+WRKSRC=		${WRKDIR}/SlimServer_6.5_v2007-07-11
 
 BUILD_DEPENDS+=	${SITE_PERL}/File/Which.pm:${PORTSDIR}/sysutils/p5-File-Which
 RUN_DEPENDS+=	${LOCALBASE}/bin/mDNSResponderPosix:${PORTSDIR}/net/mDNSResponder \
@@ -95,6 +97,8 @@ SUB_FILES=	softsqueeze.sh pkg-install
 SUB_LIST=	PERL=${PERL} \
 		SLIMDIR=${SLIMDIR} \
 		SLIMDBDIR=${SLIMDBDIR} \
+		SLIMUSER=${SLIMUSER} \
+		SLIMGROUP=${SLIMGROUP} \
 		CONFFILES="${CONFFILES}"
 
 pre-fetch:
@@ -105,7 +109,9 @@ pre-fetch:
 .endif
 
 SLIMDIR?=	slimserver
-SLIMDBDIR=	/var/db/slimserver
+SLIMDBDIR?=	/var/db/slimserver
+SLIMUSER?=	slimserv
+SLIMGROUP?=	${SLIMUSER}
 
 post-fetch:
 .for _PKG in ${SLIMCPANPKGS}
@@ -120,12 +126,14 @@ post-patch:
 	    -e 's|%%TMP_SLIMDIR%%|${TMP_SLIMDIR}|' \
 	    -e 's|%%CPANWRKDIR%%|${CPANWRKDIR}|' \
 	    -e 's|%%DISTDIR%%|${_DISTDIR}|' \
-		${WRKSRC}/Bin/build-perl-modules.pl
-	@${REINPLACE_CMD} \
-	    -e 's|/usr/bin/perl|${PERL}|' \
-		${WRKSRC}/scanner.pl ${WRKSRC}/slimserver.pl \
-		${WRKSRC}/Bin/dbish
+	    -e 's|%%SLIMDBDIR%%|${SLIMDBDIR}|' \
+		${WRKSRC}/Bin/build-perl-modules.pl \
+		${WRKSRC}/Bin/dbish \
+		${WRKSRC}/Slim/Utils/Prefs.pm \
+		${WRKSRC}/scanner.pl \
+		${WRKSRC}/slimserver.pl
 	@${RM} ${WRKSRC}/scanner.pl.bak ${WRKSRC}/slimserver.pl.bak \
+	    ${WRKSRC}/Slim/Utils/Prefs.pm.bak \
 	    ${WRKSRC}/Bin/dbish.bak
 
 do-build:
@@ -160,9 +168,12 @@ post-build:
 	@${ECHO} "${SLIMDIR}/Cache" >> ${PLIST}
 	@${ECHO} "${SLIMDIR}/MySQL/errmsg.txt" >> ${PLIST}
 	@${ECHO} "${SLIMDIR}/MySQL/errmsg.sys" >> ${PLIST}
-	@${FIND} ${TMP_SLIMDIR} -type d | \
+	${FIND} ${TMP_SLIMDIR} -type d | \
+	    egrep -v "${TMP_SLIMDIR}(|/Plugins)$$" | \
 	    ${SED} -e 's|${TMP_SLIMDIR}|@dirrm %%SLIMDIR%%|' | \
 	    ${SORT} -r >> ${PLIST}
+	echo "@dirrmtry %%SLIMDIR%%/Plugins" >> ${PLIST}
+	echo "@dirrmtry %%SLIMDIR%%" >> ${PLIST}
 .if !defined(NOPORTDOCS)
 	@${FIND} ${TMP_DOCSDIR} -type d | \
 	    ${SED} -e 's|${TMP_DOCSDIR}|@dirrm %%DOCSDIR%%|' | \
diff --git a/audio/squeezecenter/distinfo b/audio/squeezecenter/distinfo
index a489cac09306..64b32242c668 100644
--- a/audio/squeezecenter/distinfo
+++ b/audio/squeezecenter/distinfo
@@ -1,6 +1,6 @@
-MD5 (slimserver/SlimServer_v6.5.2.no-cpan-arch.tar.gz) = d57f280ec34e4c1745686211ed8a54ab
-SHA256 (slimserver/SlimServer_v6.5.2.no-cpan-arch.tar.gz) = c9d290ccf77711cb688488cceb7a6deb2e139eaa15607b5f46e05f54e2b59a79
-SIZE (slimserver/SlimServer_v6.5.2.no-cpan-arch.tar.gz) = 15764217
+MD5 (slimserver/SlimServer_v6.5.3.no-cpan-arch.tar.gz) = 5bb731da7f97dbb3259691ca60f57750
+SHA256 (slimserver/SlimServer_v6.5.3.no-cpan-arch.tar.gz) = 2d4aab42643504698125373558d96150a598a34e835e38e3a959851a7a94227d
+SIZE (slimserver/SlimServer_v6.5.3.no-cpan-arch.tar.gz) = 15760025
 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-Slim_Utils_Prefs.pm b/audio/squeezecenter/files/patch-Slim_Utils_Prefs.pm
index 001a803a5ff0..c7e5178a5b5b 100644
--- a/audio/squeezecenter/files/patch-Slim_Utils_Prefs.pm
+++ b/audio/squeezecenter/files/patch-Slim_Utils_Prefs.pm
@@ -9,7 +9,7 @@ $FreeBSD$
  
 +	} elsif (Slim::Utils::OSDetect::OS() eq 'unix') {
 +
-+		$path = "/var/db/slimserver/playlists";
++		$path = "%%SLIMDBDIR%%/playlists";
 +
  	} else {
  
@@ -19,7 +19,7 @@ $FreeBSD$
  	} elsif ($os eq 'unix') {
  
 -		$CacheDir = catdir($ENV{'HOME'},'Cache');
-+		$CacheDir = "/var/db/slimserver/cache";
++		$CacheDir = "%%SLIMDBDIR%%/cache";
  
  	} elsif ($os eq 'win' && Slim::Utils::OSDetect::details->{'osName'} =~ /Vista/) {
  
@@ -28,7 +28,7 @@ $FreeBSD$
  		}
  	} else {
 -	 	$prefsPath = $ENV{'HOME'};
-+	 	$prefsPath = "/var/db/slimserver";
++	 	$prefsPath = "%%SLIMDBDIR%%";
  	}
  	
  	$::d_prefs && msg("The default prefs directory is $prefsPath\n");
diff --git a/audio/squeezecenter/files/pkg-install.in b/audio/squeezecenter/files/pkg-install.in
index 6281f6397078..04fc2c825072 100644
--- a/audio/squeezecenter/files/pkg-install.in
+++ b/audio/squeezecenter/files/pkg-install.in
@@ -1,15 +1,15 @@
 #!/bin/sh
-# $FreeBSD: /tmp/pcvs/ports/audio/squeezecenter/files/Attic/pkg-install.in,v 1.2 2005-04-21 20:05:53 brooks Exp $
+# $FreeBSD: /tmp/pcvs/ports/audio/squeezecenter/files/Attic/pkg-install.in,v 1.3 2007-07-15 03:47:20 brooks Exp $
 
 name=slimserver
-u=slimserv
-g=slimserv
+u=%%SLIMUSER%%
+g=%%SLIMGROUP%%
 ugid=104
 homedir=/nonexistent
 shell=/sbin/nologin
 comment="Slim Devices SlimServer pseudo-user"
 slimdir="%%PREFIX%%/%%SLIMDIR%%"
-statedir=/var/db/slimserver
+statedir=%%SLIMDBDIR%%
 cachedir=${statedir}/cache
 conffile=${statedir}/slimserver.conf
 playlistdir=${statedir}/playlists
diff --git a/audio/squeezecenter/files/slimserver.sh.in b/audio/squeezecenter/files/slimserver.sh.in
index b91aa35cc23f..fac1e2b47eac 100644
--- a/audio/squeezecenter/files/slimserver.sh.in
+++ b/audio/squeezecenter/files/slimserver.sh.in
@@ -28,8 +28,8 @@ statedir=%%SLIMDBDIR%%
 cachedir=${statedir}/cache
 playlistdir=${statedir}/playlists
 conffile=${statedir}/slimserver.conf
-u=slimserv
-g=slimserv
+u=%%SLIMUSER%%
+g=%%SLIMGROUP%%
 command_args="--daemon --prefsfile=${conffile} --logfile=${logfile} --user=${u} --group=${g} --pidfile=${pidfile}"
 
 slimserver_start_precmd()
diff --git a/audio/squeezecenter/files/squeezecenter.sh.in b/audio/squeezecenter/files/squeezecenter.sh.in
index b91aa35cc23f..fac1e2b47eac 100644
--- a/audio/squeezecenter/files/squeezecenter.sh.in
+++ b/audio/squeezecenter/files/squeezecenter.sh.in
@@ -28,8 +28,8 @@ statedir=%%SLIMDBDIR%%
 cachedir=${statedir}/cache
 playlistdir=${statedir}/playlists
 conffile=${statedir}/slimserver.conf
-u=slimserv
-g=slimserv
+u=%%SLIMUSER%%
+g=%%SLIMGROUP%%
 command_args="--daemon --prefsfile=${conffile} --logfile=${logfile} --user=${u} --group=${g} --pidfile=${pidfile}"
 
 slimserver_start_precmd()