Update to 0.9.3

PR:		ports/150636
Submitted by:	Mykola Dzham <i@levsha.me> (maintainer)

audio/liquidsoap/Makefile

@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	liquidsoap
-PORTVERSION=	0.9.2
-PORTREVISION?=	6
-DISTVERSIONPREFIX=	full-
+PORTVERSION=	0.9.3
 CATEGORIES=	audio net
 MASTER_SITES=	SF/savonet/${PORTNAME}/${PORTVERSION}
+DISTNAME=	${PORTNAME}-full-${PORTVERSION}-1
 
 MAINTAINER=	i@levsha.me
 COMMENT=	The audio stream generator of the Savonet project
@@ -18,6 +17,8 @@ COMMENT=	The audio stream generator of the Savonet project
 BUILD_DEPENDS=	${OCAMLFIND_DEPEND} \
 		${LOCALBASE}/${OCAML_SITELIBDIR}/pcre/pcre.a:${PORTSDIR}/devel/ocaml-pcre
 
+DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}
+
 .if !defined(NOPORTDOCS)
 BUILD_DEPENDS+=	${SITE_PERL}/XML/DOM.pm:${PORTSDIR}/textproc/p5-XML-DOM
 .endif
@@ -39,7 +40,7 @@ OPTIONS=	AO		"portable and stable, but it does only output"	Off \
 		SOUNDTOUCH	"for changing pitch and tempo of sound" Off \
 		PULSEAUDIO	"cross-platform audio sound server"	Off \
 		TAGLIB		"for MP3 ID3 tag reading"	On \
-		WGET	"for downloading remote files (http, https, ftp)"	On
+		WGET		"for downloading remote files (http, https, ftp)"	On
 
 # xmplapalylist disabled now: missing ocaml-xmlm port
 #		XMLPLAYLIST	"support various xml format (rss/podcast/etc)"	Off \
@@ -68,14 +69,16 @@ MAN1=	liquidsoap.1
 
 LIQUIDSOAP_USER=	liquidsoap
 LIQUIDSOAP_GROUP=	${LIQUIDSOAP_USER}
-UID=	923
-GID=	${UID}
+USERS=	${LIQUIDSOAP_USER}
+GROUPS=	${LIQUIDSOAP_GROUP}
 LOGDIR=	/var/log/liquidsoap
 PIDDIR=	/var/run/liquidsoap
 
-SUB_FILES=	pkg-install
-SUB_LIST=	LIQUIDSOAP_USER=${LIQUIDSOAP_USER} LIQUIDSOAP_GROUP=${LIQUIDSOAP_GROUP} UID=${UID} GID=${GID} PIDDIR=${PIDDIR}
-PLIST_SUB=	PORTVERSION=${PORTVERSION} LIQUIDSOAP_USER=${LIQUIDSOAP_USER} LIQUIDSOAP_GROUP=${LIQUIDSOAP_GROUP} LOGDIR=${LOGDIR} PIDDIR=${PIDDIR}
+SUB_LIST=	LIQUIDSOAP_USER=${LIQUIDSOAP_USER} LIQUIDSOAP_GROUP=${LIQUIDSOAP_GROUP} \
+	PIDDIR=${PIDDIR}
+PLIST_SUB=	RELVER=${PORTVERSION} \
+	LIQUIDSOAP_USER=${LIQUIDSOAP_USER} LIQUIDSOAP_GROUP=${LIQUIDSOAP_GROUP} \
+	LOGDIR=${LOGDIR} PIDDIR=${PIDDIR}
 
 .include <bsd.port.options.mk>
 
@@ -107,19 +110,19 @@ RUN_DEPENDS+=	${LOCALBASE}/bin/wget:${PORTSDIR}/ftp/wget
 .endif
 
 .if defined(WITH_VORBIS) && !defined(WITH_OGG)
-IGNORE=	OGG required for VORBIS. Please rerun make config and select OGG
+IGNORE=	ogg required for vorbis. please rerun make config and select ogg
 .endif
 
 .if defined(WITH_SPEEX) && !defined(WITH_OGG)
-IGNORE=	OGG required for SPEEX. Please rerun make config and select OGG
+IGNORE=	ogg required for speex. please rerun make config and select ogg
 .endif
 
 .if defined(WITH_THEORA) && ( !defined(WITH_OGG) || !defined(WITH_VORBIS) )
-IGNORE=	OGG and VORBIS required for THEORA. Please rerun make config and select OGG and VORBIS
+IGNORE=	ogg and vorbis required for theora. Please rerun make config and select ogg and vorbis
 .endif
 
 .if defined(WITH_LASTFM) && !defined(WITH_XMLPLAYLIST)
-IGNORE=	XMLPLAYLIST required for LASTFM. Please rerun make config and select XMLPLAYLIST
+IGNORE=	xmlplaylist required for lastfm. please rerun make config and select xmlplaylist
 .endif
 
 #Server is known as JACK, but module named ocaml-bjack
@@ -150,7 +153,4 @@ post-patch:
 pre-configure:
 	(cd ${WRKSRC} && ./bootstrap)
 
-pre-install:
-	PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
-
 .include <bsd.port.mk>

