upgpkg: mpd-server-minimal 0.19.21-1

Upstream release + improve PKGBUILD.

Make use of variables as much as possible.
Switch to https.
Fix wrong use of `replaces`.
Reorganize ./configure arguments.
Disable some more useless things.
Only provide systemd system service.

1 files changed, 65 insertions, 52 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 083e5a7743ce..58518d538869 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,48 +1,49 @@
 # Maintainer: Bruno Pagani (a.k.a. ArchangeGabriel) <bruno.n.pagani@gmail.com>
 
-pkgbase=mpd-server
-pkgname=mpd-server-minimal
-pkgver=0.19.19
+_pkgname=mpd
+pkgbase=${_pkgname}-server
+pkgname=${_pkgname}-server-minimal
+pkgver=0.19.21
 pkgrel=1
-pkgdesc='Flexible, powerful, server-side application for playing music. Minimal version with only flac playback as server running under mpd user.'
-url='http://www.musicpd.org/'
+pkgdesc="Flexible, powerful, server-side application for playing music. Minimal version with only flac playback as server running under mpd user."
+url="https://www.musicpd.org/"
 license=('GPL')
 arch=('i686' 'x86_64' 'armv7h')
 depends=('alsa-lib' 'flac' 'glib2' 'icu' 'libmpdclient' 'sqlite')
 makedepends=('boost')
-provides=("mpd=$pkgver")
-conflicts=('mpd')
-replaces=('mpd')
-validpgpkeys=('0392335A78083894A4301C43236E8A58C6DB4512')
-source=("http://www.musicpd.org/download/mpd/${pkgver%.*}/mpd-${pkgver}.tar.xz"{,.sig}
-        'mpd.tmpfile'
-        'mpd.conf')
-sha1sums=('8c281b823825cab6677cb142b564acbf09a2874d'
+provides=("${_pkgname}=$pkgver")
+conflicts=("${_pkgname}")
+backup=("etc/${_pkgname}.conf")
+install=mpd.install
+source=("${url}/download/${_pkgname}/${pkgver%.*}/${_pkgname}-${pkgver}.tar.xz"{,.sig}
+        "${_pkgname}.tmpfile"
+        "${_pkgname}.conf")
+sha1sums=('27dd903f4f7c0f5ffeb85e6820c02d2b82485572'
           'SKIP'
           'f4d5922abb69abb739542d8e93f4dfd748acdad7'
           '291fd5cda9f0845834a553017327c4586bd853f6')
-backup=('etc/mpd.conf')
-install=mpd.install
+validpgpkeys=('0392335A78083894A4301C43236E8A58C6DB4512') # Max Kellermann
 
 build() {
-    cd "${srcdir}/mpd-${pkgver}"
+    cd ${_pkgname}-${pkgver}
 
-	./configure \
+    ./configure \
         --prefix=/usr \
         --sysconfdir=/etc \
-        --enable-libmpdclient \
-        --disable-ao \
-        --disable-httpd-output \
-        --disable-jack \
-        --disable-openal \
-        --disable-oss \
-        --disable-pulse \
-        --disable-recorder-output \
-        --disable-roar \
-        --disable-shout \
+        --disable-bzip2 \
+        --disable-iso9660 \
+        --disable-zlib \
+        --disable-zzip \
+        --enable-ipv6 \
+        --enable-tcp \
+        --disable-un \
+        --disable-largefile \
+        --disable-nfs \
+        --disable-smbclient \
         --disable-aac \
         --disable-adplug \
         --disable-audiofile \
+        --disable-dsd \
         --disable-ffmpeg \
         --enable-flac \
         --disable-fluidsynth \
@@ -58,49 +59,61 @@ build() {
         --disable-vorbis \
         --disable-wavpack \
         --disable-wildmidi \
-        --disable-curl \
-        --disable-expat \
-        --enable-ipv6 \
-        --disable-libwrap \
+        --disable-id3 \
+        --disable-ao \
+        --enable-alsa \
+        --enable-fifo \
+        --disable-httpd-output \
+        --disable-jack \
         --disable-mms \
-        --disable-nfs \
-        --disable-smbclient \
-        --disable-soundcloud \
-        --enable-tcp \
-        --disable-upnp \
-        --disable-bzip2 \
-        --disable-iso9660 \
-        --disable-zlib \
-        --disable-zzip \
+        --disable-openal \
+        --disable-oss \
+        --disable-osx \
+        --disable-pipe-output \
+        --disable-pulse \
+        --disable-recorder-output \
+        --disable-roar \
+        --disable-shout \
+        --disable-solaris-output \
         --disable-cdio-paranoia \
-        --disable-id3 \
-        --disable-largefile \
-        --disable-lsr \
-        --disable-soxr \
+        --disable-curl \
+        --disable-soundcloud \
         --disable-lame-encoder \
         --disable-shine-encoder \
         --disable-twolame-encoder \
         --disable-vorbis-encoder \
         --disable-wave-encoder \
+        --disable-lsr \
+        --disable-soxr \
         --disable-neighbor-plugins \
+        --disable-upnp \
+        --disable-expat \
+        --disable-libwrap \
+        --disable-debug \
+        --disable-test \
+        --disable-documentation \
+        --disable-inotify \
+        --enable-libmpdclient \
+        --enable-database \
         --enable-sqlite \
+        --enable-icu \
+        --enable-glib \
         --disable-systemd-daemon \
+        --without-systemduserunitdir \
         --with-systemdsystemunitdir=/usr/lib/systemd/system \
         --with-zeroconf=no
-
     make
 }
 
 package_mpd-server-minimal() {
-    cd "${srcdir}/mpd-${pkgver}"
+    cd ${_pkgname}-${pkgver}
 
     make DESTDIR="${pkgdir}" install
 
-   install -Dm644 ../mpd.conf "${pkgdir}"/etc/mpd.conf
-   install -Dm644 ../mpd.tmpfile "${pkgdir}"/usr/lib/tmpfiles.d/mpd.conf
-   install -d -g 45 -o 45 "${pkgdir}"/var/lib/mpd/{,playlists}
+    install -Dm644 ../"${_pkgname}".conf "${pkgdir}"/etc/"${_pkgname}".conf
+    install -Dm644 ../"${_pkgname}".tmpfile "${pkgdir}"/usr/lib/tmpfiles.d/"${_pkgname}".conf
+    install -d -g 45 -o 45 "${pkgdir}"/var/lib/mpd/{,playlists}
 
-    install -Dm644 "${pkgdir}"/usr/lib/systemd/{system,user}/mpd.service
-    sed '/\[Service\]/a User=mpd' -i "${pkgdir}"/usr/lib/systemd/system/mpd.service
-    sed '/WantedBy=/c WantedBy=default.target' -i "${pkgdir}"/usr/lib/systemd/{system,user}/mpd.service
+    sed '/\[Service\]/a User=mpd' -i "${pkgdir}"/usr/lib/systemd/system/"${_pkgname}".service
+    sed '/WantedBy=/c WantedBy=default.target' -i "${pkgdir}"/usr/lib/systemd/system/"${_pkgname}".service
 }