Upgrade to 2.0b7.

2 files changed, 83 insertions, 54 deletions

diff --git a/misc/tkman/files/patch-aa b/misc/tkman/files/patch-aa
index 2b83542a57a8..9dc241cf0dff 100644
--- a/misc/tkman/files/patch-aa
+++ b/misc/tkman/files/patch-aa
@@ -1,16 +1,13 @@
---- Makefile.orig	Wed Aug 14 21:51:18 1996
-+++ Makefile	Sat Oct 19 17:02:21 1996
-@@ -47,22 +47,22 @@
- 
+--- Makefile.orig	Sat Aug 23 02:55:32 1997
++++ Makefile	Mon Aug 25 11:06:34 1997
+@@ -38,13 +38,13 @@
  ### you need to localize the paths on these lines
  
--WISH = /usr/sww/tcl-7.5/bin/wish
--#WISH = /home/orodruin/h/bair/phelps/bin/sun4/wish4.2
--#WISH = /usr/local/bin/wish
-+#WISH = /usr/sww/tcl-7.5/bin/wish
-+#WISH = /home/orodruin/h/bair/phelps/bin/sun4/wish4.2
-+WISH = ${PREFIX}/bin/wish4.1
- 
+ #WISH = /usr/sww/tcl-8.0/bin/wish
+-WISH = /home/orodruin/h/bair/phelps/bin/sun4/wish
+-#WISH = /usr/local/bin/wish8.0
++#WISH = /home/orodruin/h/bair/phelps/bin/sun4/wish
++WISH = ${PREFIX}/bin/wish8.0
  
  # the executable `tkman' is placed in BINDIR
  # this should be a directory that's in your bin PATH
@@ -19,48 +16,78 @@
 +#BINDIR = /home/orodruin/h/bair/phelps/bin
 +BINDIR = ${PREFIX}/bin
  
- # directory in which to place the manual page.  The help information
- # is maintained in HTML, from which the [tn]roff version is 
- # automatically generated.
--MANDIR = /home/orodruin/h/bair/phelps/man/man1
-+#MANDIR = /home/orodruin/h/bair/phelps/man/man1
- #MANDIR = /usr/sww/X11/man/man1
--#MANDIR = /usr/local/man/man1
-+MANDIR = ${PREFIX}/man/man1
+ 
+ # OPTIONAL
+@@ -53,9 +53,9 @@
+ # (Follow pattern in sample "dir.tkman".)
+ # More information is given in tkman-help.html
+ # if you don't have Texinfo files, leave this variable empty
+-texinfodir = ""
++#texinfodir = ""
+ #texinfodir = /home/orodruin/h/bair/phelps/spine/tkman/info
+-#texinfodir = /usr/local/info
++texinfodir = ${PREFIX}/info
  
  
- # list of common printers, in addition to default printer (PRINTER or LPDEST)
-@@ -74,12 +74,12 @@
+ # OPTIONAL
+@@ -79,10 +79,12 @@
+ # 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.
+-mastermen = "/usr/man /usr/local/man"
++#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 = "${PREFIX}/man usr/share/man ${X11BASE}/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 = "/usr/bin ${PREFIX}/bin ${X11BASE}/bin"
  
- # # # MACHINE DEPENDENCIES # # #
  
--manformat = {tbl | neqn | nroff -man }
-+#manformat = {tbl | neqn | nroff -man }
- # col performs the line overlays implied by reverse line-feeds,
+ # names of common printers, in addition to default printer (PRINTER or LPDEST)
+@@ -99,13 +101,13 @@
  # but seems to kill international characters, such as u-with-umlaut
  #manformat = {tbl | neqn | nroff -man | col }
- # alternatives
+ # ALTERNATIVES
 -#manformat = {groff -Tascii -te -mandoc}
 +manformat = {groff -Tascii -te -mandoc}
- # Ultrix users should uncomment the following line
+ # Marco Melgazzi (marco@techie.com) prefers LONGER MAN PAGE LINES.
+ # The following line adds an entry in Preferences/See to set the length.
+ # You must use groff and the "/tmp/ll" path for this feature to take effect.
+ # lines are cached in .../man/cat<n>@<line-length>; 
+ #   that is, the line length is appended to the usual cache directory names
+-manformat = {groff -te -Tascii -man /tmp/ll - 2>/dev/null}
++#manformat = {groff -te -Tascii -man /tmp/ll - 2>/dev/null}
+ # Ultrix users should uncomment the following line (you don't have eqn)
  #manformat = {tbl | nroff -man }
