From 22fad72e1f05766b8fb54efd546c962c665a0c8d Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Thu, 31 Jul 2014 08:29:05 +0200
Subject: [PATCH] mpd: update to 0.18.12.

---
 srcpkgs/mpd/template | 44 +++++++++++++++++++++++---------------------
 1 file changed, 23 insertions(+), 21 deletions(-)

diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index a17f0dd621e..e6e00ae62ca 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -1,12 +1,11 @@
 # Template file for 'mpd'
 pkgname=mpd
-version=0.18.11
-revision=3
+version=0.18.12
+revision=1
 build_style=gnu-configure
 configure_args="
  --enable-soundcloud --enable-pipe-output --disable-twolame-encoder
- --disable-sidplay --with-systemdsystemunitdir=/usr/lib/systemd/system
- --enable-bzip2 --enable-zzip LDFLAGS="
+ --disable-sidplay --enable-bzip2 --enable-zzip"
 hostmakedepends="pkg-config"
 makedepends="
  ffmpeg-devel>=2.1 libmodplug-devel libmad-devel libcurl-devel faad2-devel
@@ -16,7 +15,6 @@ makedepends="
  libcdio-devel zziplib-devel libmpdclient-devel"
 conf_files="/etc/mpd.conf"
 system_accounts="mpd"
-systemd_services="mpd.service on"
 mpd_homedir="/var/lib/mpd"
 make_dirs="/var/lib/mpd/playlists 0755 mpd mpd"
 short_desc="Flexible, powerful, server-side application for playing music"
@@ -24,21 +22,7 @@ maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-3"
 homepage="http://www.musicpd.org/"
 distfiles="http://www.musicpd.org/download/mpd/${version%.*}/mpd-${version}.tar.xz"
-checksum=f0466a92008ba1a030aebef7ee3cf23f3a56a5764aa36f3a4058d2f336df2ad7
-
-post_install() {
-	vinstall doc/mpdconf.example 644 etc mpd.conf
-	vinstall ${FILESDIR}/tmpfiles.d 644 usr/lib/tmpfiles.d mpd.conf
-	vmkdir usr/lib/systemd/user
-	ln -s ../system/mpd.service ${DESTDIR}/usr/lib/systemd/user/mpd.service
-	sed \
-		-e '/^#playlist_directory/c playlist_directory "/var/lib/mpd/playlists"' \
-		-e '/^#db_file/c db_file "/var/lib/mpd/mpd.db"' \
-		-e '/^#pid_file/c pid_file "/run/mpd/mpd.pid"' \
-		-e '/^#state_file/c state_file "/var/lib/mpd/mpdstate"' \
-		-e '/^#user/c user "mpd"' \
-		-i ${DESTDIR}/etc/mpd.conf
-}
+checksum=30cd1f6f396a6433f7f27a6c0ec0de5e061cec6ad1bd2f7de9095c16aac0d86c
 
 # Package build options
 build_options="jack lame mpcdec pulseaudio systemd wavpack"
@@ -73,8 +57,9 @@ else
 fi
 
 if [ "$build_option_systemd" ]; then
-	configure_args+=" --enable-systemd-daemon"
+	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
@@ -85,3 +70,20 @@ if [ "$build_option_wavpack" ]; then
 else
 	configure_args+=" --disable-wavpack"
 fi
+
+post_install() {
+	vinstall doc/mpdconf.example 644 etc mpd.conf
+	sed \
+		-e '/^#playlist_directory/c playlist_directory "/var/lib/mpd/playlists"' \
+		-e '/^#db_file/c db_file "/var/lib/mpd/mpd.db"' \
+		-e '/^#pid_file/c pid_file "/run/mpd/mpd.pid"' \
+		-e '/^#state_file/c state_file "/var/lib/mpd/mpdstate"' \
+		-e '/^#user/c user "mpd"' \
+		-i ${DESTDIR}/etc/mpd.conf
+
+	if [ "$build_option_systemd" ]; then
+		vinstall ${FILESDIR}/tmpfiles.d 644 usr/lib/tmpfiles.d mpd.conf
+		vmkdir usr/lib/systemd/user
+		ln -s ../system/mpd.service ${DESTDIR}/usr/lib/systemd/user/mpd.service
+	fi
+}