From 16bcf691bf7266ef48b76fd3a80291a450a1e783 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sat, 8 Jan 2005 02:23:44 +0000 Subject: Punt redhat fixes since they are outdated and not really useful anymore. --- sys-apps/man/ChangeLog | 7 +++++-- .../man/files/man-1.5o_p2-defmanpath-symlinks.patch | 20 ++++++++++++++++++++ sys-apps/man/man-1.5o_p2.ebuild | 9 ++------- 3 files changed, 27 insertions(+), 9 deletions(-) create mode 100644 sys-apps/man/files/man-1.5o_p2-defmanpath-symlinks.patch (limited to 'sys-apps/man') diff --git a/sys-apps/man/ChangeLog b/sys-apps/man/ChangeLog index 23dc502fc9c2..359deaade9a3 100644 --- a/sys-apps/man/ChangeLog +++ b/sys-apps/man/ChangeLog @@ -1,10 +1,13 @@ # ChangeLog for sys-apps/man # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/ChangeLog,v 1.63 2005/01/08 02:10:18 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/ChangeLog,v 1.64 2005/01/08 02:23:44 vapier Exp $ + +*man-1.5o_p2 (07 Jan 2005) 07 Jan 2005; Mike Frysinger - files/man-1.5m-groff-1.18.patch, -man-1.5o_p1.ebuild: + files/man-1.5m-groff-1.18.patch, +man-1.5o_p2.ebuild: Version bump. Also fix the gremlins #44201 by Chris Smith. + Punt redhat fixes since they are outdated and not really useful anymore. *man-1.5o_p1 (13 Dec 2004) diff --git a/sys-apps/man/files/man-1.5o_p2-defmanpath-symlinks.patch b/sys-apps/man/files/man-1.5o_p2-defmanpath-symlinks.patch new file mode 100644 index 000000000000..9261fb6aca4a --- /dev/null +++ b/sys-apps/man/files/man-1.5o_p2-defmanpath-symlinks.patch @@ -0,0 +1,20 @@ +--- man-1.5o2/src/makewhatis.sh.orig 2005-01-07 21:19:37.812163552 -0500 ++++ man-1.5o2/src/makewhatis.sh 2005-01-07 21:20:43.023249960 -0500 +@@ -41,7 +41,7 @@ + # and should be first. + # It is a bug to add /var/cache/man to DEFCATPATH. + dm= +-for d in /usr/man /usr/share/man ++for d in /usr/local/man /usr/share/man + do + if [ -d $d ]; then + if [ x$dm = x ]; then dm=$d; else dm=$dm:$d; fi +@@ -49,7 +49,7 @@ + done + DEFMANPATH=$dm + dc= +-for d in /usr/man/preformat /usr/man /usr/share/man/preformat /usr/share/man ++for d in /usr/local/man /usr/share/man + do + if [ -d $d ]; then + if [ x$dc = x ]; then dc=$d; else dc=$dc:$d; fi diff --git a/sys-apps/man/man-1.5o_p2.ebuild b/sys-apps/man/man-1.5o_p2.ebuild index 6482b8c4c0be..75c082b4b4d5 100644 --- a/sys-apps/man/man-1.5o_p2.ebuild +++ b/sys-apps/man/man-1.5o_p2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/man-1.5o_p2.ebuild,v 1.1 2005/01/08 02:10:18 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/man-1.5o_p2.ebuild,v 1.2 2005/01/08 02:23:44 vapier Exp $ inherit eutils flag-o-matic toolchain-funcs @@ -44,9 +44,6 @@ src_unpack() { # For groff-1.18 or later we need to call nroff with '-c' epatch ${FILESDIR}/man-1.5m-groff-1.18.patch - # Various fixes from Redhat - epatch ${FILESDIR}/man-1.5m-redhat-patches.patch - # Do not print the 'man: No such file or directory' error if # 'man -d' was called and the NLS catalogue was not found, as # it confuses people, and be more informative ... (bug #6360) @@ -60,9 +57,7 @@ src_unpack() { # makewhatis traverses manpages twice, as default manpath # contains two directories that are symlinked together - # (bug 23848) - # -taviso@gentoo.org - epatch ${FILESDIR}/man-1.5m-defmanpath-symlinks.patch + epatch ${FILESDIR}/man-1.5o_p2-defmanpath-symlinks.patch # Make sure the locale is searched in the right order #37778 epatch ${FILESDIR}/man-1.5m-locale-order.patch -- cgit v1.2.3-65-gdbad