From c53dca816490c4c81e0e2c5d4adc5c3a0701ca8d Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Fri, 14 Aug 2009 09:36:18 +0000
Subject: main/util-linux-ng: moved from testing. use gnu sed. sfdisk subpkg.

---
 main/util-linux-ng/APKBUILD    | 65 ++++++++++++++++++++++++++++++++++++++++++
 testing/util-linux-ng/APKBUILD | 50 --------------------------------
 2 files changed, 65 insertions(+), 50 deletions(-)
 create mode 100644 main/util-linux-ng/APKBUILD
 delete mode 100644 testing/util-linux-ng/APKBUILD

diff --git a/main/util-linux-ng/APKBUILD b/main/util-linux-ng/APKBUILD
new file mode 100644
index 00000000..68641051
--- /dev/null
+++ b/main/util-linux-ng/APKBUILD
@@ -0,0 +1,65 @@
+# Contributor: Leonardo Arena <rnalrd@gmail.com>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=util-linux-ng
+pkgver=2.16
+pkgrel=1
+pkgdesc="Random collection of Linux utilities"
+arch=""
+url="http://kernel.org/~kzak/util-linux-ng/"
+license="GPL-2 GPL Public Domain"
+depends=
+# use GNU sed til bb sed is fixed
+makedepends="zlib-dev sed"
+install=
+source="http://www.kernel.org/pub/linux/utils/util-linux-ng/v2.16/$pkgname-$pkgver.tar.gz"
+subpackages="$pkgname-doc $pkgname-dev libuuid libblkid sfdisk"
+replaces="e2fsprogs"
+
+build() {
+	cd "$srcdir/$pkgname-$pkgver"
+	sed -e 's/versionsort/alphasort/g'\
+		-e 's/strverscmp.h/dirent.h/g' \
+		-i mount/lomount.c
+
+	./configure --prefix=/usr \
+		--disable-uuidd \
+		--disable-nls \
+		--disable-tls \
+		--disable-kill \
+		--disable-init \
+		--without-ncurses \
+		--without-pam
+		
+	make || return 1
+	make -j1 install DESTDIR="$pkgdir"
+	# use pkg-config
+	rm -f "$pkgdir"/usr/lib/*.la
+}
+
+dev() {
+	default_dev
+	replaces="e2fsprogs-dev"
+}
+
+libuuid() {
+	pkgdesc="DCE compatible Universally Unique Identifier library"
+	depends=
+	mkdir -p "$subpkgdir"/lib
+	mv "$pkgdir"/lib/libuuid* "$subpkgdir"/lib/
+}
+
+libblkid() {
+	pkgdesc="Block device identification library from util-linux-ng"
+	depends=
+	mkdir -p "$subpkgdir"/lib 
+	mv "$pkgdir"/lib/libblkid* "$subpkgdir"/lib/
+}
+
+sfdisk() {
+	pkgdesk="Partition table manipulator from util-linux-ng"
+	depends=
+	mkdir -p "$subpkgdir"/sbin
+	mv "$pkgdir"/sbin/sfdisk "$subpkgdir"/sbin/
+}
+
+md5sums="f6aba93a43b7736782d7aaa3718c45e3  util-linux-ng-2.16.tar.gz"
diff --git a/testing/util-linux-ng/APKBUILD b/testing/util-linux-ng/APKBUILD
deleted file mode 100644
index 6a0dbc80..00000000
--- a/testing/util-linux-ng/APKBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# Contributor: Leonardo Arena <rnalrd@gmail.com>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=util-linux-ng
-pkgver=2.16
-pkgrel=0
-pkgdesc="Random collection of Linux utilities"
-arch=""
-url="http://kernel.org/~kzak/util-linux-ng/"
-license="GPL-2 GPL Public Domain"
-depends=
-makedepends="zlib-dev"
-install=
-source="http://www.kernel.org/pub/linux/utils/util-linux-ng/v2.16/$pkgname-$pkgver.tar.gz"
-subpackages="$pkgname-doc $pkgname-dev libuuid libblkid"
-
-build() {
-	cd "$srcdir/$pkgname-$pkgver"
-	sed -e 's/versionsort/alphasort/g'\
-		-e 's/strverscmp.h/dirent.h/g' \
-		-i mount/lomount.c
-
-	./configure --prefix=/usr \
-		--disable-uuidd \
-		--disable-nls \
-		--disable-tls \
-		--disable-kill \
-		--disable-init \
-		--without-ncurses \
-		--without-pam
-		
-	make || return 1
-	make install DESTDIR=$pkgdir
-}
-
-libuuid() {
-	pkgdesc="DCE compatible Universally Unique Identifier library"
-	depends=
-	mkdir -p "$subpkgdir"/lib
-	mv "$pkgdir"/lib/libuuid* "$subpkgdir"/lib/
-}
-
-libblkid() {
-	pkgdesc="Block device identification library"
-	depends=
-	mkdir -p "$subpkgdir"/lib 
-	mv "$pkgdir"/lib/libblkid* "$subpkgdir"/lib/
-}
-
-	
-md5sums="f6aba93a43b7736782d7aaa3718c45e3  util-linux-ng-2.16.tar.gz"
-- 
cgit v1.2.3