diff --git a/misc/tkman/Makefile b/misc/tkman/Makefile index 9734bd082e8..8076186e6a9 100644 --- a/misc/tkman/Makefile +++ b/misc/tkman/Makefile @@ -3,11 +3,11 @@ # Date created: May 20 1998 # Whom: Angelos D. Keromytis # -# $OpenBSD: Makefile,v 1.6 2000/03/24 23:28:24 espie Exp $ +# $OpenBSD: Makefile,v 1.7 2000/03/27 06:46:22 kevlo Exp $ # -DISTNAME= tkman-2.0.6 -CATEGORIES= misc tk80 +DISTNAME= tkman-2.1b4 +CATEGORIES= misc NEED_VERSION= 1.230 MASTER_SITES= ftp://ftp.cs.berkeley.edu/ucb/people/phelps/tcltk/ EXTRACT_SUFX= .tar.Z @@ -19,13 +19,15 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= "no fee" PERMIT_DISTFILES_FTP= Yes -LIB_DEPENDS= tk80.1.::x11/tk80 +LIB_DEPENDS= tk83.1.::x11/tk/8.3 RUN_DEPENDS= rman::textproc/rman \ glimpse::textproc/glimpse +FAKE= Yes + .if !defined(NOPORTDOCS) post-install: - @mkdir -p ${PREFIX}/share/doc/tkman + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/tkman ${INSTALL_DATA} ${WRKSRC}/tkman-help.html ${PREFIX}/share/doc/tkman .endif diff --git a/misc/tkman/files/md5 b/misc/tkman/files/md5 index ff108a3d178..e76a3e888b5 100644 --- a/misc/tkman/files/md5 +++ b/misc/tkman/files/md5 @@ -1,3 +1,3 @@ -MD5 (tkman-2.0.6.tar.Z) = ed9b221357a77c55bc721e56da23032d -RMD160 (tkman-2.0.6.tar.Z) = 6d47495522c9c4a64841312a596925bdd3dc8dd3 -SHA1 (tkman-2.0.6.tar.Z) = fd1ed9e30ccff7ebb06ea750a054bab3b1c66c7a +MD5 (tkman-2.1b4.tar.Z) = 15c4567893fa81157332ce8835817c47 +RMD160 (tkman-2.1b4.tar.Z) = 4cf80f966f14f92f4c10ebeeb2282f3bf88bb152 +SHA1 (tkman-2.1b4.tar.Z) = a5420b96e95ef3d6ccacab307ab20a378306a1c2 diff --git a/misc/tkman/patches/patch-aa b/misc/tkman/patches/patch-aa index 9851bf308a1..41cd2877fda 100644 --- a/misc/tkman/patches/patch-aa +++ b/misc/tkman/patches/patch-aa @@ -1,13 +1,13 @@ ---- Makefile.orig Tue Nov 4 22:22:25 1997 -+++ Makefile Thu Nov 6 08:54:39 1997 -@@ -43,13 +43,13 @@ +--- Makefile.orig Mon Mar 27 22:32:35 2000 ++++ Makefile Mon Mar 27 22:43:29 2000 +@@ -27,14 +27,13 @@ ### you need to localize the paths on these lines - #WISH = /usr/sww/tcl-8.0/bin/wish + #WISH = /usr/sww/tcl-8.3/bin/wish -WISH = /private/share/bin/wish --#WISH = /usr/local/bin/wish8.0 -+#WISH = /private/share/bin/wish -+WISH = ${PREFIX}/bin/wish8.0 + #WISH = /private/share/bin/wish8.3 +-#WISH = /usr/local/bin/wish8.3 ++WISH = ${PREFIX}/bin/wish8.3 # the executable `tkman' is placed in BINDIR # this should be a directory that's in your bin PATH @@ -18,46 +18,54 @@ # OPTIONAL -@@ -85,10 +85,12 @@ +@@ -82,9 +81,9 @@ # 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 = "${PREFIX}/man /usr/share/man ${X11BASE}/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" + #masterbin = "/usr/bin /usr/local/bin /usr/sww/bin /usr/sww/share/bin /usr/sww/share/X11R5/bin" - # names of common printers, in addition to default printer (PRINTER or LPDEST) -@@ -118,11 +120,11 @@ - # lines are cached in .../man/cat@; +@@ -115,7 +114,7 @@ + # 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 -Tlatin1 -man /tmp/ll - 2>/dev/null} -+#manformat = {groff -te -Tlatin1 -man /tmp/ll - 2>/dev/null} + #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 } - # BSD macros (.Sh, .Ss, .PP, ...) call for -mandoc + # HP-UX uses a number of macros that groff doesn't define, so use the builtin nroff +@@ -123,7 +122,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 } - -@@ -156,7 +158,7 @@ - + # It's actually legal to leave this empty if all the pages you'll ever +@@ -168,13 +167,14 @@ # pick a printing pipeline for which your platform has all the constituants --manprint = {groff -man -Tps -te -l} + #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} -@@ -192,7 +194,7 @@ - # Check contrib/glimpse4-fix.txt for a bug fix patch for glimpseindex. + #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" +@@ -203,7 +203,7 @@ + # the right-topmost menu's Rebuild Database/Glimpse Index menu choice. # BY DEFAULT ON (Boolean scope set to entire file) -glimpse = "glimpse -W" @@ -65,31 +73,20 @@ # IF YOU DON'T WANT TO BOTHER WITH GLIMPSE, you can disable it here #glimpse = "" # give the full path, if you'd like -@@ -200,6 +202,7 @@ +@@ -211,6 +211,7 @@ # variations (refer to the Glimpse manual page) # no characters treated as meta characters: #glimpse = "glimpse -Wk" +glimpse = "glimpse -z" + # compressed manual pages are handled automatically; don't add -z to above # 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 -@@ -241,7 +244,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:${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 -@@ -440,8 +443,8 @@ +@@ -461,7 +462,7 @@ chmod +rx $(BINDIR)/tkman $(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?' ++ #@echo 'You also need RosettaMan to run TkMan.' test: dox tkman cp tkman $(BINDIR)