Remove BROKEN and update to newly released 2.4.7.256

- upstream does not tag release tar balls with version numbers
- upstream does not maintain old releases in any archive
- update sha and size for this release
- remove CONFIG_BUILDER as it is deprecated
- add SERVERSETUP for building a new server
- remove deprecated docs files and add newly added docs

Tested in anger on my personal shoutcast server.

Thanks to the folks at nullsoft/AOL for their continued support of FreeBSD
as a target platform for shoutcast servers.

Readme, changelog and bug reports should be reported at:
http://forums.winamp.com/showthread.php?p=3022006

3 files changed, 43 insertions, 54 deletions

diff --git a/audio/shoutcast/Makefile b/audio/shoutcast/Makefile
index e6e779202170..9af11811f02a 100644
--- a/audio/shoutcast/Makefile
+++ b/audio/shoutcast/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	shoutcast
-PORTVERSION=	2.4.2.167
-PORTREVISION=	2
+PORTVERSION=	2.4.7.256
 CATEGORIES=	audio net
 MASTER_SITES=	http://download.nullsoft.com/shoutcast/tools/
 DISTNAME=	sc_serv2_bsd-latest
@@ -14,12 +13,10 @@ COMMENT=	SHOUTcast Distributed Network Audio Server
 RESTRICTED=	redistribution of software is not permitted
 IA32_BINARY_PORT=	yes
 
-BROKEN=		Checksum and size mismatch
-
 USES=		dos2unix shebangfix
 DOS2UNIX_REGEX=	.*\.(conf|css|html|js|txt|xml)
 bash_CMD=	${SH}
-SHEBANG_FILES=	builder.sh setup.sh
+SHEBANG_FILES=	setup.sh
 
 USE_RC_SUBR=	shoutcast
 
@@ -27,9 +24,9 @@ CONFLICTS=	linux-shoutcast-[0-9]*
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 
-OPTIONS_DEFAULT=	CONFIG_BUILDER EXAMPLES
-OPTIONS_DEFINE=	CONFIG_BUILDER DOCS EXAMPLES
-CONFIG_BUILDER_DESC=	SHOUTcast Configuration Builder
+OPTIONS_DEFAULT=	SERVERSETUP EXAMPLES
+OPTIONS_DEFINE=	SERVERSETUP DOCS EXAMPLES
+SETUPSERVER_DESC=	SHOUTcast Server Setup Tools
 EXAMPLE_DESC=	SHOUTcast Server Example Configuration Files
 
 SHOUTCASTUSER=	${PORTNAME}
@@ -62,32 +59,26 @@ RUN_DEPENDS+=	${LOCALBASE}/lib32/compat/libstdc++.so.6:${PORTSDIR}/misc/compat9x
 .endif
 .endif
 
-.if ${PORT_OPTIONS:MCONFIG_BUILDER}
-PLIST_SUB+=	CONFIG_BUILDER=""
+.if ${PORT_OPTIONS:MSERVERSETUP}
+PLIST_SUB+=	SERVERSETUP=""
 .else
-PLIST_SUB+=	CONFIG_BUILDER="@comment "
+PLIST_SUB+=	SERVERSETUP="@comment "
 .endif
 
 post-patch:
-.for _file in basic debug public relay simple
+.for _file in basic public relay simple
 	@${REINPLACE_CMD} -e '/sc_serv2 directory/d' \
 		-e 's#=.*/\([^\.]*.log\)#=${SHOUTCASTLDIR}/\1#g' \
 		-e 's#=control/#=${SHOUTCASTDIR}/#g' ${WRKSRC}/examples/sc_serv_${_file}.conf
 .endfor