audio/liquidsoap/distinfo

@@ -1,3 +1,3 @@
-MD5 (liquidsoap-full-0.9.2.tar.gz) = 68fff21d149cd9e4b8697b29f7a35da9
-SHA256 (liquidsoap-full-0.9.2.tar.gz) = 1348a79b1ad703cd09d3ace66a39139fb55f8d0eb762e9dfb7540ae5ffb91624
-SIZE (liquidsoap-full-0.9.2.tar.gz) = 3404549
+MD5 (liquidsoap-full-0.9.3-1.tar.gz) = ac15541bb7d3616d139a7033dbcf5bb4
+SHA256 (liquidsoap-full-0.9.3-1.tar.gz) = b0293821a9f4a86f9747da6d1b0ddf7242b92368fa8196dc34a99e975cc4cf60
+SIZE (liquidsoap-full-0.9.3-1.tar.gz) = 3455598

audio/liquidsoap/files/liquidsoap.sh.in

@@ -11,8 +11,6 @@
 
 . /etc/rc.subr
 
-sig_stop=KILL
-
 name=liquidsoap
 rcvar=`set_rcvar`
 

audio/liquidsoap/files/patch-liquidsoap-0.9.2__Makefile.defs.in

@@ -1,18 +0,0 @@
---- ./liquidsoap-0.9.2/Makefile.defs.in.orig
-+++ ./liquidsoap-0.9.2/Makefile.defs.in
-@@ -1,6 +1,6 @@
- # @configure_input@
- 
--DISTDIR=liquidsoap-@version@
-+DISTDIR=liquidsoap
- 
- user=@install_user@
- group=@install_group@
-@@ -17,6 +17,7 @@
- datadir = @datadir@
- INSTALL = @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_DIRECTORY = @INSTALL@ -d
- INSTALL_DATA = @INSTALL_DATA@
- MAKE = @MAKE@

audio/liquidsoap/files/patch-liquidsoap-0.9.2__doc__Makefile

