tweak

5 files changed, 37 insertions, 17 deletions

diff --git a/sys-apps/man/ChangeLog b/sys-apps/man/ChangeLog
index 8d4099a444ad..7991646dd793 100644
--- a/sys-apps/man/ChangeLog
+++ b/sys-apps/man/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/man
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/ChangeLog,v 1.36 2003/09/06 12:17:06 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/ChangeLog,v 1.37 2003/09/06 13:46:56 taviso Exp $
+
+  06 Sep 2003; Tavis Ormandy <taviso@gentoo.org> man-1.5m.ebuild,
+  files/man-1.5m-makewhatis.cron:
+  remove symlinked paths with a patch.
 
 *man-1.5m (06 Sep 2003)
 
diff --git a/sys-apps/man/Manifest b/sys-apps/man/Manifest
index 005dff4130f4..063914bd5f00 100644
--- a/sys-apps/man/Manifest
+++ b/sys-apps/man/Manifest
@@ -1,14 +1,15 @@
 MD5 d020fa3baaf93822ab983d529f28e7e1 man-1.5l-r3.ebuild 2311
-MD5 f81d7194bd7a5cd7d401526d28c3fc29 man-1.5m.ebuild 2583
+MD5 0076a6ffc0280b87ffae95fcf906b66b man-1.5m.ebuild 2766
 MD5 f8b1c002982c8ad007dad7d16145dc78 man-1.5k-r1.ebuild 2563
 MD5 ee72fd94fb8f63b92b9cb14d356b991d man-1.5l-r5.ebuild 2409
 MD5 e7dc30c047d82ceee603b52863eebb05 man-1.5l-r4.ebuild 2357
 MD5 a825386d37ad27ccddca70297edd6bfa man-1.5i-r3.ebuild 1723
 MD5 ec0aa69a15cfed6240ef9c7666af616c man-1.5l-r6.ebuild 2594
-MD5 498f9c454a9c9f1029f556f55b863707 ChangeLog 6058
+MD5 9952aa3d421fc983bd4fd099fa4c3a86 ChangeLog 6198
 MD5 cbbd4de51a8359a1ae81f46f2dad6bd8 files/man-1.5k-search-order.patch 489
 MD5 7de4684156992ffd479e773a4abc79d7 files/man-1.5l-locale-debug-info.patch 2128
 MD5 cbbd4de51a8359a1ae81f46f2dad6bd8 files/man-1.5l-search-order.patch 489
+MD5 fc750a4d956da7cb889e89722fe8f4e2 files/man-1.5m-defmanpath-symlinks.patch 750
 MD5 53e5d8000368e638927ed8f4c0411f18 files/man-1.5k-util_c-segfault.patch 2275
 MD5 7de4684156992ffd479e773a4abc79d7 files/man-1.5m-locale-debug-info.patch 2128
 MD5 c5192bd8b69dea5e3b281950a427d025 files/man-1.5k-wrong-quotes.patch 340
@@ -22,7 +23,6 @@ MD5 08bb9cc46b14ee967cab2354dc1e56a8 files/man-1.5l-redhat-patches.patch 7166
 MD5 d8990b0dc5c9670156737c7012de3e9e files/man-1.5l-wrong-quotes.patch 411
 MD5 fe9f5db8b8b6feaaac25563cb294c901 files/man-1.5m-util_c-segfault.patch 2276
 MD5 df6ae39cf3544b31e1d9e11b74b43d13 files/man-1.5k-groff-1.18.patch 634
-MD5 eec39d59daf326df6282eb7c88212353 files/man-1.5m-makewhatis.cron 179
 MD5 cb6f4195874e0c7bd39bc6ccc26611b7 files/man-1.5m-security.patch 781
 MD5 34fd8ac346c17188a9eb54e64276feee files/makewhatis.cron 155
 MD5 d8990b0dc5c9670156737c7012de3e9e files/man-1.5m-wrong-quotes.patch 411
diff --git a/sys-apps/man/files/man-1.5m-defmanpath-symlinks.patch b/sys-apps/man/files/man-1.5m-defmanpath-symlinks.patch
new file mode 100644
index 000000000000..7d359be922ba
--- /dev/null
+++ b/sys-apps/man/files/man-1.5m-defmanpath-symlinks.patch
@@ -0,0 +1,21 @@
+diff -urN man-1.5m2.orig/src/makewhatis.sh man-1.5m2/src/makewhatis.sh
+--- man-1.5m2.orig/src/makewhatis.sh	2003-09-06 14:57:10.000000000 +0100
++++ man-1.5m2/src/makewhatis.sh	2003-09-06 14:57:52.000000000 +0100
+@@ -41,7 +41,7 @@
+ # and should be first.
+ # It is a bug to add /var/cache/man to DEFCATPATH.
+ dm=
+-for d in /usr/share/man /usr/X11R6/man /usr/local/man /usr/man
++for d in /usr/share/man /usr/X11R6/man /usr/local/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 /var/cache/man /usr/share/man/preformat /usr/man/preformat
++for d in /var/cache/man /usr/share/man/preformat
+ do
+     if [ -d $d ]; then
+ 	if [ x$dc = x ]; then dc=$d; else dc=$dc:$d; fi
diff --git a/sys-apps/man/files/man-1.5m-makewhatis.cron b/sys-apps/man/files/man-1.5m-makewhatis.cron
deleted file mode 100644
index efbf0cda3fd4..000000000000
--- a/sys-apps/man/files/man-1.5m-makewhatis.cron
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-#
-# Uncomment the following if you want 
-# your whatis database rebuilt regularly
-#
-# this is part of the man package
-#
-#
-
-#source /etc/profile.env
-#/usr/sbin/makewhatis -w
diff --git a/sys-apps/man/man-1.5m.ebuild b/sys-apps/man/man-1.5m.ebuild
index 1e4f81581dcc..2f3451c5fccb 100644
--- a/sys-apps/man/man-1.5m.ebuild
+++ b/sys-apps/man/man-1.5m.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/man-1.5m.ebuild,v 1.1 2003/09/06 12:17:06 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/man-1.5m.ebuild,v 1.2 2003/09/06 13:46:56 taviso Exp $
 
 IUSE="nls"
 
@@ -64,6 +64,12 @@ src_unpack() {
 	# <grant.mcdorman@sympatico.ca> for the patch, (bug #21018). 
 	# 	-taviso@gentoo.org
 	epatch ${FILESDIR}/${P}-LL-linelength.patch
+
+	# makewhatis traverses manpages twice, as default manpath
+	# contains two directories that are symlinked together
+	# (bug 23848)
+	#  -taviso@gentoo.org
+	epatch ${FILESDIR}/${P}-defmanpath-symlinks.patch
 }
 
 src_compile() {
@@ -101,5 +107,5 @@ src_install() {
 	keepdir /var/cache/man
 
 	exeinto /etc/cron.daily
-	newexe ${FILESDIR}/${P}-makewhatis.cron makewhatis.cron
+	doexe ${FILESDIR}/makewhatis.cron
 }