-.if ${PORT_OPTIONS:MCONFIG_BUILDER}
-	@${REINPLACE_CMD} -e 's#<[^>]*>Windows<[^>]*>##g' \
-		-e 's#<[^>]*>Macintosh<[^>]*>##g' ${WRKSRC}/config_builder/config_builder.html
-	@${REINPLACE_CMD} -e 's#\(LogFile="\)\([^"/]*\)#\1${SHOUTCASTLDIR}/\2#g' \
-		-e 's#\(ConfFile="\)\([^"/]*\)#\1${ETCDIR}/\2#g' \
-		-e 's#\(BanFile="\)\([^"/]*\)#\1${SHOUTCASTDIR}/\2#g' \
-		-e 's#\(RipFile="\)\([^"/]*\)#\1${SHOUTCASTDIR}/\2#g' ${WRKSRC}/config_builder/config_builder.js
-.endif
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/sc_serv ${STAGEDIR}${PREFIX}/sbin
 	${MKDIR} ${STAGEDIR}${ETCDIR}
 	${MKDIR} ${STAGEDIR}${SHOUTCASTLDIR}
 	${MKDIR} ${STAGEDIR}${SHOUTCASTDIR}
+	${MKDIR} ${STAGEDIR}${SHOUTCASTDIR}/logs
+	${MKDIR} ${STAGEDIR}${SHOUTCASTDIR}/control
 .if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/DNAS_Server_Changelog.html ${STAGEDIR}${DOCSDIR}/DNAS_Server_Changelog.html
@@ -95,16 +86,18 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/tos.txt ${STAGEDIR}${DOCSDIR}/tos.txt
 	${INSTALL_DATA} ${WRKSRC}/cacert.pem ${STAGEDIR}${DOCSDIR}/cacert.pem
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/docs
+	${INSTALL_DATA} ${WRKSRC}/docs/Getting_Started.html ${STAGEDIR}${DOCSDIR}/docs/Getting_Started.html
 	${INSTALL_DATA} ${WRKSRC}/docs/DNAS_Server_XML_Responses.html ${STAGEDIR}${DOCSDIR}/docs/DNAS_Server_XML_Responses.html
 	${INSTALL_DATA} ${WRKSRC}/docs/DNAS_Server_Authhash_Management.html ${STAGEDIR}${DOCSDIR}/docs/DNAS_Server_Authhash_Management.html
 	${INSTALL_DATA} ${WRKSRC}/docs/DNAS_Server.html ${STAGEDIR}${DOCSDIR}/docs/DNAS_Server.html
-	${INSTALL_DATA} ${WRKSRC}/docs/Getting_Started.html ${STAGEDIR}${DOCSDIR}/docs/Getting_Started.html
 	${INSTALL_DATA} ${WRKSRC}/docs/DNAS_Server_JSON_Responses.html ${STAGEDIR}${DOCSDIR}/docs/DNAS_Server_JSON_Responses.html
+	${INSTALL_DATA} ${WRKSRC}/docs/DNAS_Server_CDN_Management.html ${STAGEDIR}${DOCSDIR}/docs/DNAS_Server_CDN_Management.html
+	${INSTALL_DATA} ${WRKSRC}/docs/DNAS_Server_Source_Support.html ${STAGEDIR}${DOCSDIR}/docs/DNAS_Server_Source_Support.html
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/docs/res
 	${INSTALL_DATA} ${WRKSRC}/docs/res/Linux_Console.png ${STAGEDIR}${DOCSDIR}/docs/res/Linux_Console.png
 	${INSTALL_DATA} ${WRKSRC}/docs/res/Output_tag_configuration_error.png ${STAGEDIR}${DOCSDIR}/docs/res/Output_tag_configuration_error.png
 	${INSTALL_DATA} ${WRKSRC}/docs/res/Stream_Ban_List_Page.png ${STAGEDIR}${DOCSDIR}/docs/res/Stream_Ban_List_Page.png
-	${INSTALL_DATA} ${WRKSRC}/docs/res/Stream_Blocked_User_Agent_List_Page.png ${STAGEDIR}${DOCSDIR}/docs/res/Stream_Ban_Blocked_User_Agent_List_Page.png
+	${INSTALL_DATA} ${WRKSRC}/docs/res/Stream_Blocked_User_Agent_List_Page.png ${STAGEDIR}${DOCSDIR}/docs/res/Stream_Blocked_User_Agent_List_Page.png
 	${INSTALL_DATA} ${WRKSRC}/docs/res/Start.png ${STAGEDIR}${DOCSDIR}/docs/res/Start.png
 	${INSTALL_DATA} ${WRKSRC}/docs/res/Server_Bandwidth_Page.png ${STAGEDIR}${DOCSDIR}/docs/res/Server_Bandwidth_Page.png
 	${INSTALL_DATA} ${WRKSRC}/docs/res/Manual.png ${STAGEDIR}${DOCSDIR}/docs/res/Manual.png
