From dd5f2d4b88bd28823b28342a0c641eb585f4fe1f Mon Sep 17 00:00:00 2001 From: frueauf Date: Thu, 3 Dec 1998 13:09:11 +0000 Subject: Update tkman to 2.1b2, provided in pr 6509 by Johnny C. Lam. This version significantly improves Texinfo support: * full text searching includes Texinfo, RFC, and other text files * intrapage searching for Texinfo shows all matches (vs other info viewers) * fast Texinfo display (high quality on-the-fly formatting from Texinfo source) * yellow-marker highlights available on Texinfo * command name searches can match Texinfo names and (optionally) prefer them, --- x11/tkman/Makefile | 4 ++-- x11/tkman/files/md5 | 4 ++-- x11/tkman/patches/patch-aa | 50 +++++++++++++++++++++++++++++++++++----------- 3 files changed, 42 insertions(+), 16 deletions(-) (limited to 'x11/tkman') diff --git a/x11/tkman/Makefile b/x11/tkman/Makefile index ac648116c65..1226a7dab6d 100644 --- a/x11/tkman/Makefile +++ b/x11/tkman/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.17 1998/12/03 12:41:58 frueauf Exp $ +# $NetBSD: Makefile,v 1.18 1998/12/03 13:09:11 frueauf Exp $ # FreeBSD Id: Makefile,v 1.28 1997/12/08 15:51:20 tg Exp # -DISTNAME= tkman-2.1b1 +DISTNAME= tkman-2.1b2 CATEGORIES= x11 tk80 MASTER_SITES= ftp://ftp.cs.berkeley.edu/ucb/people/phelps/tcltk/ EXTRACT_SUFX= .tar.Z diff --git a/x11/tkman/files/md5 b/x11/tkman/files/md5 index c37d4aa5b08..beefb8702c7 100644 --- a/x11/tkman/files/md5 +++ b/x11/tkman/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.6 1998/09/22 09:36:11 agc Exp $ +$NetBSD: md5,v 1.7 1998/12/03 13:09:12 frueauf Exp $ -MD5 (tkman-2.1b1.tar.Z) = 040fc427c3f0eb4da71090c1a0e37d67 +MD5 (tkman-2.1b2.tar.Z) = 4543f4d2159e94d9b5bbf6fb04317bc9 diff --git a/x11/tkman/patches/patch-aa b/x11/tkman/patches/patch-aa index f940e3bb081..203737ccbde 100644 --- a/x11/tkman/patches/patch-aa +++ b/x11/tkman/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.4 1998/09/08 14:55:22 agc Exp $ +$NetBSD: patch-aa,v 1.5 1998/12/03 13:09:12 frueauf Exp $ ---- Makefile.orig Mon Jul 13 10:44:32 1998 -+++ Makefile Tue Sep 8 15:43:10 1998 -@@ -44,14 +44,16 @@ +--- Makefile.orig Sat Nov 21 01:21:26 1998 ++++ Makefile Sun Nov 29 05:26:12 1998 +@@ -41,14 +41,16 @@ ### you need to localize the paths on these lines #WISH = /usr/sww/tcl-8.0/bin/wish @@ -10,18 +10,18 @@ $NetBSD: patch-aa,v 1.4 1998/09/08 14:55:22 agc Exp $ +#WISH = /private/share/bin/wish #WISH = /private/share/bin/wish8.1 #WISH = /usr/local/bin/wish8.0 -+WISH= ${PREFIX}/bin/wish8.0 ++WISH = ${LOCALBASE}/bin/wish8.0 # the executable `tkman' is placed in BINDIR # this should be a directory that's in your bin PATH -BINDIR = /private/share/bin +#BINDIR = /private/share/bin #BINDIR = /usr/local/bin -+BINDIR= ${PREFIX}/bin ++BINDIR = ${PREFIX}/bin # OPTIONAL -@@ -97,10 +99,12 @@ +@@ -94,11 +96,26 @@ # will examine for matches if a search in the usual locations fails while searching # for a man pages and displaying its associated binaries (if any). # Use this feature carefully as a large number of directories can slow down startup. @@ -29,14 +29,29 @@ $NetBSD: patch-aa,v 1.4 1998/09/08 14:55:22 agc Exp $ +#mastermen = "/usr/man /usr/local/man" #mastermen = "/usr/man /usr/local/man /usr/sww/man /usr/share/man /usr/kerberos/man" -masterbin = "/usr/bin /usr/local/bin" -+mastermen = "/usr/share/man ${PREFIX}/man /usr/X11R6/man /usr/local/man" -+#masterbin = "/usr/bin /usr/local/bin" - #masterbin = "/usr/bin /usr/local/bin /usr/sww/bin /usr/sww/share/bin /usr/sww/share/X11R5/bin" -+masterbin = "/bin /sbin /usr/bin /usr/sbin ${PREFIX}/bin ${PREFIX}/sbin /usr/local/bin" +-#masterbin = "/usr/bin /usr/local/bin /usr/sww/bin /usr/sww/share/bin /usr/sww/share/X11R5/bin" ++mastermen = /usr/share/man ${LOCALBASE}/man ${X11BASE}/man ++.if (${PREFIX} != ${LOCALBASE}) && (${PREFIX} != ${X11BASE}) ++mastermen += ${PREFIX}/man ++.endif ++.if (${PREFIX} != "/usr/local") ++mastermen += /usr/local/man ++.endif ++#masterbin = "/usr/bin /usr/local/bin" ++#masterbin = "/usr/bin /usr/local/bin /usr/sww/bin /usr/sww/share/bin /usr/sww/share/X11R5/bin" ++masterbin = /bin /sbin /usr/bin /usr/sbin ++masterbin += ${LOCALBASE}/bin ${LOCALBASE}/sbin ${X11BASE}/bin ++.if (${PREFIX} != ${LOCALBASE}) && (${PREFIX} != ${X11BASE}) ++masterbin += ${PREFIX}/bin ++.endif ++.if (${PREFIX} != "/usr/local") ++masterbin += /usr/local/bin /usr/local/sbin ++.endif # names of common printers, in addition to default printer (PRINTER or LPDEST) -@@ -130,7 +134,7 @@ + # (individual users can edit this list in the Preferences panel) +@@ -127,7 +144,7 @@ # Lines are cached in .../man/cat@; # that is, the line length is appended to the usual cache directory names #manformat = {groff -te -Tascii -man /tmp/ll - 2>/dev/null} @@ -45,3 +60,14 @@ $NetBSD: patch-aa,v 1.4 1998/09/08 14:55:22 agc Exp $ # Ultrix users should uncomment the following line (you don't have eqn) #manformat = {tbl | nroff -man } # HP-UX uses a number of macros that groff doesn't define, so use the builtin nroff +@@ -359,8 +376,8 @@ + echo 'set manx(mintk) $(mintk)' >> tkman + echo 'set manx(newuser) $(newuser)' >> tkman + echo 'set manx(dirnameindex) $(dirnameindex)' >> tkman +- echo 'set manx(mastermen) $(mastermen)' >> tkman +- echo 'set manx(masterbin) $(masterbin)' >> tkman ++ echo 'set manx(mastermen) "$(mastermen)"' >> tkman ++ echo 'set manx(masterbin) "$(masterbin)"' >> tkman + echo 'set man(zcat) $(zcat)' >> tkman + echo 'set man(compress) $(compress)' >> tkman + echo 'set man(apropos) $(apropos)' >> tkman -- cgit v1.2.3