Upgrade to 7.5.1. Seems to fix DBIx-Class compatiabilty issues.

Drop the musepack option for the moment.  I didn't see a trivial way
to make it work and don't really have the resources to test it.

Feature safe:	yes

4 files changed, 21 insertions, 15 deletions

diff --git a/audio/squeezeboxserver/Makefile b/audio/squeezeboxserver/Makefile
index 8b1c1f985e84..34a35e8bf4f5 100644
--- a/audio/squeezeboxserver/Makefile
+++ b/audio/squeezeboxserver/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	squeezeboxserver
-PORTVERSION=	7.5.0
-PORTREVISION=	1
+PORTVERSION=	7.5.1
 CATEGORIES=	audio
 MASTER_SITES=	http://downloads.slimdevices.com/SqueezeboxServer_v${PORTVERSION}/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-noCPAN
@@ -16,9 +15,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	brooks@FreeBSD.org
 COMMENT=	Slim Devices audio streaming server
 
-CONFLICTS=	squeezecenter-*
-
-BROKEN=         Incompatiable with recent DBIx-Class updates
+CONFLICTS=	squeezecenter-[67]*
 
 # Defaults support playback of relativly unrestricted formats on SB2 or
 # SB3 devices and wired SB1 devices.
@@ -26,13 +23,12 @@ 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 \
 		SOX "Support OGG Vorbis input via SoX (SliMP3 and SB1)" on
 
 RESTRICTED=	Contains non-redistributable firmware, documentation, and images
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}-30464-noCPAN
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}-30836-noCPAN
 
 RUN_DEPENDS+=	${SITE_PERL}/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-Compress-Zlib \
 		${SITE_PERL}/DBIx/Class.pm:${PORTSDIR}/databases/p5-DBIx-Class \
@@ -76,9 +72,6 @@ RUN_DEPENDS+=	flac:${PORTSDIR}/audio/flac
 .if !defined(WITHOUT_LAME)
 RUN_DEPENDS+=	lame:${PORTSDIR}/audio/lame
 .endif
-.if !defined(WITHOUT_MUSEPACK)
-RUN_DEPENDS+=	mpcdec:${PORTSDIR}/audio/musepack
-.endif
 .if !defined(WITHOUT_SHORTEN)
 RUN_DEPENDS+=	shorten:${PORTSDIR}/audio/shorten
 .endif
diff --git a/audio/squeezeboxserver/distinfo b/audio/squeezeboxserver/distinfo
index 960b6826ccd6..1e2d2ea397ea 100644
--- a/audio/squeezeboxserver/distinfo
+++ b/audio/squeezeboxserver/distinfo
@@ -1,3 +1,3 @@
-MD5 (squeezeboxserver-7.5.0-noCPAN.tgz) = a7a7164a09f4cddf25b0f3d45c355f7b
-SHA256 (squeezeboxserver-7.5.0-noCPAN.tgz) = a92116e702809087fa12c8e2386375101a9ead4c8bc42452f0be979e39c67a9f
-SIZE (squeezeboxserver-7.5.0-noCPAN.tgz) = 20701362
+MD5 (squeezeboxserver-7.5.1-noCPAN.tgz) = 82ffd0072c70122633fb721e8b4eda1c
+SHA256 (squeezeboxserver-7.5.1-noCPAN.tgz) = bab313b1bf68c4e4825d821352ce6d59a0eaa883ae487cd273a9cd9b4a5245ff
+SIZE (squeezeboxserver-7.5.1-noCPAN.tgz) = 20719890
diff --git a/audio/squeezeboxserver/files/patch-modules.conf b/audio/squeezeboxserver/files/patch-modules.conf
new file mode 100644
index 000000000000..b4b6dae87b1d
--- /dev/null
+++ b/audio/squeezeboxserver/files/patch-modules.conf
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- modules.conf.orig
++++ modules.conf
+@@ -5,7 +5,7 @@
+ # <module> <min_version> [ <max_version> ]
+ 
+ AnyEvent 5.202
+-Audio::Scan 0.82 0.82
++Audio::Scan 0.82
+ 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 ad9a75774b73..541951ff6532 100644
--- a/audio/squeezeboxserver/pkg-plist
+++ b/audio/squeezeboxserver/pkg-plist
@@ -1859,9 +1859,9 @@ bin/softsqueeze
 %%SLIMDIR%%/Slim/Plugin/RhapsodyDirect/ProtocolHandler.pm
 %%SLIMDIR%%/Slim/Plugin/RhapsodyDirect/install.xml
 %%SLIMDIR%%/Slim/Plugin/RhapsodyDirect/strings.txt
-%%SLIMDIR%%/Slim/Plugin/SN/install.xml
 %%SLIMDIR%%/Slim/Plugin/SN/Plugin.pm
 %%SLIMDIR%%/Slim/Plugin/SN/ProtocolHandler.pm
+%%SLIMDIR%%/Slim/Plugin/SN/install.xml
 %%SLIMDIR%%/Slim/Plugin/SN/strings.txt
 %%SLIMDIR%%/Slim/Plugin/SavePlaylist/Plugin.pm
 %%SLIMDIR%%/Slim/Plugin/SavePlaylist/install.xml
@@ -2071,7 +2071,6 @@ bin/softsqueeze
 %%SLIMDIR%%/lib/Net/UPnP/Service.pm
 %%SLIMDIR%%/lib/README
 %%SLIMDIR%%/lib/Template/Provider.pm
-%%SLIMDIR%%/custom-convert.conf
 %%SLIMDIR%%/modules.conf
 %%SLIMDIR%%/revision.txt
 %%SLIMDIR%%/scanner.pl