Upgrade, 1.6 -> 1.7.3. Note this has a restrictive copyright, so there

is going to be NO_PACKAGE.

It uses wish4.0 too.  It's the first port to depend on Tk-4.0!

6 files changed, 113 insertions, 157 deletions

diff --git a/misc/tkman/Makefile b/misc/tkman/Makefile
index 13023b9ed1b5..c26cc7ee8cc1 100644
--- a/misc/tkman/Makefile
+++ b/misc/tkman/Makefile
@@ -1,20 +1,25 @@
 # New ports collection makefile for:	tkman
-# Version required:     1.6
+# Version required:     1.7.3
 # Date created:         27 Dec 1994
 # Whom:                 thomas@ghpc8.ihf.rwth-aachen.de
 #
-# $Id: Makefile,v 1.6 1995/05/13 10:22:04 asami Exp $
+# $Id: Makefile,v 1.7 1995/05/19 09:40:05 asami Exp $
 #
 
-DISTNAME=	tkman-1.6
+DISTNAME=	tkman-1.7.3
 CATEGORIES+=	utilities
 MASTER_SITES=	ftp://ftp.cs.berkeley.edu/ucb/people/phelps/tcltk/
 EXTRACT_SUFX=	.tar.Z
 
-EXEC_DEPENDS=	wish:${PORTSDIR}/x11/tk \
+EXEC_DEPENDS=	wish4.0:${PORTSDIR}/x11/tk4 \
 		rman:${PORTSDIR}/utils/rman
 
 # Restrictive copyright
 NO_PACKAGE=	yes
 
+post-install:
+.if !defined(NOMANCOMPRESS)
+	gzip -9nf ${PREFIX}/man/man1/tkman.1
+.endif
+
 .include <bsd.port.mk>