@@ -112,46 +105,41 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/docs/res/Simple.png ${STAGEDIR}${DOCSDIR}/docs/res/Simple.png
 	${INSTALL_DATA} ${WRKSRC}/docs/res/Console_Error.png ${STAGEDIR}${DOCSDIR}/docs/res/Console_Error.png
 	${INSTALL_DATA} ${WRKSRC}/docs/res/Server_Log_Page.png ${STAGEDIR}${DOCSDIR}/docs/res/Server_Log_Page.png
-	${INSTALL_DATA} ${WRKSRC}/docs/res/Console_Builder_Mode.png ${STAGEDIR}${DOCSDIR}/docs/res/Console_Builder_Mode.png
+	${INSTALL_DATA} ${WRKSRC}/docs/res/Server_Source_Connection_Page.png ${STAGEDIR}${DOCSDIR}/docs/res/Server_Source_Connection_Page.png
 	${INSTALL_DATA} ${WRKSRC}/docs/res/Select_Source_DSP_in_Winamp.png ${STAGEDIR}${DOCSDIR}/docs/res/Select_Source_DSP_in_Winamp.png
-	${INSTALL_DATA} ${WRKSRC}/docs/res/Removed.png ${STAGEDIR}${DOCSDIR}/docs/res/Removed.png
 	${INSTALL_DATA} ${WRKSRC}/docs/res/Console_Linux.png ${STAGEDIR}${DOCSDIR}/docs/res/Console_Linux.png
 	${INSTALL_DATA} ${WRKSRC}/docs/res/Windows_Service_Install_Failure.png ${STAGEDIR}${DOCSDIR}/docs/res/Windows_Service_Install_Failure.png
 	${INSTALL_DATA} ${WRKSRC}/docs/res/Stream_Summary_Page.png ${STAGEDIR}${DOCSDIR}/docs/res/Stream_Summary_Page.png
 	${INSTALL_DATA} ${WRKSRC}/docs/res/Stream_Admin_Page.png ${STAGEDIR}${DOCSDIR}/docs/res/Stream_Admin_Page.png
+	${INSTALL_DATA} ${WRKSRC}/docs/res/Streams_Summary_Page.png ${STAGEDIR}${DOCSDIR}/docs/res/Streams_Summary_Page.png
 	${INSTALL_DATA} ${WRKSRC}/docs/res/Console_Setup_Mode.png ${STAGEDIR}${DOCSDIR}/docs/res/Console_Setup_Mode.png
 	${INSTALL_DATA} ${WRKSRC}/docs/res/Invalid_Configuration_Item.png ${STAGEDIR}${DOCSDIR}/docs/res/Invalid_Configuration_Item.png
 	${INSTALL_DATA} ${WRKSRC}/docs/res/Server_Summary_Page.png ${STAGEDIR}${DOCSDIR}/docs/res/Server_Summary_Page.png
 	${INSTALL_DATA} ${WRKSRC}/docs/res/Example_Windows_Console.png ${STAGEDIR}${DOCSDIR}/docs/res/Example_Windows_Console.png
-	${INSTALL_DATA} ${WRKSRC}/docs/res/Server_Source_Login_Page.png ${STAGEDIR}${DOCSDIR}/docs/res/Server_Source_Login_Page.png
-	${INSTALL_DATA} ${WRKSRC}/docs/res/Streams_Summary_Page.png ${STAGEDIR}${DOCSDIR}/docs/res/Streams_Summary_Page.png
 	${INSTALL_DATA} ${WRKSRC}/docs/res/Example_Linux_Console.png ${STAGEDIR}${DOCSDIR}/docs/res/Example_Linux_Console.png
 	${INSTALL_DATA} ${WRKSRC}/docs/res/Linux_Daemon_Mode.png ${STAGEDIR}${DOCSDIR}/docs/res/Linux_Daemon_Mode.png
