Add patch to build with the NetBSD version of libedit; and add libedit as a dependency.

Package-Manager: portage-2.1.2_rc4-r4

4 files changed, 42 insertions, 17 deletions

diff --git a/sys-freebsd/freebsd-usbin/ChangeLog b/sys-freebsd/freebsd-usbin/ChangeLog
index 9198280a9ae5..dc6ce296c9e0 100644
--- a/sys-freebsd/freebsd-usbin/ChangeLog
+++ b/sys-freebsd/freebsd-usbin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-freebsd/freebsd-usbin
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/ChangeLog,v 1.36 2006/12/29 15:22:27 flameeyes Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/ChangeLog,v 1.37 2007/01/03 16:02:32 flameeyes Exp $
+
+  03 Jan 2007; Diego Pettenò <flameeyes@gentoo.org>
+  +files/freebsd-usbin-6.2_rc2-libedit-netbsd.patch,
+  freebsd-usbin-6.2_rc2.ebuild:
+  Add patch to build with the NetBSD version of libedit; and add libedit as a
+  dependency.
 
 *freebsd-usbin-6.2_rc2 (29 Dec 2006)
 
diff --git a/sys-freebsd/freebsd-usbin/Manifest b/sys-freebsd/freebsd-usbin/Manifest
index a9ffc76ecca9..3ec405da3f84 100644
--- a/sys-freebsd/freebsd-usbin/Manifest
+++ b/sys-freebsd/freebsd-usbin/Manifest
@@ -17,6 +17,10 @@ AUX freebsd-usbin-6.1-nowrap.patch 1256 RMD160 2356f3fc63a6d27b399e7ec7f2d8637fa
 MD5 13ff92c94bd109435bff0855224d1116 files/freebsd-usbin-6.1-nowrap.patch 1256
 RMD160 2356f3fc63a6d27b399e7ec7f2d8637fa519712d files/freebsd-usbin-6.1-nowrap.patch 1256
 SHA256 e1413acbf003be3fa3a73f8fa0bdf79caa99885192622c79b034345d600b92f8 files/freebsd-usbin-6.1-nowrap.patch 1256
+AUX freebsd-usbin-6.2_rc2-libedit-netbsd.patch 552 RMD160 71f2acb0c53f1e027b19d9b35f94e502ecbc3d7e SHA1 b8d28fbebe44a0904e8550f38f3ebd2cb7ed0d7b SHA256 1d09fe1ed65aebbb1e48f10231a5da9342ef850a7a13afdaee971e7e70d0d57a
+MD5 ba55fb141d3ffc2ab8a51719d4053ce6 files/freebsd-usbin-6.2_rc2-libedit-netbsd.patch 552
+RMD160 71f2acb0c53f1e027b19d9b35f94e502ecbc3d7e files/freebsd-usbin-6.2_rc2-libedit-netbsd.patch 552
+SHA256 1d09fe1ed65aebbb1e48f10231a5da9342ef850a7a13afdaee971e7e70d0d57a files/freebsd-usbin-6.2_rc2-libedit-netbsd.patch 552
 AUX freebsd-usbin-adduser.patch 428 RMD160 fecedb0bad9f29e9f0d889b2fce0edeb9a954d0b SHA1 3407974fcd42701d1587684f14547b5e02b6b342 SHA256 2e91737ffefd3b7ce3b55da4ce98eb0425961bba2d4a7c4e7c7ffabc1d38f2af
 MD5 5444cbe3e2bc667285b7a68c02785017 files/freebsd-usbin-adduser.patch 428
 RMD160 fecedb0bad9f29e9f0d889b2fce0edeb9a954d0b files/freebsd-usbin-adduser.patch 428
@@ -103,14 +107,14 @@ EBUILD freebsd-usbin-6.1-r1.ebuild 4711 RMD160 84233ad505daa08b6ac352edd733eee70
 MD5 f0ef09d38ccd6b0b7694725a18561ecd freebsd-usbin-6.1-r1.ebuild 4711
 RMD160 84233ad505daa08b6ac352edd733eee70c016672 freebsd-usbin-6.1-r1.ebuild 4711
 SHA256 c31b0b8d221d596f9eea396c655201fd2c6c7c18bbaf175f11ac81db9f459088 freebsd-usbin-6.1-r1.ebuild 4711
