summaryrefslogtreecommitdiff
path: root/x11/tkman/patches/patch-ab
blob: c012afda348671298db692f015868b74fbc019f2 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
$NetBSD: patch-ab,v 1.5 2006/03/03 04:03:28 minskim Exp $

--- manpath.tcl.orig	2003-04-01 15:31:38.000000000 -0800
+++ manpath.tcl
@@ -24,8 +24,13 @@ proc manManpathCheck {} {
 	# doesn't that's OK (it's got a good whatis organization)
 
 	# BSDI concatenates all whatis information into single file
-	# share fBSDI with manualpage.tcl to find xxx.0 files
+	# share fBSDI with manualpage.tcl to find xxx.0 files,
+	# but NetBSD uses multiple whatis.db files.
+	if {![file executable "/usr/libexec/makewhatis"]} {
 	set manx(fBSDI) [file readable [set whatis "/usr/share/man/whatis.db"]]
+	} else {
+		set manx(fBSDI) 0
+	}
 	set fDebian [expr {[file readable [set whatis "/usr/share/man/index.bt"]] || [file readable [set whatis "/var/cache/man/index.bt"]] || [file readable [set whatis "/usr/man/index.bt"]] || [file readable [set whatis "/var/catman/index.bt"]]}]
 	# HPUX concatenates all whatis information into single file
 	set fHPUX 0; if {!$manx(fBSDI) && !$fDebian} { set fHPUX [file readable [set whatis "/usr/lib/whatis"]] }
@@ -84,10 +89,12 @@ proc manManpathCheck {} {
 			lappend manx(pathstat) $man($root)
 			set manx($root,latest) [lfirst [manLatestMan $root]]
 
-			# check for apropos index (called windex on Solaris)
+			# check for apropos index (called windex on Solaris, whatis.db on NetBSD)
 			if {!$manx(fBSDI) && !$fDebian && !$fHPUX} {
 				if {![file exists [set whatis [file join $root "windex"]]]} {
+					if ![file exists [set whatis $root/whatis.db]] {
 					set whatis $root/whatis
+					}
 				}
 			}