# HG changeset patch
# User Christopher Rogers <slaxemulator@gmail.com>
# Date 1304768171 0
# Node ID 6afc9676e6792e746c96e998b223c14ab7efdfe8
# Parent  0ee75cad7429e9734c73f163f13186f6bb948be7
coreutils: clean up

diff -r 0ee75cad7429 -r 6afc9676e679 coreutils-command/receipt
--- a/coreutils-command/receipt	Sat May 07 11:24:42 2011 +0000
+++ b/coreutils-command/receipt	Sat May 07 11:36:11 2011 +0000
@@ -48,11 +48,11 @@
 
 post_remove()
 {
-	ln -s /bin/busybox /bin/nice
-	ln -s /bin/busybox /bin/kill
-	ln -s /bin/busybox /bin/sleep
-	ln -s /bin/busybox /usr/bin/env
-	ln -s /bin/busybox /usr/bin/nohup
-	ln -s /bin/busybox /usr/bin/timeout
-	ln -s /bin/busybox /usr/sbin/chroot
+	ln -s /bin/busybox $1/bin/nice
+	ln -s /bin/busybox $1/bin/kill
+	ln -s /bin/busybox $1/bin/sleep
+	ln -s /bin/busybox $1/usr/bin/env
+	ln -s /bin/busybox $1/usr/bin/nohup
+	ln -s /bin/busybox $1/usr/bin/timeout
+	ln -s /bin/busybox $1/usr/sbin/chroot
 }
