aboutsummaryrefslogtreecommitdiffstats
path: root/main/util-linux-ng
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2011-08-30 08:07:06 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2011-08-30 11:46:09 +0000
commit84381d73914e05032f66e3f3adcb1abebe106030 (patch)
tree6efb6a544ccdda4b4cc6c8d5a3e1cd104d028600 /main/util-linux-ng
parent47e8b1a82b77054a9142c98f713d4a72f1fa696d (diff)
downloadaports-84381d73914e05032f66e3f3adcb1abebe106030.tar.bz2
aports-84381d73914e05032f66e3f3adcb1abebe106030.tar.xz
main/util-linux: renamed from util-linux-ng and upgrade to 2.20
Diffstat (limited to 'main/util-linux-ng')
-rw-r--r--main/util-linux-ng/APKBUILD105
-rw-r--r--main/util-linux-ng/program-invocation.patch11
2 files changed, 0 insertions, 116 deletions
diff --git a/main/util-linux-ng/APKBUILD b/main/util-linux-ng/APKBUILD
deleted file mode 100644
index 7dcbc606c4..0000000000
--- a/main/util-linux-ng/APKBUILD
+++ /dev/null
@@ -1,105 +0,0 @@
-# Contributor: Leonardo Arena <rnalrd@gmail.com>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=util-linux-ng
-pkgver=2.19.1
-pkgrel=2
-pkgdesc="Random collection of Linux utilities"
-url="http://kernel.org/~kzak/util-linux/"
-arch="all"
-license="GPL-2 GPL Public Domain"
-depends=
-# use GNU sed til bb sed is fixed
-makedepends="zlib-dev sed ncurses-dev"
-install=
-source="http://www.kernel.org/pub/linux/utils/util-linux-ng/v${pkgver%.*}/util-linux-$pkgver.tar.gz
- program-invocation.patch"
-subpackages="$pkgname-doc $pkgname-dev libuuid libblkid sfdisk cfdisk mcookie blkid"
-replaces="e2fsprogs"
-
-_builddir="$srcdir/util-linux-$pkgver"
-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
-}
-
-build() {
- cd "$_builddir"
- 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 \
- --with-ncurses \
- --without-pam
-
- make || return 1
-}
-
-package() {
- cd "$_builddir"
- make -j1 install DESTDIR="$pkgdir"
- # use pkg-config
- rm -f "$pkgdir"/usr/lib/*.la
-}
-
-dev() {
- default_dev
- replaces="e2fsprogs-dev"
-}
-
-blkid() {
- pkgdesc="block device identificatio tool"
- replaces="util-linux-ng"
- depends=
- mkdir -p "$subpkgdir"/sbin
- mv "$pkgdir"/sbin/blkid "$subpkgdir"/sbin/
-}
-
-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() {
- pkgdesc="Partition table manipulator from util-linux-ng"
- depends=
- mkdir -p "$subpkgdir"/sbin
- mv "$pkgdir"/sbin/sfdisk "$subpkgdir"/sbin/
-}
-
-
-cfdisk() {
- pkgdesc="Curses based partition table manipulator from util-linux-ng"
- depends=
- mkdir -p "$subpkgdir"/sbin
- mv "$pkgdir"/sbin/cfdisk "$subpkgdir"/sbin/
-}
-
-mcookie() {
- pkgdesc="mcookie from util-linux-ng"
- replaces="util-linux-ng"
- mkdir -p "$subpkgdir"/usr/bin
- mv "$pkgdir"/usr/bin/mcookie "$subpkgdir"/usr/bin/
-}
-
-md5sums="dd242eeb2ba76e4e55bf2237a50dd2b7 util-linux-2.19.1.tar.gz
-079dc713684e01ad48c7e0bb877dc51a program-invocation.patch"
diff --git a/main/util-linux-ng/program-invocation.patch b/main/util-linux-ng/program-invocation.patch
deleted file mode 100644
index c81f97e36a..0000000000
--- a/main/util-linux-ng/program-invocation.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- util-linux-2.19.1.orig/include/c.h
-+++ util-linux-2.19.1/include/c.h
-@@ -115,7 +115,7 @@
-
- #ifndef HAVE_PROGRAM_INVOCATION_SHORT_NAME
- # ifdef HAVE___PROGNAME
--extern char *__progname;
-+extern const char *__progname;
- # define program_invocation_short_name __progname
- # else
- # include <string.h>