diff options
| author |   Timothy Redaelli <drizzt@gentoo.org> | 2007-01-11 21:59:55 +0000 |
|---|---|---|
| committer | Timothy Redaelli <drizzt@gentoo.org> | 2007-01-11 21:59:55 +0000 |
| commit | 2c4ab1da1edc74861058e8fbbe5ea8188944f2aa (patch) | |
| tree | 3b00389ce64b7357a28b0aba72c1838ed9a0d3df /sys-freebsd | |
| parent | arm/ia64/s390/sh stable (diff) | |
| download | gentoo-2-2c4ab1da1edc74861058e8fbbe5ea8188944f2aa.tar.gz gentoo-2-2c4ab1da1edc74861058e8fbbe5ea8188944f2aa.tar.bz2 gentoo-2-2c4ab1da1edc74861058e8fbbe5ea8188944f2aa.zip | |
Remove pbm manpage, it collides with netpbm
(Portage version: 2.1.2_rc4-r6)
Diffstat (limited to 'sys-freebsd')
| -rw-r--r-- | sys-freebsd/freebsd-share/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-freebsd/freebsd-share/freebsd-share-6.2_rc2.ebuild | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/sys-freebsd/freebsd-share/ChangeLog b/sys-freebsd/freebsd-share/ChangeLog index 78428f5ce0de..c32d94a8e916 100644 --- a/sys-freebsd/freebsd-share/ChangeLog +++ b/sys-freebsd/freebsd-share/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-freebsd/freebsd-share # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-share/ChangeLog,v 1.24 2007/01/05 21:30:53 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-share/ChangeLog,v 1.25 2007/01/11 21:59:55 drizzt Exp $ + + 11 Jan 2007; Timothy Redaelli <drizzt@gentoo.org> + freebsd-share-6.2_rc2.ebuild: + Remove pbm manpage, it collides with netpbm 05 Jan 2007; Diego Pettenò <flameeyes@gentoo.org> -files/freebsd-share-6.0-links.patch, -files/freebsd-share-6.1-utf8.patch, diff --git a/sys-freebsd/freebsd-share/freebsd-share-6.2_rc2.ebuild b/sys-freebsd/freebsd-share/freebsd-share-6.2_rc2.ebuild index 1a4cb648ed4e..8795daf9c428 100644 --- a/sys-freebsd/freebsd-share/freebsd-share-6.2_rc2.ebuild +++ b/sys-freebsd/freebsd-share/freebsd-share-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-share/freebsd-share-6.2_rc2.ebuild,v 1.1 2006/12/29 15:20:44 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-share/freebsd-share-6.2_rc2.ebuild,v 1.2 2007/01/11 21:59:55 drizzt Exp $ inherit bsdmk freebsd @@ -46,6 +46,8 @@ src_unpack() { sed -i -e 's:make.conf.5::' "${S}/man/man5/Makefile" # Remove mailer.conf manpage sed -i -e 's:mailer.conf.5::' "${S}/man/man5/Makefile" + # Remove pbm manpage + sed -i -e 's:pbm.5::' "${S}/man/man5/Makefile" # Don't install the arch-specific directories in subdirectories sed -i -e '/MANSUBDIR/d' "${S}"/man/man4/man4.{alpha,i386,sparc64}/Makefile |