diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2011-11-07 22:47:46 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2011-11-07 22:47:46 +0000 |
| commit | 7c13df4f35c530a4cec05784a37391b388ece242 (patch) | |
| tree | 9791f557c4357701f47220450047df163c1b499d /sys-freebsd/freebsd-lib | |
| parent | Revbump to migrate the icedtea-bin handle from 'icedtea6-bin' to the standard... (diff) | |
| download | gentoo-2-7c13df4f35c530a4cec05784a37391b388ece242.tar.gz gentoo-2-7c13df4f35c530a4cec05784a37391b388ece242.tar.bz2 gentoo-2-7c13df4f35c530a4cec05784a37391b388ece242.zip | |
fix manpage collision with readline
(Portage version: 2.2.0_alpha72/cvs/Linux x86_64)
Diffstat (limited to 'sys-freebsd/freebsd-lib')
| -rw-r--r-- | sys-freebsd/freebsd-lib/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-mancol.patch | 11 | ||||
| -rw-r--r-- | sys-freebsd/freebsd-lib/freebsd-lib-9.0_rc1.ebuild | 3 |
3 files changed, 18 insertions, 2 deletions
diff --git a/sys-freebsd/freebsd-lib/ChangeLog b/sys-freebsd/freebsd-lib/ChangeLog index e3cbef553461..e8ecfe5669b7 100644 --- a/sys-freebsd/freebsd-lib/ChangeLog +++ b/sys-freebsd/freebsd-lib/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-freebsd/freebsd-lib # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.102 2011/11/07 16:46:26 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.103 2011/11/07 22:47:46 aballier Exp $ + + 07 Nov 2011; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0_rc1.ebuild, + +files/freebsd-lib-9.0-mancol.patch: + fix manpage collision with readline 07 Nov 2011; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0_rc1.ebuild: fix sed calls with gnu sed when bsd sed is not available diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-mancol.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-mancol.patch new file mode 100644 index 000000000000..64bdd9b557aa --- /dev/null +++ b/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-mancol.patch @@ -0,0 +1,11 @@ +--- lib/libedit/Makefile.old 2011-11-07 16:02:33.000000000 +0000 ++++ lib/libedit/Makefile 2011-11-07 16:02:53.000000000 +0000 +@@ -17,7 +17,7 @@ + + MLINKS= editline.3 el_deletestr.3 editline.3 el_end.3 editline.3 el_init.3 \ + editline.3 el_get.3 editline.3 el_getc.3 editline.3 el_gets.3 \ +- editline.3 history.3 editline.3 history_end.3 \ ++ editline.3 history_libedit.3 editline.3 history_end.3 \ + editline.3 history_init.3 editline.3 el_insertstr.3 \ + editline.3 el_line.3 editline.3 el_parse.3 editline.3 el_push.3 \ + editline.3 el_reset.3 editline.3 el_resize.3 editline.3 el_set.3 \ diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-9.0_rc1.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-9.0_rc1.ebuild index 0b0bb5ace436..01131937fde6 100644 --- a/sys-freebsd/freebsd-lib/freebsd-lib-9.0_rc1.ebuild +++ b/sys-freebsd/freebsd-lib/freebsd-lib-9.0_rc1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0_rc1.ebuild,v 1.3 2011/11/07 16:46:26 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0_rc1.ebuild,v 1.4 2011/11/07 22:47:46 aballier Exp $ EAPI=2 @@ -89,6 +89,7 @@ PATCHES=( "${FILESDIR}/${PN}-6.2-bluetooth.patch" "${FILESDIR}/${PN}-8.0-rpcsec_gss.patch" "${FILESDIR}/${PN}-9.0-liblink.patch" + "${FILESDIR}/${PN}-9.0-mancol.patch" "${FILESDIR}/${PN}-bsdxml2expat.patch" ) # Here we disable and remove source which we don't need or want |