5 files changed, 130 insertions, 122 deletions

diff --git a/misc/tkman/Makefile b/misc/tkman/Makefile
index dcb6a376105d..859b161a50a3 100644
--- a/misc/tkman/Makefile
+++ b/misc/tkman/Makefile
@@ -6,26 +6,29 @@
 #
 
 PORTNAME=	tkman
-PORTVERSION=	2.1
-CATEGORIES=	misc tk83
+PORTVERSION=	2.2
+CATEGORIES=	misc tk84
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	tg@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A Tcl/Tk based manual browser
 
-LIB_DEPENDS=	tk83.1:${PORTSDIR}/x11-toolkits/tk83
+LIB_DEPENDS=	tk84.1:${PORTSDIR}/x11-toolkits/tk84
 RUN_DEPENDS=	rman:${PORTSDIR}/textproc/rman \
 		glimpse:${PORTSDIR}/textproc/glimpse
 
+USE_GMAKE=	yes
+USE_REINPLACE=	yes
+
 post-patch:
-	${PERL} -pi -e "s;/usr/local/bin/wish;${LOCALBASE}/bin/wish8.3;" \
+	@${REINPLACE_CMD} -e "s;/usr/local/bin/wish;${PREFIX}/bin/wish8.4;" \
 		${WRKSRC}/contrib/tkmanclient
 
 post-install:
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/tkman
-	${INSTALL_DATA} ${WRKSRC}/tkman-help.html ${PREFIX}/share/doc/tkman
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/manual.html ${DOCSDIR}
 .endif
 	${INSTALL_SCRIPT} ${WRKSRC}/contrib/tkmanclient ${PREFIX}/bin
 	@${MKDIR} ${PREFIX}/etc/periodic/weekly
diff --git a/misc/tkman/distinfo b/misc/tkman/distinfo
index 1edb94c8ca3a..c4d205fc1c72 100644
--- a/misc/tkman/distinfo
+++ b/misc/tkman/distinfo
@@ -1 +1 @@
-MD5 (tkman-2.1.tar.gz) = c9ecaacf83a30f36ed0995ba51fdd33f
+MD5 (tkman-2.2.tar.gz) = 0e81735c93ab2500d6105ff33095c3e8
diff --git a/misc/tkman/files/patch-aa b/misc/tkman/files/patch-aa
index 14f0295d627a..3a6b92cdf5cc 100644
--- a/misc/tkman/files/patch-aa
+++ b/misc/tkman/files/patch-aa
@@ -1,98 +1,103 @@
---- Makefile.orig	Wed Mar  1 20:09:59 2000
-+++ Makefile	Sat May 20 07:55:37 2000
-@@ -27,14 +27,14 @@
- ### you need to localize the paths on these lines
- 
- #WISH = /usr/sww/tcl-8.3/bin/wish
--WISH = /private/share/bin/wish
-+#WISH = /private/share/bin/wish
- #WISH = /private/share/bin/wish8.3
--#WISH = /usr/local/bin/wish8.3
-+WISH = ${LOCALBASE}/bin/wish8.3
- 
- # the executable `tkman' is placed in BINDIR
- # this should be a directory that's in your bin PATH
--BINDIR = /private/share/bin
--#BINDIR = /usr/local/bin
-+#BINDIR = /private/share/bin
-+BINDIR = ${PREFIX}/bin
- 
- 
- # OPTIONAL
-@@ -44,13 +44,13 @@
- # This directory should not have any Texinfo source itself.
- # More information is given in tkman-help.html
- # if you don't have Texinfo files, leave this variable empty
--texinfodir = ""
-+#texinfodir = ""
- #texinfodir = /home/orodruin/h/bair/phelps/spine/tkman/info
--#texinfodir = /usr/local/info
-+texinfodir = ${PREFIX}/info
- # In order to search within Texinfo files you need a grep, such as GNU grep 2.1,
- # that can report byte offsets (with the -b switch).  This needs to be
- # gzgrep if you'll be searching in compressed Texinfo source.
--gzgrep = ""
-+#gzgrep = ""
- #gzgrep = "gzgrep -E"
- #gzgrep = "gzgrep -Ew"
- # Linux calls it zgrep
-@@ -59,6 +59,7 @@
- #gzgrep = grep
- # if you don't compress your Texinfo source, this is fine
- #gzgrep = grep
-+gzgrep = "/usr/bin/zgrep -E"
- 
- # OPTIONAL
- # directory root of hierarchy of RFC files, with "rfc-index.txt" at the root
-@@ -82,10 +83,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 = "${PREFIX}/man /usr/share/man ${X11BASE}/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 = "/usr/bin ${PREFIX}/bin ${X11BASE}/bin"
- 
- 
- # names of common printers, in addition to default printer (PRINTER or LPDEST)
-@@ -115,7 +118,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 -}
--manformat = {groff -te -Tlatin1 -man /tmp/ll -}
-+#manformat = {groff -te -Tlatin1 -man /tmp/ll -}
- # Ultrix users should uncomment the following line (you don't have eqn)
- #manformat = {tbl | nroff -man }
- # HP-UX uses a number of macros that groff doesn't define, so use the builtin nroff
-@@ -123,7 +126,7 @@
- #  space between the .de and the macro name, and groff doesn't like this.)
- #manformat = {tbl | neqn | nroff -man }
- # BSD macros (.Sh, .Ss, .PP, ...) need -mandoc
--#manformat = {groff -Tascii -te -mandoc}
-+manformat = {groff -Tascii -te -mandoc}
- # BSDI
- #manformat = {tbl | eqn -Tascii | nroff -man }
- # It's actually legal to leave this empty if all the pages you'll ever
-@@ -174,7 +177,8 @@
- #manprint = {tbl | eqn | psroff -man}
- #manprint = {tbl | eqn | gtroff -Tpsc | psdit | lpr}
- # use an empty pipeline if you're environmentally conscious or have no printer
--manprint = ""
-+#manprint = ""
-+manprint = {groff -mandoc -Tps -te -l}
- # printing string for preformatted pages without [tn]roff source
- #catprint = lpr
- #catprint = "lpr -h"
-@@ -461,7 +465,7 @@
- 	chmod +rx $(BINDIR)/tkman
- 	$(CP) retkman $(BINDIR)
- 	chmod +rx $(BINDIR)/retkman
--	@echo 'You also need RosettaMan to run TkMan.'
-+#	@echo 'You also need RosettaMan to run TkMan.'
- 
- test: dox tkman
- 	cp tkman $(BINDIR)
+--- Makefile.orig	Wed Apr  2 01:31:38 2003
++++ Makefile	Sun Oct 19 11:05:53 2003
+@@ -25,14 +25,16 @@
+ 

