diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2007-01-03 16:02:32 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2007-01-03 16:02:32 +0000 |
| commit | 5de991da4ca3e25c9abf89bdddef09db72dd4707 (patch) | |
| tree | 3c036a83024c7d9f48cefa98757dc5cd338fe0d1 /sys-freebsd | |
| parent | Version bump (diff) | |
| download | gentoo-2-5de991da4ca3e25c9abf89bdddef09db72dd4707.tar.gz gentoo-2-5de991da4ca3e25c9abf89bdddef09db72dd4707.tar.bz2 gentoo-2-5de991da4ca3e25c9abf89bdddef09db72dd4707.zip | |
Add patch to build with the NetBSD version of libedit; and add libedit as a dependency.
(Portage version: 2.1.2_rc4-r4)
Diffstat (limited to 'sys-freebsd')
3 files changed, 26 insertions, 5 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/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 |