-	${INSTALL_DATA} ${WRKSRC}/docs/res/Admin_Config_Reload.png ${STAGEDIR}${DOCSDIR}/docs/res/Admin_Config_Reload.png
 	${INSTALL_DATA} ${WRKSRC}/docs/res/Windows_Console.png ${STAGEDIR}${DOCSDIR}/docs/res/Windows_Console.png
 	${INSTALL_DATA} ${WRKSRC}/docs/res/Stream_Reserved_List_Page.png ${STAGEDIR}${DOCSDIR}/docs/res/Stream_Reserved_List_Page.png
 	${INSTALL_DATA} ${WRKSRC}/docs/res/Summary.png ${STAGEDIR}${DOCSDIR}/docs/res/Summary.png
 	${INSTALL_DATA} ${WRKSRC}/docs/res/Setup_Mode_Error.png ${STAGEDIR}${DOCSDIR}/docs/res/Setup_Mode_Error.png
 	${INSTALL_DATA} ${WRKSRC}/docs/res/Editing.png ${STAGEDIR}${DOCSDIR}/docs/res/Editing.png
 	${INSTALL_DATA} ${WRKSRC}/docs/res/Console_Windows.png ${STAGEDIR}${DOCSDIR}/docs/res/Console_Windows.png
+	${INSTALL_DATA} ${WRKSRC}/docs/res/View_Source_Connection_Details.png ${STAGEDIR}${DOCSDIR}/docs/res/View_Source_Connection_Details.png
 
 .endif
+.if ${PORT_OPTIONS:MSERVERSETUP}
+	${MKDIR} ${STAGEDIR}${WWWDIR}/setup
+	${INSTALL_DATA} ${WRKSRC}/setup.sh ${STAGEDIR}${WWWDIR}/setup.sh
+	${INSTALL_DATA} ${WRKSRC}/setup/setup.js ${STAGEDIR}${WWWDIR}/setup/setup.js
+	${INSTALL_DATA} ${WRKSRC}/setup/setup.html ${STAGEDIR}${WWWDIR}/setup/setup.html
+	${INSTALL_DATA} ${WRKSRC}/setup/setup.txt ${STAGEDIR}${WWWDIR}/setup/setup.txt
+.endif
 .if ${PORT_OPTIONS:MEXAMPLES}
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/sc_serv_basic.conf ${STAGEDIR}${EXAMPLESDIR}/sc_serv_basic.conf
-	${INSTALL_DATA} ${WRKSRC}/examples/sc_serv_debug.conf ${STAGEDIR}${EXAMPLESDIR}/sc_serv_debug.conf
 	${INSTALL_DATA} ${WRKSRC}/examples/sc_serv_public.conf ${STAGEDIR}${EXAMPLESDIR}/sc_serv_public.conf
 	${INSTALL_DATA} ${WRKSRC}/examples/sc_serv_relay.conf ${STAGEDIR}${EXAMPLESDIR}/sc_serv_relay.conf
 	${INSTALL_DATA} ${WRKSRC}/examples/sc_serv_simple.conf ${STAGEDIR}${EXAMPLESDIR}/sc_serv_simple.conf
 .endif
-.if ${PORT_OPTIONS:MCONFIG_BUILDER}
-	${MKDIR} ${STAGEDIR}${WWWDIR}/config_builder
-	${INSTALL_DATA} ${WRKSRC}/config_builder/config_builder.html ${STAGEDIR}${WWWDIR}/config_builder/config_builder.html
-	${INSTALL_DATA} ${WRKSRC}/config_builder/config_builder.txt ${STAGEDIR}${WWWDIR}/config_builder/config_builder.txt
-	${INSTALL_DATA} ${WRKSRC}/config_builder/config_builder.js ${STAGEDIR}${WWWDIR}/config_builder/config_builder.js
-	${INSTALL_DATA} ${WRKSRC}/config_builder/config_builder.css ${STAGEDIR}${WWWDIR}/config_builder/config_builder.css
-	${INSTALL_DATA} ${WRKSRC}/builder.sh ${STAGEDIR}${WWWDIR}/config_builder/builder.sh
-	${INSTALL_DATA} ${WRKSRC}/setup.sh ${STAGEDIR}${WWWDIR}/config_builder/setup.sh
-.endif
 
 .include <bsd.port.mk>
