From 7d056b440b434b8bd7172b93cc286983855cdb18 Mon Sep 17 00:00:00 2001 From: tg Date: Mon, 25 Aug 1997 09:46:38 +0000 Subject: Upgrade to 2.0b7. --- misc/tkman/Makefile | 21 +++++---- misc/tkman/distinfo | 2 +- misc/tkman/files/patch-aa | 115 +++++++++++++++++++++++++++++----------------- misc/tkman/files/patch-ab | 22 ++++----- misc/tkman/pkg-plist | 4 +- 5 files changed, 99 insertions(+), 65 deletions(-) (limited to 'misc/tkman') diff --git a/misc/tkman/Makefile b/misc/tkman/Makefile index fd388da..99bd06e 100644 --- a/misc/tkman/Makefile +++ b/misc/tkman/Makefile @@ -1,23 +1,26 @@ # New ports collection makefile for: tkman -# Version required: 1.8 +# Version required: 2.0b7 # Date created: 27 Dec 1994 -# Whom: thomas Gellekum +# Whom: Thomas Gellekum # -# $Id: Makefile,v 1.23 1997/04/27 00:25:19 asami Exp $ +# $Id: Makefile,v 1.24 1997/06/17 06:05:50 tg Exp $ # -DISTNAME= tkman-1.8 -CATEGORIES= misc tk41 -MASTER_SITES= ftp://ftp.cs.berkeley.edu/ucb/people/phelps/tcltk/old/ +DISTNAME= tkman-2.0b7 +CATEGORIES= misc tk80 +MASTER_SITES= ftp://ftp.cs.berkeley.edu/ucb/people/phelps/tcltk/ EXTRACT_SUFX= .tar.Z MAINTAINER= tg@freebsd.org -LIB_DEPENDS= tk41\\.1\\.:${PORTSDIR}/x11/tk41 +LIB_DEPENDS= tk80\\.1\\.:${PORTSDIR}/x11/tk80 RUN_DEPENDS= rman:${PORTSDIR}/textproc/rman \ glimpse:${PORTSDIR}/textproc/glimpse -NO_CDROM= "Don't sell for profit" -MAN1= tkman.1 +.if !defined(NOPORTDOCS) +post-install: + @${MKDIR} ${PREFIX}/share/doc/tkman + ${INSTALL_DATA} ${WRKSRC}/tkman-help.html ${PREFIX}/share/doc/tkman +.endif .include diff --git a/misc/tkman/distinfo b/misc/tkman/distinfo index b7bb42d..a525233 100644 --- a/misc/tkman/distinfo +++ b/misc/tkman/distinfo @@ -1 +1 @@ -MD5 (tkman-1.8.tar.Z) = 91d08d3bfe5518c1f23505c400ddeb2c +MD5 (tkman-2.0b7.tar.Z) = 4658e6957d623e4576dc8e69a133b5d9 diff --git a/misc/tkman/files/patch-aa b/misc/tkman/files/patch-aa index 2b83542..9dc241c 100644 --- a/misc/tkman/files/patch-aa +++ b/misc/tkman/files/patch-aa @@ -1,16 +1,13 @@ ---- Makefile.orig Wed Aug 14 21:51:18 1996 -+++ Makefile Sat Oct 19 17:02:21 1996 -@@ -47,22 +47,22 @@ - +--- Makefile.orig Sat Aug 23 02:55:32 1997 ++++ Makefile Mon Aug 25 11:06:34 1997 +@@ -38,13 +38,13 @@ ### 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.2 --#WISH = /usr/local/bin/wish -+#WISH = /usr/sww/tcl-7.5/bin/wish -+#WISH = /home/orodruin/h/bair/phelps/bin/sun4/wish4.2 -+WISH = ${PREFIX}/bin/wish4.1 - + #WISH = /usr/sww/tcl-8.0/bin/wish +-WISH = /home/orodruin/h/bair/phelps/bin/sun4/wish +-#WISH = /usr/local/bin/wish8.0 ++#WISH = /home/orodruin/h/bair/phelps/bin/sun4/wish ++WISH = ${PREFIX}/bin/wish8.0 # the executable `tkman' is placed in BINDIR # this should be a directory that's in your bin PATH @@ -19,48 +16,78 @@ +#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/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 + + # OPTIONAL +@@ -53,9 +53,9 @@ + # (Follow pattern in sample "dir.tkman".) + # 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 - # list of common printers, in addition to default printer (PRINTER or LPDEST) -@@ -74,12 +74,12 @@ + # OPTIONAL +@@ -79,10 +79,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" - # # # MACHINE DEPENDENCIES # # # --manformat = {tbl | neqn | nroff -man } -+#manformat = {tbl | neqn | nroff -man } - # col performs the line overlays implied by reverse line-feeds, + # names of common printers, in addition to default printer (PRINTER or LPDEST) +@@ -99,13 +101,13 @@ # but seems to kill international characters, such as u-with-umlaut #manformat = {tbl | neqn | nroff -man | col } - # alternatives + # ALTERNATIVES -#manformat = {groff -Tascii -te -mandoc} +manformat = {groff -Tascii -te -mandoc} - # Ultrix users should uncomment the following line + # Marco Melgazzi (marco@techie.com) prefers LONGER MAN PAGE LINES. + # The following line adds an entry in Preferences/See to set the length. + # You must use groff and the "/tmp/ll" path for this feature to take effect. + # lines are cached in .../man/cat@; + # that is, the line length is appended to the usual cache directory names +-manformat = {groff -te -Tascii -man /tmp/ll - 2>/dev/null} ++#manformat = {groff -te -Tascii -man /tmp/ll - 2>/dev/null} + # Ultrix users should uncomment the following line (you don't have eqn) #manformat = {tbl | nroff -man } - # for BSDI -@@ -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" + # BSDI +@@ -151,7 +153,7 @@ + + + # 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 = {tbl | eqn | troff -man -t | lpr -t} + #manprint = {tbl | eqn | psroff -man} +@@ -175,7 +177,7 @@ + # so how can you lose? + + # BY DEFAULT ON (Boolean scope set to entire file) +-glimpse = "glimpse -W" ++#glimpse = "glimpse -W" # 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 +@@ -183,6 +185,7 @@ # variations (refer to the Glimpse manual page) -@@ -209,7 +209,7 @@ + # no characters treated as meta characters: + #glimpse = "glimpse -Wk" ++glimpse = "glimpse -z" + + # glimpseindex indexes the manual pages, for each component of one's MANPATH, + # and places the results in a set of files named .glimpse_* in that MANPATH +@@ -224,7 +227,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). @@ -69,12 +96,14 @@ #manpathdef = /usr/man:/usr/local/man #manpathdef = /usr/man:/usr/local/man:/usr/sww/man:/usr/sww/X11/man # for SGI -@@ -373,7 +373,7 @@ - $(CP) tkman $(BINDIR) +@@ -395,8 +398,8 @@ chmod +rx $(BINDIR)/tkman - $(CP) tkman.1 $(MANDIR) + $(CP) retkman $(BINDIR) + chmod +rx $(BINDIR)/retkman - @echo 'You also need RosettaMan to run TkMan.' +- @echo 'Have you installed the elided text patch to Tk?' +# @echo 'You also need RosettaMan to run TkMan.' ++# @echo 'Have you installed the elided text patch to Tk?' test: dox tkman cp tkman $(BINDIR) diff --git a/misc/tkman/files/patch-ab b/misc/tkman/files/patch-ab index 38a7fa0..30cfabbb 100644 --- a/misc/tkman/files/patch-ab +++ b/misc/tkman/files/patch-ab @@ -1,11 +1,11 @@ ---- tkman.tcl.orig Mon Nov 11 21:18:41 1996 -+++ tkman.tcl Thu Nov 14 20:07:27 1996 -@@ -5018,7 +5018,7 @@ - # ... then check for proper versions of selected executables - if {[set info [lassoc $manx(bin-versioned) $tail]]!=""} { - lset $info flag minvers -- set execerr [catch {set lines [exec $fullpath $flag < /dev/null]} info] -+ set execerr [catch {set lines [exec $fullpath $flag < /dev/null 2> /dev/null]} info] - } elseif {[string match "g*" $tail]} { - # could be a GNU -- maybe take this out since it lengthens startup for all in exchange for small benefit for few - set minvers 0.0 +--- tkman.tcl.orig Sat Aug 23 02:55:32 1997 ++++ tkman.tcl Mon Aug 25 11:39:03 1997 +@@ -2410,7 +2410,7 @@ + set man(glimpse) $default(glimpse) + set man(glimpseindex) $default(glimpseindex) + # likewise, reset manformat so assured of picking up long lines +- set man(manformat) $default(manformat) ++ set man(format) $default(format) + + set fixup 1 + } diff --git a/misc/tkman/pkg-plist b/misc/tkman/pkg-plist index 73d4916..cd81cc4 100644 --- a/misc/tkman/pkg-plist +++ b/misc/tkman/pkg-plist @@ -1,2 +1,4 @@ bin/tkman -man/man1/tkman.1.gz +bin/retkman +share/doc/tkman/tkman-help.html +@dirrm share/doc/tkman -- cgit v1.1