Move sort in /bin so that it won't hinder booting without /usr partition.

Package-Manager: portage-2.1.1

3 files changed, 25 insertions, 14 deletions

diff --git a/sys-freebsd/freebsd-contrib/ChangeLog b/sys-freebsd/freebsd-contrib/ChangeLog
index 60ae97234d5e..ec1d09f8b378 100644
--- a/sys-freebsd/freebsd-contrib/ChangeLog
+++ b/sys-freebsd/freebsd-contrib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-freebsd/freebsd-contrib
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-contrib/ChangeLog,v 1.8 2006/07/27 01:22:29 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-contrib/ChangeLog,v 1.9 2006/09/09 16:25:52 flameeyes Exp $
+
+  09 Sep 2006; Diego Pettenò <flameeyes@gentoo.org>
+  freebsd-contrib-6.1.ebuild:
+  Move sort in /bin so that it won't hinder booting without /usr partition.
 
   27 Jul 2006; Diego Pettenò <flameeyes@gentoo.org>
   -freebsd-contrib-6.0.ebuild:
diff --git a/sys-freebsd/freebsd-contrib/Manifest b/sys-freebsd/freebsd-contrib/Manifest
index 00ed193f8273..1f7744b584e4 100644
--- a/sys-freebsd/freebsd-contrib/Manifest
+++ b/sys-freebsd/freebsd-contrib/Manifest
@@ -8,14 +8,14 @@ SHA256 ee3ec95497ceea4e88101f10f89b7e161eed1684a624ea9eae257a20408080da files/fr
 DIST freebsd-contrib-6.1.tar.bz2 36017365 RMD160 225f6ade032533d08b98b79cb29b75da2a3c74fa SHA1 adac960daad3f4169874fe0ba1050fe7e906aa23 SHA256 41283b7f78597cf81f98477aef04eb9cce2b130b1a2f8b5c7d647549c973c054
 DIST freebsd-gcc-3.4.2.tar.bz2 8447406 RMD160 bb9d525baee03e8d0b3897baf0c3b7b36d7941f2 SHA1 4bf1a6500f389d07050576b539bc32ffeb14255c SHA256 9946c986c73ddad8085a94771cac59755fd1c53e3d7cd2841817bdfd5cccd31f
 DIST freebsd-gnu-6.1.tar.bz2 867244 RMD160 5eeff2beb898984c40ae1d7c8adfdf41f2c0b8f8 SHA1 93dbfd053132c54b927f6ca5605158b8ccd0f969 SHA256 7bf79a2535539add15da6480830f771e5aea6594c24ffed2d196c7f0c700fdc1