diff --git a/audio/shoutcast/distinfo b/audio/shoutcast/distinfo
index 42a0589de888..1fbfd58fed5d 100644
--- a/audio/shoutcast/distinfo
+++ b/audio/shoutcast/distinfo
@@ -1,2 +1,2 @@
-SHA256 (sc_serv2_bsd-latest.tar.gz) = 64fa33496de68c1897c855d5461de7739f0d53e0201694f3094c616443b1acfa
-SIZE (sc_serv2_bsd-latest.tar.gz) = 3034714
+SHA256 (sc_serv2_bsd-latest.tar.gz) = 9a4bf61b7cf88df2545f068d891b92f1778c5c2c4b71b2123ed729405b07e08e
+SIZE (sc_serv2_bsd-latest.tar.gz) = 3382677
diff --git a/audio/shoutcast/pkg-plist b/audio/shoutcast/pkg-plist
index 0b82b901052e..8f5b750dfb98 100644
--- a/audio/shoutcast/pkg-plist
+++ b/audio/shoutcast/pkg-plist
@@ -9,10 +9,13 @@ sbin/sc_serv
 %%PORTDOCS%%%%DOCSDIR%%/docs/DNAS_Server.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/Getting_Started.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/DNAS_Server_JSON_Responses.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/DNAS_Server_CDN_Management.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/DNAS_Server_Source_Support.html
 
 %%PORTDOCS%%%%DOCSDIR%%/docs/res/Linux_Console.png
 %%PORTDOCS%%%%DOCSDIR%%/docs/res/Output_tag_configuration_error.png
 %%PORTDOCS%%%%DOCSDIR%%/docs/res/Stream_Ban_List_Page.png
+%%PORTDOCS%%%%DOCSDIR%%/docs/res/Stream_Blocked_User_Agent_List_Page.png
 %%PORTDOCS%%%%DOCSDIR%%/docs/res/Start.png
 %%PORTDOCS%%%%DOCSDIR%%/docs/res/Server_Bandwidth_Page.png
 %%PORTDOCS%%%%DOCSDIR%%/docs/res/Manual.png
@@ -20,49 +23,44 @@ sbin/sc_serv
 %%PORTDOCS%%%%DOCSDIR%%/docs/res/Simple.png
 %%PORTDOCS%%%%DOCSDIR%%/docs/res/Console_Error.png
 %%PORTDOCS%%%%DOCSDIR%%/docs/res/Server_Log_Page.png
-%%PORTDOCS%%%%DOCSDIR%%/docs/res/Console_Builder_Mode.png
 %%PORTDOCS%%%%DOCSDIR%%/docs/res/Select_Source_DSP_in_Winamp.png
-%%PORTDOCS%%%%DOCSDIR%%/docs/res/Removed.png
+%%PORTDOCS%%%%DOCSDIR%%/docs/res/Server_Source_Connection_Page.png
+%%PORTDOCS%%%%DOCSDIR%%/docs/res/Server_Summary_Page.png
 %%PORTDOCS%%%%DOCSDIR%%/docs/res/Console_Linux.png
 %%PORTDOCS%%%%DOCSDIR%%/docs/res/Windows_Service_Install_Failure.png
 %%PORTDOCS%%%%DOCSDIR%%/docs/res/Stream_Summary_Page.png
 %%PORTDOCS%%%%DOCSDIR%%/docs/res/Stream_Admin_Page.png
 %%PORTDOCS%%%%DOCSDIR%%/docs/res/Console_Setup_Mode.png
 %%PORTDOCS%%%%DOCSDIR%%/docs/res/Invalid_Configuration_Item.png
