Statically link libedit into sh so we don't have another mess if we

  ever change things again. We do the same thing with bash/readline too.
Package-Manager: portage-2.1.2.7

4 files changed, 35 insertions, 21 deletions

diff --git a/sys-freebsd/freebsd-bin/ChangeLog b/sys-freebsd/freebsd-bin/ChangeLog
index 66a6e92ebdd4..180ce6a214e6 100644
--- a/sys-freebsd/freebsd-bin/ChangeLog
+++ b/sys-freebsd/freebsd-bin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-freebsd/freebsd-bin
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-bin/ChangeLog,v 1.27 2007/01/15 21:34:27 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-bin/ChangeLog,v 1.28 2007/05/18 16:47:49 uberlord Exp $
+
+  18 May 2007; Roy Marples <uberlord@gentoo.org>
+  +files/freebsd-bin-6.2-sh-libedit.patch, freebsd-bin-6.2.ebuild:
+  Statically link libedit into sh so we don't have another mess if we
+  ever change things again. We do the same thing with bash/readline too.
 
 *freebsd-bin-6.2 (15 Jan 2007)
 
diff --git a/sys-freebsd/freebsd-bin/Manifest b/sys-freebsd/freebsd-bin/Manifest
index ce68765239ea..f61273777ecb 100644
--- a/sys-freebsd/freebsd-bin/Manifest
+++ b/sys-freebsd/freebsd-bin/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX freebsd-bin-6.0-flex-2.5.31.patch 277 RMD160 3dd13f280f462964feecd54ea9cafac8608955d4 SHA1 a1e9e16bc343610a30b60f77ee54e85e0c601326 SHA256 4c60ee85f4ec7dfb86eab1536eb0d6aae65c955c756362cd2b7f2b5a024dfb17
 MD5 88b10ffe4168218251cdaee3994b36e2 files/freebsd-bin-6.0-flex-2.5.31.patch 277
 RMD160 3dd13f280f462964feecd54ea9cafac8608955d4 files/freebsd-bin-6.0-flex-2.5.31.patch 277
@@ -9,17 +6,21 @@ AUX freebsd-bin-6.2-mkdir-posix.patch 3119 RMD160 cba1d464c174bf6f99b15f3c78b7b1
 MD5 fb3911b41fbc161929b2f8d1f4856e1e files/freebsd-bin-6.2-mkdir-posix.patch 3119
 RMD160 cba1d464c174bf6f99b15f3c78b7b16e7214d9d0 files/freebsd-bin-6.2-mkdir-posix.patch 3119
 SHA256 21bab8cdf05e7eedd934ae598707788af7cd0c6dad6913062a37298a91afc133 files/freebsd-bin-6.2-mkdir-posix.patch 3119
+AUX freebsd-bin-6.2-sh-libedit.patch 454 RMD160 88bf9aed92938fe767a49b152e68f5b1b0aeddf2 SHA1 d9b5a8bfc31afaf23ee36aecd18619dba645edf4 SHA256 94de63ac40a4c8fa8589bb4ba84bd04f48d88d06a9572eeb39755f586463afd2
+MD5 fe0f10070bc6c01f61f7b3c0d3b63c1e files/freebsd-bin-6.2-sh-libedit.patch 454
+RMD160 88bf9aed92938fe767a49b152e68f5b1b0aeddf2 files/freebsd-bin-6.2-sh-libedit.patch 454
+SHA256 94de63ac40a4c8fa8589bb4ba84bd04f48d88d06a9572eeb39755f586463afd2 files/freebsd-bin-6.2-sh-libedit.patch 454
 DIST freebsd-bin-6.2.tar.bz2 406748 RMD160 d687c8ee46fdcc6ea441367a50aad03b695ee616 SHA1 c4ea24e987c9e613b3400d83671688b22648f967 SHA256 202c2024d9a5326ddfd07cae49e2f663118a8ae2f8c79a40c92d513acece3935
 DIST freebsd-lib-6.2.tar.bz2 2670374 RMD160 95bbce7862fc7a406b8629914f281d5e01e5ea71 SHA1 3cd061f83ef6672d98599dd3a294ead6832a1b14 SHA256 8e0c909a79a9ed18841f8a5a6e25fc770f76de1a5dc20cbd6bc591bed52d1033
 DIST freebsd-sbin-6.2.tar.bz2 1162548 RMD160 f7d5f4ea5e4b5e03910a44a127b5670f8d6ebf2c SHA1 be082439c7ed657a1f188af93837f7c34677eddf SHA256 aef424c07686bb72fbd06e4fd66a01b00bd36b70fec02ebdc228061cd4b435dd