+ ### you need to localize the paths on these lines

+ 

+-WISH = /usr/local/bin/wish8.4

++#WISH = /usr/local/bin/wish8.4

+ #WISH = /usr/sww/tcl-8.4/bin/wish

+ #WISH = /private/share/bin/wish8.4

++WISH = ${PREFIX}/bin/wish8.4

+ 

+ # the executable `tkman' is placed in BINDIR

+ # this should be a directory that's in your bin PATH

+-BINDIR = /usr/local/bin

++#BINDIR = /usr/local/bin

+ #BINDIR = /private/share/bin

++BINDIR = ${PREFIX}/bin

+ 

+ 

+ # OPTIONAL FEATURES

+@@ -42,13 +44,14 @@
+ # This directory should not have any Texinfo source itself.

+ # More information is given in manual.html

+ # if you don't have Texinfo files, leave this variable empty

+-texinfodir = ""

++#texinfodir = ""

+ #texinfodir = /home/orodruin/h/bair/phelps/spine/tkman/info

+ #texinfodir = /usr/local/info

++texinfodir = ${PREFIX}/info

+ # In order to search within Texinfo files you need a grep, such as GNU grep 2.1,

+ # that can report byte offsets (with the -b switch).  This needs to be

+ # gzgrep if you'll be searching in compressed Texinfo source.

+-gzgrep = ""

++#gzgrep = ""

+ #gzgrep = "gzgrep -E"

+ #gzgrep = "gzgrep -Ew"

+ # Linux calls it zgrep

+@@ -57,6 +60,7 @@
+ #gzgrep = grep

+ # if you don't compress your Texinfo source, this is fine

+ #gzgrep = grep

++gzgrep = "/usr/bin/zgrep -E"

+ 

+ # OPTIONAL

+ # directory root of hierarchy of RFC files, with "rfc-index.txt" at the root

+@@ -80,10 +84,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 ${X11BASE}/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 = "/usr/bin ${PREFIX}/bin ${X11BASE}/bin"

+ 

+ 

+ # names of common printers, in addition to default printer (PRINTER or LPDEST)

+@@ -113,7 +119,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 -}

+-manformat = {groff -te -Tlatin1 -man /tmp/ll -}

++#manformat = {groff -te -Tlatin1 -man /tmp/ll -}

+ # Ultrix users should uncomment the following line (you don't have eqn)

+ #manformat = {tbl | nroff -man }

