Upgrade from 1.8b5 to 1.8

4 files changed, 17 insertions, 19 deletions

diff --git a/misc/tkman/Makefile b/misc/tkman/Makefile
index 4c84603d3138..05f80a3c42fa 100644
--- a/misc/tkman/Makefile
+++ b/misc/tkman/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	tkman
-# Version required:     1.8b5
+# Version required:     1.8
 # Date created:         27 Dec 1994
 # Whom:                 thomas@ghpc8.ihf.rwth-aachen.de
 #
-# $Id: Makefile,v 1.17 1996/10/21 06:46:52 tg Exp $
+# $Id: Makefile,v 1.18 1996/11/11 05:50:17 obrien Exp $
 #
 
-DISTNAME=	tkman-1.8b5
+DISTNAME=	tkman-1.8
 CATEGORIES=	misc
 MASTER_SITES=	ftp://ftp.cs.berkeley.edu/ucb/people/phelps/tcltk/
 EXTRACT_SUFX=	.tar.Z
diff --git a/misc/tkman/distinfo b/misc/tkman/distinfo
index a295b4c174fb..394fa3140068 100644
--- a/misc/tkman/distinfo
+++ b/misc/tkman/distinfo
@@ -1 +1 @@
-MD5 (tkman-1.8b5.tar.Z) = 754119a6a5c138d52588eaf9b0cc2a02
+MD5 (tkman-1.8.tar.Z) = f96dee208a9de9aa79cb068532689d5b
diff --git a/misc/tkman/files/patch-aa b/misc/tkman/files/patch-aa
index f0d9b12b6350..2b83542a57a8 100644
--- a/misc/tkman/files/patch-aa
+++ b/misc/tkman/files/patch-aa
@@ -5,10 +5,10 @@
  ### 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.1
+-#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.1
++#WISH = /home/orodruin/h/bair/phelps/bin/sun4/wish4.2
 +WISH = ${PREFIX}/bin/wish4.1
  
  
@@ -45,19 +45,6 @@
  # Ultrix users should uncomment the following line
  #manformat = {tbl | nroff -man }
  # for BSDI
-@@ -129,10 +129,10 @@
- 
- 
- # pick a printing pipeline for which your platform has all the constituants
--manprint = {tbl | eqn | troff -man -t | lpr -t}
-+#manprint = {tbl | eqn | troff -man -t | lpr -t}
- # alternatives
- #manprint = {tbl | eqn | psroff -man}
--#manprint = {groff -man -Tps -te -l}
-+manprint = {groff -mandoc -Tps -te -l}
- #manprint = {groff -man -Tascii -te -l}
- # printing string for preformatted pages without [tn]roff source
- catprint = lpr
 @@ -159,12 +159,12 @@
  # (Even if your pages aren't compressed, this speeds up searching dramatically,
  # which is why it's the default.)
diff --git a/misc/tkman/files/patch-ab b/misc/tkman/files/patch-ab
new file mode 100644
index 000000000000..6559dd684baf
--- /dev/null
+++ b/misc/tkman/files/patch-ab
@@ -0,0 +1,11 @@
+--- tkman.tcl.orig	Fri Nov  8 00:12:03 1996
++++ tkman.tcl	Sun Nov 10 20:57:01 1996
+@@ -5340,7 +5340,7 @@
+ 
+ # versions of supporting binaries, if those binaries happen to be used
+ set manx(bin-versregexp) {([0-9]+\.[0-9]+)([^ ,;]+)?} ;#(\.[0-9]+)?
+-set manx(bin-versioned) {{rman "-v" 2.4} {glimpse "-V" 2.1} {glimpseindex "-V" 2.1}}
++set manx(bin-versioned) {{rman "-v" 2.4} {glimpse "-V" 2.1}}
+ set manx(modes) {man help section txt apropos super info}
+ # bug}
+ set manx(mode-desc) {"manual pages seen" "references to help page" "volume listings invoked" "text files seen" "apropos listings" "Glimpse full-text searches" "ganders at this page"}