From b092bc1a3105d02aa67ccdc433207962bf2f0ef0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
Date: Mon, 20 Jun 2016 11:59:09 +0200
Subject: main/bash-completion: {u,}mount completions are provided by
 util-linux

fixes #5710
---
 main/bash-completion/APKBUILD | 33 +++++++++++++++------------------
 1 file changed, 15 insertions(+), 18 deletions(-)

(limited to 'main/bash-completion')

diff --git a/main/bash-completion/APKBUILD b/main/bash-completion/APKBUILD
index 1c717e8f40..42c1243009 100644
--- a/main/bash-completion/APKBUILD
+++ b/main/bash-completion/APKBUILD
@@ -1,8 +1,9 @@
+# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
 # Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
 # Maintainer: Eivind Uggedal <eivind@uggedal.com>
 pkgname=bash-completion
 pkgver=2.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Command-line tab-completion for bash"
 url="http://bash-completion.alioth.debian.org/"
 arch="noarch"
@@ -11,9 +12,7 @@ depends="bash"
 depends_dev=
 makedepends="$depends_dev"
 install=""
-source="http://ftp.debian.org/debian/pool/main/b/bash-completion/${pkgname}_${pkgver}.orig.tar.bz2"
-
-_builddir="$srcdir"/$pkgname-$pkgver
+source="http://ftp.debian.org/debian/pool/main/b/${pkgname}/${pkgname}_${pkgver}.orig.tar.bz2"
 
 # Provided with util-linux and networkmanager:
 _conflicting="
@@ -32,33 +31,31 @@ _conflicting="
 	rtcwake
 	su
 	nmcli
+	umount
+	mount
 	"
 
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
-
+builddir="$srcdir"/$pkgname-$pkgver
 build() {
-	cd "$_builddir"
-	./configure --prefix=/usr \
+	cd "$builddir"
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--localstatedir=/var \
 		|| return 1
 	make || return 1
 }
 
 package() {
-	cd "$_builddir"
+	cd "$builddir"
 	make -j1 DESTDIR="$pkgdir" install || return 1
 
 	cd "$pkgdir"/usr/share/bash-completion/completions
 	for c in $_conflicting; do
-		rm $c
+		rm -f $c || return 1
 	done
 }
 
-- 
cgit v1.2.3