Update to version 2.1b1 of this package. The old version has been taken

from the ftp site, and we're unable to mirror the distfile for licence
reasons.

2 files changed, 27 insertions, 25 deletions

diff --git a/x11/tkman/Makefile b/x11/tkman/Makefile
index f088d8c5b3f..d92f7ffd9c5 100644
--- a/x11/tkman/Makefile
+++ b/x11/tkman/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 1998/05/06 09:51:02 agc Exp $
+# $NetBSD: Makefile,v 1.14 1998/09/08 14:55:22 agc Exp $
 # FreeBSD Id: Makefile,v 1.28 1997/12/08 15:51:20 tg Exp
 #
 
-DISTNAME=		tkman-2.0.6
+DISTNAME=		tkman-2.1b1
 CATEGORIES=		misc tk80
 MASTER_SITES=		ftp://ftp.cs.berkeley.edu/ucb/people/phelps/tcltk/
 EXTRACT_SUFX=		.tar.Z
diff --git a/x11/tkman/patches/patch-aa b/x11/tkman/patches/patch-aa
index 2fce23580a5..f940e3bb081 100644
--- a/x11/tkman/patches/patch-aa
+++ b/x11/tkman/patches/patch-aa
@@ -1,45 +1,47 @@
-$NetBSD: patch-aa,v 1.3 1998/08/07 11:18:20 agc Exp $
+$NetBSD: patch-aa,v 1.4 1998/09/08 14:55:22 agc Exp $
 
---- Makefile.orig	Tue Nov  4 22:22:25 1997
-+++ Makefile	Sun Nov 23 17:50:26 1997
-@@ -43,13 +43,15 @@
+--- Makefile.orig	Mon Jul 13 10:44:32 1998
++++ Makefile	Tue Sep  8 15:43:10 1998
+@@ -44,14 +44,16 @@
  ### you need to localize the paths on these lines
  
  #WISH = /usr/sww/tcl-8.0/bin/wish
 -WISH = /private/share/bin/wish
 +#WISH = /private/share/bin/wish
+ #WISH = /private/share/bin/wish8.1
  #WISH = /usr/local/bin/wish8.0
-+WISH = ${PREFIX}/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 = /private/share/bin
 +#BINDIR = /private/share/bin
  #BINDIR = /usr/local/bin
-+BINDIR = ${PREFIX}/bin
++BINDIR= ${PREFIX}/bin
  
  
  # OPTIONAL
-@@ -118,7 +120,7 @@
- # lines are cached in .../man/cat<n>@<line-length>; 
+@@ -97,10 +99,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 = "/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"
+ 
+ 
+ # names of common printers, in addition to default printer (PRINTER or LPDEST)
+@@ -130,7 +134,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 }
- # 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 = ""
- #manpathdef = /usr/man:/usr/local/man
- #manpathdef = /usr/man:/usr/local/man:/usr/sww/man:/usr/sww/X11/man
- # for SGI
- #manpathdef = /usr/share/catman:/usr/share/man:/usr/catman:/usr/man
-+manpathdef = /usr/share/man:${PREFIX}/man:/usr/X11R6/man:/usr/local/man
- 
- 
- # If a new user--as indicated by the lack of a ~/.tkman file--runs TkMan,
+ # HP-UX uses a number of macros that groff doesn't define, so use the builtin nroff