diff options
| author | fredb <fredb@pkgsrc.org> | 2000-04-18 06:49:17 +0000 |
|---|---|---|
| committer | fredb <fredb@pkgsrc.org> | 2000-04-18 06:49:17 +0000 |
| commit | a39679e6b6ed338f9e14915761c6c9639347fe91 (patch) | |
| tree | 707b41d0713680eebb26632e486e5e2e5cad3820 | |
| parent | 6ad71732cfd8a8d1b25d04992de391e62fdfc733 (diff) | |
| download | pkgsrc-a39679e6b6ed338f9e14915761c6c9639347fe91.tar.gz | |
- - Update depends for rman package (wildcard).
- - Refine check for BSDI, and accept "whatis.db" for name(s) of apropos
database(s). /usr/share/man/whatis.db had been taken for BSDI-style
monolithic whatis.db. Now recognizes multiple whatis.db's in MANPATH.
(You still have to make them, e.g.: "for m in /usr/*/man
/usr/pkg/lib/perl5/man; do /usr/libexec/makewhatis $m; done".)
| -rw-r--r-- | x11/tkman/Makefile | 4 | ||||
| -rw-r--r-- | x11/tkman/files/patch-sum | 3 | ||||
| -rw-r--r-- | x11/tkman/patches/patch-ab | 35 |
3 files changed, 39 insertions, 3 deletions
diff --git a/x11/tkman/Makefile b/x11/tkman/Makefile index a4fc5409a9c..a92156a3358 100644 --- a/x11/tkman/Makefile +++ b/x11/tkman/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 1999/04/26 19:30:28 garbled Exp $ +# $NetBSD: Makefile,v 1.21 2000/04/18 06:49:17 fredb Exp $ # FreeBSD Id: Makefile,v 1.28 1997/12/08 15:51:20 tg Exp # @@ -10,7 +10,7 @@ EXTRACT_SUFX= .tar.Z MAINTAINER= packages@netbsd.org DEPENDS+= tk-8.0.5:../../x11/tk80 -DEPENDS+= rman-3.0.6:../../textproc/rman +DEPENDS+= rman-3.0.*:../../textproc/rman DEPENDS+= glimpse-4.1:../../textproc/glimpse USE_X11= yes diff --git a/x11/tkman/files/patch-sum b/x11/tkman/files/patch-sum index a0d848baefa..57a7c74236f 100644 --- a/x11/tkman/files/patch-sum +++ b/x11/tkman/files/patch-sum @@ -1,3 +1,4 @@ -$NetBSD: patch-sum,v 1.1 1999/07/09 14:23:31 agc Exp $ +$NetBSD: patch-sum,v 1.2 2000/04/18 06:49:18 fredb Exp $ MD5 (patch-aa) = 52e0019d707f606c1486bdddde93d1cc +MD5 (patch-ab) = bd6ca94464d9d4616ed7722d2ea7ff78 diff --git a/x11/tkman/patches/patch-ab b/x11/tkman/patches/patch-ab new file mode 100644 index 00000000000..88bb2a8748f --- /dev/null +++ b/x11/tkman/patches/patch-ab @@ -0,0 +1,35 @@ +$NetBSD: patch-ab,v 1.3 2000/04/18 06:49:18 fredb Exp $ + +--- manpath.tcl.orig Sat Nov 21 00:21:24 1998 ++++ manpath.tcl Tue Apr 18 01:14:34 2000 +@@ -19,8 +19,13 @@ + # 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 +- set manx(fBSDI) [file readable [set whatis "/usr/share/man/whatis.db"]] ++ # 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/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"]] } +@@ -79,10 +84,12 @@ + 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 $root/windex]] { +- set whatis $root/whatis ++ if ![file exists [set whatis $root/whatis.db]] { ++ set whatis $root/whatis ++ } + } + } + |