Depend on the ports version of p5-YAML-Syck instead of using the one from

slimdevices.  It turns out we just need to be more agressive about removing
all the pieces of it they ship in the tarball.

Submitted by:	Christopher Key <cjk32 at cam dot ac dot uk>

6 files changed, 15 insertions, 57 deletions

diff --git a/audio/slimserver/Makefile b/audio/slimserver/Makefile
index 4c87b38c618e..fe8512ddb8ea 100644
--- a/audio/slimserver/Makefile
+++ b/audio/slimserver/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	slimserver
 PORTVERSION=	6.5.4
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://www.slimdevices.com/downloads/SlimServer_v${PORTVERSION}/
 DISTNAME=	SlimServer_v${PORTVERSION}.no-cpan-arch
@@ -37,7 +38,8 @@ RUN_DEPENDS+=	${LOCALBASE}/bin/mDNSResponderPosix:${PORTSDIR}/net/mDNSResponder
 		${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
+		${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser \
+		${SITE_PERL}/${PERL_ARCH}/YAML/Syck.pm:${PORTSDIR}/textproc/p5-YAML-Syck
 
 PKGINSTALL=	${WRKDIR}/pkg-install
 
@@ -45,9 +47,6 @@ 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
@@ -79,12 +78,12 @@ RUN_DEPENDS+=	oggdec:${PORTSDIR}/audio/vorbis-tools
 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
+		CPAN/arch \
+		CPAN/YAML
 
 CPIOARGS=	--quiet -pdum -R
 PLIST=		${WRKDIR}/pkg-plist
@@ -111,21 +110,13 @@ 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}|' \
 	    -e 's|%%SLIMDBDIR%%|${SLIMDBDIR}|' \
-		${WRKSRC}/Bin/build-perl-modules.pl \
 		${WRKSRC}/Bin/dbish \
 		${WRKSRC}/Slim/Utils/Prefs.pm \
 		${WRKSRC}/scanner.pl \
@@ -147,8 +138,6 @@ do-build:
 	@${MKDIR} ${TMP_DOCSDIR}
 	@cd ${WRKSRC} && ${INSTALL_DATA} ${DOCFILES} ${TMP_DOCSDIR}
 .endif
-	${MKDIR} ${CPANWRKDIR}
-	${WRKSRC}/Bin/build-perl-modules.pl
 
 post-build:
 	@${RM} -f ${PLIST}
diff --git a/audio/slimserver/distinfo b/audio/slimserver/distinfo
index 7f5b55294a4e..d8efa64de7c5 100644
--- a/audio/slimserver/distinfo
+++ b/audio/slimserver/distinfo
@@ -1,6 +1,3 @@
 MD5 (slimserver/SlimServer_v6.5.4.no-cpan-arch.tar.gz) = 6ffa0002b47dc6a77649289a3ad7f8b9
 SHA256 (slimserver/SlimServer_v6.5.4.no-cpan-arch.tar.gz) = 7e9bb04006cb61b1a527c37e4ae2be437f78236e1301869bbfea852ff601e27a
 SIZE (slimserver/SlimServer_v6.5.4.no-cpan-arch.tar.gz) = 15757045
-MD5 (slimserver/YAML-Syck-0.64.tar.gz) = 51054b5da582e381158f10276f82ae15
-SHA256 (slimserver/YAML-Syck-0.64.tar.gz) = 70ff201165020c7aeadeb4bd1a6233462994a07a7153c8f5570a3698b0207e07
-SIZE (slimserver/YAML-Syck-0.64.tar.gz) = 128255
diff --git a/audio/squeezeboxserver/Makefile b/audio/squeezeboxserver/Makefile
index 4c87b38c618e..fe8512ddb8ea 100644
--- a/audio/squeezeboxserver/Makefile
+++ b/audio/squeezeboxserver/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	slimserver
 PORTVERSION=	6.5.4
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://www.slimdevices.com/downloads/SlimServer_v${PORTVERSION}/
 DISTNAME=	SlimServer_v${PORTVERSION}.no-cpan-arch
@@ -37,7 +38,8 @@ RUN_DEPENDS+=	${LOCALBASE}/bin/mDNSResponderPosix:${PORTSDIR}/net/mDNSResponder
 		${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
+		${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser \
+		${SITE_PERL}/${PERL_ARCH}/YAML/Syck.pm:${PORTSDIR}/textproc/p5-YAML-Syck
 
 PKGINSTALL=	${WRKDIR}/pkg-install
 
@@ -45,9 +47,6 @@ 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
@@ -79,12 +78,12 @@ RUN_DEPENDS+=	oggdec:${PORTSDIR}/audio/vorbis-tools
 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
+		CPAN/arch \
+		CPAN/YAML
 
 CPIOARGS=	--quiet -pdum -R
 PLIST=		${WRKDIR}/pkg-plist
@@ -111,21 +110,13 @@ 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}|' \
 	    -e 's|%%SLIMDBDIR%%|${SLIMDBDIR}|' \
-		${WRKSRC}/Bin/build-perl-modules.pl \
 		${WRKSRC}/Bin/dbish \
 		${WRKSRC}/Slim/Utils/Prefs.pm \
 		${WRKSRC}/scanner.pl \
@@ -147,8 +138,6 @@ do-build:
 	@${MKDIR} ${TMP_DOCSDIR}
 	@cd ${WRKSRC} && ${INSTALL_DATA} ${DOCFILES} ${TMP_DOCSDIR}
 .endif
-	${MKDIR} ${CPANWRKDIR}
-	${WRKSRC}/Bin/build-perl-modules.pl
 
 post-build:
 	@${RM} -f ${PLIST}
diff --git a/audio/squeezeboxserver/distinfo b/audio/squeezeboxserver/distinfo
index 7f5b55294a4e..d8efa64de7c5 100644
--- a/audio/squeezeboxserver/distinfo
+++ b/audio/squeezeboxserver/distinfo
@@ -1,6 +1,3 @@
 MD5 (slimserver/SlimServer_v6.5.4.no-cpan-arch.tar.gz) = 6ffa0002b47dc6a77649289a3ad7f8b9
 SHA256 (slimserver/SlimServer_v6.5.4.no-cpan-arch.tar.gz) = 7e9bb04006cb61b1a527c37e4ae2be437f78236e1301869bbfea852ff601e27a
 SIZE (slimserver/SlimServer_v6.5.4.no-cpan-arch.tar.gz) = 15757045
-MD5 (slimserver/YAML-Syck-0.64.tar.gz) = 51054b5da582e381158f10276f82ae15
-SHA256 (slimserver/YAML-Syck-0.64.tar.gz) = 70ff201165020c7aeadeb4bd1a6233462994a07a7153c8f5570a3698b0207e07
-SIZE (slimserver/YAML-Syck-0.64.tar.gz) = 128255
diff --git a/audio/squeezecenter/Makefile b/audio/squeezecenter/Makefile
index 4c87b38c618e..fe8512ddb8ea 100644
--- a/audio/squeezecenter/Makefile
+++ b/audio/squeezecenter/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	slimserver
 PORTVERSION=	6.5.4
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://www.slimdevices.com/downloads/SlimServer_v${PORTVERSION}/
 DISTNAME=	SlimServer_v${PORTVERSION}.no-cpan-arch
@@ -37,7 +38,8 @@ RUN_DEPENDS+=	${LOCALBASE}/bin/mDNSResponderPosix:${PORTSDIR}/net/mDNSResponder
 		${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
+		${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser \
+		${SITE_PERL}/${PERL_ARCH}/YAML/Syck.pm:${PORTSDIR}/textproc/p5-YAML-Syck
 
 PKGINSTALL=	${WRKDIR}/pkg-install
 
@@ -45,9 +47,6 @@ 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
@@ -79,12 +78,12 @@ RUN_DEPENDS+=	oggdec:${PORTSDIR}/audio/vorbis-tools
 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
+		CPAN/arch \
+		CPAN/YAML
 
 CPIOARGS=	--quiet -pdum -R
 PLIST=		${WRKDIR}/pkg-plist
@@ -111,21 +110,13 @@ 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}|' \
 	    -e 's|%%SLIMDBDIR%%|${SLIMDBDIR}|' \
-		${WRKSRC}/Bin/build-perl-modules.pl \
 		${WRKSRC}/Bin/dbish \
 		${WRKSRC}/Slim/Utils/Prefs.pm \
 		${WRKSRC}/scanner.pl \
@@ -147,8 +138,6 @@ do-build:
 	@${MKDIR} ${TMP_DOCSDIR}
 	@cd ${WRKSRC} && ${INSTALL_DATA} ${DOCFILES} ${TMP_DOCSDIR}
 .endif
-	${MKDIR} ${CPANWRKDIR}
-	${WRKSRC}/Bin/build-perl-modules.pl
 
 post-build:
 	@${RM} -f ${PLIST}
diff --git a/audio/squeezecenter/distinfo b/audio/squeezecenter/distinfo
index 7f5b55294a4e..d8efa64de7c5 100644
--- a/audio/squeezecenter/distinfo
+++ b/audio/squeezecenter/distinfo
@@ -1,6 +1,3 @@
 MD5 (slimserver/SlimServer_v6.5.4.no-cpan-arch.tar.gz) = 6ffa0002b47dc6a77649289a3ad7f8b9
 SHA256 (slimserver/SlimServer_v6.5.4.no-cpan-arch.tar.gz) = 7e9bb04006cb61b1a527c37e4ae2be437f78236e1301869bbfea852ff601e27a
 SIZE (slimserver/SlimServer_v6.5.4.no-cpan-arch.tar.gz) = 15757045
-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