From 019483ccc47d8c416e357b8c1129fe74c771b7f7 Mon Sep 17 00:00:00 2001 From: fredb Date: Thu, 31 Aug 2000 03:58:14 +0000 Subject: Update to tkman-2.1. The most significant change is that the license is relaxed to be more GPL-like. Also, now requires tk-8.3.x, the "makefile" adds an option to use -mandoc for BSD-style man pages, which we enable, and Tkman now has a homepage. --- x11/tkman/Makefile | 24 +++++++++++------------- x11/tkman/files/md5 | 4 ++-- x11/tkman/files/patch-sum | 6 +++--- x11/tkman/patches/patch-aa | 44 +++++++++++++++++++++++++------------------- x11/tkman/patches/patch-ab | 14 ++++++-------- 5 files changed, 47 insertions(+), 45 deletions(-) (limited to 'x11/tkman') diff --git a/x11/tkman/Makefile b/x11/tkman/Makefile index c92d2fff86d..e23901ece5b 100644 --- a/x11/tkman/Makefile +++ b/x11/tkman/Makefile @@ -1,24 +1,22 @@ -# $NetBSD: Makefile,v 1.22 2000/08/18 22:46:52 hubertf Exp $ +# $NetBSD: Makefile,v 1.23 2000/08/31 03:58:14 fredb Exp $ # FreeBSD Id: Makefile,v 1.28 1997/12/08 15:51:20 tg Exp # -DISTNAME= tkman-2.1b2 -CATEGORIES= x11 tk80 -MASTER_SITES= ftp://ftp.cs.berkeley.edu/ucb/people/phelps/tcltk/ -EXTRACT_SUFX= .tar.Z +DISTNAME= tkman +PKGNAME= tkman-2.1 +CATEGORIES= x11 +MASTER_SITES= ftp://tkman.sourceforge.net/pub/tkman/ \ + http://tkman.sourceforge.net/ MAINTAINER= packages@netbsd.org +HOMEPAGE= http://tkman.sourceforge.net/ -DEPENDS+= tk-8.0.5:../../x11/tk80 -DEPENDS+= rman-3.0.*:../../textproc/rman DEPENDS+= glimpse-4.1:../../textproc/glimpse - -RESTRICTED= "Don't sell for profit" -NO_SRC_ON_FTP= ${RESTRICTED} -NO_SRC_ON_CDROM= ${RESTRICTED} -NO_BIN_ON_FTP= ${RESTRICTED} -NO_BIN_ON_CDROM= ${RESTRICTED} +DEPENDS+= rman-3.0.*:../../textproc/rman +DEPENDS+= tk-8.3.2:../../x11/tk USE_X11= yes +WRKSRC= ${WRKDIR}/${PKGNAME} + .include "../../mk/bsd.pkg.mk" diff --git a/x11/tkman/files/md5 b/x11/tkman/files/md5 index beefb8702c7..3ed75495a96 100644 --- a/x11/tkman/files/md5 +++ b/x11/tkman/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.7 1998/12/03 13:09:12 frueauf Exp $ +$NetBSD: md5,v 1.8 2000/08/31 03:58:14 fredb Exp $ -MD5 (tkman-2.1b2.tar.Z) = 4543f4d2159e94d9b5bbf6fb04317bc9 +MD5 (tkman.tar.gz) = c9ecaacf83a30f36ed0995ba51fdd33f diff --git a/x11/tkman/files/patch-sum b/x11/tkman/files/patch-sum index 57a7c74236f..0fbeb0df882 100644 --- a/x11/tkman/files/patch-sum +++ b/x11/tkman/files/patch-sum @@ -1,4 +1,4 @@ -$NetBSD: patch-sum,v 1.2 2000/04/18 06:49:18 fredb Exp $ +$NetBSD: patch-sum,v 1.3 2000/08/31 03:58:14 fredb Exp $ -MD5 (patch-aa) = 52e0019d707f606c1486bdddde93d1cc -MD5 (patch-ab) = bd6ca94464d9d4616ed7722d2ea7ff78 +MD5 (patch-aa) = 486264c0f38635c7030abaf55e115784 +MD5 (patch-ab) = ce1b2441b543379e15e0c62ad5ea5fb0 diff --git a/x11/tkman/patches/patch-aa b/x11/tkman/patches/patch-aa index 203737ccbde..8b3567b0251 100644 --- a/x11/tkman/patches/patch-aa +++ b/x11/tkman/patches/patch-aa @@ -1,27 +1,24 @@ -$NetBSD: patch-aa,v 1.5 1998/12/03 13:09:12 frueauf Exp $ +$NetBSD: patch-aa,v 1.6 2000/08/31 03:58:14 fredb Exp $ ---- Makefile.orig Sat Nov 21 01:21:26 1998 -+++ Makefile Sun Nov 29 05:26:12 1998 -@@ -41,14 +41,16 @@ +--- Makefile.orig Thu Jun 22 17:39:42 2000 ++++ Makefile Thu Aug 17 20:10:04 2000 +@@ -26,13 +26,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 = /private/share/bin/wish - #WISH = /private/share/bin/wish8.1 - #WISH = /usr/local/bin/wish8.0 -+WISH = ${LOCALBASE}/bin/wish8.0 ++WISH = ${LOCALBASE}/bin/wish + #WISH = /private/share/bin/wish8.3 + #WISH = /usr/local/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 = /private/share/bin - #BINDIR = /usr/local/bin +BINDIR = ${PREFIX}/bin + #BINDIR = /usr/local/bin - # OPTIONAL -@@ -94,11 +96,26 @@ +@@ -81,11 +81,26 @@ # 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. @@ -51,19 +48,28 @@ $NetBSD: patch-aa,v 1.5 1998/12/03 13:09:12 frueauf Exp $ # names of common printers, in addition to default printer (PRINTER or LPDEST) # (individual users can edit this list in the Preferences panel) -@@ -127,7 +144,7 @@ +@@ -114,7 +129,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${PREFIX} - 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 } # HP-UX uses a number of macros that groff doesn't define, so use the builtin nroff -@@ -359,8 +376,8 @@ +@@ -122,7 +137,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 +@@ -351,8 +366,8 @@ + echo 'set manx(mintcl) $(mintcl)' >> tkman echo 'set manx(mintk) $(mintk)' >> tkman echo 'set manx(newuser) $(newuser)' >> tkman - echo 'set manx(dirnameindex) $(dirnameindex)' >> tkman - echo 'set manx(mastermen) $(mastermen)' >> tkman - echo 'set manx(masterbin) $(masterbin)' >> tkman + echo 'set manx(mastermen) "$(mastermen)"' >> tkman diff --git a/x11/tkman/patches/patch-ab b/x11/tkman/patches/patch-ab index 88bb2a8748f..e145cbee341 100644 --- a/x11/tkman/patches/patch-ab +++ b/x11/tkman/patches/patch-ab @@ -1,17 +1,16 @@ -$NetBSD: patch-ab,v 1.3 2000/04/18 06:49:18 fredb Exp $ +$NetBSD: patch-ab,v 1.4 2000/08/31 03:58:14 fredb Exp $ ---- manpath.tcl.orig Sat Nov 21 00:21:24 1998 -+++ manpath.tcl Tue Apr 18 01:14:34 2000 +--- manpath.tcl.orig Thu Jun 22 17:39:42 2000 ++++ manpath.tcl Thu Aug 17 19:48:41 2000 @@ -19,8 +19,13 @@ # doesn't that's OK (it's got a good whatis organization) # BSDI concatenates all whatis information into single file - # share fBSDI with manualpage.tcl to find xxx.0 files -- set manx(fBSDI) [file readable [set whatis "/usr/share/man/whatis.db"]] + # share fBSDI with manualpage.tcl to find xxx.0 files, + # but NetBSD uses multiple whatis.db files. + if {![file executable "/usr/libexec/makewhatis"]} { -+ set manx(fBSDI) [file readable [set whatis "/usr/share/man/whatis.db"]] + set manx(fBSDI) [file readable [set whatis "/usr/share/man/whatis.db"]] + } else { + set manx(fBSDI) 0 + } @@ -25,10 +24,9 @@ $NetBSD: patch-ab,v 1.3 2000/04/18 06:49:18 fredb Exp $ - # check for apropos index (called windex on Solaris) + # check for apropos index (called windex on Solaris, whatis.db on NetBSD) if {!$manx(fBSDI) && !$fDebian && !$fHPUX} { - if ![file exists [set whatis $root/windex]] { -- set whatis $root/whatis + if {![file exists [set whatis [file join $root "windex"]]]} { + if ![file exists [set whatis $root/whatis.db]] { -+ set whatis $root/whatis + set whatis $root/whatis + } } } -- cgit v1.2.3