- # for BSDI
-@@ -159,12 +159,12 @@
- # (Even if your pages aren't compressed, this speeds up searching dramatically,
- # which is why it's the default.)
- # If you choose this option, also set glimpseindex to use -o or -b.
--glimpse = "glimpse -N"
-+#glimpse = "glimpse -N"
+ # BSDI
+@@ -151,7 +153,7 @@
+ 
+ 
+ # pick a printing pipeline for which your platform has all the constituants
+-manprint = {groff -man -Tps -te -l}
++manprint = {groff -mandoc -Tps -te -l}
+ # alternatives
+ #manprint = {tbl | eqn | troff -man -t | lpr -t}
+ #manprint = {tbl | eqn | psroff -man}
+@@ -175,7 +177,7 @@
+ # so how can you lose?
+ 
+ # BY DEFAULT ON (Boolean scope set to entire file)
+-glimpse = "glimpse -W"
++#glimpse = "glimpse -W"
  # IF YOU DON'T WANT TO BOTHER WITH GLIMPSE, you can disable it here
- # ALSO DISABLE GLIMPSEINDEX BELOW
  #glimpse = ""
- # if you have any compressed pages (and aren't using -N), use the -z option
--#glimpse = "glimpse -z"
-+glimpse = "glimpse -z"
  # give the full path, if you'd like
- #glimpse = /usr/sww/bin/glimpse
+@@ -183,6 +185,7 @@
  # variations (refer to the Glimpse manual page)
-@@ -209,7 +209,7 @@
+ # no characters treated as meta characters:
+ #glimpse = "glimpse -Wk"
++glimpse = "glimpse -z"
+ 
+ # glimpseindex indexes the manual pages, for each component of one's MANPATH,
+ # and places the results in a set of files named .glimpse_* in that MANPATH
+@@ -224,7 +227,7 @@
  # default MANPATH to use if user doesn't have a MANPATH environment variable set.
  # Leave this empty to have TkMan calculate a MANPATH based on a users PATH
  # (like Perl man does).
@@ -69,12 +96,14 @@
  #manpathdef = /usr/man:/usr/local/man
  #manpathdef = /usr/man:/usr/local/man:/usr/sww/man:/usr/sww/X11/man
  # for SGI
-@@ -373,7 +373,7 @@
- 	$(CP) tkman $(BINDIR)
+@@ -395,8 +398,8 @@
  	chmod +rx $(BINDIR)/tkman
- 	$(CP) tkman.1 $(MANDIR)
+ 	$(CP) retkman $(BINDIR)
+ 	chmod +rx $(BINDIR)/retkman
 -	@echo 'You also need RosettaMan to run TkMan.'
+-	@echo 'Have you installed the elided text patch to Tk?'
 +#	@echo 'You also need RosettaMan to run TkMan.'
++#	@echo 'Have you installed the elided text patch to Tk?'
  
  test: dox tkman
  	cp tkman $(BINDIR)
diff --git a/misc/tkman/files/patch-ab b/misc/tkman/files/patch-ab
index 38a7fa02bfc6..30cfabbb66fc 100644
--- a/misc/tkman/files/patch-ab
+++ b/misc/tkman/files/patch-ab
@@ -1,11 +1,11 @@
---- tkman.tcl.orig	Mon Nov 11 21:18:41 1996
-+++ tkman.tcl	Thu Nov 14 20:07:27 1996
-@@ -5018,7 +5018,7 @@
- 				# ... then check for proper versions of selected executables
- 				if {[set info [lassoc $manx(bin-versioned) $tail]]!=""} {
- 					lset $info flag minvers
--					set execerr [catch {set lines [exec $fullpath $flag < /dev/null]} info]
-+					set execerr [catch {set lines [exec $fullpath $flag < /dev/null 2> /dev/null]} info]
- 				} elseif {[string match "g*" $tail]} {
- 					# could be a GNU -- maybe take this out since it lengthens startup for all in exchange for small benefit for few
- 					set minvers 0.0
+--- tkman.tcl.orig	Sat Aug 23 02:55:32 1997
++++ tkman.tcl	Mon Aug 25 11:39:03 1997
+@@ -2410,7 +2410,7 @@
+ 			set man(glimpse) $default(glimpse)
+ 			set man(glimpseindex) $default(glimpseindex)
+ 			# likewise, reset manformat so assured of picking up long lines
+-			set man(manformat) $default(manformat)
++			set man(format) $default(format)
+ 
+ 			set fixup 1
+ 		}