6 files changed, 14 insertions, 30 deletions

diff --git a/audio/squeezeboxserver/Makefile b/audio/squeezeboxserver/Makefile
index 42e3ec6091f8..953baccfded2 100644
--- a/audio/squeezeboxserver/Makefile
+++ b/audio/squeezeboxserver/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	squeezecenter
-PORTVERSION=	7.0.0
-PORTREVISION=	5
+PORTVERSION=	7.0.1
 CATEGORIES=	audio
 MASTER_SITES=	http://www.slimdevices.com/downloads/SqueezeCenter_v${PORTVERSION}/
 DISTNAME=	${PORTNAME}-7.0-noCPAN
@@ -209,11 +208,9 @@ build-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%%|' | \
+	    ${SED} -e 's|${TMP_DOCSDIR}|%%PORTDOCS%%%%DOCSDIR%%|' | \
 	    ${SORT} >> ${PLIST}
-.endif
 	@${FIND} ${TMP_SLIMDIR}/* -type f | \
 	    ${SED} -e 's|${TMP_SLIMDIR}|%%SLIMDIR%%|' | \
 	    ${SORT} >> ${PLIST}
@@ -226,11 +223,9 @@ build-plist:
 	    ${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%%|' | \
+	    ${SED} -e 's|${TMP_DOCSDIR}|%%PORTDOCS%%@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}
diff --git a/audio/squeezeboxserver/distinfo b/audio/squeezeboxserver/distinfo
index 045c2f3e2c0b..dcd8ee6279ce 100644
--- a/audio/squeezeboxserver/distinfo
+++ b/audio/squeezeboxserver/distinfo
@@ -1,6 +1,3 @@
 MD5 (squeezecenter/squeezecenter-7.0-noCPAN.tgz) = 55925e50fd016c999a812e522fdcc931
 SHA256 (squeezecenter/squeezecenter-7.0-noCPAN.tgz) = 78bbb0c0e296b1d19dee1f5c9d88f996f7cd43808f8798f2baded6dd2c334df7
 SIZE (squeezecenter/squeezecenter-7.0-noCPAN.tgz) = 18464419
-MD5 (squeezecenter/YAML-Syck-0.64.tar.gz) = 51054b5da582e381158f10276f82ae15
-SHA256 (squeezecenter/YAML-Syck-0.64.tar.gz) = 70ff201165020c7aeadeb4bd1a6233462994a07a7153c8f5570a3698b0207e07
-SIZE (squeezecenter/YAML-Syck-0.64.tar.gz) = 128255
diff --git a/audio/squeezeboxserver/pkg-plist b/audio/squeezeboxserver/pkg-plist
index 86eebab508dc..e8f1dbcde003 100644
--- a/audio/squeezeboxserver/pkg-plist
+++ b/audio/squeezeboxserver/pkg-plist
@@ -1,9 +1,9 @@
 bin/softsqueeze
 @unexec if cmp -s %D/%%SLIMDIR%%/convert.conf %D/%%SLIMDIR%%/convert.conf.sample; then rm -f %D/%%SLIMDIR%%/convert.conf; fi
 @unexec if cmp -s %D/%%SLIMDIR%%/types.conf %D/%%SLIMDIR%%/types.conf.sample; then rm -f %D/%%SLIMDIR%%/types.conf; fi
-%%DOCSDIR%%/Changelog.html
-%%DOCSDIR%%/Installation.txt
-%%DOCSDIR%%/License.txt
+%%PORTDOCS%%%%DOCSDIR%%/Changelog.html
+%%PORTDOCS%%%%DOCSDIR%%/Installation.txt
+%%PORTDOCS%%%%DOCSDIR%%/License.txt
 %%SLIMDIR%%/CPAN/Algorithm/C3.pm
 %%SLIMDIR%%/CPAN/Archive/Zip.pm
 %%SLIMDIR%%/CPAN/Archive/Zip/Archive.pm
@@ -2541,7 +2541,7 @@ squeezecenter/MySQL/errmsg.sys
 @dirrm %%SLIMDIR%%/CPAN
 @dirrmtry %%SLIMDIR%%/Plugins
 @dirrmtry %%SLIMDIR%%
-@dirrm %%DOCSDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @unexec rm -rf /var/db/squeezecenter/cache > /dev/null 2>&1 || true
 @dirrmtry /var/db/squeezecenter/playlists
 @dirrmtry /var/db/squeezecenter
diff --git a/audio/squeezecenter/Makefile b/audio/squeezecenter/Makefile
index 42e3ec6091f8..953baccfded2 100644
--- a/audio/squeezecenter/Makefile
+++ b/audio/squeezecenter/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	squeezecenter
-PORTVERSION=	7.0.0
-PORTREVISION=	5
+PORTVERSION=	7.0.1
 CATEGORIES=	audio
 MASTER_SITES=	http://www.slimdevices.com/downloads/SqueezeCenter_v${PORTVERSION}/
 DISTNAME=	${PORTNAME}-7.0-noCPAN
@@ -209,11 +208,9 @@ build-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%%|' | \
+	    ${SED} -e 's|${TMP_DOCSDIR}|%%PORTDOCS%%%%DOCSDIR%%|' | \
 	    ${SORT} >> ${PLIST}
-.endif
 	@${FIND} ${TMP_SLIMDIR}/* -type f | \
 	    ${SED} -e 's|${TMP_SLIMDIR}|%%SLIMDIR%%|' | \
 	    ${SORT} >> ${PLIST}
@@ -226,11 +223,9 @@ build-plist:
 	    ${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%%|' | \
+	    ${SED} -e 's|${TMP_DOCSDIR}|%%PORTDOCS%%@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}
diff --git a/audio/squeezecenter/distinfo b/audio/squeezecenter/distinfo
index 045c2f3e2c0b..dcd8ee6279ce 100644
--- a/audio/squeezecenter/distinfo
+++ b/audio/squeezecenter/distinfo
@@ -1,6 +1,3 @@
 MD5 (squeezecenter/squeezecenter-7.0-noCPAN.tgz) = 55925e50fd016c999a812e522fdcc931
 SHA256 (squeezecenter/squeezecenter-7.0-noCPAN.tgz) = 78bbb0c0e296b1d19dee1f5c9d88f996f7cd43808f8798f2baded6dd2c334df7
 SIZE (squeezecenter/squeezecenter-7.0-noCPAN.tgz) = 18464419
-MD5 (squeezecenter/YAML-Syck-0.64.tar.gz) = 51054b5da582e381158f10276f82ae15
-SHA256 (squeezecenter/YAML-Syck-0.64.tar.gz) = 70ff201165020c7aeadeb4bd1a6233462994a07a7153c8f5570a3698b0207e07
-SIZE (squeezecenter/YAML-Syck-0.64.tar.gz) = 128255
diff --git a/audio/squeezecenter/pkg-plist b/audio/squeezecenter/pkg-plist
index 86eebab508dc..e8f1dbcde003 100644
--- a/audio/squeezecenter/pkg-plist
+++ b/audio/squeezecenter/pkg-plist
@@ -1,9 +1,9 @@
 bin/softsqueeze
 @unexec if cmp -s %D/%%SLIMDIR%%/convert.conf %D/%%SLIMDIR%%/convert.conf.sample; then rm -f %D/%%SLIMDIR%%/convert.conf; fi
 @unexec if cmp -s %D/%%SLIMDIR%%/types.conf %D/%%SLIMDIR%%/types.conf.sample; then rm -f %D/%%SLIMDIR%%/types.conf; fi
-%%DOCSDIR%%/Changelog.html
-%%DOCSDIR%%/Installation.txt
-%%DOCSDIR%%/License.txt
+%%PORTDOCS%%%%DOCSDIR%%/Changelog.html
+%%PORTDOCS%%%%DOCSDIR%%/Installation.txt
+%%PORTDOCS%%%%DOCSDIR%%/License.txt
 %%SLIMDIR%%/CPAN/Algorithm/C3.pm
 %%SLIMDIR%%/CPAN/Archive/Zip.pm
 %%SLIMDIR%%/CPAN/Archive/Zip/Archive.pm
@@ -2541,7 +2541,7 @@ squeezecenter/MySQL/errmsg.sys
 @dirrm %%SLIMDIR%%/CPAN
 @dirrmtry %%SLIMDIR%%/Plugins
 @dirrmtry %%SLIMDIR%%
-@dirrm %%DOCSDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @unexec rm -rf /var/db/squeezecenter/cache > /dev/null 2>&1 || true
 @dirrmtry /var/db/squeezecenter/playlists
 @dirrmtry /var/db/squeezecenter