From 18631b55294f1284851363f9c5e7c6edfa89490d Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Mon, 17 Sep 2012 15:50:27 +0200
Subject: [PATCH] base-system-live-busybox: renamed to base-system-busybox,
 provides/conflicts procps.

---
 .../base-system-busybox.rshlibs}                    |  0
 .../files/dotconfig                                 |  0
 .../files/udhcpc-default.script                     |  0
 .../files/udhcpc@.service                           |  0
 .../patches/glibc-2.16.patch                        |  0
 .../patches/mount_strictatime.patch                 |  0
 .../template                                        | 13 +++++++------
 7 files changed, 7 insertions(+), 6 deletions(-)
 rename srcpkgs/{base-system-live-busybox/base-system-live-busybox.rshlibs => base-system-busybox/base-system-busybox.rshlibs} (100%)
 rename srcpkgs/{base-system-live-busybox => base-system-busybox}/files/dotconfig (100%)
 rename srcpkgs/{base-system-live-busybox => base-system-busybox}/files/udhcpc-default.script (100%)
 rename srcpkgs/{base-system-live-busybox => base-system-busybox}/files/udhcpc@.service (100%)
 rename srcpkgs/{base-system-live-busybox => base-system-busybox}/patches/glibc-2.16.patch (100%)
 rename srcpkgs/{base-system-live-busybox => base-system-busybox}/patches/mount_strictatime.patch (100%)
 rename srcpkgs/{base-system-live-busybox => base-system-busybox}/template (86%)

diff --git a/srcpkgs/base-system-live-busybox/base-system-live-busybox.rshlibs b/srcpkgs/base-system-busybox/base-system-busybox.rshlibs
similarity index 100%
rename from srcpkgs/base-system-live-busybox/base-system-live-busybox.rshlibs
rename to srcpkgs/base-system-busybox/base-system-busybox.rshlibs
diff --git a/srcpkgs/base-system-live-busybox/files/dotconfig b/srcpkgs/base-system-busybox/files/dotconfig
similarity index 100%
rename from srcpkgs/base-system-live-busybox/files/dotconfig
rename to srcpkgs/base-system-busybox/files/dotconfig
diff --git a/srcpkgs/base-system-live-busybox/files/udhcpc-default.script b/srcpkgs/base-system-busybox/files/udhcpc-default.script
similarity index 100%
rename from srcpkgs/base-system-live-busybox/files/udhcpc-default.script
rename to srcpkgs/base-system-busybox/files/udhcpc-default.script
diff --git a/srcpkgs/base-system-live-busybox/files/udhcpc@.service b/srcpkgs/base-system-busybox/files/udhcpc@.service
similarity index 100%
rename from srcpkgs/base-system-live-busybox/files/udhcpc@.service
rename to srcpkgs/base-system-busybox/files/udhcpc@.service
diff --git a/srcpkgs/base-system-live-busybox/patches/glibc-2.16.patch b/srcpkgs/base-system-busybox/patches/glibc-2.16.patch
similarity index 100%
rename from srcpkgs/base-system-live-busybox/patches/glibc-2.16.patch
rename to srcpkgs/base-system-busybox/patches/glibc-2.16.patch
diff --git a/srcpkgs/base-system-live-busybox/patches/mount_strictatime.patch b/srcpkgs/base-system-busybox/patches/mount_strictatime.patch
similarity index 100%
rename from srcpkgs/base-system-live-busybox/patches/mount_strictatime.patch
rename to srcpkgs/base-system-busybox/patches/mount_strictatime.patch
diff --git a/srcpkgs/base-system-live-busybox/template b/srcpkgs/base-system-busybox/template
similarity index 86%
rename from srcpkgs/base-system-live-busybox/template
rename to srcpkgs/base-system-busybox/template
index 5e0a06e761..7f90a1f423 100644
--- a/srcpkgs/base-system-live-busybox/template
+++ b/srcpkgs/base-system-busybox/template
@@ -1,16 +1,17 @@
 # Build template for 'base-system-live-busybox'.
-pkgname=base-system-live-busybox
+pkgname=base-system-busybox
 version=1.20.2
-revision=3
+revision=4
 wrksrc="busybox-${version}"
 homepage="http://www.busybox.net"
 distfiles="${homepage}/downloads/busybox-$version.tar.bz2"
 makedepends="perl pam-devel"
-replaces="base-busybox>=0"
+replaces="base-busybox>=0 base-system-live-busybox>=0"
 conflicts="base-system>=0 run-parts>=0 coreutils>=0 util-linux>=0
-dosfstools>=0 grep>=0 findutils>=0 sed>=0"
+dosfstools>=0 grep>=0 findutils>=0 sed>=0 procps>=0"
 provides="coreutils-${version} util-linux-${version} run-parts-${version}
-dosfstools-${version} grep-${version} findutils-${version} sed-${version}"
+dosfstools-${version} grep-${version} findutils-${version} sed-${version}
+procps-${version}"
 short_desc="The Swiss Army Knife of Embedded Linux - for base-system-live"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -24,7 +25,7 @@ long_desc="
  very much like their GNU counterparts. BusyBox provides a fairly complete
  environment for any small or embedded system.
 
- This package is only meant to be installed by vmklive utility and shall
+ This package is only meant to be installed by void-mklive utility and shall
  not be installed into a running system."
 
 do_build() {