diff -r 0ee75cad7429 -r 6afc9676e679 coreutils-conditions/receipt
--- a/coreutils-conditions/receipt	Sat May 07 11:24:42 2011 +0000
+++ b/coreutils-conditions/receipt	Sat May 07 11:36:11 2011 +0000
@@ -43,9 +43,9 @@
 
 post_remove()
 {
-	ln -s /bin/busybox /bin/false
-	ln -s /bin/busybox /bin/true
-	ln -s /bin/busybox /usr/bin/test
-	ln -s /bin/busybox /usr/bin/[
-	ln -s /bin/busybox /usr/bin/expr
+	ln -s /bin/busybox $1/bin/false
+	ln -s /bin/busybox $1/bin/true
+	ln -s /bin/busybox $1/usr/bin/test
+	ln -s /bin/busybox $1/usr/bin/[
+	ln -s /bin/busybox $1/usr/bin/expr
 }
diff -r 0ee75cad7429 -r 6afc9676e679 coreutils-context-system/receipt
--- a/coreutils-context-system/receipt	Sat May 07 11:24:42 2011 +0000
+++ b/coreutils-context-system/receipt	Sat May 07 11:36:11 2011 +0000
@@ -44,8 +44,8 @@
 
 post_remove()
 {
-	ln -s /bin/busybox /bin/date
-	ln -s /bin/busybox /bin/uname
-	ln -s /bin/busybox /usr/bin/hostid
-	ln -s /bin/busybox /usr/bin/uptime
+	ln -s /bin/busybox $1/bin/date
+	ln -s /bin/busybox $1/bin/uname
+	ln -s /bin/busybox $1/usr/bin/hostid
+	ln -s /bin/busybox $1/usr/bin/uptime
 }
diff -r 0ee75cad7429 -r 6afc9676e679 coreutils-context-user/receipt
--- a/coreutils-context-user/receipt	Sat May 07 11:24:42 2011 +0000
+++ b/coreutils-context-user/receipt	Sat May 07 11:36:11 2011 +0000
@@ -45,8 +45,8 @@
 
 post_remove()
 {
-	ln -s /bin/busybox /bin/id
-	ln -s /bin/busybox /usr/bin/logname
-	ln -s /bin/busybox /usr/bin/whoami
-	ln -s /bin/busybox /usr/bin/who
+	ln -s /bin/busybox $1/bin/id
+	ln -s /bin/busybox $1/usr/bin/logname
+	ln -s /bin/busybox $1/usr/bin/whoami
+	ln -s /bin/busybox $1/usr/bin/who
 }
diff -r 0ee75cad7429 -r 6afc9676e679 coreutils-context-working/receipt
--- a/coreutils-context-working/receipt	Sat May 07 11:24:42 2011 +0000
+++ b/coreutils-context-working/receipt	Sat May 07 11:36:11 2011 +0000
@@ -42,8 +42,8 @@
 
 post_remove()
 {
-	ln -s /bin/busybox /bin/pwd
-	ln -s /bin/busybox /bin/stty
-	ln -s /bin/busybox /bin/printenv
-	ln -s /bin/busybox /usr/bin/tty
+	ln -s /bin/busybox $1/bin/pwd
+	ln -s /bin/busybox $1/bin/stty
+	ln -s /bin/busybox $1/bin/printenv
+	ln -s /bin/busybox $1/usr/bin/tty
 }
diff -r 0ee75cad7429 -r 6afc9676e679 coreutils-directory/receipt
--- a/coreutils-directory/receipt	Sat May 07 11:24:42 2011 +0000
+++ b/coreutils-directory/receipt	Sat May 07 11:36:11 2011 +0000
@@ -41,8 +41,8 @@
 
 post_remove()
 {
-	ln -s /bin/busybox /bin/ls
-	ln -s /bin/busybox /usr/bin/dir
-	ln -s /bin/busybox /usr/bin/vdir
-	ln -s /bin/busybox /usr/bin/dircolors
+	ln -s /bin/busybox $1/bin/ls
+	ln -s /bin/busybox $1/usr/bin/dir
+	ln -s /bin/busybox $1/usr/bin/vdir
+	ln -s /bin/busybox $1/usr/bin/dircolors
 }
diff -r 0ee75cad7429 -r 6afc9676e679 coreutils-disk/receipt
--- a/coreutils-disk/receipt	Sat May 07 11:24:42 2011 +0000
+++ b/coreutils-disk/receipt	Sat May 07 11:36:11 2011 +0000
@@ -43,8 +43,8 @@
 
 post_remove()
 {
-	ln -s /bin/busybox /bin/df
-	ln -s /bin/busybox /bin/stat
-	ln -s /bin/busybox /bin/sync
-	ln -s /bin/busybox /usr/bin/du
+	ln -s /bin/busybox $1/bin/df
+	ln -s /bin/busybox $1/bin/stat
+	ln -s /bin/busybox $1/bin/sync
+	ln -s /bin/busybox $1/usr/bin/du
 }
diff -r 0ee75cad7429 -r 6afc9676e679 coreutils-file-attributes/receipt
--- a/coreutils-file-attributes/receipt	Sat May 07 11:24:42 2011 +0000
+++ b/coreutils-file-attributes/receipt	Sat May 07 11:36:11 2011 +0000
@@ -39,8 +39,8 @@
 
 post_remove()
 {
-	ln -s /bin/busybox /bin/chown
-	ln -s /bin/busybox /bin/chgrp
-	ln -s /bin/busybox /bin/chmod
-	ln -s /bin/busybox /bin/touch
+	ln -s /bin/busybox $1/bin/chown
+	ln -s /bin/busybox $1/bin/chgrp
+	ln -s /bin/busybox $1/bin/chmod
+	ln -s /bin/busybox $1/bin/touch
 }
diff -r 0ee75cad7429 -r 6afc9676e679 coreutils-file-format/receipt
--- a/coreutils-file-format/receipt	Sat May 07 11:24:42 2011 +0000
+++ b/coreutils-file-format/receipt	Sat May 07 11:36:11 2011 +0000
@@ -38,5 +38,5 @@
 
 post_remove()
 {
-	ln -s /bin/busybox /usr/bin/fold
+	ln -s /bin/busybox $1/usr/bin/fold
 }
diff -r 0ee75cad7429 -r 6afc9676e679 coreutils-file-output-part/receipt
--- a/coreutils-file-output-part/receipt	Sat May 07 11:24:42 2011 +0000
+++ b/coreutils-file-output-part/receipt	Sat May 07 11:36:11 2011 +0000
@@ -39,7 +39,7 @@
 
 post_remove()
 {
-	ln -s /bin/busybox /usr/bin/head
-	ln -s /bin/busybox /usr/bin/tail
-	ln -s /bin/busybox /usr/bin/split
+	ln -s /bin/busybox $1/usr/bin/head
+	ln -s /bin/busybox $1/usr/bin/tail
+	ln -s /bin/busybox $1/usr/bin/split
 }
diff -r 0ee75cad7429 -r 6afc9676e679 coreutils-file-sort/receipt
--- a/coreutils-file-sort/receipt	Sat May 07 11:24:42 2011 +0000
+++ b/coreutils-file-sort/receipt	Sat May 07 11:36:11 2011 +0000
@@ -41,7 +41,7 @@
 
 post_remove()
 {
-	ln -s /bin/busybox /usr/bin/sort
-	ln -s /bin/busybox /usr/bin/uniq
-	ln -s /bin/busybox /usr/bin/comm
+	ln -s /bin/busybox $1/usr/bin/sort
+	ln -s /bin/busybox $1/usr/bin/uniq
+	ln -s /bin/busybox $1/usr/bin/comm
 }
diff -r 0ee75cad7429 -r 6afc9676e679 coreutils-file-special/receipt
--- a/coreutils-file-special/receipt	Sat May 07 11:24:42 2011 +0000
+++ b/coreutils-file-special/receipt	Sat May 07 11:36:11 2011 +0000
@@ -48,19 +48,19 @@
 pre_remove()
 {
 	# Need to handle the removal of ln
-	cp -a -fd /bin/ln /bin/ln-coreutils
+	cp -a -fd /bin/ln $1/bin/ln-coreutils
 }
 
 post_remove()
 {
 	# Restore ln
-	ln-coreutils -s /bin/busybox /bin/ln
+	ln-coreutils -s /bin/busybox $1/bin/ln
 
-	ln -s /bin/busybox /bin/mkdir
-	ln -s /bin/busybox /bin/mknod
-	ln -s /bin/busybox /bin/rmdir
-	ln -s /bin/busybox /usr/bin/mkfifo
-	ln -s /bin/busybox /usr/bin/readlink
+	ln -s /bin/busybox $1/bin/mkdir
+	ln -s /bin/busybox $1/bin/mknod
+	ln -s /bin/busybox $1/bin/rmdir
+	ln -s /bin/busybox $1/usr/bin/mkfifo
+	ln -s /bin/busybox $1/usr/bin/readlink
 	
-	rm -f /bin/ln-coreutils
+	rm -f $1/bin/ln-coreutils
 }
diff -r 0ee75cad7429 -r 6afc9676e679 coreutils-file-summarize/receipt
--- a/coreutils-file-summarize/receipt	Sat May 07 11:24:42 2011 +0000
+++ b/coreutils-file-summarize/receipt	Sat May 07 11:36:11 2011 +0000
@@ -46,11 +46,11 @@
 
 post_remove()
 {
-	ln -s /bin/busybox /usr/bin/wc
-	ln -s /bin/busybox /usr/bin/sum
-	ln -s /bin/busybox /usr/bin/cksum
-	ln -s /bin/busybox /usr/bin/md5sum
-	ln -s /bin/busybox /usr/bin/sha1sum
-	ln -s /bin/busybox /usr/bin/sha256sum
-	ln -s /bin/busybox /usr/bin/sha512sum
+	ln -s /bin/busybox $1/usr/bin/wc
+	ln -s /bin/busybox $1/usr/bin/sum
+	ln -s /bin/busybox $1/usr/bin/cksum
+	ln -s /bin/busybox $1/usr/bin/md5sum
+	ln -s /bin/busybox $1/usr/bin/sha1sum
+	ln -s /bin/busybox $1/usr/bin/sha256sum
+	ln -s /bin/busybox $1/usr/bin/sha512sum
 }
diff -r 0ee75cad7429 -r 6afc9676e679 coreutils-line/receipt
--- a/coreutils-line/receipt	Sat May 07 11:24:42 2011 +0000
+++ b/coreutils-line/receipt	Sat May 07 11:36:11 2011 +0000
@@ -38,5 +38,5 @@
 
 post_remove()
 {
-	ln -s /bin/busybox /usr/bin/cut
+	ln -s /bin/busybox $1/usr/bin/cut
 }
diff -r 0ee75cad7429 -r 6afc9676e679 coreutils-numeric/receipt
--- a/coreutils-numeric/receipt	Sat May 07 11:24:42 2011 +0000
+++ b/coreutils-numeric/receipt	Sat May 07 11:36:11 2011 +0000
@@ -37,5 +37,5 @@
 
 post_remove()
 {
-	ln -s /bin/busybox /usr/bin/seq
+	ln -s /bin/busybox $1/usr/bin/seq
 }
diff -r 0ee75cad7429 -r 6afc9676e679 coreutils-operations/receipt
--- a/coreutils-operations/receipt	Sat May 07 11:24:42 2011 +0000
+++ b/coreutils-operations/receipt	Sat May 07 11:36:11 2011 +0000
@@ -51,11 +51,11 @@
 {
 	# use busybox ln applet directly since /bin/ln
         # in this package is remove already
-	/bin/busybox ln -s /bin/busybox /bin/cp
-	/bin/busybox ln -s /bin/busybox /bin/dd
-	/bin/busybox ln -s /bin/busybox /bin/mv
-	/bin/busybox ln -s /bin/busybox /bin/ln
-	/bin/busybox ln -s /bin/busybox /bin/rm
-	/bin/busybox ln -s /bin/busybox /usr/bin/install
-	/bin/busybox ln -s /bin/busybox /usr/bin/shred
+	/bin/busybox ln -s /bin/busybox $1/bin/cp
+	/bin/busybox ln -s /bin/busybox $1/bin/dd
+	/bin/busybox ln -s /bin/busybox $1/bin/mv
+	/bin/busybox ln -s /bin/busybox $1/bin/ln
+	/bin/busybox ln -s /bin/busybox $1/bin/rm
+	/bin/busybox ln -s /bin/busybox $1/usr/bin/install
+	/bin/busybox ln -s /bin/busybox $1/usr/bin/shred
 }
diff -r 0ee75cad7429 -r 6afc9676e679 coreutils-path/receipt
--- a/coreutils-path/receipt	Sat May 07 11:24:42 2011 +0000
+++ b/coreutils-path/receipt	Sat May 07 11:36:11 2011 +0000
@@ -38,6 +38,6 @@
 
 post_remove()
 {
-	ln -s /bin/busybox /usr/bin/basename
-	ln -s /bin/busybox /usr/bin/dirname
+	ln -s /bin/busybox $1/usr/bin/basename
+	ln -s /bin/busybox $1/usr/bin/dirname
 }
diff -r 0ee75cad7429 -r 6afc9676e679 coreutils-print/receipt
--- a/coreutils-print/receipt	Sat May 07 11:24:42 2011 +0000
+++ b/coreutils-print/receipt	Sat May 07 11:36:11 2011 +0000
@@ -41,7 +41,7 @@
 
 post_remove()
 {
-	ln -s /bin/busybox /bin/echo
-	ln -s /bin/busybox /usr/bin/printf
-	ln -s /bin/busybox /usr/bin/yes
+	ln -s /bin/busybox $1/bin/echo
+	ln -s /bin/busybox $1/usr/bin/printf
+	ln -s /bin/busybox $1/usr/bin/yes
 }
diff -r 0ee75cad7429 -r 6afc9676e679 coreutils-redirection/receipt
--- a/coreutils-redirection/receipt	Sat May 07 11:24:42 2011 +0000
+++ b/coreutils-redirection/receipt	Sat May 07 11:36:11 2011 +0000
@@ -36,5 +36,5 @@
 
 post_remove()
 {
-	ln -s /bin/busybox /usr/bin/tee
+	ln -s /bin/busybox $1/usr/bin/tee
 }
diff -r 0ee75cad7429 -r 6afc9676e679 coreutils/receipt
--- a/coreutils/receipt	Sat May 07 11:24:42 2011 +0000
+++ b/coreutils/receipt	Sat May 07 11:36:11 2011 +0000
@@ -26,7 +26,7 @@
 			continue
 		fi
 		echo "Apply $patch_file"
-		patch -p1 < ../stuff/$patch_file || return 1
+		patch -p1 < $stuff/$patch_file || return 1
 		touch done.$patch_file
 	done <<EOT
 ls.u
@@ -36,13 +36,7 @@
 	sed -i 's/1.10a/1.10.2/' configure.ac || return 1
 	sed -i 's/dist-xz/dist-lzma/' configure.ac || return 1
 
-	./configure \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		$CONFIGURE_ARGS &&
-	make &&
-	make DESTDIR=$PWD/_pkg install
+	./configure && make && make install
 
 	# Restore original sigcontext.h
 	# mv -f /usr/include/asm/sigcontext.h.bak /usr/include/asm/sigcontext.h
@@ -88,8 +82,8 @@
 
 post_remove()
 {
-	ln -s /bin/busybox /usr/bin/od
-	ln -s /bin/busybox /usr/bin/split
+	ln -s /bin/busybox $1/usr/bin/od
+	ln -s /bin/busybox $1/usr/bin/split
 }
 
 clean_wok()