Merge remote-tracking branch 'x/master'

* x/master:
  New package: base-busybox, DO NOT INSTALL IT.
  New package: base-system-live-0.1.
  base-files: replace egrep with grep -E to make busybox happy.
  libidn: update to 1.24.

srcpkgs/base-busybox/base-busybox.rshlibs

@@ -0,0 +1,3 @@
+libm.so.6
+libc.so.6
+libcrypt.so.1

srcpkgs/base-busybox/template

@@ -0,0 +1,33 @@
+# Build template for 'base-busybox'.
+pkgname=base-busybox
+version=1.19.3
+wrksrc="busybox-${version}"
+homepage="http://www.busybox.net"
+distfiles="${homepage}/downloads/busybox-$version.tar.bz2"
+short_desc="The Swiss Army Knife of Embedded Linux - for base system"
+maintainer="Juan RP <xtraeme@gmail.com>"
+license="GPL-2"
+checksum=a1a9a35732c719ef384f02b6e357c324d8be25bc154af91a48c4264b1e6038f0
+long_desc="
+ BusyBox combines tiny versions of many common UNIX utilities into a single
+ small executable. It provides replacements for most of the utilities you
+ usually find in GNU fileutils, shellutils, etc. The utilities in BusyBox
+ generally have fewer options than their full-featured GNU cousins; however,
+ the options that are included provide the expected functionality and behave
+ very much like their GNU counterparts. BusyBox provides a fairly complete
+ environment for any small or embedded system."
+
+provides="busybox-${version}"
+replaces="busybox>=0"
+
+Add_dependency build coreutils
+Add_dependency build perl ">=0"
+
+do_build() {
+	cp -f ${FILESDIR}/dotconfig .config
+	make ${makejobs}
+}
+
+do_install() {
+	make CONFIG_PREFIX=${DESTDIR} install
+}

srcpkgs/base-files/files/colorls.sh

@@ -32,7 +32,7 @@ if [ -z "$USER_LS_COLORS" ]; then
 
   eval `dircolors --sh "$COLORS" 2>/dev/null`
   [ -z "$LS_COLORS" ] && return
-  egrep -qi "^COLOR.*none" $COLORS >/dev/null 2>/dev/null && return
+  grep -Eqi "^COLOR.*none" $COLORS >/dev/null 2>/dev/null && return
 fi
 
 alias ll='ls -l --color=auto' 2>/dev/null

srcpkgs/base-files/files/profile

@@ -4,7 +4,7 @@
 # Functions and aliases go in /etc/bashrc
 
 pathmunge () {
-	if ! echo $PATH | /usr/bin/egrep -q "(^|:)$1($|:)" ; then
+	if ! echo $PATH | grep -Eq "(^|:)$1($|:)" ; then
 	   if [ "$2" = "after" ] ; then
 	      PATH=$PATH:$1
 	   else

srcpkgs/base-files/template

@@ -1,6 +1,6 @@
 # Template file for 'base-files'
 pkgname=base-files
-version=0.57
+version=0.58
 short_desc="Void GNU/Linux base system files"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://code.google.com/p/xbps"

srcpkgs/base-system-live/template

@@ -0,0 +1,29 @@
+# Template file for 'base-system-live'
+pkgname=base-system-live
+version=0.1
+build_style=meta-template
+homepage="http://code.google.com/p/xbps"
+short_desc="Void GNU/Linux live base system meta package"
+maintainer="Juan RP <xtraeme@gmail.com>"
+license="Public domain"
+long_desc="
+ This package installs the base system packages for the
+ Void GNU/Linux system live image."
+
+noarch=yes
+
+Add_dependency run base-files
+Add_dependency run ncurses-base
+Add_dependency run shadow
+Add_dependency run kmod
+Add_dependency run base-busybox
+Add_dependency run e2fsprogs
+Add_dependency run btrfs-progs
+Add_dependency run xfsprogs
+Add_dependency run kbd
+Add_dependency run sudo
+Add_dependency run iana-etc
+Add_dependency run udev
+Add_dependency run systemd
+Add_dependency run xbps
+Add_dependency run void-artwork

srcpkgs/libidn/libidn-devel.template

@@ -8,14 +8,11 @@ long_desc="${long_desc}
 Add_dependency run glibc-devel
 Add_dependency run libidn
 
-do_install()
+do_install() {
-{
+	vmove usr/include usr
-	mkdir -p ${DESTDIR}/usr/lib
+	vmove "usr/lib/*.a" usr/lib
-	mkdir -p ${DESTDIR}/usr/share/man
+	vmove usr/lib/pkgconfig usr/lib
-
+	vmove usr/share/man/man3 usr/share/man
-	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
+	vmove usr/share/emacs usr/share
-	mv ${SRCPKGDESTDIR}/usr/lib/*.*a ${DESTDIR}/usr/lib
+	vmove usr/share/info usr/share
-	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/share/man/man3 ${DESTDIR}/usr/share/man
-	mv ${SRCPKGDESTDIR}/usr/share/{emacs,info} ${DESTDIR}/usr/share
 }

srcpkgs/libidn/template

@@ -1,15 +1,14 @@
 # Template build file for 'libidn'.
 pkgname=libidn
-version=1.22
+version=1.24
 distfiles="http://ftp.gnu.org/gnu/libidn/libidn-$version.tar.gz"
 build_style=gnu-configure
 configure_args="--disable-csharp --disable-java --enable-threads=posix"
-revision=1
 short_desc="Internationalized Domain Names command line tool"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnu.org/software/libidn/"
 license="GPL3, LGPL"
-checksum=2f765e868795f5478900ec9f42cb0ecc6ca22e2a85a62763c0b13c7da2f588ed
+checksum=da1708c6063ecb7951a0908e67df3eacdfe128b18edaa6cf6867d7b73b5f35ff
 long_desc="
  GNU Libidn is an implementation of the Stringprep, Punycode, and IDNA
  specifications defined by the IETF Internationalized Domain Names (IDN)