Index: head/audio/slimserver/Makefile
===================================================================
--- head/audio/slimserver/Makefile	(revision 195638)
+++ head/audio/slimserver/Makefile	(revision 195639)
@@ -1,202 +1,213 @@
 # Ports collection makefile for:	slimserver
 # Date created:				Wed Apr 14, 2004
 # Whom:					Brooks Davis <brooks@freebsd.org>
 #
 # $FreeBSD$
 #
 
 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
 DIST_SUBDIR=	slimserver
 
 MAINTAINER=	brooks@FreeBSD.org
 COMMENT=	Slim Devices audio streaming server
 
 # Defaults support playback of relativly unrestricted formats on SB2 or
 # 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 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 (SliMP3 and SB1)" 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 \
 		${SITE_PERL}/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-Compress-Zlib \
 		${SITE_PERL}/${PERL_ARCH}/DBD/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
 
 PKGINSTALL=	${WRKDIR}/pkg-install
 
 USE_PERL5=	yes
 USE_MYSQL=	yes
 IGNORE_WITH_MYSQL=	323 40
 
 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
 .if !defined(WITHOUT_FAAD)
 RUN_DEPENDS+=	faad:${PORTSDIR}/audio/faad
 .endif
 .if !defined(WITHOUT_FLAC)
 RUN_DEPENDS+=	flac:${PORTSDIR}/audio/flac
 .endif
 .if !defined(WITHOUT_LAME)
 RUN_DEPENDS+=	lame:${PORTSDIR}/audio/lame
 .endif
 .if !defined(WITHOUT_MUSEPACK)
 RUN_DEPENDS+=	mppdec:${PORTSDIR}/audio/musepack
 .endif
 .if !defined(WITHOUT_SHORTEN)
 RUN_DEPENDS+=	shorten:${PORTSDIR}/audio/shorten
 .endif
 .if !defined(WITHOUT_VORBIS)
 RUN_DEPENDS+=	oggdec:${PORTSDIR}/audio/vorbis-tools
 .endif
 
 USE_RC_SUBR=	slimserver.sh
 TMP_SLIMDIR=	${WRKDIR}/slimserver
 TMP_DOCSDIR=	${WRKDIR}/doc
 CPANWRKDIR=	${WRKDIR}/cpantemp
 DOCFILES=	Changelog.html Installation.txt License.txt
 CONFFILES=	convert.conf types.conf
 EXCEPTFILES=	${DOCFILES} ${CONFFILES} MySQL/errmsg.txt MySQL/errmsg.sys
 EXCEPTDIRS=	Bin \
 		CPAN/arch
 
 CPIOARGS=	--quiet -pdum -R
 PLIST=		${WRKDIR}/pkg-plist
 PLIST_SUB=	SLIMDIR=${SLIMDIR}
 PLIST_FILES=	bin/softsqueeze
 
 SUB_FILES=	softsqueeze.sh pkg-install
 SUB_LIST=	PERL=${PERL} \
 		SLIMDIR=${SLIMDIR} \
 		SLIMDBDIR=${SLIMDBDIR} \
+		SLIMUSER=${SLIMUSER} \
+		SLIMGROUP=${SLIMGROUP} \
 		CONFFILES="${CONFFILES}"
 
 pre-fetch:
 .if !defined(SLIMDIR)
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "Define SLIMDIR to override default of 'slimserver'."
 	@${ECHO_MSG} ""
 .endif
 
 SLIMDIR?=	slimserver
-SLIMDBDIR=	/var/db/slimserver
+SLIMDBDIR?=	/var/db/slimserver
+SLIMUSER?=	slimserv
+SLIMGROUP?=	${SLIMUSER}
 
 post-fetch:
 .for _PKG in ${SLIMCPANPKGS}
 	@cd ${_DISTDIR}; test -e ${_PKG} || \
 	    ${FETCH_CMD} -o ${_PKG} http://svn.slimdevices.com/vendor/src/${_PKG}?view=auto
 .endfor
 
 post-patch:
 	@${REINPLACE_CMD} \
 	    -e 's|/usr/bin/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
