From dd214fd39179d807eb1e965e6a71547e6aecc307 Mon Sep 17 00:00:00 2001
From: Josef Miegl <josef@miegl.cz>
Date: Thu, 7 Feb 2019 17:01:51 +0100
Subject: [PATCH] minor adjustments

---
 .SRCINFO |  1 -
 PKGBUILD | 21 ++++++++++-----------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index 7e67612..154e93f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -17,7 +17,6 @@ pkgbase = butt
 	depends = flac
 	depends = opus
 	depends = libsamplerate
-	optdepends = icecast
 	source = http://sourceforge.net/projects/butt/files/butt/butt-0.1.17/butt-0.1.17.tar.gz
 	sha256sums = afe9596b1d9ef38d2fde1f3255e5a3a12b206c73c8e6601e37cccb07e67ae33d
 
diff --git a/PKGBUILD b/PKGBUILD
index af34f23..e7b768d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,39 +10,38 @@ arch=('i686' 'x86_64' 'armv7h')
 license=('GPL2')
 url="http://butt.sourceforge.net/"
 depends=('fltk' 'libpng12' 'portaudio' 'libfdk-aac' 'libvorbis' 'libogg' 'lame' 'flac' 'opus' 'libsamplerate')
-optdepends=('icecast')
-source=("http://sourceforge.net/projects/$pkgname/files/$pkgname/$pkgname-$pkgver/$pkgname-$pkgver.tar.gz")
+source=("http://sourceforge.net/projects/${pkgname}/files/${pkgname}/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.gz")
 sha256sums=('afe9596b1d9ef38d2fde1f3255e5a3a12b206c73c8e6601e37cccb07e67ae33d')
 
 build() {
-	cd "$pkgname-$pkgver"
+	cd "${srcdir}/${pkgname}-${pkgver}"
 	./configure --prefix=/usr
 	make
 }
 
 package() {
-	cd "$pkgname-$pkgver"
-	make DESTDIR="$pkgdir/" install
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make DESTDIR="${pkgdir}" install
 
 	# Desktop file
-	install -D -m644 "usr/share/applications/$pkgname.desktop" "$pkgdir/usr/share/applications/$pkgname.desktop"
+	install -Dm644 "usr/share/applications/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
 
 	# Icons
 	for size in 16 22 24 32 48 64 96 128 256 512; do
 		format="${size}x${size}"
-		install -D -m644 "icons/icon_${format}.png" "$pkgdir/usr/share/icons/hicolor/${format}/apps/$pkgname.png"
+		install -Dm644 "icons/icon_${format}.png" "${pkgdir}/usr/share/icons/hicolor/${format}/apps/${pkgname}.png"
 	done
 
-	install -D -m644 "icons/icon_scalable.svg" "$pkgdir/usr/share/icons/hicolor/scalable/apps/$pkgname.svg"
+	install -Dm644 "icons/icon_scalable.svg" "${pkgdir}/usr/share/icons/hicolor/scalable/apps/${pkgname}.svg"
 
 	# Documentation
 	for doc in AUTHORS ChangeLog KNOWN_BUGS NEWS README THANKS; do
-		install -D -m644 "${doc}" "$pkgdir/usr/share/doc/$pkgname/${doc}"
+		install -Dm644 "${doc}" "${pkgdir}/usr/share/doc/${pkgname}/${doc}"
 	done
 
 	# Pixmaps
-	for file in usr/share/pixmaps/"$pkgname"*; do
+	for file in usr/share/pixmaps/"${pkgname}"*; do
 		filename=`basename "${file}"`
-		install -D -m644 "${file}" "$pkgdir/usr/share/pixmaps/${filename}"
+		install -Dm644 "${file}" "${pkgdir}/usr/share/pixmaps/${filename}"
 	done
 }