-EBUILD freebsd-usbin-6.2_rc2.ebuild 5333 RMD160 a03f67c9ea8e02870650a4e39ef691953d6f8cc9 SHA1 33537d8f60a5e519e3701a3026775faefa615120 SHA256 c538705ebca96a50f1f71835b224ea45d8c0c4cd4070021b1275c110cb516ff2
-MD5 55191aceec9066f6d2231c0dab6706dd freebsd-usbin-6.2_rc2.ebuild 5333
-RMD160 a03f67c9ea8e02870650a4e39ef691953d6f8cc9 freebsd-usbin-6.2_rc2.ebuild 5333
-SHA256 c538705ebca96a50f1f71835b224ea45d8c0c4cd4070021b1275c110cb516ff2 freebsd-usbin-6.2_rc2.ebuild 5333
-MISC ChangeLog 12829 RMD160 e087f764023a8e8093dc1e7f0973eec92649a621 SHA1 43363fc10c3c8764f672305af414d16c73211318 SHA256 34c81c4991ea35d8125c4452f7f5a172e8f1a959a749f722b2d50484c1c9c768
-MD5 f6d2f2583fb58466c8b86ae9e7c3c18e ChangeLog 12829
-RMD160 e087f764023a8e8093dc1e7f0973eec92649a621 ChangeLog 12829
-SHA256 34c81c4991ea35d8125c4452f7f5a172e8f1a959a749f722b2d50484c1c9c768 ChangeLog 12829
+EBUILD freebsd-usbin-6.2_rc2.ebuild 5399 RMD160 ce007f8418426c948abb8644829442a735134192 SHA1 600841604b5683f3216e61406de66f32c5e015a0 SHA256 5dc86e43420554d08068ffec0a101475725346d93758f3dfb46b7b2c7867d9b1
+MD5 3a55de49aad99994db0ff67272ae9893 freebsd-usbin-6.2_rc2.ebuild 5399
+RMD160 ce007f8418426c948abb8644829442a735134192 freebsd-usbin-6.2_rc2.ebuild 5399
+SHA256 5dc86e43420554d08068ffec0a101475725346d93758f3dfb46b7b2c7867d9b1 freebsd-usbin-6.2_rc2.ebuild 5399
+MISC ChangeLog 13060 RMD160 824b49397e7122b1d912860e7491d128d144ccd6 SHA1 d1381e7832543805d331a96270d20aee4bc562fa SHA256 6a312908b63aac5a37d0dca32829972500c006450eb980c7744f6dff56b89b39
+MD5 b203a88863b8db2d5a131dfe070f24e3 ChangeLog 13060
+RMD160 824b49397e7122b1d912860e7491d128d144ccd6 ChangeLog 13060
+SHA256 6a312908b63aac5a37d0dca32829972500c006450eb980c7744f6dff56b89b39 ChangeLog 13060
 MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7
 MD5 2bd48a5ae413433cbb36110b219ce97c metadata.xml 156
 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 metadata.xml 156
@@ -122,9 +126,9 @@ MD5 e041b4e19c86cc21217a557529768b0f files/digest-freebsd-usbin-6.2_rc2 2430
 RMD160 4a1357c6bebfb43cdda1db2f802c945f9b1bc86c files/digest-freebsd-usbin-6.2_rc2 2430
 SHA256 9f42c76dcdb48089548274792ad71c34328eb17ae23c9632eaedecfe9aa4ac8d files/digest-freebsd-usbin-6.2_rc2 2430
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
+Version: GnuPG v2.0.1 (GNU/Linux)
 
-iD8DBQFFlTK9AiZjviIA2XgRAv4UAJ97inqxHbIdOu0NYEGiACvzBOpABACgyqpW
-Dxm9NociWiz4VHH4XV06Sp0=
-=iV1R
+iD8DBQFFm9OjAiZjviIA2XgRAnVeAKDvqYTVp8aTsgelyA1uQvZTzOS1sACfSZUt
+oPCSqN5IOQBZ0z4xqSc+ul4=
+=J0eE
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-6.2_rc2-libedit-netbsd.patch b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-6.2_rc2-libedit-netbsd.patch
new file mode 100644
index 000000000000..fe8a807ace31
--- /dev/null
+++ b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-6.2_rc2-libedit-netbsd.patch
@@ -0,0 +1,13 @@
+Index: fbsd-6.2rc2/usr.sbin/cdcontrol/cdcontrol.c
+===================================================================
+--- fbsd-6.2rc2.orig/usr.sbin/cdcontrol/cdcontrol.c
++++ fbsd-6.2rc2/usr.sbin/cdcontrol/cdcontrol.c
+@@ -1130,7 +1130,7 @@ input (int *cmd)
+ 				el = el_init("cdcontrol", stdin, stdout,
+ 				    stderr);
+ 				hist = history_init();
+-				history(hist, &he, H_EVENT, 100);
++				history(hist, &he, H_SETSIZE, 100);
+ 				el_set(el, EL_HIST, history, hist);
+ 				el_set(el, EL_EDITOR, "emacs");
+ 				el_set(el, EL_PROMPT, cdcontrol_prompt);
diff --git a/sys-freebsd/freebsd-usbin/freebsd-usbin-6.2_rc2.ebuild b/sys-freebsd/freebsd-usbin/freebsd-usbin-6.2_rc2.ebuild
index 889b655a789f..1ca2ef4fdf65 100644
--- a/sys-freebsd/freebsd-usbin/freebsd-usbin-6.2_rc2.ebuild
+++ b/sys-freebsd/freebsd-usbin/freebsd-usbin-6.2_rc2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/freebsd-usbin-6.2_rc2.ebuild,v 1.1 2006/12/29 15:22:27 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/freebsd-usbin-6.2_rc2.ebuild,v 1.2 2007/01/03 16:02:32 flameeyes Exp $
 
 inherit bsdmk freebsd flag-o-matic eutils
 
@@ -25,6 +25,7 @@ RDEPEND="=sys-freebsd/freebsd-lib-${RV}*
 	=sys-freebsd/freebsd-libexec-${RV}*
 	ssl? ( dev-libs/openssl )
 	tcpd? ( sys-apps/tcp-wrappers )
+	dev-libs/libedit
 	net-libs/libpcap"
 DEPEND="${RDEPEND}
 	=sys-freebsd/freebsd-mk-defs-${RV}*
@@ -69,7 +70,8 @@ pkg_setup() {
 PATCHES="${FILESDIR}/${PN}-6.0-fixmakefiles.patch
 	${FILESDIR}/${PN}-6.1-nowrap.patch
 	${FILESDIR}/${PN}-6.1-gcc41.patch
-	${FILESDIR}/${PN}-adduser.patch"
+	${FILESDIR}/${PN}-adduser.patch
+	${FILESDIR}/${PN}-6.2_rc2-libedit-netbsd.patch"
 
 REMOVE_SUBDIRS="
 	named named-checkzone named-checkconf rndc rndc-confgen