-	@${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:
 	@${MKDIR} -m 0755 ${TMP_SLIMDIR}
 	@cd ${WRKSRC} && \
 	    ${FIND} . -name \*.orig ${EXCEPTFILES:S|^|-o -path ./|} \
 	    ${EXCEPTDIRS:S/$/\*/:S/^/-o -path .\//} -o -print | \
 	    ${CPIO} ${CPIOARGS} ${BINOWN}:${BINGRP} ${TMP_SLIMDIR}
 .for _CONF in ${CONFFILES}
 	@cd ${WRKSRC} && ${INSTALL_DATA} ${_CONF} ${TMP_SLIMDIR}/${_CONF}.sample
 .endfor
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${TMP_DOCSDIR}
 	@cd ${WRKSRC} && ${INSTALL_DATA} ${DOCFILES} ${TMP_DOCSDIR}
 .endif
 	${MKDIR} ${CPANWRKDIR}
 	${WRKSRC}/Bin/build-perl-modules.pl
 
 post-build:
 	@${RM} -f ${PLIST}
 .for _CONF in ${CONFFILES}
 	@${ECHO} '@unexec if cmp -s %D/%%SLIMDIR%%/${_CONF} %D/%%SLIMDIR%%/${_CONF}.sample; then rm -f %D/%%SLIMDIR%%/${_CONF}; fi' >> ${PLIST}
 .endfor
 .if !defined(NOPORTDOCS)
 	@${FIND} ${TMP_DOCSDIR} -type f | \
 	    ${SED} -e 's|${TMP_DOCSDIR}|%%DOCSDIR%%|' | \
 	    ${SORT} >> ${PLIST}
 .endif
 	@${FIND} ${TMP_SLIMDIR}/* -type f | \
 	    ${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 | \
+	${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%%|' | \
 	    ${SORT} -r >> ${PLIST}
 .endif
 	@${ECHO} '@unexec rm -rf ${SLIMDBDIR}/cache > /dev/null 2>&1 || true' >> ${PLIST}
 	@${ECHO} '@dirrmtry ${SLIMDBDIR}/playlists' >> ${PLIST}
 	@${ECHO} '@dirrmtry ${SLIMDBDIR}' >> ${PLIST}
 	@${ECHO} '@unexec test -d ${SLIMDBDIR} && (echo "Configuration information saved.  If you will *NOT* use this package anymore," && echo "please remove ${SLIMDBDIR} and its contents manually.")' >> ${PLIST}
 
 pre-install:
 	@${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
 do-install:
 	@${MKDIR} -m 0755 ${PREFIX}/${SLIMDIR}
 	@${LN} -s ${SLIMDBDIR}/cache ${PREFIX}/${SLIMDIR}/Cache
 	@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}
 	@cd ${TMP_DOCSDIR} && \
 	    ${FIND} . | \
 	    ${CPIO} ${CPIOARGS} ${BINOWN}:${BINGRP} ${DOCSDIR}
 .endif
 
 post-install:
 	@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 	@${ECHO}
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>

Property changes on: head/audio/slimserver/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.36
\ No newline at end of property
+1.37
\ No newline at end of property
Index: head/audio/slimserver/distinfo
===================================================================
--- head/audio/slimserver/distinfo	(revision 195638)
+++ head/audio/slimserver/distinfo	(revision 195639)
@@ -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

Property changes on: head/audio/slimserver/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.18
\ No newline at end of property
+1.19
\ No newline at end of property
Index: head/audio/slimserver/files/patch-Slim_Utils_Prefs.pm
===================================================================
--- head/audio/slimserver/files/patch-Slim_Utils_Prefs.pm	(revision 195638)
+++ head/audio/slimserver/files/patch-Slim_Utils_Prefs.pm	(revision 195639)
@@ -1,34 +1,34 @@
 
 $FreeBSD$
 
 --- Slim/Utils/Prefs.pm.orig
 +++ Slim/Utils/Prefs.pm
 @@ -392,6 +392,10 @@
  
  		$path = $Bin . '/Playlists';
  
 +	} elsif (Slim::Utils::OSDetect::OS() eq 'unix') {
 +
-+		$path = "/var/db/slimserver/playlists";
++		$path = "%%SLIMDBDIR%%/playlists";
 +
  	} else {
  
  		$path = '';
 @@ -424,7 +428,7 @@
  
  	} 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/) {
  
 @@ -1022,7 +1026,7 @@
  			$prefsPath = $Bin;
  		}
  	} else {
 -	 	$prefsPath = $ENV{'HOME'};
-+	 	$prefsPath = "/var/db/slimserver";
++	 	$prefsPath = "%%SLIMDBDIR%%";
  	}
  	
  	$::d_prefs && msg("The default prefs directory is $prefsPath\n");

Property changes on: head/audio/slimserver/files/patch-Slim_Utils_Prefs.pm
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.6
\ No newline at end of property
+1.7
\ No newline at end of property
Index: head/audio/slimserver/files/pkg-install.in
===================================================================
--- head/audio/slimserver/files/pkg-install.in	(revision 195638)
+++ head/audio/slimserver/files/pkg-install.in	(revision 195639)
@@ -1,80 +1,80 @@
 #!/bin/sh
-# $FreeBSD: /tmp/pcvs/ports/audio/slimserver/files/Attic/pkg-install.in,v 1.2 2005-04-21 20:05:53 brooks Exp $
+# $FreeBSD: /tmp/pcvs/ports/audio/slimserver/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
 pidfile=/var/run/${name}.pid
 newsyslogfile=/etc/newsyslog.conf
 logfile=/var/log/slimserver.log
 logcomment="# added by audio/slimserver port"
 logline="${logfile}	${u}:${g} 644 3	   100	*     Z     ${pidfile}"
 
 case $2 in
 PRE-INSTALL)
 	if pw group show "${g}" >/dev/null 2>&1; then
 		echo "Using existing group \"${g}\"."
 	else
 		echo "Creating group \"${g}\", (gid: ${ugid})."
 		pw groupadd ${g} -g ${ugid}
 		if [ $? != 0 ]; then
 			echo "Failed to add group \"${g}\"."
 			exit 1
 		fi
 	fi
 	if pw user show "${u}" >/dev/null 2>&1; then
 		echo "Using existing user \"${u}\"."
 	else
 		echo "Creating user \"${u}\", (uid: ${ugid})."
 		pw useradd ${u} -u ${ugid} -g ${ugid} -h - \
 		    -d ${homedir} -s ${shell} -c "${comment}"
 		if [ $? != 0 ]; then
 			echo "Failed to add user \"${u}\"."
 			exit 1
 		fi
 	fi
 	;;
 POST-INSTALL)
 	if [ -d ${statedir} ]; then
 		chown -R ${u}:${g} ${statedir}
 	fi
 	if [ -d ${cachedir} ]; then
 		chown -R ${u}:${g} ${cachedir}
 	fi
 	if [ -d ${playlistdir} ]; then
 		chown -R ${u}:${g} ${playlistdir}
 	fi
         if [ -d /var/run/slimserver ]; then
                 chown -R ${u}:${g} /var/run/slimserver
         fi
         if [ -f ${conffile} ]; then
                 chown ${u}:${g} ${conffile}
         fi
         if [ -f ${logfile} ]; then
                 chown ${u}:${g} ${logfile}
         fi
 	if egrep -q "^${logfile}\>" ${newsyslogfile}; then
 		echo "Using existing ${newsyslogfile} entry."
 	else
 		echo "Adding slimserver log entry to ${newsyslogfile}."
 		echo "$logcomment" >> ${newsyslogfile}
 		echo "$logline" >> ${newsyslogfile}
 	fi
 	for file in %%CONFFILES%%; do
 		path="${slimdir}/${file}"
 		if [ ! -e ${path} ]; then
 			cp ${path}.sample ${path}
 			chmod 644 ${path}
 		fi
 	done
 	;;
 esac

Property changes on: head/audio/slimserver/files/pkg-install.in
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.2
\ No newline at end of property
+1.3
\ No newline at end of property
Index: head/audio/slimserver/files/slimserver.sh.in
===================================================================
--- head/audio/slimserver/files/slimserver.sh.in	(revision 195638)
+++ head/audio/slimserver/files/slimserver.sh.in	(revision 195639)
@@ -1,78 +1,78 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 
 # PROVIDE: slimserver
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable slimserver:
 #
 #slimserver_enable="YES"
 #
 
 . %%RC_SUBR%%
 
 name=slimserver
 start_precmd="slimserver_start_precmd"
 stop_postcmd="slimserver_poststop"
 rcvar=`set_rcvar`
 
 command=%%PREFIX%%/%%SLIMDIR%%/slimserver.pl
 command_interpreter=%%PERL%%
 pidfile=/var/run/${name}.pid
 logfile=/var/log/slimserver.log
 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()
 {
 	if [ ! -d ${statedir} ]; then
 		mkdir -p ${statedir}
 		chown -R ${u}:${g} ${statedir}
 	fi
 	if [ ! -d ${cachedir} ]; then
 		mkdir -p ${cachedir}
 		chown -R ${u}:${g} ${cachedir}
 	fi
 	if [ ! -d ${playlistdir} ]; then
 		mkdir -p ${playlistdir}
 		chown -R ${u}:${g} ${playlistdir}
 	fi
 	if [ ! -f ${conffile} ]; then
 		touch ${conffile}
 		chown ${u}:${g} ${conffile}
 	fi
 	if [ ! -f ${logfile} ]; then
 		touch ${logfile}
 		chown ${u}:${g} ${logfile}
 	fi
 }
 
 slimserver_poststop()
 {
         # Slimserver kills mDNSResponderPosix, but then manages to start
         # another one while dying so kill it off.
         echo "Stopping SlimServer's mDNSResponderPosix."
         mdns_pid=$(check_pidfile ${cachedir}/mDNS.pid %%LOCALBASE%%/bin/mDNSResponderPosix)
         if [ -n "${mdns_pid}" ]; then
                 # mDNSResponderPosix doens't die without a kill
                 kill -9 $mdns_pid
                 wait_for_pids $mdns_pid
 		rm -f ${cachedir}/mDNS.pid
         fi
 }
 
 load_rc_config ${name}
 
 slimserver_enable=${slimserver_enable:-"NO"}
 slimserver_flags=${slimserver_flags:-""}
 
 run_rc_command "$1"

Property changes on: head/audio/slimserver/files/slimserver.sh.in
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.7
\ No newline at end of property
+1.8
\ No newline at end of property
Index: head/audio/squeezeboxserver/Makefile
===================================================================
--- head/audio/squeezeboxserver/Makefile	(revision 195638)
+++ head/audio/squeezeboxserver/Makefile	(revision 195639)
@@ -1,202 +1,213 @@
 # Ports collection makefile for:	slimserver
 # Date created:				Wed Apr 14, 2004
 # Whom:					Brooks Davis <brooks@freebsd.org>
 #
 # $FreeBSD$
 #
 
 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
 DIST_SUBDIR=	slimserver
 
 MAINTAINER=	brooks@FreeBSD.org
 COMMENT=	Slim Devices audio streaming server
 
 # Defaults support playback of relativly unrestricted formats on SB2 or
 # 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 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 (SliMP3 and SB1)" 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 \
 		${SITE_PERL}/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-Compress-Zlib \
 		${SITE_PERL}/${PERL_ARCH}/DBD/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
 
 PKGINSTALL=	${WRKDIR}/pkg-install
 
 USE_PERL5=	yes
 USE_MYSQL=	yes
 IGNORE_WITH_MYSQL=	323 40
 
 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
 .if !defined(WITHOUT_FAAD)
 RUN_DEPENDS+=	faad:${PORTSDIR}/audio/faad
 .endif
 .if !defined(WITHOUT_FLAC)
 RUN_DEPENDS+=	flac:${PORTSDIR}/audio/flac
 .endif
 .if !defined(WITHOUT_LAME)
 RUN_DEPENDS+=	lame:${PORTSDIR}/audio/lame
 .endif
 .if !defined(WITHOUT_MUSEPACK)
 RUN_DEPENDS+=	mppdec:${PORTSDIR}/audio/musepack
 .endif
 .if !defined(WITHOUT_SHORTEN)
 RUN_DEPENDS+=	shorten:${PORTSDIR}/audio/shorten
 .endif
 .if !defined(WITHOUT_VORBIS)
 RUN_DEPENDS+=	oggdec:${PORTSDIR}/audio/vorbis-tools
 .endif
 
 USE_RC_SUBR=	slimserver.sh
 TMP_SLIMDIR=	${WRKDIR}/slimserver
 TMP_DOCSDIR=	${WRKDIR}/doc
 CPANWRKDIR=	${WRKDIR}/cpantemp
 DOCFILES=	Changelog.html Installation.txt License.txt
 CONFFILES=	convert.conf types.conf
 EXCEPTFILES=	${DOCFILES} ${CONFFILES} MySQL/errmsg.txt MySQL/errmsg.sys
 EXCEPTDIRS=	Bin \
 		CPAN/arch
 
 CPIOARGS=	--quiet -pdum -R
 PLIST=		${WRKDIR}/pkg-plist
 PLIST_SUB=	SLIMDIR=${SLIMDIR}
 PLIST_FILES=	bin/softsqueeze
 
 SUB_FILES=	softsqueeze.sh pkg-install
 SUB_LIST=	PERL=${PERL} \
 		SLIMDIR=${SLIMDIR} \
 		SLIMDBDIR=${SLIMDBDIR} \
+		SLIMUSER=${SLIMUSER} \
+		SLIMGROUP=${SLIMGROUP} \
 		CONFFILES="${CONFFILES}"
 
 pre-fetch:
 .if !defined(SLIMDIR)
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "Define SLIMDIR to override default of 'slimserver'."
 	@${ECHO_MSG} ""
 .endif
 
 SLIMDIR?=	slimserver
-SLIMDBDIR=	/var/db/slimserver
+SLIMDBDIR?=	/var/db/slimserver
+SLIMUSER?=	slimserv
+SLIMGROUP?=	${SLIMUSER}
 
 post-fetch:
 .for _PKG in ${SLIMCPANPKGS}
 	@cd ${_DISTDIR}; test -e ${_PKG} || \
 	    ${FETCH_CMD} -o ${_PKG} http://svn.slimdevices.com/vendor/src/${_PKG}?view=auto
 .endfor
 
 post-patch:
 	@${REINPLACE_CMD} \
 	    -e 's|/usr/bin/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
-	@${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:
 	@${MKDIR} -m 0755 ${TMP_SLIMDIR}
 	@cd ${WRKSRC} && \
 	    ${FIND} . -name \*.orig ${EXCEPTFILES:S|^|-o -path ./|} \
 	    ${EXCEPTDIRS:S/$/\*/:S/^/-o -path .\//} -o -print | \
 	    ${CPIO} ${CPIOARGS} ${BINOWN}:${BINGRP} ${TMP_SLIMDIR}
 .for _CONF in ${CONFFILES}
 	@cd ${WRKSRC} && ${INSTALL_DATA} ${_CONF} ${TMP_SLIMDIR}/${_CONF}.sample
 .endfor
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${TMP_DOCSDIR}
 	@cd ${WRKSRC} && ${INSTALL_DATA} ${DOCFILES} ${TMP_DOCSDIR}
 .endif
 	${MKDIR} ${CPANWRKDIR}
 	${WRKSRC}/Bin/build-perl-modules.pl
 
 post-build:
 	@${RM} -f ${PLIST}
 .for _CONF in ${CONFFILES}
 	@${ECHO} '@unexec if cmp -s %D/%%SLIMDIR%%/${_CONF} %D/%%SLIMDIR%%/${_CONF}.sample; then rm -f %D/%%SLIMDIR%%/${_CONF}; fi' >> ${PLIST}
 .endfor
 .if !defined(NOPORTDOCS)
 	@${FIND} ${TMP_DOCSDIR} -type f | \
 	    ${SED} -e 's|${TMP_DOCSDIR}|%%DOCSDIR%%|' | \
 	    ${SORT} >> ${PLIST}
 .endif
 	@${FIND} ${TMP_SLIMDIR}/* -type f | \
 	    ${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 | \
+	${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%%|' | \
 	    ${SORT} -r >> ${PLIST}
 .endif
 	@${ECHO} '@unexec rm -rf ${SLIMDBDIR}/cache > /dev/null 2>&1 || true' >> ${PLIST}
 	@${ECHO} '@dirrmtry ${SLIMDBDIR}/playlists' >> ${PLIST}
 	@${ECHO} '@dirrmtry ${SLIMDBDIR}' >> ${PLIST}
 	@${ECHO} '@unexec test -d ${SLIMDBDIR} && (echo "Configuration information saved.  If you will *NOT* use this package anymore," && echo "please remove ${SLIMDBDIR} and its contents manually.")' >> ${PLIST}
 
 pre-install:
 	@${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
 do-install:
 	@${MKDIR} -m 0755 ${PREFIX}/${SLIMDIR}
 	@${LN} -s ${SLIMDBDIR}/cache ${PREFIX}/${SLIMDIR}/Cache
 	@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}
 	@cd ${TMP_DOCSDIR} && \
 	    ${FIND} . | \
 	    ${CPIO} ${CPIOARGS} ${BINOWN}:${BINGRP} ${DOCSDIR}
 .endif
 
 post-install:
 	@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 	@${ECHO}
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>

Property changes on: head/audio/squeezeboxserver/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.36
\ No newline at end of property
+1.37
\ No newline at end of property
Index: head/audio/squeezeboxserver/distinfo
===================================================================
--- head/audio/squeezeboxserver/distinfo	(revision 195638)
+++ head/audio/squeezeboxserver/distinfo	(revision 195639)
@@ -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

Property changes on: head/audio/squeezeboxserver/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.18
\ No newline at end of property
+1.19
\ No newline at end of property
Index: head/audio/squeezeboxserver/files/patch-Slim_Utils_Prefs.pm
===================================================================
--- head/audio/squeezeboxserver/files/patch-Slim_Utils_Prefs.pm	(revision 195638)
+++ head/audio/squeezeboxserver/files/patch-Slim_Utils_Prefs.pm	(revision 195639)
@@ -1,34 +1,34 @@
 
 $FreeBSD$
 
 --- Slim/Utils/Prefs.pm.orig
 +++ Slim/Utils/Prefs.pm
 @@ -392,6 +392,10 @@
  
  		$path = $Bin . '/Playlists';
  
 +	} elsif (Slim::Utils::OSDetect::OS() eq 'unix') {
 +
-+		$path = "/var/db/slimserver/playlists";
++		$path = "%%SLIMDBDIR%%/playlists";
 +
  	} else {
  
  		$path = '';
 @@ -424,7 +428,7 @@
  
  	} 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/) {
  
 @@ -1022,7 +1026,7 @@
  			$prefsPath = $Bin;
  		}
  	} else {
 -	 	$prefsPath = $ENV{'HOME'};
-+	 	$prefsPath = "/var/db/slimserver";
++	 	$prefsPath = "%%SLIMDBDIR%%";
  	}
  	
  	$::d_prefs && msg("The default prefs directory is $prefsPath\n");

Property changes on: head/audio/squeezeboxserver/files/patch-Slim_Utils_Prefs.pm
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.6
\ No newline at end of property
+1.7
\ No newline at end of property
Index: head/audio/squeezeboxserver/files/pkg-install.in
===================================================================
--- head/audio/squeezeboxserver/files/pkg-install.in	(revision 195638)
+++ head/audio/squeezeboxserver/files/pkg-install.in	(revision 195639)
@@ -1,80 +1,80 @@
 #!/bin/sh
-# $FreeBSD: /tmp/pcvs/ports/audio/squeezeboxserver/files/pkg-install.in,v 1.2 2005-04-21 20:05:53 brooks Exp $
+# $FreeBSD: /tmp/pcvs/ports/audio/squeezeboxserver/files/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
 pidfile=/var/run/${name}.pid
 newsyslogfile=/etc/newsyslog.conf
 logfile=/var/log/slimserver.log
 logcomment="# added by audio/slimserver port"
 logline="${logfile}	${u}:${g} 644 3	   100	*     Z     ${pidfile}"
 
 case $2 in
 PRE-INSTALL)
 	if pw group show "${g}" >/dev/null 2>&1; then
 		echo "Using existing group \"${g}\"."
 	else
 		echo "Creating group \"${g}\", (gid: ${ugid})."
 		pw groupadd ${g} -g ${ugid}
 		if [ $? != 0 ]; then
 			echo "Failed to add group \"${g}\"."
 			exit 1
 		fi
 	fi
 	if pw user show "${u}" >/dev/null 2>&1; then
 		echo "Using existing user \"${u}\"."
 	else
 		echo "Creating user \"${u}\", (uid: ${ugid})."
 		pw useradd ${u} -u ${ugid} -g ${ugid} -h - \
 		    -d ${homedir} -s ${shell} -c "${comment}"
 		if [ $? != 0 ]; then
 			echo "Failed to add user \"${u}\"."
 			exit 1
 		fi
 	fi
 	;;
 POST-INSTALL)
 	if [ -d ${statedir} ]; then
 		chown -R ${u}:${g} ${statedir}
 	fi
 	if [ -d ${cachedir} ]; then
 		chown -R ${u}:${g} ${cachedir}
 	fi
 	if [ -d ${playlistdir} ]; then
 		chown -R ${u}:${g} ${playlistdir}
 	fi
         if [ -d /var/run/slimserver ]; then
                 chown -R ${u}:${g} /var/run/slimserver
         fi
         if [ -f ${conffile} ]; then
                 chown ${u}:${g} ${conffile}
         fi
         if [ -f ${logfile} ]; then
                 chown ${u}:${g} ${logfile}
         fi
 	if egrep -q "^${logfile}\>" ${newsyslogfile}; then
 		echo "Using existing ${newsyslogfile} entry."
 	else
 		echo "Adding slimserver log entry to ${newsyslogfile}."
 		echo "$logcomment" >> ${newsyslogfile}
 		echo "$logline" >> ${newsyslogfile}
 	fi
 	for file in %%CONFFILES%%; do
 		path="${slimdir}/${file}"
 		if [ ! -e ${path} ]; then
 			cp ${path}.sample ${path}
 			chmod 644 ${path}
 		fi
 	done
 	;;
 esac

Property changes on: head/audio/squeezeboxserver/files/pkg-install.in
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.2
\ No newline at end of property
+1.3
\ No newline at end of property
Index: head/audio/squeezeboxserver/files/slimserver.sh.in
===================================================================
--- head/audio/squeezeboxserver/files/slimserver.sh.in	(revision 195638)
+++ head/audio/squeezeboxserver/files/slimserver.sh.in	(revision 195639)
@@ -1,78 +1,78 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 
 # PROVIDE: slimserver
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable slimserver:
 #
 #slimserver_enable="YES"
 #
 
 . %%RC_SUBR%%
 
 name=slimserver
 start_precmd="slimserver_start_precmd"
 stop_postcmd="slimserver_poststop"
 rcvar=`set_rcvar`
 
 command=%%PREFIX%%/%%SLIMDIR%%/slimserver.pl
 command_interpreter=%%PERL%%
 pidfile=/var/run/${name}.pid
 logfile=/var/log/slimserver.log
 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()
 {
 	if [ ! -d ${statedir} ]; then
 		mkdir -p ${statedir}
 		chown -R ${u}:${g} ${statedir}
 	fi
 	if [ ! -d ${cachedir} ]; then
 		mkdir -p ${cachedir}
 		chown -R ${u}:${g} ${cachedir}
 	fi
 	if [ ! -d ${playlistdir} ]; then
 		mkdir -p ${playlistdir}
 		chown -R ${u}:${g} ${playlistdir}
 	fi
 	if [ ! -f ${conffile} ]; then
 		touch ${conffile}
 		chown ${u}:${g} ${conffile}
 	fi
 	if [ ! -f ${logfile} ]; then
 		touch ${logfile}
 		chown ${u}:${g} ${logfile}
 	fi
 }
 
 slimserver_poststop()
 {
         # Slimserver kills mDNSResponderPosix, but then manages to start
         # another one while dying so kill it off.
         echo "Stopping SlimServer's mDNSResponderPosix."
         mdns_pid=$(check_pidfile ${cachedir}/mDNS.pid %%LOCALBASE%%/bin/mDNSResponderPosix)
         if [ -n "${mdns_pid}" ]; then
                 # mDNSResponderPosix doens't die without a kill
                 kill -9 $mdns_pid
                 wait_for_pids $mdns_pid
 		rm -f ${cachedir}/mDNS.pid
         fi
 }
 
 load_rc_config ${name}
 
 slimserver_enable=${slimserver_enable:-"NO"}
 slimserver_flags=${slimserver_flags:-""}
 
 run_rc_command "$1"

Property changes on: head/audio/squeezeboxserver/files/slimserver.sh.in
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.7
\ No newline at end of property
+1.8
\ No newline at end of property
Index: head/audio/squeezeboxserver/files/squeezecenter.sh.in
===================================================================
--- head/audio/squeezeboxserver/files/squeezecenter.sh.in	(revision 195638)
+++ head/audio/squeezeboxserver/files/squeezecenter.sh.in	(revision 195639)
@@ -1,78 +1,78 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 
 # PROVIDE: slimserver
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable slimserver:
 #
 #slimserver_enable="YES"
 #
 
 . %%RC_SUBR%%
 
 name=slimserver
 start_precmd="slimserver_start_precmd"
 stop_postcmd="slimserver_poststop"
 rcvar=`set_rcvar`
 
 command=%%PREFIX%%/%%SLIMDIR%%/slimserver.pl
 command_interpreter=%%PERL%%
 pidfile=/var/run/${name}.pid
 logfile=/var/log/slimserver.log
 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()
 {
 	if [ ! -d ${statedir} ]; then
 		mkdir -p ${statedir}
 		chown -R ${u}:${g} ${statedir}
 	fi
 	if [ ! -d ${cachedir} ]; then
 		mkdir -p ${cachedir}
 		chown -R ${u}:${g} ${cachedir}
 	fi
 	if [ ! -d ${playlistdir} ]; then
 		mkdir -p ${playlistdir}
 		chown -R ${u}:${g} ${playlistdir}
 	fi
 	if [ ! -f ${conffile} ]; then
 		touch ${conffile}
 		chown ${u}:${g} ${conffile}
 	fi
 	if [ ! -f ${logfile} ]; then
 		touch ${logfile}
 		chown ${u}:${g} ${logfile}
 	fi
 }
 
 slimserver_poststop()
 {
         # Slimserver kills mDNSResponderPosix, but then manages to start
         # another one while dying so kill it off.
         echo "Stopping SlimServer's mDNSResponderPosix."
         mdns_pid=$(check_pidfile ${cachedir}/mDNS.pid %%LOCALBASE%%/bin/mDNSResponderPosix)
         if [ -n "${mdns_pid}" ]; then
                 # mDNSResponderPosix doens't die without a kill
                 kill -9 $mdns_pid
                 wait_for_pids $mdns_pid
 		rm -f ${cachedir}/mDNS.pid
         fi
 }
 
 load_rc_config ${name}
 
 slimserver_enable=${slimserver_enable:-"NO"}
 slimserver_flags=${slimserver_flags:-""}
 
 run_rc_command "$1"

Property changes on: head/audio/squeezeboxserver/files/squeezecenter.sh.in
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.7
\ No newline at end of property
+1.8
\ No newline at end of property
Index: head/audio/squeezecenter/Makefile
===================================================================
--- head/audio/squeezecenter/Makefile	(revision 195638)
+++ head/audio/squeezecenter/Makefile	(revision 195639)
@@ -1,202 +1,213 @@
 # Ports collection makefile for:	slimserver
 # Date created:				Wed Apr 14, 2004
 # Whom:					Brooks Davis <brooks@freebsd.org>
 #
 # $FreeBSD$
 #
 
 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
 DIST_SUBDIR=	slimserver
 
 MAINTAINER=	brooks@FreeBSD.org
 COMMENT=	Slim Devices audio streaming server
 
 # Defaults support playback of relativly unrestricted formats on SB2 or
 # 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 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 (SliMP3 and SB1)" 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 \
 		${SITE_PERL}/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-Compress-Zlib \
 		${SITE_PERL}/${PERL_ARCH}/DBD/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
 
 PKGINSTALL=	${WRKDIR}/pkg-install
 
 USE_PERL5=	yes
 USE_MYSQL=	yes
 IGNORE_WITH_MYSQL=	323 40
 
 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
 .if !defined(WITHOUT_FAAD)
 RUN_DEPENDS+=	faad:${PORTSDIR}/audio/faad
 .endif
 .if !defined(WITHOUT_FLAC)
 RUN_DEPENDS+=	flac:${PORTSDIR}/audio/flac
 .endif
 .if !defined(WITHOUT_LAME)
 RUN_DEPENDS+=	lame:${PORTSDIR}/audio/lame
 .endif
 .if !defined(WITHOUT_MUSEPACK)
 RUN_DEPENDS+=	mppdec:${PORTSDIR}/audio/musepack
 .endif
 .if !defined(WITHOUT_SHORTEN)
 RUN_DEPENDS+=	shorten:${PORTSDIR}/audio/shorten
 .endif
 .if !defined(WITHOUT_VORBIS)
 RUN_DEPENDS+=	oggdec:${PORTSDIR}/audio/vorbis-tools
 .endif
 
 USE_RC_SUBR=	slimserver.sh
 TMP_SLIMDIR=	${WRKDIR}/slimserver
 TMP_DOCSDIR=	${WRKDIR}/doc
 CPANWRKDIR=	${WRKDIR}/cpantemp
 DOCFILES=	Changelog.html Installation.txt License.txt
 CONFFILES=	convert.conf types.conf
 EXCEPTFILES=	${DOCFILES} ${CONFFILES} MySQL/errmsg.txt MySQL/errmsg.sys
 EXCEPTDIRS=	Bin \
 		CPAN/arch
 
 CPIOARGS=	--quiet -pdum -R
 PLIST=		${WRKDIR}/pkg-plist
 PLIST_SUB=	SLIMDIR=${SLIMDIR}
 PLIST_FILES=	bin/softsqueeze
 
 SUB_FILES=	softsqueeze.sh pkg-install
 SUB_LIST=	PERL=${PERL} \
 		SLIMDIR=${SLIMDIR} \
 		SLIMDBDIR=${SLIMDBDIR} \
+		SLIMUSER=${SLIMUSER} \
+		SLIMGROUP=${SLIMGROUP} \
 		CONFFILES="${CONFFILES}"
 
 pre-fetch:
 .if !defined(SLIMDIR)
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "Define SLIMDIR to override default of 'slimserver'."
 	@${ECHO_MSG} ""
 .endif
 
 SLIMDIR?=	slimserver
-SLIMDBDIR=	/var/db/slimserver
+SLIMDBDIR?=	/var/db/slimserver
+SLIMUSER?=	slimserv
+SLIMGROUP?=	${SLIMUSER}
 
 post-fetch:
 .for _PKG in ${SLIMCPANPKGS}
 	@cd ${_DISTDIR}; test -e ${_PKG} || \
 	    ${FETCH_CMD} -o ${_PKG} http://svn.slimdevices.com/vendor/src/${_PKG}?view=auto
 .endfor
 
 post-patch:
 	@${REINPLACE_CMD} \
 	    -e 's|/usr/bin/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
-	@${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:
 	@${MKDIR} -m 0755 ${TMP_SLIMDIR}
 	@cd ${WRKSRC} && \
 	    ${FIND} . -name \*.orig ${EXCEPTFILES:S|^|-o -path ./|} \
 	    ${EXCEPTDIRS:S/$/\*/:S/^/-o -path .\//} -o -print | \
 	    ${CPIO} ${CPIOARGS} ${BINOWN}:${BINGRP} ${TMP_SLIMDIR}
 .for _CONF in ${CONFFILES}
 	@cd ${WRKSRC} && ${INSTALL_DATA} ${_CONF} ${TMP_SLIMDIR}/${_CONF}.sample
 .endfor
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${TMP_DOCSDIR}
 	@cd ${WRKSRC} && ${INSTALL_DATA} ${DOCFILES} ${TMP_DOCSDIR}
 .endif
 	${MKDIR} ${CPANWRKDIR}
 	${WRKSRC}/Bin/build-perl-modules.pl
 
 post-build:
 	@${RM} -f ${PLIST}
 .for _CONF in ${CONFFILES}
 	@${ECHO} '@unexec if cmp -s %D/%%SLIMDIR%%/${_CONF} %D/%%SLIMDIR%%/${_CONF}.sample; then rm -f %D/%%SLIMDIR%%/${_CONF}; fi' >> ${PLIST}
 .endfor
 .if !defined(NOPORTDOCS)
 	@${FIND} ${TMP_DOCSDIR} -type f | \
 	    ${SED} -e 's|${TMP_DOCSDIR}|%%DOCSDIR%%|' | \
 	    ${SORT} >> ${PLIST}
 .endif
 	@${FIND} ${TMP_SLIMDIR}/* -type f | \
 	    ${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 | \
+	${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%%|' | \
 	    ${SORT} -r >> ${PLIST}
 .endif
 	@${ECHO} '@unexec rm -rf ${SLIMDBDIR}/cache > /dev/null 2>&1 || true' >> ${PLIST}
 	@${ECHO} '@dirrmtry ${SLIMDBDIR}/playlists' >> ${PLIST}
 	@${ECHO} '@dirrmtry ${SLIMDBDIR}' >> ${PLIST}
 	@${ECHO} '@unexec test -d ${SLIMDBDIR} && (echo "Configuration information saved.  If you will *NOT* use this package anymore," && echo "please remove ${SLIMDBDIR} and its contents manually.")' >> ${PLIST}
 
 pre-install:
 	@${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
 do-install:
 	@${MKDIR} -m 0755 ${PREFIX}/${SLIMDIR}
 	@${LN} -s ${SLIMDBDIR}/cache ${PREFIX}/${SLIMDIR}/Cache
 	@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}
 	@cd ${TMP_DOCSDIR} && \
 	    ${FIND} . | \
 	    ${CPIO} ${CPIOARGS} ${BINOWN}:${BINGRP} ${DOCSDIR}
 .endif
 
 post-install:
 	@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 	@${ECHO}
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>

Property changes on: head/audio/squeezecenter/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.36
\ No newline at end of property
+1.37
\ No newline at end of property
Index: head/audio/squeezecenter/distinfo
===================================================================
--- head/audio/squeezecenter/distinfo	(revision 195638)
+++ head/audio/squeezecenter/distinfo	(revision 195639)
@@ -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

Property changes on: head/audio/squeezecenter/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.18
\ No newline at end of property
+1.19
\ No newline at end of property
Index: head/audio/squeezecenter/files/patch-Slim_Utils_Prefs.pm
===================================================================
--- head/audio/squeezecenter/files/patch-Slim_Utils_Prefs.pm	(revision 195638)
+++ head/audio/squeezecenter/files/patch-Slim_Utils_Prefs.pm	(revision 195639)
@@ -1,34 +1,34 @@
 
 $FreeBSD$
 
 --- Slim/Utils/Prefs.pm.orig
 +++ Slim/Utils/Prefs.pm
 @@ -392,6 +392,10 @@
  
  		$path = $Bin . '/Playlists';
  
 +	} elsif (Slim::Utils::OSDetect::OS() eq 'unix') {
 +
-+		$path = "/var/db/slimserver/playlists";
++		$path = "%%SLIMDBDIR%%/playlists";
 +
  	} else {
  
  		$path = '';
 @@ -424,7 +428,7 @@
  
  	} 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/) {
  
 @@ -1022,7 +1026,7 @@
  			$prefsPath = $Bin;
  		}
  	} else {
 -	 	$prefsPath = $ENV{'HOME'};
-+	 	$prefsPath = "/var/db/slimserver";
++	 	$prefsPath = "%%SLIMDBDIR%%";
  	}
  	
  	$::d_prefs && msg("The default prefs directory is $prefsPath\n");

Property changes on: head/audio/squeezecenter/files/patch-Slim_Utils_Prefs.pm
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.6
\ No newline at end of property
+1.7
\ No newline at end of property
Index: head/audio/squeezecenter/files/pkg-install.in
===================================================================
--- head/audio/squeezecenter/files/pkg-install.in	(revision 195638)
+++ head/audio/squeezecenter/files/pkg-install.in	(revision 195639)
@@ -1,80 +1,80 @@
 #!/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
 pidfile=/var/run/${name}.pid
 newsyslogfile=/etc/newsyslog.conf
 logfile=/var/log/slimserver.log
 logcomment="# added by audio/slimserver port"
 logline="${logfile}	${u}:${g} 644 3	   100	*     Z     ${pidfile}"
 
 case $2 in
 PRE-INSTALL)
 	if pw group show "${g}" >/dev/null 2>&1; then
 		echo "Using existing group \"${g}\"."
 	else
 		echo "Creating group \"${g}\", (gid: ${ugid})."
 		pw groupadd ${g} -g ${ugid}
 		if [ $? != 0 ]; then
 			echo "Failed to add group \"${g}\"."
 			exit 1
 		fi
 	fi
 	if pw user show "${u}" >/dev/null 2>&1; then
 		echo "Using existing user \"${u}\"."
 	else
 		echo "Creating user \"${u}\", (uid: ${ugid})."
 		pw useradd ${u} -u ${ugid} -g ${ugid} -h - \
 		    -d ${homedir} -s ${shell} -c "${comment}"
 		if [ $? != 0 ]; then
 			echo "Failed to add user \"${u}\"."
 			exit 1
 		fi
 	fi
 	;;
 POST-INSTALL)
 	if [ -d ${statedir} ]; then
 		chown -R ${u}:${g} ${statedir}
 	fi
 	if [ -d ${cachedir} ]; then
 		chown -R ${u}:${g} ${cachedir}
 	fi
 	if [ -d ${playlistdir} ]; then
 		chown -R ${u}:${g} ${playlistdir}
 	fi
         if [ -d /var/run/slimserver ]; then
                 chown -R ${u}:${g} /var/run/slimserver
         fi
         if [ -f ${conffile} ]; then
                 chown ${u}:${g} ${conffile}
         fi
         if [ -f ${logfile} ]; then
                 chown ${u}:${g} ${logfile}
         fi
 	if egrep -q "^${logfile}\>" ${newsyslogfile}; then
 		echo "Using existing ${newsyslogfile} entry."
 	else
 		echo "Adding slimserver log entry to ${newsyslogfile}."
 		echo "$logcomment" >> ${newsyslogfile}
 		echo "$logline" >> ${newsyslogfile}
 	fi
 	for file in %%CONFFILES%%; do
 		path="${slimdir}/${file}"
 		if [ ! -e ${path} ]; then
 			cp ${path}.sample ${path}
 			chmod 644 ${path}
 		fi
 	done
 	;;
 esac

Property changes on: head/audio/squeezecenter/files/pkg-install.in
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.2
\ No newline at end of property
+1.3
\ No newline at end of property
Index: head/audio/squeezecenter/files/slimserver.sh.in
===================================================================
--- head/audio/squeezecenter/files/slimserver.sh.in	(revision 195638)
+++ head/audio/squeezecenter/files/slimserver.sh.in	(revision 195639)
@@ -1,78 +1,78 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 
 # PROVIDE: slimserver
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable slimserver:
 #
 #slimserver_enable="YES"
 #
 
 . %%RC_SUBR%%
 
 name=slimserver
 start_precmd="slimserver_start_precmd"
 stop_postcmd="slimserver_poststop"
 rcvar=`set_rcvar`
 
 command=%%PREFIX%%/%%SLIMDIR%%/slimserver.pl
 command_interpreter=%%PERL%%
 pidfile=/var/run/${name}.pid
 logfile=/var/log/slimserver.log
 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()
 {
 	if [ ! -d ${statedir} ]; then
 		mkdir -p ${statedir}
 		chown -R ${u}:${g} ${statedir}
 	fi
 	if [ ! -d ${cachedir} ]; then
 		mkdir -p ${cachedir}
 		chown -R ${u}:${g} ${cachedir}
 	fi
 	if [ ! -d ${playlistdir} ]; then
 		mkdir -p ${playlistdir}
 		chown -R ${u}:${g} ${playlistdir}
 	fi
 	if [ ! -f ${conffile} ]; then
 		touch ${conffile}
 		chown ${u}:${g} ${conffile}
 	fi
 	if [ ! -f ${logfile} ]; then
 		touch ${logfile}
 		chown ${u}:${g} ${logfile}
 	fi
 }
 
 slimserver_poststop()
 {
         # Slimserver kills mDNSResponderPosix, but then manages to start
         # another one while dying so kill it off.
         echo "Stopping SlimServer's mDNSResponderPosix."
         mdns_pid=$(check_pidfile ${cachedir}/mDNS.pid %%LOCALBASE%%/bin/mDNSResponderPosix)
         if [ -n "${mdns_pid}" ]; then
                 # mDNSResponderPosix doens't die without a kill
                 kill -9 $mdns_pid
                 wait_for_pids $mdns_pid
 		rm -f ${cachedir}/mDNS.pid
         fi
 }
 
 load_rc_config ${name}
 
 slimserver_enable=${slimserver_enable:-"NO"}
 slimserver_flags=${slimserver_flags:-""}
 
 run_rc_command "$1"

Property changes on: head/audio/squeezecenter/files/slimserver.sh.in
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.7
\ No newline at end of property
+1.8
\ No newline at end of property
Index: head/audio/squeezecenter/files/squeezecenter.sh.in
===================================================================
--- head/audio/squeezecenter/files/squeezecenter.sh.in	(revision 195638)
+++ head/audio/squeezecenter/files/squeezecenter.sh.in	(revision 195639)
@@ -1,78 +1,78 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 
 # PROVIDE: slimserver
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable slimserver:
 #
 #slimserver_enable="YES"
 #
 
 . %%RC_SUBR%%
 
 name=slimserver
 start_precmd="slimserver_start_precmd"
 stop_postcmd="slimserver_poststop"
 rcvar=`set_rcvar`
 
 command=%%PREFIX%%/%%SLIMDIR%%/slimserver.pl
 command_interpreter=%%PERL%%
 pidfile=/var/run/${name}.pid
 logfile=/var/log/slimserver.log
 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()
 {
 	if [ ! -d ${statedir} ]; then
 		mkdir -p ${statedir}
 		chown -R ${u}:${g} ${statedir}
 	fi
 	if [ ! -d ${cachedir} ]; then
 		mkdir -p ${cachedir}
 		chown -R ${u}:${g} ${cachedir}
 	fi
 	if [ ! -d ${playlistdir} ]; then
 		mkdir -p ${playlistdir}
 		chown -R ${u}:${g} ${playlistdir}
 	fi
 	if [ ! -f ${conffile} ]; then
 		touch ${conffile}
 		chown ${u}:${g} ${conffile}
 	fi
 	if [ ! -f ${logfile} ]; then
 		touch ${logfile}
 		chown ${u}:${g} ${logfile}
 	fi
 }
 
 slimserver_poststop()
 {
         # Slimserver kills mDNSResponderPosix, but then manages to start
         # another one while dying so kill it off.
         echo "Stopping SlimServer's mDNSResponderPosix."
         mdns_pid=$(check_pidfile ${cachedir}/mDNS.pid %%LOCALBASE%%/bin/mDNSResponderPosix)
         if [ -n "${mdns_pid}" ]; then
                 # mDNSResponderPosix doens't die without a kill
                 kill -9 $mdns_pid
                 wait_for_pids $mdns_pid
 		rm -f ${cachedir}/mDNS.pid
         fi
 }
 
 load_rc_config ${name}
 
 slimserver_enable=${slimserver_enable:-"NO"}
 slimserver_flags=${slimserver_flags:-""}
 
 run_rc_command "$1"

Property changes on: head/audio/squeezecenter/files/squeezecenter.sh.in
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.7
\ No newline at end of property
+1.8
\ No newline at end of property