-EBUILD freebsd-contrib-6.1.ebuild 1430 RMD160 3273b253a8e0be403aeee8941e55921b4396a350 SHA1 8d8471d531bc2bffb600386bf92354e01df2cb56 SHA256 b0681e15d02a0c23e6ae62bf50a8ce787de6911e1fdaa78da73126a0082dd74a
-MD5 642a238167a63c50603a5d4d34a1af6e freebsd-contrib-6.1.ebuild 1430
-RMD160 3273b253a8e0be403aeee8941e55921b4396a350 freebsd-contrib-6.1.ebuild 1430
-SHA256 b0681e15d02a0c23e6ae62bf50a8ce787de6911e1fdaa78da73126a0082dd74a freebsd-contrib-6.1.ebuild 1430
-MISC ChangeLog 2204 RMD160 0c6941048814e3136d83bb1a7bf03b70efe62021 SHA1 807b9961f24e7f812900649b8af4f487ea4b9e53 SHA256 482409629c3ba46827bc708ff5a4d427a0e42c23dd3e08c41e6062c9eb262ed9
-MD5 f742654b36d855b024db58548da40839 ChangeLog 2204
-RMD160 0c6941048814e3136d83bb1a7bf03b70efe62021 ChangeLog 2204
-SHA256 482409629c3ba46827bc708ff5a4d427a0e42c23dd3e08c41e6062c9eb262ed9 ChangeLog 2204
+EBUILD freebsd-contrib-6.1.ebuild 1575 RMD160 878c93163e17e9e7a0d8fe4c253f8a8c361e8f49 SHA1 1125be764cf7ee8d760123eafe6f055a7c0f0356 SHA256 5b655b619f9cfccf22e1c0c4ee28f278ec2c0c7fcbb66401ccd38342c6fcfac9
+MD5 5f4a339504dd097ba96d7c8aadb5ac96 freebsd-contrib-6.1.ebuild 1575
+RMD160 878c93163e17e9e7a0d8fe4c253f8a8c361e8f49 freebsd-contrib-6.1.ebuild 1575
+SHA256 5b655b619f9cfccf22e1c0c4ee28f278ec2c0c7fcbb66401ccd38342c6fcfac9 freebsd-contrib-6.1.ebuild 1575
+MISC ChangeLog 2364 RMD160 756c05f818ed942a5f5bbc8f8d538a3ddbcbc393 SHA1 7163383ebdaacea0f863e461a7c627be79bbd4d8 SHA256 537b1642a2751143a2aff77c3f3e0d74899b24c2ea1c40969b38c38e3832ee0b
+MD5 33db1a51f411f38f86972c6ef0b60ae1 ChangeLog 2364
+RMD160 756c05f818ed942a5f5bbc8f8d538a3ddbcbc393 ChangeLog 2364
+SHA256 537b1642a2751143a2aff77c3f3e0d74899b24c2ea1c40969b38c38e3832ee0b ChangeLog 2364
 MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7
 MD5 2bd48a5ae413433cbb36110b219ce97c metadata.xml 156
 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 metadata.xml 156
@@ -24,9 +24,9 @@ MD5 7337f39e121d6cad5948eb92fbee7eff files/digest-freebsd-contrib-6.1 777
 RMD160 63f1776d876d27f2d3a5851d3ba9028eb3b5a941 files/digest-freebsd-contrib-6.1 777
 SHA256 714f12051a166b013c8137135b0f3c5ce403f39495abe8061fe24f656188bc7a files/digest-freebsd-contrib-6.1 777
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFEyBVeAiZjviIA2XgRAoZnAJ9pf6Zwv1rjqoW+VQLvYNT2Ljd2ZQCgwJwm
-nRZ9FoulutD73uqfoN8sGiY=
-=htyX
+iD8DBQFFAuswAiZjviIA2XgRAjwsAJ0SfTUrjjL8BY/uw9oKd+JKudot5wCgnUzj
+PL9WuugG0xqRk/czp5BZqg8=
+=f9so
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-contrib/freebsd-contrib-6.1.ebuild b/sys-freebsd/freebsd-contrib/freebsd-contrib-6.1.ebuild
index 1edad7ece5a8..d4c1bd4435ff 100644
--- a/sys-freebsd/freebsd-contrib/freebsd-contrib-6.1.ebuild
+++ b/sys-freebsd/freebsd-contrib/freebsd-contrib-6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-contrib/freebsd-contrib-6.1.ebuild,v 1.1 2006/05/09 07:34:55 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-contrib/freebsd-contrib-6.1.ebuild,v 1.2 2006/09/09 16:25:52 flameeyes Exp $
 
 inherit bsdmk freebsd flag-o-matic
 
@@ -43,3 +43,10 @@ REMOVE_SUBDIRS="lib/libg2c lib/libgcc lib/libgcc_r lib/libgcov lib/libiberty
 
 PATCHES="${FILESDIR}/${PN}-5.3-lib_csu-makefile.patch"
 
+src_install() {
+	freebsd_src_install
+
+	# Move these to /bin for boot access
+	dodir /bin
+	mv "${D}/usr/bin/sort" "${D}/bin/" || die "mv failed"
+}