diff --git a/misc/tkman/distinfo b/misc/tkman/distinfo
index 1aad55214943..c46ce12ecd5c 100644
--- a/misc/tkman/distinfo
+++ b/misc/tkman/distinfo
@@ -1 +1 @@
-MD5 (tkman-1.6.tar.Z) = ce2d94f2accd33af372dc3f1da8eafa9
+MD5 (tkman-1.7.3.tar.Z) = 4be6d0ed76b95692e5c437820e816c95
diff --git a/misc/tkman/files/patch-aa b/misc/tkman/files/patch-aa
index a8428c3fa148..3af788e7b48c 100644
--- a/misc/tkman/files/patch-aa
+++ b/misc/tkman/files/patch-aa
@@ -1,150 +1,99 @@
-*** Makefile.orig	Fri Dec 30 23:25:05 1994
---- Makefile	Mon Feb 27 00:19:20 1995
-***************
-*** 36,58 ****
-  # (pathname should be less than 25 or so characters)
-  #               1         2     |if name meets or passes vertical bar,
-  #      1234567890123456789012345|the wish path is too long
-! WISH = /usr/sww/X11/bin/wish
-  
-  # 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
-  
-  # directory in which to place the manual page.  The help information
-  # is maintained in HTML, from which the [tn]roff version is automatically
-  # generated using RosettaMan.
-! MANDIR = /home/auspex/h/bair/phelps/man/man1
-  
-  
-  # # # MACHINE DEPENDENCIES # # #
-  
-! manformat = {tbl | neqn | nroff -man | col}
-  # alternatively
-! #manformat = {groff -Tascii -te -mandoc -l}
-  # Ultrix users should uncomment the following line
-  #manformat = {tbl | nroff -man | col}
-  
---- 36,58 ----
-  # (pathname should be less than 25 or so characters)
-  #               1         2     |if name meets or passes vertical bar,
-  #      1234567890123456789012345|the wish path is too long
-! WISH = /usr/local/bin/wish
-  
-  # the executable `tkman' is placed in BINDIR
-  # this should be a directory that's in your bin PATH
-! BINDIR = /usr/local/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 using RosettaMan.
-! MANDIR = /usr/local/man/man1
-  
-  
-  # # # MACHINE DEPENDENCIES # # #
-  
-! # manformat = {tbl | neqn | nroff -man | col}
-  # alternatively
-! manformat = {groff -Tascii -te -mandoc}
-  # Ultrix users should uncomment the following line
-  #manformat = {tbl | nroff -man | col}
-  
-***************
-*** 111,119 ****
-  # so how can you lose?
-  
-  # by default on
-! glimpse = glimpse
-  # IF YOU DON'T WANT TO BOTHER WITH GLIMPSE, you can disable it
-! #glimpse = ""
-  # give the full path, if you'd like
-  #glimpse = /usr/sww/bin/glimpse
-  # variations (refer to the Glimpse manual page)
---- 111,119 ----
-  # so how can you lose?
-  
-  # by default on
-! #glimpse = glimpse
-  # IF YOU DON'T WANT TO BOTHER WITH GLIMPSE, you can disable it
-! glimpse = ""
-  # give the full path, if you'd like
-  #glimpse = /usr/sww/bin/glimpse
-  # variations (refer to the Glimpse manual page)
-***************
-*** 163,169 ****
-  # (`-debug' option), obtain the problemmatic glimpseindex command,
-  # and make sure it works when executed by hand.
-  
-! glimpseindex = glimpseindex
-  # IF YOU DON'T WANT TO BOTHER WITH GLIMPSE, DISABLE IT HERE *ALSO*
-  #glimpseindex = ""
-  # produce a larger index (6-9% of source text) allowing faster search w/"-o"
---- 163,169 ----
-  # (`-debug' option), obtain the problemmatic glimpseindex command,
-  # and make sure it works when executed by hand.
-  
-! #glimpseindex = glimpseindex
-  # IF YOU DON'T WANT TO BOTHER WITH GLIMPSE, DISABLE IT HERE *ALSO*
-  #glimpseindex = ""
-  # produce a larger index (6-9% of source text) allowing faster search w/"-o"
-***************
-*** 180,186 ****
-  
-  # default MANPATH to use if user doesn't have
-  # a MANPATH environment variable set
-! manpathdef = /usr/man:/usr/local/man
-  #manpathdef = /usr/man:/usr/local/man:/usr/sww/man:/usr/sww/X11/man
-  
-  
---- 180,186 ----
-  
-  # default MANPATH to use if user doesn't have
-  # a MANPATH environment variable set
-! manpathdef = /usr/share/man:/usr/local/man
-  #manpathdef = /usr/man:/usr/local/man:/usr/sww/man:/usr/sww/X11/man
-  
-  
-***************
-*** 216,227 ****
-  
-  # 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 = /home/orodruin/h/bair/phelps/bin/alpha/rman
-  
-! manprint = {tbl | eqn | troff -man}
-  # alternatives
-! #manprint = {groff -man -Tps -te}
-  #manprint = {tbl | eqn | psroff -man}
-  #manprint = {groff -Tascii -te}
-  # printing string for preformatted pages without [tn]roff source
---- 216,227 ----
-  
-  # 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 = /usr/local/bin/rman
-  #rman = /home/orodruin/h/bair/phelps/bin/alpha/rman
-  
-! #manprint = {tbl | eqn | troff -man}
-  # alternatives
-! manprint = {groff -man -Tps -te}
-  #manprint = {tbl | eqn | psroff -man}
-  #manprint = {groff -Tascii -te}
-  # printing string for preformatted pages without [tn]roff source
-***************
-*** 322,328 ****
-  	$(CP) tkman $(BINDIR)
-  	chmod +x $(BINDIR)/tkman
-  	$(CP) tkman.1 $(MANDIR)
-! 	@echo 'You also need RosettaMan to run TkMan.'
-  
-  test: dox tkman
-  	cp tkman $(BINDIR)
---- 322,328 ----
-  	$(CP) tkman $(BINDIR)
-  	chmod +x $(BINDIR)/tkman
-  	$(CP) tkman.1 $(MANDIR)
-! #	@echo 'You also need RosettaMan to run TkMan.'
-  
-  test: dox tkman
-  	cp tkman $(BINDIR)
+--- ./Makefile.org	Fri Aug 18 17:07:54 1995
++++ ./Makefile	Fri Aug 18 23:03:50 1995
+@@ -35,28 +35,28 @@
+ ### 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.4b4/bin/wish
++#WISH = /usr/sww/tcl-7.4b4/bin/wish
+ #WISH = /home/orodruin/h/bair/phelps/bin/alpha/wish
+-#WISH = /usr/local/bin/wish
++WISH = /usr/local/bin/wish4.0
+ 
+ # 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 = /usr/local/bin
++#BINDIR = /home/auspex/h/bair/phelps/bin
++BINDIR = /usr/local/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 = /usr/sww/X11/man/man1
+-#MANDIR = /usr/local/man/man1
++MANDIR = /usr/local/man/man1
+ 
+ 
+ # # # MACHINE DEPENDENCIES # # #
+ 
+-manformat = {tbl | neqn | nroff -man | col}
++#manformat = {tbl | neqn | nroff -man | col}
+ # alternatively
+-#manformat = {groff -Tascii -te -mandoc}
++manformat = {groff -Tascii -te -mandoc}
+ # Ultrix users should uncomment the following line
+ #manformat = {tbl | nroff -man | col}
+ 
+@@ -120,10 +120,10 @@
+ # so how can you lose?
+ 
+ # BY DEFAULT ON
+-glimpse = glimpse
++#glimpse = glimpse
+ # IF YOU DON'T WANT TO BOTHER WITH GLIMPSE, you can disable it here
+ # ALSO DISABLE GLIMPSEINDEX BELOW
+-#glimpse = ""
++glimpse = ""
+ # give the full path, if you'd like
+ #glimpse = /usr/sww/bin/glimpse
+ # variations (refer to the Glimpse manual page)
+@@ -150,9 +150,9 @@
+ # (`-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 = ""
++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"
+@@ -170,7 +170,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).
+-manpathdef = ""
++manpathdef = /usr/share/man:/usr/local/man:/usr/X11R6/man
+ #manpathdef = /usr/man:/usr/local/man
+ #manpathdef = /usr/man:/usr/local/man:/usr/sww/man:/usr/sww/X11/man
+ # for SGI
+@@ -223,13 +223,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 = /usr/local/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
+@@ -330,7 +330,7 @@
+ 	$(CP) tkman $(BINDIR)
+ 	chmod +x $(BINDIR)/tkman
+ 	$(CP) tkman.1 $(MANDIR)
+-	@echo 'You also need RosettaMan to run TkMan.'
++#	@echo 'You also need RosettaMan to run TkMan.'
+ 
+ test: dox tkman
+ 	cp tkman $(BINDIR)
diff --git a/misc/tkman/pkg-comment b/misc/tkman/pkg-comment
index 84af216e1e7f..487465d433f7 100644
--- a/misc/tkman/pkg-comment
+++ b/misc/tkman/pkg-comment
@@ -1 +1 @@
-tkman - a Tcl/Tk based manual browser
+tkman-1.7.3 - a Tcl/Tk based manual browser
diff --git a/misc/tkman/pkg-descr b/misc/tkman/pkg-descr
index 4f5192f5d2a8..2e21636946b7 100644
--- a/misc/tkman/pkg-descr
+++ b/misc/tkman/pkg-descr
@@ -14,3 +14,5 @@ than forcing all who share a man directory to follow a single organization,
 TkMan gives control to the individual.  In fact, one may decide he has no
 use for a large set of man pages--say for instance the programmer routines
 in volumes 2, 3, 4, 8--and eliminate them from his personal database.
+
+This is version 1.7.3.
diff --git a/misc/tkman/pkg-plist b/misc/tkman/pkg-plist
index 4525f55a641c..58237c6ac8cd 100644
--- a/misc/tkman/pkg-plist
+++ b/misc/tkman/pkg-plist
@@ -3,4 +3,4 @@
 @mode 755
 bin/tkman
 @mode 644
-man/man1/tkman.1
+man/man1/tkman.1.gz