@@ -1,25 +0,0 @@
---- ./liquidsoap-0.9.2/doc/Makefile.orig
-+++ ./liquidsoap-0.9.2/doc/Makefile
-@@ -1,4 +1,4 @@
--.PHONY: doc upload reference all-subdirs
-+.PHONY: doc upload reference all-subdirs html-install man-install
- 
- SUBDIRS = content liqi
- DISTFILES = liquidsoap.1 Makefile reference_to_liqi.pl settings_to_liqi.pl no-ref.txt
-@@ -89,9 +89,13 @@
- 	@echo ""
- 	@find html/scripts | grep '\.pl' | sort | ./scripts/test_snipets "perl -c"
- 
--doc-install: $(HTML)
--	$(INSTALL)  -d $(datadir)/doc/$(DISTDIR)/html
--	cp -rf html/* $(datadir)/doc/$(DISTDIR)/html
-+doc-install: html-install man-install
-+
-+html-install: $(HTML)
-+	$(PORTDOCS)$(INSTALL)  -d $(datadir)/doc/$(DISTDIR)/html
-+	$(PORTDOCS)cp -rf html/* $(datadir)/doc/$(DISTDIR)/html
-+
-+man-install:
- 	$(INSTALL) -d $(mandir)/man1
- 	$(INSTALL_DATA) liquidsoap.1 $(mandir)/man1
- 

audio/liquidsoap/files/patch-liquidsoap-0.9.2__examples__Makefile

@@ -1,10 +0,0 @@
---- ./liquidsoap-0.9.2/examples/Makefile.orig
-+++ ./liquidsoap-0.9.2/examples/Makefile
-@@ -6,5 +6,5 @@
- 
- .PHONY: doc-install
- doc-install:
--	$(INSTALL) -d $(datadir)/doc/$(DISTDIR)/examples
--	$(INSTALL_DATA) $(wildcard *.liq) README $(datadir)/doc/$(DISTDIR)/examples
-+	$(PORTEXAMPLES)$(INSTALL) -d $(datadir)/examples/$(DISTDIR)
-+	$(PORTEXAMPLES)$(INSTALL_DATA) $(wildcard *.liq) README $(datadir)/examples/$(DISTDIR)

audio/liquidsoap/files/patch-liquidsoap-0.9.3__Makefile

@@ -1,5 +1,5 @@
---- ./liquidsoap-0.9.2/Makefile.orig	2009-10-30 16:07:44.000000000 +0200
-+++ ./liquidsoap-0.9.2/Makefile	2009-12-11 21:42:24.000000000 +0200
+--- ./liquidsoap-0.9.3/Makefile.orig	2010-10-31 15:06:48.616074307 -0400
++++ ./liquidsoap-0.9.3/Makefile	2010-10-31 15:07:23.378069324 -0400
 @@ -64,8 +64,8 @@
  endif
  	$(INSTALL_DIRECTORY) $(bindir)

audio/liquidsoap/files/patch-liquidsoap-0.9.3__Makefile.defs.in

@@ -0,0 +1,10 @@
+--- ./liquidsoap-0.9.3/Makefile.defs.in.orig	2010-10-31 14:57:59.750864986 -0400
++++ ./liquidsoap-0.9.3/Makefile.defs.in	2010-10-31 14:58:14.881372535 -0400
+@@ -19,6 +19,7 @@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_DIRECTORY = @INSTALL@ -d
+ INSTALL_DATA = @INSTALL_DATA@
++INSTALL_SCRIPT= @INSTALL_SCRIPT@
+ MAKE = @MAKE@
+ CC = @CC@
+ CFLAGS = @CFLAGS@

audio/liquidsoap/files/patch-ocaml-ao-0.1.10_src_ao__stubs.c

@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- ocaml-ao-0.1.10/src/ao_stubs.c.orig
-+++ ocaml-ao-0.1.10/src/ao_stubs.c
-@@ -138,6 +138,7 @@
-                        value channels,
-                        value byte_format)
- {
-+  memset(format, 0, sizeof(*format));
-   format->bits = Int_val(bits);
-   format->rate = Int_val(rate);
-   format->channels = Int_val(channels);

audio/liquidsoap/files/pkg-install.in

@@ -1,40 +0,0 @@
-#! /bin/sh
-
-# $FreeBSD$
-
-PATH=/bin:/usr/sbin
-
-USER=%%LIQUIDSOAP_USER%%
-GROUP=%%LIQUIDSOAP_GROUP%%
-UID=%%UID%%
-GID=%%GID%%
-
-case $2 in
-PRE-INSTALL)
-
-	if pw group show "${GROUP}" 2>/dev/null; then
-		echo "You already have a group \"${GROUP}\", so I will use it."
-	else
-		if pw groupadd ${GROUP} -g ${GID}; then
-			echo "Added group \"${GROUP}\"."
-		else
-			echo "Adding group \"${GROUP}\" failed..."
-			exit 1
-		fi
-	fi
-
-	if pw user show "${USER}" 2>/dev/null; then
-		echo "You already have a user \"${USER}\", so I will use it."
-	else
-		if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \
-			-d /nonexistent -c "Liquidsoap User"
-		then
-			echo "Added user \"${USER}\"."
-		else
-			echo "Adding user \"${USER}\" failed..."
-			exit 1
-		fi
-	fi
-
-	;;
-esac

audio/liquidsoap/pkg-plist

@@ -1,248 +1,249 @@
 bin/liquidsoap
 %%ETCDIR%%/radio.liq.example
 etc/logrotate.d/liquidsoap
-lib/liquidsoap/%%PORTVERSION%%/extract-replaygain
-lib/liquidsoap/%%PORTVERSION%%/liquidtts
-lib/liquidsoap/%%PORTVERSION%%/utils.liq
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fallible.liq
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/geek.liq
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/radio.liq
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/transitions.liq
-%%PORTDOCS%%%%DOCSDIR%%/html/advanced.html
-%%PORTDOCS%%%%DOCSDIR%%/html/blank.html
-%%PORTDOCS%%%%DOCSDIR%%/html/bubble.html
-%%PORTDOCS%%%%DOCSDIR%%/html/build.html
-%%PORTDOCS%%%%DOCSDIR%%/html/complete_case.html
-%%PORTDOCS%%%%DOCSDIR%%/html/cookbook.html
-%%PORTDOCS%%%%DOCSDIR%%/html/documentation.html
-%%PORTDOCS%%%%DOCSDIR%%/html/dolebrai.html
-%%PORTDOCS%%%%DOCSDIR%%/html/external_decoders.html
-%%PORTDOCS%%%%DOCSDIR%%/html/external_encoders.html
-%%PORTDOCS%%%%DOCSDIR%%/html/external_streams.html
-%%PORTDOCS%%%%DOCSDIR%%/html/frequence3.html
-%%PORTDOCS%%%%DOCSDIR%%/html/geekradio.html
-%%PORTDOCS%%%%DOCSDIR%%/html/help.html
-%%PORTDOCS%%%%DOCSDIR%%/html/homepage.css
-%%PORTDOCS%%%%DOCSDIR%%/html/http_vs_harbor.html
-%%PORTDOCS%%%%DOCSDIR%%/html/images/basic-radio-graph.png
-%%PORTDOCS%%%%DOCSDIR%%/html/images/block_blue.png
-%%PORTDOCS%%%%DOCSDIR%%/html/images/block_magenta.png
-%%PORTDOCS%%%%DOCSDIR%%/html/images/block_red.png
-%%PORTDOCS%%%%DOCSDIR%%/html/images/blocks/fleche123.png
-%%PORTDOCS%%%%DOCSDIR%%/html/images/blocks/play/block_play_arrow.png
-%%PORTDOCS%%%%DOCSDIR%%/html/images/blocks/play/block_play_bg.png
-%%PORTDOCS%%%%DOCSDIR%%/html/images/blocks/play/block_play_cl.png
-%%PORTDOCS%%%%DOCSDIR%%/html/images/blocks/play/block_play_cr.png
-%%PORTDOCS%%%%DOCSDIR%%/html/images/blocks/play/block_play_text.png
-%%PORTDOCS%%%%DOCSDIR%%/html/images/boxes/box_blue_bg.png
-%%PORTDOCS%%%%DOCSDIR%%/html/images/boxes/box_blue_say.png
-%%PORTDOCS%%%%DOCSDIR%%/html/images/boxes/box_blue_top.png
-%%PORTDOCS%%%%DOCSDIR%%/html/images/boxes/box_green_bg.png
-%%PORTDOCS%%%%DOCSDIR%%/html/images/boxes/box_green_hear.png
-%%PORTDOCS%%%%DOCSDIR%%/html/images/boxes/box_green_top.png
-%%PORTDOCS%%%%DOCSDIR%%/html/images/boxes/box_red_bg.png
-%%PORTDOCS%%%%DOCSDIR%%/html/images/boxes/box_red_see.png
-%%PORTDOCS%%%%DOCSDIR%%/html/images/boxes/box_red_top.png
-%%PORTDOCS%%%%DOCSDIR%%/html/images/design/background.png
-%%PORTDOCS%%%%DOCSDIR%%/html/images/design/background_page.png
-%%PORTDOCS%%%%DOCSDIR%%/html/images/design/logo.png
-%%PORTDOCS%%%%DOCSDIR%%/html/images/grab.png
-%%PORTDOCS%%%%DOCSDIR%%/html/images/icons/16/audio.png
-%%PORTDOCS%%%%DOCSDIR%%/html/images/icons/32/audio.png
-%%PORTDOCS%%%%DOCSDIR%%/html/images/icons/48/deb.png
-%%PORTDOCS%%%%DOCSDIR%%/html/images/icons/48/exec.png
-%%PORTDOCS%%%%DOCSDIR%%/html/images/icons/48/package.png
-%%PORTDOCS%%%%DOCSDIR%%/html/images/icons/48/sourcecode.png
-%%PORTDOCS%%%%DOCSDIR%%/html/images/icons/48/subversion.png
-%%PORTDOCS%%%%DOCSDIR%%/html/images/liqgraph.png
-%%PORTDOCS%%%%DOCSDIR%%/html/images/schema-webradio-inkscape.png
-%%PORTDOCS%%%%DOCSDIR%%/html/images/stream.png
-%%PORTDOCS%%%%DOCSDIR%%/html/images/tabs/tab_API.png
-%%PORTDOCS%%%%DOCSDIR%%/html/images/tabs/tab_about.png
-%%PORTDOCS%%%%DOCSDIR%%/html/images/tabs/tab_developers.png
-%%PORTDOCS%%%%DOCSDIR%%/html/images/tabs/tab_docs.png
-%%PORTDOCS%%%%DOCSDIR%%/html/images/tabs/tab_install.png
-%%PORTDOCS%%%%DOCSDIR%%/html/images/tabs/tab_red_bg.png
-%%PORTDOCS%%%%DOCSDIR%%/html/images/tabs/tab_red_l.png
-%%PORTDOCS%%%%DOCSDIR%%/html/images/tabs/tab_red_r.png
-%%PORTDOCS%%%%DOCSDIR%%/html/images/tabs/tab_snippets.png
-%%PORTDOCS%%%%DOCSDIR%%/html/index.html
-%%PORTDOCS%%%%DOCSDIR%%/html/kube.html
-%%PORTDOCS%%%%DOCSDIR%%/html/language.html
-%%PORTDOCS%%%%DOCSDIR%%/html/links.txt
-%%PORTDOCS%%%%DOCSDIR%%/html/metadata.html
-%%PORTDOCS%%%%DOCSDIR%%/html/multichannel.html
-%%PORTDOCS%%%%DOCSDIR%%/html/optimization.html
-%%PORTDOCS%%%%DOCSDIR%%/html/quick_start.html
-%%PORTDOCS%%%%DOCSDIR%%/html/radio-nova.html
-%%PORTDOCS%%%%DOCSDIR%%/html/radiopi.html
-%%PORTDOCS%%%%DOCSDIR%%/html/reference.html
-%%PORTDOCS%%%%DOCSDIR%%/html/replay_gain.html
-%%PORTDOCS%%%%DOCSDIR%%/html/request_sources.html
-%%PORTDOCS%%%%DOCSDIR%%/html/requests.html
-%%PORTDOCS%%%%DOCSDIR%%/html/script_loading.html
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/alsa_output.html
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/alsa_output.sh
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/alsa_output_unbuffered.html
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/alsa_output_unbuffered.sh
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/alsa_unbuffered.html
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/alsa_unbuffered.liq
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/alsa_unbuffered_debug.html
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/alsa_unbuffered_debug.sh
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/append_title.html
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/append_title.liq
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/bubble.html
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/bubble.liq
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/bubble_full.html
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/bubble_full.liq
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/complete_case.html
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/complete_case.liq
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/crossfade.html
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/crossfade.liq
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/dolebrai.html
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/dolebrai.liq
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/dolutils.html
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/dolutils.liq
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/faad_decoder.html
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/faad_decoder.liq
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/fallback_basic.html
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/fallback_basic.liq
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/flac_decoder.html
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/flac_decoder.liq
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/flac_resolver.html
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/flac_resolver.liq
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/harbor.html
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/harbor.liq
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/harbor_auth.html
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/harbor_auth.liq
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/harbor_source.html
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/harbor_source.liq
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/hour_jingle.html
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/hour_jingle.liq
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/http_source.html
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/http_source.liq
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/icecast.html
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/icecast.sh
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/index.html
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/index.txt
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/input_mplayer.html
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/input_mplayer.liq
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/jack_multichannel.html
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/jack_multichannel.liq
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/lang_dummy_example.html
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/lang_dummy_example.liq
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/lang_fun_def.html
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/lang_fun_def.liq
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/lang_func_type.html
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/lang_func_type.liq
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/lang_partial_application.html
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/lang_partial_application.liq
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/lang_rewrite.html
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/lang_rewrite.liq
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/lastfm.html
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/lastfm.liq
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/lastfm_uri.html
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/lastfm_uri.liq
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/mplayer_decoder.html
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/mplayer_decoder.liq
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/on_blank.html
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/on_blank.liq
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/out.html
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/out.sh
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/out_playlist.html
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/out_playlist.sh
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/out_smartcross.html
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/out_smartcross.sh
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/output-aplay.html
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/output-aplay.liq
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/output-icecast-flac.html
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/output-icecast-flac.liq
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/output-icecast-lame.html
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/output-icecast-lame.liq
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/play_every_xx.html
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/play_every_xx.liq
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/playlist.html
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/playlist.liq
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/playlist_dynamic_request.html
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/playlist_dynamic_request.liq
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/radio-nova.html
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/radio-nova.liq
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/radio_basic.html
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/radio_basic.liq
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/recipe_base.html
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/recipe_base.liq
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/recipe_out.html
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/recipe_out.sh
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/reencoding.html
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/reencoding.liq
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/replaygain.html
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/replaygain.liq
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/rewrite_metadata.html
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/rewrite_metadata.liq
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/run_alsa_input.html
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/run_alsa_input.sh
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/schedulers.html
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/schedulers.liq
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/scripted_dynamic_request.html
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/scripted_dynamic_request.liq
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/shoutcast.html
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/shoutcast.liq
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/shoutcast.sh
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/simple_crossfade.html
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/simple_crossfade.liq
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/single.html
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/single.liq
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/skip_blank.html
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/skip_blank.liq
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/smart_crossfade.html
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/smart_crossfade.liq
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/smooth_add.html
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/smooth_add.liq
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/strip_blank.html
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/strip_blank.liq
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/switch_generic.html
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/switch_generic.liq
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/track_sensitive_fallback.html
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/track_sensitive_fallback.liq
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/transcoding.html
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/transcoding.liq
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/users_kube-dev.html
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/users_kube-dev.liq
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/users_kube.html
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/users_kube.liq
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/users_radiopi.html
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/users_radiopi.liq
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/video_static.html
-%%PORTDOCS%%%%DOCSDIR%%/html/scripts/video_static.liq
-%%PORTDOCS%%%%DOCSDIR%%/html/settings.html
-%%PORTDOCS%%%%DOCSDIR%%/html/shoutcast.html
-%%PORTDOCS%%%%DOCSDIR%%/html/smartcrossfade.html
-%%PORTDOCS%%%%DOCSDIR%%/html/sources.html
-%%PORTDOCS%%%%DOCSDIR%%/html/style.css
-%%PORTDOCS%%%%DOCSDIR%%/html/video-static.html
-%%PORTDOCS%%%%DOCSDIR%%/html/video.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/scripts
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/images/tabs
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/images/icons/48
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/images/icons/32
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/images/icons/16
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/images/icons
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/images/design
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/images/boxes
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/images/blocks/play
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/images/blocks
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/images
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-@dirrm lib/liquidsoap/%%PORTVERSION%%
+lib/liquidsoap/%%RELVER%%/extract-replaygain
+lib/liquidsoap/%%RELVER%%/liquidtts
+lib/liquidsoap/%%RELVER%%/utils.liq
+%%DOCSDIR%%/examples/transitions.liq
+%%DOCSDIR%%/examples/radio.liq
+%%DOCSDIR%%/examples/README
+%%DOCSDIR%%/examples/geek.liq
+%%DOCSDIR%%/examples/fallible.liq
+%%DOCSDIR%%/html/documentation.html
+%%DOCSDIR%%/html/radio-nova.html
+%%DOCSDIR%%/html/shoutcast.html
+%%DOCSDIR%%/html/images/liqgraph.png
+%%DOCSDIR%%/html/images/block_red.png
+%%DOCSDIR%%/html/images/boxes/box_blue_say.png
+%%DOCSDIR%%/html/images/boxes/box_green_top.png
+%%DOCSDIR%%/html/images/boxes/box_blue_top.png
+%%DOCSDIR%%/html/images/boxes/box_red_bg.png
+%%DOCSDIR%%/html/images/boxes/box_green_hear.png
+%%DOCSDIR%%/html/images/boxes/box_red_top.png
+%%DOCSDIR%%/html/images/boxes/box_red_see.png
+%%DOCSDIR%%/html/images/boxes/box_blue_bg.png
+%%DOCSDIR%%/html/images/boxes/box_green_bg.png
+%%DOCSDIR%%/html/images/graph_clocks.png
+%%DOCSDIR%%/html/images/block_blue.png
+%%DOCSDIR%%/html/images/tabs/tab_docs.png
+%%DOCSDIR%%/html/images/tabs/tab_install.png
+%%DOCSDIR%%/html/images/tabs/tab_API.png
+%%DOCSDIR%%/html/images/tabs/tab_red_bg.png
+%%DOCSDIR%%/html/images/tabs/tab_about.png
+%%DOCSDIR%%/html/images/tabs/tab_snippets.png
+%%DOCSDIR%%/html/images/tabs/tab_red_l.png
+%%DOCSDIR%%/html/images/tabs/tab_developers.png
+%%DOCSDIR%%/html/images/tabs/tab_red_r.png
+%%DOCSDIR%%/html/images/design/background_page.png
+%%DOCSDIR%%/html/images/design/background.png
+%%DOCSDIR%%/html/images/design/logo.png
+%%DOCSDIR%%/html/images/stream.png
+%%DOCSDIR%%/html/images/grab.png
+%%DOCSDIR%%/html/images/icons/48/sourcecode.png
+%%DOCSDIR%%/html/images/icons/48/subversion.png
+%%DOCSDIR%%/html/images/icons/48/exec.png
+%%DOCSDIR%%/html/images/icons/48/deb.png
+%%DOCSDIR%%/html/images/icons/48/package.png
+%%DOCSDIR%%/html/images/icons/32/audio.png
+%%DOCSDIR%%/html/images/icons/16/audio.png
+%%DOCSDIR%%/html/images/block_magenta.png
+%%DOCSDIR%%/html/images/basic-radio-graph.png
+%%DOCSDIR%%/html/images/schema-webradio-inkscape.png
+%%DOCSDIR%%/html/images/blocks/play/block_play_cl.png
+%%DOCSDIR%%/html/images/blocks/play/block_play_text.png
+%%DOCSDIR%%/html/images/blocks/play/block_play_arrow.png
+%%DOCSDIR%%/html/images/blocks/play/block_play_cr.png
+%%DOCSDIR%%/html/images/blocks/play/block_play_bg.png
+%%DOCSDIR%%/html/images/blocks/fleche123.png
+%%DOCSDIR%%/html/replay_gain.html
+%%DOCSDIR%%/html/style.css
+%%DOCSDIR%%/html/bubble.html
+%%DOCSDIR%%/html/metadata.html
+%%DOCSDIR%%/html/requests.html
+%%DOCSDIR%%/html/dolebrai.html
+%%DOCSDIR%%/html/index.html
+%%DOCSDIR%%/html/kube.html
+%%DOCSDIR%%/html/advanced.html
+%%DOCSDIR%%/html/request_sources.html
+%%DOCSDIR%%/html/video-static.html
+%%DOCSDIR%%/html/video.html
+%%DOCSDIR%%/html/help.html
+%%DOCSDIR%%/html/frequence3.html
+%%DOCSDIR%%/html/complete_case.html
+%%DOCSDIR%%/html/language.html
+%%DOCSDIR%%/html/http_vs_harbor.html
+%%DOCSDIR%%/html/external_decoders.html
+%%DOCSDIR%%/html/external_streams.html
+%%DOCSDIR%%/html/geekradio.html
+%%DOCSDIR%%/html/script_loading.html
+%%DOCSDIR%%/html/multichannel.html
+%%DOCSDIR%%/html/build.html
+%%DOCSDIR%%/html/links.txt
+%%DOCSDIR%%/html/optimization.html
+%%DOCSDIR%%/html/external_encoders.html
+%%DOCSDIR%%/html/blank.html
+%%DOCSDIR%%/html/sources.html
+%%DOCSDIR%%/html/reference.html
+%%DOCSDIR%%/html/radiopi.html
+%%DOCSDIR%%/html/scripts/lastfm.html
+%%DOCSDIR%%/html/scripts/crossfade.liq
+%%DOCSDIR%%/html/scripts/mplayer_decoder.liq
+%%DOCSDIR%%/html/scripts/transcoding.liq
+%%DOCSDIR%%/html/scripts/faad_decoder.html
+%%DOCSDIR%%/html/scripts/dolebrai.html
+%%DOCSDIR%%/html/scripts/alsa_output_unbuffered.html
+%%DOCSDIR%%/html/scripts/lang_rewrite.html
+%%DOCSDIR%%/html/scripts/lastfm_uri.liq
+%%DOCSDIR%%/html/scripts/lang_partial_application.html
+%%DOCSDIR%%/html/scripts/harbor.liq
+%%DOCSDIR%%/html/scripts/smart_crossfade.liq
+%%DOCSDIR%%/html/scripts/run_alsa_input.sh
+%%DOCSDIR%%/html/scripts/lang_partial_application.liq
+%%DOCSDIR%%/html/scripts/single.html
+%%DOCSDIR%%/html/scripts/switch_generic.html
+%%DOCSDIR%%/html/scripts/skip_blank.html
+%%DOCSDIR%%/html/scripts/complete_case.html
+%%DOCSDIR%%/html/scripts/index.txt
+%%DOCSDIR%%/html/scripts/track_sensitive_fallback.liq
+%%DOCSDIR%%/html/scripts/users_kube-dev.liq
+%%DOCSDIR%%/html/scripts/radio-nova.html
+%%DOCSDIR%%/html/scripts/alsa_output.html
+%%DOCSDIR%%/html/scripts/playlist_dynamic_request.liq
+%%DOCSDIR%%/html/scripts/video_static.liq
+%%DOCSDIR%%/html/scripts/schedulers.liq
+%%DOCSDIR%%/html/scripts/output-icecast-lame.liq
+%%DOCSDIR%%/html/scripts/out_playlist.html
+%%DOCSDIR%%/html/scripts/bubble.liq
+%%DOCSDIR%%/html/scripts/hour_jingle.liq
+%%DOCSDIR%%/html/scripts/replaygain.html
+%%DOCSDIR%%/html/scripts/playlist.html
+%%DOCSDIR%%/html/scripts/lang_func_type.html
+%%DOCSDIR%%/html/scripts/alsa_unbuffered_debug.html
+%%DOCSDIR%%/html/scripts/shoutcast.html
+%%DOCSDIR%%/html/scripts/out_smartcross.html
+%%DOCSDIR%%/html/scripts/single.liq
+%%DOCSDIR%%/html/scripts/switch_generic.liq
+%%DOCSDIR%%/html/scripts/strip_blank.html
+%%DOCSDIR%%/html/scripts/radio-nova.liq
+%%DOCSDIR%%/html/scripts/transcoding.html
+%%DOCSDIR%%/html/scripts/rewrite_metadata.html
+%%DOCSDIR%%/html/scripts/output-aplay.html
+%%DOCSDIR%%/html/scripts/lastfm_uri.html
+%%DOCSDIR%%/html/scripts/jack_multichannel.html
+%%DOCSDIR%%/html/scripts/play_every_xx.html
+%%DOCSDIR%%/html/scripts/icecast.html
+%%DOCSDIR%%/html/scripts/skip_blank.liq
+%%DOCSDIR%%/html/scripts/faad_decoder.liq
+%%DOCSDIR%%/html/scripts/append_title.html
+%%DOCSDIR%%/html/scripts/recipe_base.liq
+%%DOCSDIR%%/html/scripts/lang_fun_def.liq
+%%DOCSDIR%%/html/scripts/run_alsa_input.html
+%%DOCSDIR%%/html/scripts/dolebrai.liq
+%%DOCSDIR%%/html/scripts/output-icecast-flac.html
+%%DOCSDIR%%/html/scripts/smart_crossfade.html
+%%DOCSDIR%%/html/scripts/jack_multichannel.liq
+%%DOCSDIR%%/html/scripts/harbor_auth.html
+%%DOCSDIR%%/html/scripts/output-icecast-lame.html
+%%DOCSDIR%%/html/scripts/video_static.html
+%%DOCSDIR%%/html/scripts/play_every_xx.liq
+%%DOCSDIR%%/html/scripts/lang_dummy_example.liq
+%%DOCSDIR%%/html/scripts/users_radiopi.liq
+%%DOCSDIR%%/html/scripts/fallback_basic.liq
+%%DOCSDIR%%/html/scripts/users_radiopi.html
+%%DOCSDIR%%/html/scripts/scripted_dynamic_request.liq
+%%DOCSDIR%%/html/scripts/strip_blank.liq
+%%DOCSDIR%%/html/scripts/smooth_add.liq
+%%DOCSDIR%%/html/scripts/on_blank.html
+%%DOCSDIR%%/html/scripts/users_kube.liq
+%%DOCSDIR%%/html/scripts/schedulers.html
+%%DOCSDIR%%/html/scripts/icecast.sh
+%%DOCSDIR%%/html/scripts/alsa_output_unbuffered.sh
+%%DOCSDIR%%/html/scripts/simple_crossfade.html
+%%DOCSDIR%%/html/scripts/http_source.liq
+%%DOCSDIR%%/html/scripts/alsa_unbuffered.html
+%%DOCSDIR%%/html/scripts/mplayer_decoder.html
+%%DOCSDIR%%/html/scripts/reencoding.liq
+%%DOCSDIR%%/html/scripts/reencoding.html
+%%DOCSDIR%%/html/scripts/recipe_base.html
+%%DOCSDIR%%/html/scripts/append_title.liq
+%%DOCSDIR%%/html/scripts/recipe_out.html
+%%DOCSDIR%%/html/scripts/users_kube-dev.html
+%%DOCSDIR%%/html/scripts/flac_resolver.liq
+%%DOCSDIR%%/html/scripts/out.html
+%%DOCSDIR%%/html/scripts/shoutcast.liq
+%%DOCSDIR%%/html/scripts/alsa_output.sh
+%%DOCSDIR%%/html/scripts/input_mplayer.html
+%%DOCSDIR%%/html/scripts/bubble_full.liq
+%%DOCSDIR%%/html/scripts/replaygain.liq
+%%DOCSDIR%%/html/scripts/harbor_source.liq
+%%DOCSDIR%%/html/scripts/users_kube.html
+%%DOCSDIR%%/html/scripts/lang_fun_def.html
+%%DOCSDIR%%/html/scripts/flac_resolver.html
+%%DOCSDIR%%/html/scripts/lang_func_type.liq
+%%DOCSDIR%%/html/scripts/flac_decoder.liq
+%%DOCSDIR%%/html/scripts/bubble.html
+%%DOCSDIR%%/html/scripts/rewrite_metadata.liq
+%%DOCSDIR%%/html/scripts/out.sh
+%%DOCSDIR%%/html/scripts/track_sensitive_fallback.html
+%%DOCSDIR%%/html/scripts/flac_decoder.html
+%%DOCSDIR%%/html/scripts/smooth_add.html
+%%DOCSDIR%%/html/scripts/radio_basic.html
+%%DOCSDIR%%/html/scripts/harbor_source.html
+%%DOCSDIR%%/html/scripts/output-icecast-flac.liq
+%%DOCSDIR%%/html/scripts/dolutils.liq
+%%DOCSDIR%%/html/scripts/lang_dummy_example.html
+%%DOCSDIR%%/html/scripts/complete_case.liq
+%%DOCSDIR%%/html/scripts/harbor_auth.liq
+%%DOCSDIR%%/html/scripts/dolutils.html
+%%DOCSDIR%%/html/scripts/hour_jingle.html
+%%DOCSDIR%%/html/scripts/bubble_full.html
+%%DOCSDIR%%/html/scripts/http_source.html
+%%DOCSDIR%%/html/scripts/shoutcast.sh
+%%DOCSDIR%%/html/scripts/lang_rewrite.liq
+%%DOCSDIR%%/html/scripts/input_mplayer.liq
+%%DOCSDIR%%/html/scripts/index.html
+%%DOCSDIR%%/html/scripts/alsa_unbuffered.liq
+%%DOCSDIR%%/html/scripts/harbor.html
+%%DOCSDIR%%/html/scripts/alsa_unbuffered_debug.sh
+%%DOCSDIR%%/html/scripts/radio_basic.liq
+%%DOCSDIR%%/html/scripts/out_smartcross.sh
+%%DOCSDIR%%/html/scripts/crossfade.html
+%%DOCSDIR%%/html/scripts/out_playlist.sh
+%%DOCSDIR%%/html/scripts/playlist.liq
+%%DOCSDIR%%/html/scripts/fallback_basic.html
+%%DOCSDIR%%/html/scripts/recipe_out.sh
+%%DOCSDIR%%/html/scripts/lastfm.liq
+%%DOCSDIR%%/html/scripts/output-aplay.liq
+%%DOCSDIR%%/html/scripts/simple_crossfade.liq
+%%DOCSDIR%%/html/scripts/playlist_dynamic_request.html
+%%DOCSDIR%%/html/scripts/on_blank.liq
+%%DOCSDIR%%/html/scripts/scripted_dynamic_request.html
+%%DOCSDIR%%/html/cookbook.html
+%%DOCSDIR%%/html/homepage.css
+%%DOCSDIR%%/html/smartcrossfade.html
+%%DOCSDIR%%/html/settings.html
+%%DOCSDIR%%/html/quick_start.html
+@dirrm %%DOCSDIR%%/html/images/boxes
+@dirrm %%DOCSDIR%%/html/images/tabs
+@dirrm %%DOCSDIR%%/html/images/design
+@dirrm %%DOCSDIR%%/html/images/icons/48
+@dirrm %%DOCSDIR%%/html/images/icons/32
+@dirrm %%DOCSDIR%%/html/images/icons/16
+@dirrm %%DOCSDIR%%/html/images/icons
+@dirrm %%DOCSDIR%%/html/images/blocks/play
+@dirrm %%DOCSDIR%%/html/images/blocks
+@dirrm %%DOCSDIR%%/html/images
+@dirrm %%DOCSDIR%%/html/scripts
+@dirrm %%DOCSDIR%%/html
+@dirrm %%DOCSDIR%%/examples
+@dirrm %%DOCSDIR%%
+@dirrm lib/liquidsoap/%%RELVER%%
 @dirrm lib/liquidsoap
 @dirrmtry %%ETCDIR%%
 @dirrmtry etc/logrotate.d
-@exec [ -d %%LOGDIR%% ] || mkdir %%LOGDIR%%
+@exec mkdir -p %%LOGDIR%%
 @exec chown %%LIQUIDSOAP_USER%%:%%LIQUIDSOAP_GROUP%% %%LOGDIR%%
-@unexec rmdir %%LOGDIR%% 2>/dev/null  || true
-@exec [ -d %%PIDDIR%% ] || mkdir %%PIDDIR%%
+@dirrmtry %%LOGDIR%%
+@exec mkdir -p %%PIDDIR%%
 @exec chown %%LIQUIDSOAP_USER%%:%%LIQUIDSOAP_GROUP%% %%PIDDIR%%
-@unexec rmdir %%PIDDIR%% 2>/dev/null  || true
+@dirrmtry %%PIDDIR%%