Index: head/audio/slimserver/Makefile
===================================================================
--- head/audio/slimserver/Makefile	(revision 183554)
+++ head/audio/slimserver/Makefile	(revision 183555)
@@ -1,204 +1,206 @@
 # Ports collection makefile for:	slimserver
 # Date created:				Wed Apr 14, 2004
 # Whom:					Brooks Davis <brooks@freebsd.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	slimserver
 PORTVERSION=	6.5.1
 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}
 
 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
 
 .if ${PERL_LEVEL} < 500803
 IGNORE=		perl 5.8.3 or newer required. Install lang/perl5.8 and try again
 .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} \
 		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
 
 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|%%PERL%%|${PERL}|' \
+	    -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
-	@${RM} ${WRKSRC}/scanner.pl.bak ${WRKSRC}/slimserver.pl.bak
+		${WRKSRC}/scanner.pl ${WRKSRC}/slimserver.pl \
+		${WRKSRC}/Bin/dbish
+	@${RM} ${WRKSRC}/scanner.pl.bak ${WRKSRC}/slimserver.pl.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 | \
 	    ${SED} -e 's|${TMP_SLIMDIR}|@dirrm %%SLIMDIR%%|' | \
 	    ${SORT} -r >> ${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.33
\ No newline at end of property
+1.34
\ No newline at end of property
Index: head/audio/slimserver/files/patch-Bin_build-perl-modules.pl
===================================================================
--- head/audio/slimserver/files/patch-Bin_build-perl-modules.pl	(revision 183554)
+++ head/audio/slimserver/files/patch-Bin_build-perl-modules.pl	(revision 183555)
@@ -1,151 +1,151 @@
 
 $FreeBSD$
 
 --- Bin/build-perl-modules.pl.orig
 +++ Bin/build-perl-modules.pl
 @@ -24,14 +24,14 @@
  
  # 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.15.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.15.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' => {
 +		'Makefile.PL' => join(' ', qw(
 +			EXPATLIBPATH="%%LOCALBASE%%/lib"
 +			EXPATINCPATH="%%LOCALBASE%%/include"
 +		)),
 +	},
  );
  
  sub main {
 @@ -73,28 +80,14 @@
  
  	print "*** Ignore any warnings about AppConfig. ***\n\n";
  
 -	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%%';
++	$perlBinary = '/usr/bin/perl';
  
  	unless (-f $perlBinary && -x $perlBinary) {
  		die "Couldn't find a perl binary. Exiting.\n";
  	}
  
  	# 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%%';
  
  	unless (-d $slimServerPath) {
  		die "Couldn't find a valid SlimServer path. Exiting.\n";
 @@ -109,12 +102,7 @@
  	# This is where the binaries will end up.
  	my $cpanDest = "$slimServerPath/CPAN/arch/$version/$archname/auto";
  
 -	# 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|;
 @@ -127,30 +115,6 @@
  
  	my $pwd = cwd();
  
 -	# 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)) {
 -
 -			if ($downloadUsing = which($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";
 -	}
 -
  	# Only download the packages that were passsed.
  	my @packages = ();
  
 @@ -189,30 +153,8 @@
  
  		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);
 -
 -		} elsif ($downloadUsing =~ /curl$/) {
 -
 -			`$downloadUsing --silent -o $package $SOURCE/$package?view=auto`;
 -
 -		} else {
 -
 -			`$downloadUsing -q -O $package $SOURCE/$package?view=auto`;
 -		}
 -
 -		unless (-r $package) {
 -			print "Something looks wrong - I couldn't read $pwd/$package, which I just downloaded.\n";
 -		}
 -
 -		print "Uncompressing..\n";
 -		`gzip -d < $package | tar xvf -`;
 +		print "\nExtracting $package in: $pwd\n";
 +		`tar xfvz %%DISTDIR%%/$package`;
  
  		unlink $package;
  

Property changes on: head/audio/slimserver/files/patch-Bin_build-perl-modules.pl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.5
\ No newline at end of property
+1.6
\ No newline at end of property
Index: head/audio/squeezeboxserver/Makefile
===================================================================
--- head/audio/squeezeboxserver/Makefile	(revision 183554)
+++ head/audio/squeezeboxserver/Makefile	(revision 183555)
@@ -1,204 +1,206 @@
 # Ports collection makefile for:	slimserver
 # Date created:				Wed Apr 14, 2004
 # Whom:					Brooks Davis <brooks@freebsd.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	slimserver
 PORTVERSION=	6.5.1
 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}
 
 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
 
 .if ${PERL_LEVEL} < 500803
 IGNORE=		perl 5.8.3 or newer required. Install lang/perl5.8 and try again
 .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} \
 		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
 
 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|%%PERL%%|${PERL}|' \
+	    -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
-	@${RM} ${WRKSRC}/scanner.pl.bak ${WRKSRC}/slimserver.pl.bak
+		${WRKSRC}/scanner.pl ${WRKSRC}/slimserver.pl \
+		${WRKSRC}/Bin/dbish
+	@${RM} ${WRKSRC}/scanner.pl.bak ${WRKSRC}/slimserver.pl.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 | \
 	    ${SED} -e 's|${TMP_SLIMDIR}|@dirrm %%SLIMDIR%%|' | \
 	    ${SORT} -r >> ${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.33
\ No newline at end of property
+1.34
\ No newline at end of property
Index: head/audio/squeezeboxserver/files/patch-Bin_build-perl-modules.pl
===================================================================
--- head/audio/squeezeboxserver/files/patch-Bin_build-perl-modules.pl	(revision 183554)
+++ head/audio/squeezeboxserver/files/patch-Bin_build-perl-modules.pl	(revision 183555)
@@ -1,151 +1,151 @@
 
 $FreeBSD$
 
 --- Bin/build-perl-modules.pl.orig
 +++ Bin/build-perl-modules.pl
 @@ -24,14 +24,14 @@
  
  # 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.15.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.15.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' => {
 +		'Makefile.PL' => join(' ', qw(
 +			EXPATLIBPATH="%%LOCALBASE%%/lib"
 +			EXPATINCPATH="%%LOCALBASE%%/include"
 +		)),
 +	},
  );
  
  sub main {
 @@ -73,28 +80,14 @@
  
  	print "*** Ignore any warnings about AppConfig. ***\n\n";
  
 -	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%%';
++	$perlBinary = '/usr/bin/perl';
  
  	unless (-f $perlBinary && -x $perlBinary) {
  		die "Couldn't find a perl binary. Exiting.\n";
  	}
  
  	# 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%%';
  
  	unless (-d $slimServerPath) {
  		die "Couldn't find a valid SlimServer path. Exiting.\n";
 @@ -109,12 +102,7 @@
  	# This is where the binaries will end up.
  	my $cpanDest = "$slimServerPath/CPAN/arch/$version/$archname/auto";
  
 -	# 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|;
 @@ -127,30 +115,6 @@
  
  	my $pwd = cwd();
  
 -	# 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)) {
 -
 -			if ($downloadUsing = which($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";
 -	}
 -
  	# Only download the packages that were passsed.
  	my @packages = ();
  
 @@ -189,30 +153,8 @@
  
  		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);
 -
 -		} elsif ($downloadUsing =~ /curl$/) {
 -
 -			`$downloadUsing --silent -o $package $SOURCE/$package?view=auto`;
 -
 -		} else {
 -
 -			`$downloadUsing -q -O $package $SOURCE/$package?view=auto`;
 -		}
 -
 -		unless (-r $package) {
 -			print "Something looks wrong - I couldn't read $pwd/$package, which I just downloaded.\n";
 -		}
 -
 -		print "Uncompressing..\n";
 -		`gzip -d < $package | tar xvf -`;
 +		print "\nExtracting $package in: $pwd\n";
 +		`tar xfvz %%DISTDIR%%/$package`;
  
  		unlink $package;
  

Property changes on: head/audio/squeezeboxserver/files/patch-Bin_build-perl-modules.pl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.5
\ No newline at end of property
+1.6
\ No newline at end of property
Index: head/audio/squeezecenter/Makefile
===================================================================
--- head/audio/squeezecenter/Makefile	(revision 183554)
+++ head/audio/squeezecenter/Makefile	(revision 183555)
@@ -1,204 +1,206 @@
 # Ports collection makefile for:	slimserver
 # Date created:				Wed Apr 14, 2004
 # Whom:					Brooks Davis <brooks@freebsd.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	slimserver
 PORTVERSION=	6.5.1
 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}
 
 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
 
 .if ${PERL_LEVEL} < 500803
 IGNORE=		perl 5.8.3 or newer required. Install lang/perl5.8 and try again
 .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} \
 		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
 
 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|%%PERL%%|${PERL}|' \
+	    -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
-	@${RM} ${WRKSRC}/scanner.pl.bak ${WRKSRC}/slimserver.pl.bak
+		${WRKSRC}/scanner.pl ${WRKSRC}/slimserver.pl \
+		${WRKSRC}/Bin/dbish
+	@${RM} ${WRKSRC}/scanner.pl.bak ${WRKSRC}/slimserver.pl.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 | \
 	    ${SED} -e 's|${TMP_SLIMDIR}|@dirrm %%SLIMDIR%%|' | \
 	    ${SORT} -r >> ${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.33
\ No newline at end of property
+1.34
\ No newline at end of property
Index: head/audio/squeezecenter/files/patch-Bin_build-perl-modules.pl
===================================================================
--- head/audio/squeezecenter/files/patch-Bin_build-perl-modules.pl	(revision 183554)
+++ head/audio/squeezecenter/files/patch-Bin_build-perl-modules.pl	(revision 183555)
@@ -1,151 +1,151 @@
 
 $FreeBSD$
 
 --- Bin/build-perl-modules.pl.orig
 +++ Bin/build-perl-modules.pl
 @@ -24,14 +24,14 @@
  
  # 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.15.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.15.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' => {
 +		'Makefile.PL' => join(' ', qw(
 +			EXPATLIBPATH="%%LOCALBASE%%/lib"
 +			EXPATINCPATH="%%LOCALBASE%%/include"
 +		)),
 +	},
  );
  
  sub main {
 @@ -73,28 +80,14 @@
  
  	print "*** Ignore any warnings about AppConfig. ***\n\n";
  
 -	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%%';
++	$perlBinary = '/usr/bin/perl';
  
  	unless (-f $perlBinary && -x $perlBinary) {
  		die "Couldn't find a perl binary. Exiting.\n";
  	}
  
  	# 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%%';
  
  	unless (-d $slimServerPath) {
  		die "Couldn't find a valid SlimServer path. Exiting.\n";
 @@ -109,12 +102,7 @@
  	# This is where the binaries will end up.
  	my $cpanDest = "$slimServerPath/CPAN/arch/$version/$archname/auto";
  
 -	# 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|;
 @@ -127,30 +115,6 @@
  
  	my $pwd = cwd();
  
 -	# 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)) {
 -
 -			if ($downloadUsing = which($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";
 -	}
 -
  	# Only download the packages that were passsed.
  	my @packages = ();
  
 @@ -189,30 +153,8 @@
  
  		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);
 -
 -		} elsif ($downloadUsing =~ /curl$/) {
 -
 -			`$downloadUsing --silent -o $package $SOURCE/$package?view=auto`;
 -
 -		} else {
 -
 -			`$downloadUsing -q -O $package $SOURCE/$package?view=auto`;
 -		}
 -
 -		unless (-r $package) {
 -			print "Something looks wrong - I couldn't read $pwd/$package, which I just downloaded.\n";
 -		}
 -
 -		print "Uncompressing..\n";
 -		`gzip -d < $package | tar xvf -`;
 +		print "\nExtracting $package in: $pwd\n";
 +		`tar xfvz %%DISTDIR%%/$package`;
  
  		unlink $package;
  

Property changes on: head/audio/squeezecenter/files/patch-Bin_build-perl-modules.pl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.5
\ No newline at end of property
+1.6
\ No newline at end of property