Update to V2.0.3;

fixes PR 4563 by Brad Salai <bsalai@law.roc.servtech.com>

2 files changed, 26 insertions, 74 deletions

diff --git a/x11/tkman/patches/patch-aa b/x11/tkman/patches/patch-aa
index 2b83542a57a..8655ed9de93 100644
--- a/x11/tkman/patches/patch-aa
+++ b/x11/tkman/patches/patch-aa
@@ -1,80 +1,43 @@
---- Makefile.orig	Wed Aug 14 21:51:18 1996
-+++ Makefile	Sat Oct 19 17:02:21 1996
-@@ -47,22 +47,22 @@
- 
+--- Makefile.orig	Tue Nov  4 22:22:25 1997
++++ Makefile	Sun Nov 23 17:50:26 1997
+@@ -43,13 +43,15 @@
  ### 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 = /private/share/bin/wish
++#WISH = /private/share/bin/wish
+ #WISH = /usr/local/bin/wish8.0
++WISH = ${PREFIX}/bin/wish8.0
  
  # the executable `tkman' is placed in BINDIR
  # this should be a directory that's in your bin PATH
--BINDIR = /home/orodruin/h/bair/phelps/bin
--#BINDIR = /usr/local/bin
-+#BINDIR = /home/orodruin/h/bair/phelps/bin
+-BINDIR = /private/share/bin
++#BINDIR = /private/share/bin
+ #BINDIR = /usr/local/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
- 
  
- # list of common printers, in addition to default printer (PRINTER or LPDEST)
-@@ -74,12 +74,12 @@
- 
- # # # MACHINE DEPENDENCIES # # #
- 
--manformat = {tbl | neqn | nroff -man }
-+#manformat = {tbl | neqn | nroff -man }
- # col performs the line overlays implied by reverse line-feeds,
- # but seems to kill international characters, such as u-with-umlaut
- #manformat = {tbl | neqn | nroff -man | col }
- # alternatives
--#manformat = {groff -Tascii -te -mandoc}
-+manformat = {groff -Tascii -te -mandoc}
- # Ultrix users should uncomment the following line
+ # OPTIONAL
+@@ -118,7 +120,7 @@
+ # 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 -Tlatin1 -man /tmp/ll - 2>/dev/null}
++manformat = {groff -te -Tlatin1 -man /tmp/ll${PREFIX} - 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"
- # 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
- # variations (refer to the Glimpse manual page)
-@@ -209,7 +209,7 @@
+ # BSD macros (.Sh, .Ss, .PP, ...) call for -mandoc
+@@ -241,11 +243,12 @@
  # 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).
 -manpathdef = ""
-+manpathdef = /usr/share/man:${PREFIX}/man:/usr/X11R6/man
++#manpathdef = ""
  #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)
- 	chmod +rx $(BINDIR)/tkman
- 	$(CP) tkman.1 $(MANDIR)
--	@echo 'You also need RosettaMan to run TkMan.'
-+#	@echo 'You also need RosettaMan to run TkMan.'
+ #manpathdef = /usr/share/catman:/usr/share/man:/usr/catman:/usr/man
++manpathdef = /usr/share/man:${PREFIX}/man:/usr/X11R6/man:/usr/local/man
+ 
  
- test: dox tkman
- 	cp tkman $(BINDIR)
+ # If a new user--as indicated by the lack of a ~/.tkman file--runs TkMan,
diff --git a/x11/tkman/patches/patch-ab b/x11/tkman/patches/patch-ab
deleted file mode 100644
index 38a7fa02bfc..00000000000
--- a/x11/tkman/patches/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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