Upgrade to 1.8b5. Uses tk41 now.

4 files changed, 54 insertions, 70 deletions

diff --git a/misc/tkman/Makefile b/misc/tkman/Makefile
index 0b0aaddca4fc..efa5739f713d 100644
--- a/misc/tkman/Makefile
+++ b/misc/tkman/Makefile
@@ -1,19 +1,19 @@
 # New ports collection makefile for:	tkman
-# Version required:     1.7.5
+# Version required:     1.8b5
 # Date created:         27 Dec 1994
 # Whom:                 thomas@ghpc8.ihf.rwth-aachen.de
 #
-# $Id: Makefile,v 1.15 1996/01/18 15:30:33 tg Exp $
+# $Id: Makefile,v 1.16 1996/06/15 06:24:23 asami Exp $
 #
 
-DISTNAME=	tkman-1.7.5
+DISTNAME=	tkman-1.8b5
 CATEGORIES+=	misc
 MASTER_SITES=	ftp://ftp.cs.berkeley.edu/ucb/people/phelps/tcltk/
 EXTRACT_SUFX=	.tar.Z
 
-MAINTAINER=	thomas@ghpc8.ihf.rwth-aachen.de
+MAINTAINER=	tg@freebsd.org
 
-LIB_DEPENDS=	tk40\\.1\\.:${PORTSDIR}/x11/tk4
+LIB_DEPENDS=	tk41\\.1\\.:${PORTSDIR}/x11/tk41
 RUN_DEPENDS=	rman:${PORTSDIR}/misc/rman \
 		glimpse:${PORTSDIR}/misc/glimpse
 
diff --git a/misc/tkman/distinfo b/misc/tkman/distinfo
index 10769b4f6278..a295b4c174fb 100644
--- a/misc/tkman/distinfo
+++ b/misc/tkman/distinfo
@@ -1 +1 @@
-MD5 (tkman-1.7.5.tar.Z) = 7ce5671154cd9cefee30aa0c9466aa40
+MD5 (tkman-1.8b5.tar.Z) = 754119a6a5c138d52588eaf9b0cc2a02
diff --git a/misc/tkman/files/patch-aa b/misc/tkman/files/patch-aa
index d6959959bc11..f0d9b12b6350 100644
--- a/misc/tkman/files/patch-aa
+++ b/misc/tkman/files/patch-aa
@@ -1,74 +1,79 @@
---- Makefile.orig	Sat Nov  4 00:22:29 1995
-+++ Makefile	Wed Jan 17 14:04:28 1996
-@@ -40,28 +40,28 @@
+--- Makefile.orig	Wed Aug 14 21:51:18 1996
++++ Makefile	Sat Oct 19 17:02:21 1996
+@@ -47,22 +47,22 @@
+ 
  ### you need to localize the paths on these lines
  
- # Tk's wish MUST be compiled with Tcl 7.4/Tk 4.0 or later versions
--WISH = /usr/sww/tcl-7.4/bin/wish-4.0
-+#WISH = /usr/sww/tcl-7.4/bin/wish-4.0
- #WISH = wish
+-WISH = /usr/sww/tcl-7.5/bin/wish
+-WISH = /home/orodruin/h/bair/phelps/bin/sun4/wish4.1
 -#WISH = /usr/local/bin/wish
-+WISH = ${PREFIX}/bin/wish4.0
++#WISH = /usr/sww/tcl-7.5/bin/wish
++#WISH = /home/orodruin/h/bair/phelps/bin/sun4/wish4.1
++WISH = ${PREFIX}/bin/wish4.1
+ 
  
  # the executable `tkman' is placed in BINDIR
  # this should be a directory that's in your bin PATH
--BINDIR = /home/auspex/h/bair/phelps/bin
+-BINDIR = /home/orodruin/h/bair/phelps/bin
 -#BINDIR = /usr/local/bin
-+#BINDIR = /home/auspex/h/bair/phelps/bin
++#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/auspex/h/bair/phelps/man/man1
-+#MANDIR = /home/auspex/h/bair/phelps/man/man1
+-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 | col}
-+#manformat = {tbl | neqn | nroff -man | col}
- # alternatively
+-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
- #manformat = {tbl | nroff -man | col}
+ #manformat = {tbl | nroff -man }
  # for BSDI
-@@ -127,12 +127,12 @@
- # so how can you lose?
+@@ -129,10 +129,10 @@
  
- # BY DEFAULT ON
--glimpse = glimpse
-+#glimpse = glimpse
+ 
+ # 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.)
+ # 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
-+glimpse = ${PREFIX}/bin/glimpse
+ #glimpse = /usr/sww/bin/glimpse
  # variations (refer to the Glimpse manual page)
- #glimpse = "glimpse -k"
- #glimpse = "glimpse -B"
-@@ -157,13 +157,13 @@
- # (`-debug' option), obtain the problemmatic glimpseindex command,
- # and make sure it works when executed by hand.
- 
--glimpseindex = glimpseindex
-+#glimpseindex = glimpseindex
- # IF YOU DON'T WANT TO BOTHER WITH GLIMPSE, DISABLE IT HERE *ALSO*
- #glimpseindex = ""
- # produce a larger index ("7-9%" of source text) allowing faster search w/"-o"
- # Need -o or -b if using -N above.
- #glimpseindex = "glimpseindex -o"
--#glimpseindex = /usr/sww/bin/glimpseindex
-+glimpseindex = "${PREFIX}/bin/glimpseindex -o"
- 
- # directory in which to place stray man directories added with manDescAdd
- # that don't correspond to a directory in MANPATH
-@@ -177,7 +177,7 @@
+@@ -209,7 +209,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).
@@ -77,24 +82,7 @@
  #manpathdef = /usr/man:/usr/local/man
  #manpathdef = /usr/man:/usr/local/man:/usr/sww/man:/usr/sww/X11/man
  # for SGI
-@@ -230,13 +230,13 @@
- 
- # if you don't want to RosettaMan (rman) in your PATH, make the name fully qualified
- # (that's probably a good idea if tkman is installed on a central server)
--rman = rman
-+rman = ${PREFIX}/bin/rman
- #rman = /home/orodruin/h/bair/phelps/bin/alpha/rman
- 
--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 -man -Tps -te -l}
- #manprint = {groff -man -Tascii -te -l}
- # printing string for preformatted pages without [tn]roff source
- catprint = lpr
-@@ -342,7 +342,7 @@
+@@ -373,7 +373,7 @@
  	$(CP) tkman $(BINDIR)
  	chmod +rx $(BINDIR)/tkman
  	$(CP) tkman.1 $(MANDIR)
diff --git a/misc/tkman/pkg-plist b/misc/tkman/pkg-plist
index 58237c6ac8cd..73d49160842d 100644
--- a/misc/tkman/pkg-plist
+++ b/misc/tkman/pkg-plist
@@ -1,6 +1,2 @@
-@cd /usr/local
-@owner bin
-@mode 755
 bin/tkman
-@mode 644
 man/man1/tkman.1.gz