- add glimpse to $RUN_DEPENDS

- cosmetic fixes in pkg/{DESCR,COMMENT}

4 files changed, 24 insertions, 19 deletions

diff --git a/misc/tkman/Makefile b/misc/tkman/Makefile
index 0874e807fcd6..701420abec61 100644
--- a/misc/tkman/Makefile
+++ b/misc/tkman/Makefile
@@ -3,7 +3,7 @@
 # Date created:         27 Dec 1994
 # Whom:                 thomas@ghpc8.ihf.rwth-aachen.de
 #
-# $Id: Makefile,v 1.13 1995/12/09 01:30:20 asami Exp $
+# $Id: Makefile,v 1.14 1995/12/18 07:29:08 tg Exp $
 #
 
 DISTNAME=	tkman-1.7.5
@@ -14,7 +14,8 @@ EXTRACT_SUFX=	.tar.Z
 MAINTAINER=	thomas@ghpc8.ihf.rwth-aachen.de
 
 LIB_DEPENDS=	tk40\\.1\\.:${PORTSDIR}/x11/tk4
-RUN_DEPENDS=	rman:${PORTSDIR}/misc/rman
+RUN_DEPENDS=	rman:${PORTSDIR}/misc/rman \
+		glimpse:${PORTSDIR}/misc/glimpse
 
 # Restrictive copyright
 NO_PACKAGE=	yes
diff --git a/misc/tkman/files/patch-aa b/misc/tkman/files/patch-aa
index 70a2bcec6496..d6959959bc11 100644
--- a/misc/tkman/files/patch-aa
+++ b/misc/tkman/files/patch-aa
@@ -1,5 +1,5 @@
---- Makefile.orig	Fri Nov  3 23:22:29 1995
-+++ Makefile	Tue Dec  5 14:12:38 1995
+--- Makefile.orig	Sat Nov  4 00:22:29 1995
++++ Makefile	Wed Jan 17 14:04:28 1996
 @@ -40,28 +40,28 @@
  ### you need to localize the paths on these lines
  
@@ -8,14 +8,14 @@
 +#WISH = /usr/sww/tcl-7.4/bin/wish-4.0
  #WISH = wish
 -#WISH = /usr/local/bin/wish
-+WISH = /usr/local/bin/wish4.0
++WISH = ${PREFIX}/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
++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 
@@ -24,7 +24,7 @@
 +#MANDIR = /home/auspex/h/bair/phelps/man/man1
  #MANDIR = /usr/sww/X11/man/man1
 -#MANDIR = /usr/local/man/man1
-+MANDIR = /usr/local/man/man1
++MANDIR = ${PREFIX}/man/man1
  
  
  # # # MACHINE DEPENDENCIES # # #
@@ -37,7 +37,7 @@
  # Ultrix users should uncomment the following line
  #manformat = {tbl | nroff -man | col}
  # for BSDI
-@@ -127,10 +127,10 @@
+@@ -127,12 +127,12 @@
  # so how can you lose?
  
  # BY DEFAULT ON
@@ -45,29 +45,35 @@
 +#glimpse = glimpse
  # IF YOU DON'T WANT TO BOTHER WITH GLIMPSE, you can disable it here
  # ALSO DISABLE GLIMPSEINDEX BELOW
--#glimpse = ""
-+glimpse = ""
+ #glimpse = ""
  # give the full path, if you'd like
- #glimpse = /usr/sww/bin/glimpse
+-#glimpse = /usr/sww/bin/glimpse
++glimpse = ${PREFIX}/bin/glimpse
  # variations (refer to the Glimpse manual page)
-@@ -157,9 +157,9 @@
+ #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 = ""
-+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"
+-#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 @@
  # 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/share/man:${PREFIX}/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
@@ -76,7 +82,7 @@
  # 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 = ${PREFIX}/bin/rman
  #rman = /home/orodruin/h/bair/phelps/bin/alpha/rman
  
 -manprint = {tbl | eqn | troff -man -t | lpr -t}
diff --git a/misc/tkman/pkg-comment b/misc/tkman/pkg-comment
index 487465d433f7..6c55dd8496df 100644
--- a/misc/tkman/pkg-comment
+++ b/misc/tkman/pkg-comment
@@ -1 +1 @@
-tkman-1.7.3 - a Tcl/Tk based manual browser
+A Tcl/Tk based manual browser
diff --git a/misc/tkman/pkg-descr b/misc/tkman/pkg-descr
index 2e21636946b7..4f5192f5d2a8 100644
--- a/misc/tkman/pkg-descr
+++ b/misc/tkman/pkg-descr
@@ -14,5 +14,3 @@ 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.