-EBUILD freebsd-bin-6.2.ebuild 1007 RMD160 4c19842a03d53dad9d3a4cd72ca9124d55e5ed3e SHA1 87bb2c2180c24c61182cee7c549895eb06c3246a SHA256 a8b9a4ed5008f5623d05ed61b277b590589272cc48fe9cb42ea989af94988434
-MD5 3f5acf0f5c1e60410fc966f5de7ca235 freebsd-bin-6.2.ebuild 1007
-RMD160 4c19842a03d53dad9d3a4cd72ca9124d55e5ed3e freebsd-bin-6.2.ebuild 1007
-SHA256 a8b9a4ed5008f5623d05ed61b277b590589272cc48fe9cb42ea989af94988434 freebsd-bin-6.2.ebuild 1007
-MISC ChangeLog 5104 RMD160 1a335b79b87ffb9999a6a237794dbf0a7e0d07aa SHA1 73acfa6e7beafdfe4a9497f93d24ee35ddbfd5ae SHA256 26869ac183b06bec283bfdfb9d8d36b14907898f000ff09b742c7ed244bdad6c
-MD5 c3371e890450ecb237b4cfa35ea3d266 ChangeLog 5104
-RMD160 1a335b79b87ffb9999a6a237794dbf0a7e0d07aa ChangeLog 5104
-SHA256 26869ac183b06bec283bfdfb9d8d36b14907898f000ff09b742c7ed244bdad6c ChangeLog 5104
+EBUILD freebsd-bin-6.2.ebuild 1050 RMD160 fb63f9d66df6e6cc22c66ea61a9e10a66518c053 SHA1 1b3b3e35b59395fb17adfb756b7ddcb907cf67a3 SHA256 301e1ceeb04dd8b84edd0d44fc7118eb3f5c3debd76bb1a98b60b915001870ab
+MD5 5ce18f92b35dddde942bc6bbff9b3839 freebsd-bin-6.2.ebuild 1050
+RMD160 fb63f9d66df6e6cc22c66ea61a9e10a66518c053 freebsd-bin-6.2.ebuild 1050
+SHA256 301e1ceeb04dd8b84edd0d44fc7118eb3f5c3debd76bb1a98b60b915001870ab freebsd-bin-6.2.ebuild 1050
+MISC ChangeLog 5366 RMD160 958f76789dabdd85482864f1af344f0d394ae51b SHA1 d2d727bd091686fcffc7c73f23ba0ab976dca40d SHA256 fc5680e9e4ef2486df4018d1191e9652ce5b0ae9bf062d9f6b376f221e335c0d
+MD5 6ee42be95af2adb2c1a17eddf1921674 ChangeLog 5366
+RMD160 958f76789dabdd85482864f1af344f0d394ae51b ChangeLog 5366
+SHA256 fc5680e9e4ef2486df4018d1191e9652ce5b0ae9bf062d9f6b376f221e335c0d ChangeLog 5366
 MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7
 MD5 2bd48a5ae413433cbb36110b219ce97c metadata.xml 156
 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 metadata.xml 156
@@ -27,10 +28,3 @@ SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 metadata
 MD5 0448d0164249da00bd5efbfcfb4501b3 files/digest-freebsd-bin-6.2 759
 RMD160 9ec2cb93091e0cb50ccbf6b55220d95662703745 files/digest-freebsd-bin-6.2 759
 SHA256 904cd56d8074066436ee1430ceded061180d4143051a013b8cb62ff1ffc621b7 files/digest-freebsd-bin-6.2 759
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
-
-iD8DBQFFq/NpGDyatLGpTbYRAtm6AKCEpAIy4uI4bS7dBnkBfNdUtXTJEgCgiUMb
-KUc9vE0pN8W8WHk/ccg6Xvs=
-=7Kye
------END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-bin/files/freebsd-bin-6.2-sh-libedit.patch b/sys-freebsd/freebsd-bin/files/freebsd-bin-6.2-sh-libedit.patch
new file mode 100644
index 000000000000..60e7e3e245f0
--- /dev/null
+++ b/sys-freebsd/freebsd-bin/files/freebsd-bin-6.2-sh-libedit.patch
@@ -0,0 +1,14 @@
+To avoid another libedit mess, we'll statically link it into sh
+
+diff -ur a/sh/Makefile b/sh/Makefile
+--- a/sh/Makefile	2007-05-18 17:27:25 +0100
++++ b/sh/Makefile	2007-05-18 17:27:47 +0100
+@@ -16,7 +16,7 @@
+ # builtin.1 in share/man/man1/.  
+ 
+ DPADD= ${LIBL} ${LIBEDIT} ${LIBTERMCAP}
+-LDADD= -ll -ledit -ltermcap
++LDADD= -Wl,-Bstatic -ledit -Wl,-Bdynamic -ll -ltermcap
+ 
+ LFLAGS= -8	# 8-bit lex scanner for arithmetic
+ CFLAGS+=-DSHELL -I. -I${.CURDIR}
diff --git a/sys-freebsd/freebsd-bin/freebsd-bin-6.2.ebuild b/sys-freebsd/freebsd-bin/freebsd-bin-6.2.ebuild
index bdc9a877eaca..508c9d811b01 100644
--- a/sys-freebsd/freebsd-bin/freebsd-bin-6.2.ebuild
+++ b/sys-freebsd/freebsd-bin/freebsd-bin-6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-bin/freebsd-bin-6.2.ebuild,v 1.1 2007/01/15 21:34:27 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-bin/freebsd-bin-6.2.ebuild,v 1.2 2007/05/18 16:47:49 uberlord Exp $
 
 inherit bsdmk freebsd
 
@@ -26,7 +26,8 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/bin
 
 PATCHES="${FILESDIR}/${PN}-6.0-flex-2.5.31.patch
-		${FILESDIR}/${PN}-6.2-mkdir-posix.patch"
+		${FILESDIR}/${PN}-6.2-mkdir-posix.patch
+		${FILESDIR}/${PN}-6.2-sh-libedit.patch"
 
 pkg_setup() {
 	use nls || mymakeopts="${mymakeopts} NO_NLS= "