From 425757ad88f4069e717635d00ff72b6437ba03ec Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sat, 13 Jun 2015 11:28:29 +0200 Subject: [PATCH] mpd: remove systemd support. --- srcpkgs/mpd/files/tmpfiles.d | 1 - srcpkgs/mpd/template | 21 +++------------------ 2 files changed, 3 insertions(+), 19 deletions(-) delete mode 100644 srcpkgs/mpd/files/tmpfiles.d diff --git a/srcpkgs/mpd/files/tmpfiles.d b/srcpkgs/mpd/files/tmpfiles.d deleted file mode 100644 index 41c4e743a3a..00000000000 --- a/srcpkgs/mpd/files/tmpfiles.d +++ /dev/null @@ -1 +0,0 @@ -d /run/mpd 0755 mpd mpd diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template index c04800f85ea..8b35c48fc0e 100644 --- a/srcpkgs/mpd/template +++ b/srcpkgs/mpd/template @@ -1,14 +1,14 @@ # Template file for 'mpd' pkgname=mpd version=0.19.9 -revision=3 +revision=4 build_style=gnu-configure configure_args="--enable-opus --enable-mikmod --enable-neighbor-plugins --enable-soundcloud --enable-pipe-output --disable-twolame-encoder --disable-sidplay --enable-bzip2 --enable-zzip $(vopt_enable jack) $(vopt_enable lame lame-encoder) $(vopt_enable mpcdec mpc) $(vopt_enable pulseaudio pulse) $(vopt_enable wavpack) - $(vopt_enable libao)" + $(vopt_enable libao) --disable-systemd-daemon" hostmakedepends="pkg-config" makedepends=" ffmpeg-devel libmodplug-devel libmad-devel libcurl-devel faad2-devel @@ -31,17 +31,9 @@ distfiles="http://www.musicpd.org/download/mpd/${version%.*}/mpd-${version}.tar. checksum=47851423053cd38cfad65be5985b41b7cd5bdbe8d0d13378e11748a28b19f26f # Package build options -build_options="jack lame mpcdec pulseaudio libao systemd wavpack" +build_options="jack lame mpcdec pulseaudio libao wavpack" build_options_default="pulseaudio libao" -if [ "$build_option_systemd" ]; then - configure_args+=" --enable-systemd-daemon --with-systemdsystemunitdir=/usr/lib/systemd/system" - makedepends+=" systemd-devel" - systemd_services="mpd.service on" -else - configure_args+=" --disable-systemd-daemon" -fi - pre_configure() { sed -i '/^doc_DATA =/s,doc/mpdconf.example,,' Makefile.in } @@ -57,11 +49,4 @@ post_install() { -i ${DESTDIR}/etc/mpd.conf vsv mpd - - if [ "$build_option_systemd" ]; then - vinstall ${FILESDIR}/tmpfiles.d 644 usr/lib/tmpfiles.d mpd.conf - install -Dm644 ${DESTDIR}/usr/lib/systemd/{system,user}/mpd.service - sed '/\[Service\]/a User=mpd' -i ${DESTDIR}/usr/lib/systemd/system/mpd.service - sed '/WantedBy=/c WantedBy=default.target' -i ${DESTDIR}/usr/lib/systemd/{system,user}/mpd.service - fi }