-%%PORTDOCS%%%%DOCSDIR%%/docs/res/Server_Summary_Page.png
 %%PORTDOCS%%%%DOCSDIR%%/docs/res/Example_Windows_Console.png
-%%PORTDOCS%%%%DOCSDIR%%/docs/res/Server_Source_Login_Page.png
-%%PORTDOCS%%%%DOCSDIR%%/docs/res/Streams_Summary_Page.png
 %%PORTDOCS%%%%DOCSDIR%%/docs/res/Example_Linux_Console.png
 %%PORTDOCS%%%%DOCSDIR%%/docs/res/Linux_Daemon_Mode.png
-%%PORTDOCS%%%%DOCSDIR%%/docs/res/Admin_Config_Reload.png
 %%PORTDOCS%%%%DOCSDIR%%/docs/res/Windows_Console.png
 %%PORTDOCS%%%%DOCSDIR%%/docs/res/Stream_Reserved_List_Page.png
+%%PORTDOCS%%%%DOCSDIR%%/docs/res/Streams_Summary_Page.png
 %%PORTDOCS%%%%DOCSDIR%%/docs/res/Summary.png
 %%PORTDOCS%%%%DOCSDIR%%/docs/res/Setup_Mode_Error.png
 %%PORTDOCS%%%%DOCSDIR%%/docs/res/Editing.png
 %%PORTDOCS%%%%DOCSDIR%%/docs/res/Console_Windows.png
+%%PORTDOCS%%%%DOCSDIR%%/docs/res/View_Source_Connection_Details.png
 
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sc_serv_basic.conf
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sc_serv_debug.conf
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sc_serv_public.conf
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sc_serv_relay.conf
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sc_serv_simple.conf
 
-%%CONFIG_BUILDER%%%%WWWDIR%%/config_builder/config_builder.html
-%%CONFIG_BUILDER%%%%WWWDIR%%/config_builder/config_builder.txt
-%%CONFIG_BUILDER%%%%WWWDIR%%/config_builder/config_builder.js
-%%CONFIG_BUILDER%%%%WWWDIR%%/config_builder/config_builder.css
-%%CONFIG_BUILDER%%%%WWWDIR%%/config_builder/builder.sh
-%%CONFIG_BUILDER%%%%WWWDIR%%/config_builder/setup.sh
+%%SERVERSETUP%%@dirrm %%WWWDIR%%/setup
+%%SERVERSETUP%%@dirrm %%WWWDIR%%
+%%SERVERSETUP%%%%WWWDIR%%/setup.sh
+%%SERVERSETUP%%%%WWWDIR%%/setup/setup.js
+%%SERVERSETUP%%%%WWWDIR%%/setup/setup.html
+%%SERVERSETUP%%%%WWWDIR%%/setup/setup.txt
 
 @dirrmtry %%ETCDIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/docs/res
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/docs
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-%%CONFIG_BUILDER%%@dirrm %%WWWDIR%%/config_builder
-%%CONFIG_BUILDER%%@dirrm %%WWWDIR%%
 
 @unexec if [ ! -s %%SHOUTCASTDIR%%/sc_serv.ban ]; then rm -f %%SHOUTCASTDIR%%/sc_serv.ban; fi
 @unexec if [ ! -s %%SHOUTCASTDIR%%/sc_serv.rip ]; then rm -f %%SHOUTCASTDIR%%/sc_serv.rip; fi
@@ -71,3 +69,6 @@ sbin/sc_serv
 @unexec if [ -d %D/%%ETCDIR%% ]; then echo "==> You should manually remove the "\""%D/%%ETCDIR%%"\"" directory."; fi
 @unexec if [ -d %%SHOUTCASTDIR%% ]; then echo "==> You should manually remove the "\""%%SHOUTCASTDIR%%"\"" directory."; fi
 @unexec if [ -d %%SHOUTCASTLDIR%% ]; then echo "==> You should manually remove the "\""%%SHOUTCASTLDIR%%"\"" directory."; fi
+
+@dirrm %%SHOUTCASTDIR%%/control
+@dirrm %%SHOUTCASTDIR%%/logs