+ # HP-UX uses a number of macros that groff doesn't define, so use the builtin nroff

+@@ -122,6 +128,7 @@
+ #manformat = {tbl | neqn | nroff -man }

+ # BSD macros (.Sh, .Ss, .PP, ...) need -mandoc

+ #manformat = {groff -Tascii -te -mandoc}

++manformat = {groff -Tlatin1 -te -mandoc}

+ # BSDI

+ #manformat = {tbl | eqn -Tascii | nroff -man }

+ # It's actually legal to leave this empty if all the pages you'll ever

+@@ -166,13 +173,14 @@
+ 

+ # pick a printing pipeline for which your platform has all the constituants

+ #manprint = {groff -man -Tps -te -l}

++manprint = {groff -mandoc -Tps -te -l}

+ # alternatives

+ #manprint = {groff -man -Tps -te -l | psnup -n2}

+ #manprint = {tbl | eqn | troff -man -t | lpr -t}

+ #manprint = {tbl | eqn | psroff -man}

+ #manprint = {tbl | eqn | gtroff -Tpsc | psdit | lpr}

+ # use an empty pipeline if you're environmentally conscious or have no printer

+-manprint = ""

++#manprint = ""

+ # printing string for preformatted pages without [tn]roff source

+ #catprint = lpr

+ #catprint = "lpr -h"

+@@ -460,7 +468,7 @@
+ 	chmod +rx $(BINDIR)/tkman

+ 	$(CP) retkman $(BINDIR)

+ 	chmod +rx $(BINDIR)/retkman

+-	@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/files/patch-ab b/misc/tkman/files/patch-ab
index 58843d5df30f..1e88eee37ee7 100644
--- a/misc/tkman/files/patch-ab
+++ b/misc/tkman/files/patch-ab
@@ -1,14 +1,14 @@
---- tkmandesc.tcl.orig	Wed Mar  1 19:55:54 2000
-+++ tkmandesc.tcl	Sat May 20 07:57:33 2000
-@@ -223,8 +223,9 @@
- 		set mani(manTitleList) $man(manTitleList)
- 
- 		if {![info exists env(MANPATH)] || [string equal [string trim $env(MANPATH)] ""]} {
--			puts stderr "You must set a MANPATH environment variable,\nwhich is a colon-separated list of directories in which\nto find man pages, for example /usr/man:/usr/share/man.\n(See the help page for an explanation of why\nalternatives to the MANPATH are a bad thing.)"
--			exit 1
-+#			puts stderr "You must set a MANPATH environment variable,\nwhich is a colon-separated list of directories in which\nto find man pages, for example /usr/man:/usr/share/man.\n(See the help page for an explanation of why\nalternatives to the MANPATH are a bad thing.)"
-+#			exit 1
-+			set env(MANPATH) [join $manx(mastermen) ":"]
- 		}
- 		set manx(MANPATH0) $env(MANPATH)
- 
+--- tkmandesc.tcl.orig	Wed Apr  2 01:31:38 2003
++++ tkmandesc.tcl	Sun Oct 19 11:09:54 2003
+@@ -224,8 +224,9 @@
+ 		set mani(manTitleList) $man(manTitleList)

+ 

+ 		if {![info exists env(MANPATH)] || [string trim $env(MANPATH)] eq ""} {

+-			puts stderr "You must set a MANPATH environment variable,\nwhich is a colon-separated list of directories in which\nto find man pages, for example /usr/man:/usr/share/man.\n(See the help page for an explanation of why\nalternatives to the MANPATH are a bad thing.)"

+-			exit 1

++#			puts stderr "You must set a MANPATH environment variable,\nwhich is a colon-separated list of directories in which\nto find man pages, for example /usr/man:/usr/share/man.\n(See the help page for an explanation of why\nalternatives to the MANPATH are a bad thing.)"

++#			exit 1

++			set env(MANPATH) [join $manx(mastermen) ":"]

+ 		}

+ 		set manx(MANPATH0) $env(MANPATH)

+ 

diff --git a/misc/tkman/pkg-plist b/misc/tkman/pkg-plist
index b3a857436061..1eba2711965b 100644
--- a/misc/tkman/pkg-plist
+++ b/misc/tkman/pkg-plist
@@ -2,7 +2,7 @@ bin/tkman
 bin/tkmanclient
 bin/retkman
 etc/periodic/weekly/310.index_manpages
-share/doc/tkman/tkman-help.html
-@dirrm share/doc/tkman
+%%PORTDOCS%%%%DOCSDIR%%/manual.html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm etc/periodic/weekly
 @dirrm etc/periodic