4 files changed, 16 insertions, 12 deletions

diff --git a/audio/squeezeboxserver/Makefile b/audio/squeezeboxserver/Makefile
index 58e2bd1de625..60b39861b53e 100644
--- a/audio/squeezeboxserver/Makefile
+++ b/audio/squeezeboxserver/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	squeezeboxserver
-PORTVERSION=	7.5.3
-PORTREVISION=	1
+PORTVERSION=	7.5.4
+#PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://downloads.slimdevices.com/SqueezeboxServer_v${PORTVERSION}/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-noCPAN
@@ -29,7 +29,7 @@ OPTIONS=	APE "Support Monkey's Audio Codec input" on \
 
 RESTRICTED=	Contains non-redistributable firmware, documentation, and images
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}-31792-noCPAN
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}-32171-noCPAN
 
 RUN_DEPENDS+=	${SITE_PERL}/DBIx/Class.pm:${PORTSDIR}/databases/p5-DBIx-Class \
 		${SITE_PERL}/File/Which.pm:${PORTSDIR}/sysutils/p5-File-Which \
@@ -44,9 +44,12 @@ RUN_DEPENDS+=	${SITE_PERL}/DBIx/Class.pm:${PORTSDIR}/databases/p5-DBIx-Class \
 		${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser \
 		${SITE_PERL}/${PERL_ARCH}/YAML/Syck.pm:${PORTSDIR}/textproc/p5-YAML-Syck \
 		${SITE_PERL}/${PERL_ARCH}/EV.pm:${PORTSDIR}/devel/p5-EV \
-		${SITE_PERL}/${PERL_ARCH}/Audio/Scan.pm:${PORTSDIR}/audio/p5-Audio-Scan \
+		p5-Audio-Scan>=0.87:${PORTSDIR}/audio/p5-Audio-Scan \
 		${SITE_PERL}/${PERL_ARCH}/Class/XSAccessor.pm:${PORTSDIR}/devel/p5-Class-XSAccessor
 
+# Work around a bug in p5-Package-Stash port
+RUN_DEPENDS+=	p5-Package-DeprecationManager>=0.10:${PORTSDIR}/devel/p5-Package-DeprecationManager
+
 PKGINSTALL=	${WRKDIR}/pkg-install
 
 USE_PERL5=	yes
diff --git a/audio/squeezeboxserver/distinfo b/audio/squeezeboxserver/distinfo
index 7d213bb1c692..2255a7c85168 100644
--- a/audio/squeezeboxserver/distinfo
+++ b/audio/squeezeboxserver/distinfo
@@ -1,2 +1,2 @@
-SHA256 (squeezeboxserver-7.5.3-noCPAN.tgz) = d813d28c15bad94c000432b6aaaa659375e1981fc405868cba02fee2fef8d6ea
-SIZE (squeezeboxserver-7.5.3-noCPAN.tgz) = 19812897
+SHA256 (squeezeboxserver-7.5.4-noCPAN.tgz) = cee93ca23b5197037a0c055acb1aac1ae46da3a7777acbb16633924e13c1004a
+SIZE (squeezeboxserver-7.5.4-noCPAN.tgz) = 19816973
diff --git a/audio/squeezeboxserver/files/patch-modules.conf b/audio/squeezeboxserver/files/patch-modules.conf
index 0e29989e46ca..544c4a426c1d 100644
--- a/audio/squeezeboxserver/files/patch-modules.conf
+++ b/audio/squeezeboxserver/files/patch-modules.conf
@@ -7,8 +7,8 @@ $FreeBSD$
  # <module> <min_version> [ <max_version> ]
  
  AnyEvent 5.202
--Audio::Scan 0.84 0.84
-+Audio::Scan 0.84
+-Audio::Scan 0.87 0.87
++Audio::Scan 0.87
  Cache::Cache 1.04
  CGI::Cookie 1.27
  Class::Data::Inheritable 0.04
diff --git a/audio/squeezeboxserver/pkg-plist b/audio/squeezeboxserver/pkg-plist
index 83aed8264cd4..d8f8781174ac 100644
--- a/audio/squeezeboxserver/pkg-plist
+++ b/audio/squeezeboxserver/pkg-plist
@@ -438,16 +438,16 @@ bin/softsqueeze
 %%SLIMDIR%%/Changelog7.html
 %%SLIMDIR%%/Firmware/boom.version
 %%SLIMDIR%%/Firmware/boom_30.bin
-%%SLIMDIR%%/Firmware/boom_52.bin
+%%SLIMDIR%%/Firmware/boom_53.bin
 %%SLIMDIR%%/Firmware/receiver.version
-%%SLIMDIR%%/Firmware/receiver_67.bin
+%%SLIMDIR%%/Firmware/receiver_68.bin
 %%SLIMDIR%%/Firmware/squeezebox.version
 %%SLIMDIR%%/Firmware/squeezebox2.version
-%%SLIMDIR%%/Firmware/squeezebox2_132.bin
+%%SLIMDIR%%/Firmware/squeezebox2_133.bin
 %%SLIMDIR%%/Firmware/squeezebox_10.bin
 %%SLIMDIR%%/Firmware/squeezebox_40.bin
 %%SLIMDIR%%/Firmware/transporter.version
-%%SLIMDIR%%/Firmware/transporter_82.bin
+%%SLIMDIR%%/Firmware/transporter_83.bin
 %%SLIMDIR%%/Graphics/CODE2000.HTM
 %%SLIMDIR%%/Graphics/CODE2000.TTF
 %%SLIMDIR%%/Graphics/FreeSans.ttf
@@ -1954,6 +1954,7 @@ bin/softsqueeze
 %%SLIMDIR%%/Slim/Utils/Accessor.pm
 %%SLIMDIR%%/Slim/Utils/Alarm.pm
 %%SLIMDIR%%/Slim/Utils/Cache.pm
+%%SLIMDIR%%/Slim/Utils/Compress.pm
 %%SLIMDIR%%/Slim/Utils/DateTime.pm
 %%SLIMDIR%%/Slim/Utils/Errno.pm
 %%SLIMDIR%%/Slim/Utils/Favorites.pm