From ef7ba4bc0f90e8c4cf782c32470e92cc38a0661b Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Wed, 10 Feb 2010 18:55:17 +0000
Subject: main/alpine-conf: upgrade to 2.1

fixes #271
(cherry picked from commit 74238644a69a4f2bddce10412717901534e71044)
---
 ...e-way-we-check-if-a-dir-is-mounted-or-not.patch | 27 ----------------------
 main/alpine-conf/APKBUILD                          | 20 ++++++++--------
 2 files changed, 10 insertions(+), 37 deletions(-)
 delete mode 100644 main/alpine-conf/0001-lbu-fix-the-way-we-check-if-a-dir-is-mounted-or-not.patch

diff --git a/main/alpine-conf/0001-lbu-fix-the-way-we-check-if-a-dir-is-mounted-or-not.patch b/main/alpine-conf/0001-lbu-fix-the-way-we-check-if-a-dir-is-mounted-or-not.patch
deleted file mode 100644
index 858c3b81..00000000
--- a/main/alpine-conf/0001-lbu-fix-the-way-we-check-if-a-dir-is-mounted-or-not.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From dedf250425d3cb082cae9f0005d94fbc01e1e953 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Mon, 11 Jan 2010 20:56:02 +0000
-Subject: [PATCH] lbu: fix the way we check if a dir is mounted or not
-
-this works around an issue when lbu wrongly assumes /media/usb is
-mounted when /media/usbdisk is.
----
- lbu.in |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/lbu.in b/lbu.in
-index 7709567..da8ba86 100644
---- a/lbu.in
-+++ b/lbu.in
-@@ -65,7 +65,7 @@ exit_clean() {
- }
- 
- mount_once() {
--	if ! grep $1 /proc/mounts >/dev/null; then
-+	if awk "\$2 == \"$1\" {exit 1}" /proc/mounts; then
- 		mount $1 && UMOUNT_LIST="$1 $UMOUNT_LIST"
- 	fi
- }
--- 
-1.6.6
-
diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD
index 902dd78d..06e26dab 100644
--- a/main/alpine-conf/APKBUILD
+++ b/main/alpine-conf/APKBUILD
@@ -1,24 +1,24 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=alpine-conf
-pkgver=2.0
-pkgrel=1
+pkgver=2.1
+pkgrel=0
 pkgdesc="Alpine configuration management scripts"
 url=http://git.alpinelinux.org/cgit/$pkgname
 depends="openrc"
-source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2
-	0001-lbu-fix-the-way-we-check-if-a-dir-is-mounted-or-not.patch
-	"
+source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2"
 license="GPL-2"
 
+_builddir="$srcdir"/$pkgname-$pkgver
 build() {
-	cd "$srcdir/$pkgname-$pkgver"
-	patch -p1 -i "$srcdir"/0001-lbu-fix-the-way-we-check-if-a-dir-is-mounted-or-not.patch || return 1
-
+	cd "$_builddir"
 	make || return 1
+}
+
+package() {
+	cd "$_builddir"
 	make install PREFIX= DESTDIR="$pkgdir"
 	for i in commit exclude include status update; do
 		ln -s lbu "$pkgdir"/sbin/lbu_$i
 	done
 }
-md5sums="0aa966ef854de61b375d7e08bdb105b4  alpine-conf-2.0.tar.bz2
-3b520ebbf30e4e5c2ff76f14a1e2d8f2  0001-lbu-fix-the-way-we-check-if-a-dir-is-mounted-or-not.patch"
+md5sums="d9b13b849abbe5f2061aa8af0c4ac7ce  alpine-conf-2.1.tar.bz2"
-- 
cgit v1.2.3