From 1ad040705f159c148abfa858dd4917dbaddf2e77 Mon Sep 17 00:00:00 2001 From: minskim Date: Fri, 3 Mar 2006 04:03:28 +0000 Subject: Update tkman to 2.2. This version is an update for Tcl/Tk 8.4. --- x11/tkman/Makefile | 18 ++++++++++-------- x11/tkman/distinfo | 14 +++++++------- x11/tkman/patches/patch-aa | 41 ++++++++++++++++++++--------------------- x11/tkman/patches/patch-ab | 12 ++++++------ x11/tkman/patches/patch-ad | 42 +++++++++++++++++++++--------------------- 5 files changed, 64 insertions(+), 63 deletions(-) (limited to 'x11') diff --git a/x11/tkman/Makefile b/x11/tkman/Makefile index f663c784a10..dcb859f0472 100644 --- a/x11/tkman/Makefile +++ b/x11/tkman/Makefile @@ -1,24 +1,26 @@ -# $NetBSD: Makefile,v 1.39 2006/02/05 23:11:44 joerg Exp $ +# $NetBSD: Makefile,v 1.40 2006/03/03 04:03:28 minskim Exp $ -DISTNAME= tkman -PKGNAME= tkman-2.1 -PKGREVISION= 1 +DISTNAME= tkman-2.2 CATEGORIES= x11 -MASTER_SITES= ftp://tkman.sourceforge.net/pub/tkman/ \ - http://tkman.sourceforge.net/ +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tkman/} MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://tkman.sourceforge.net/ COMMENT= Tcl/Tk based manual browser DEPENDS+= glimpse>=4.1:../../textproc/glimpse -DEPENDS+= tk>=8.3.2:../../x11/tk83 +DEPENDS+= tk>=8.4:../../x11/tk -WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} USE_RMAN= yes .include "../../mk/x11.buildlink3.mk" +post-extract: +.for f in Makefile manpath.tcl + ${MV} ${WRKSRC}/${f} ${WRKSRC}/${f}.cr + ${TR} -d '\r' < ${WRKSRC}/${f}.cr > ${WRKSRC}/${f} +.endfor + post-install: ${SED} -e 's|@@LOCALBASE@@|${LOCALBASE}|' \ -e 's|@@PREFIX@@|${PREFIX}|' \ diff --git a/x11/tkman/distinfo b/x11/tkman/distinfo index 775826caf2a..79a0e161369 100644 --- a/x11/tkman/distinfo +++ b/x11/tkman/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.3 2005/02/23 17:36:20 wiz Exp $ +$NetBSD: distinfo,v 1.4 2006/03/03 04:03:28 minskim Exp $ -SHA1 (tkman.tar.gz) = 0474cbe2704ee5cb01155c655594c669d844e6eb -RMD160 (tkman.tar.gz) = 9c040d68a9d683797c91fa636a5c0de3dec30796 -Size (tkman.tar.gz) = 224735 bytes -SHA1 (patch-aa) = 595396ea2c269904523bba1485cb54ac2efc2903 -SHA1 (patch-ab) = 96eb4193fceaa07e2c1f31f0fb44923a1cb5a8f6 +SHA1 (tkman-2.2.tar.gz) = c406b755b32292caa321397e5b76fba29d4f70b7 +RMD160 (tkman-2.2.tar.gz) = a5ab43102c3f4a3d6327c46dd4ca3ed4eed3ce15 +Size (tkman-2.2.tar.gz) = 229273 bytes +SHA1 (patch-aa) = b30770a9bcd44a009edcf193c1b9a23f9342adc8 +SHA1 (patch-ab) = 8e3fd6e2ac4bfa439184003c7b80f89789ac1eba SHA1 (patch-ac) = 4178da9370cdfc5da0231b12735da89f4cc6fe41 -SHA1 (patch-ad) = ca4dbeaa9c4f2d630f025796d464034d6f524eb5 +SHA1 (patch-ad) = 3a406eba6089305ec218ce0428296cb7f4cb438a diff --git a/x11/tkman/patches/patch-aa b/x11/tkman/patches/patch-aa index 046e6829451..76fb5bc9729 100644 --- a/x11/tkman/patches/patch-aa +++ b/x11/tkman/patches/patch-aa @@ -1,24 +1,24 @@ -$NetBSD: patch-aa,v 1.7 2000/09/01 03:14:16 fredb Exp $ +$NetBSD: patch-aa,v 1.8 2006/03/03 04:03:28 minskim Exp $ ---- Makefile.orig Thu Jun 22 17:39:42 2000 -+++ Makefile Thu Aug 17 20:10:04 2000 -@@ -26,13 +26,13 @@ +--- Makefile.orig 2006-03-02 19:38:02.000000000 -0800 ++++ Makefile +@@ -25,13 +25,13 @@ mintk = 8.4 + ### you need to localize the paths on these lines - #WISH = /usr/sww/tcl-8.3/bin/wish --WISH = /private/share/bin/wish +-WISH = /usr/local/bin/wish8.4 +WISH = ${LOCALBASE}/bin/wish - #WISH = /private/share/bin/wish8.3 - #WISH = /usr/local/bin/wish8.3 + #WISH = /usr/sww/tcl-8.4/bin/wish + #WISH = /private/share/bin/wish8.4 # 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 = ${PREFIX}/bin - #BINDIR = /usr/local/bin + #BINDIR = /private/share/bin -@@ -81,11 +81,26 @@ +@@ -80,11 +80,25 @@ rfcdir = "" # 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. @@ -26,7 +26,6 @@ $NetBSD: patch-aa,v 1.7 2000/09/01 03:14:16 fredb Exp $ +#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" --#masterbin = "/usr/bin /usr/local/bin /usr/sww/bin /usr/sww/share/bin /usr/sww/share/X11R5/bin" +mastermen = /usr/share/man ${LOCALBASE}/man ${X11BASE}/man +.if (${PREFIX} != ${LOCALBASE}) && (${PREFIX} != ${X11BASE}) +mastermen += ${PREFIX}/man @@ -34,9 +33,9 @@ $NetBSD: patch-aa,v 1.7 2000/09/01 03:14:16 fredb Exp $ +.if (${PREFIX} != "/usr/local") +mastermen += /usr/local/man +.endif - +#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 /usr/local/bin /usr/sww/bin /usr/sww/share/bin /usr/sww/share/X11R5/bin" +- +masterbin = /bin /sbin /usr/bin /usr/sbin +masterbin += ${LOCALBASE}/bin ${LOCALBASE}/sbin ${X11BASE}/bin +.if (${PREFIX} != ${LOCALBASE}) && (${PREFIX} != ${X11BASE}) @@ -48,7 +47,7 @@ $NetBSD: patch-aa,v 1.7 2000/09/01 03:14:16 fredb Exp $ # names of common printers, in addition to default printer (PRINTER or LPDEST) # (individual users can edit this list in the Preferences panel) -@@ -114,7 +129,7 @@ +@@ -113,7 +127,7 @@ dpis = "75 100" # 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 -} @@ -57,7 +56,7 @@ $NetBSD: patch-aa,v 1.7 2000/09/01 03:14:16 fredb Exp $ # 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,7 +137,7 @@ +@@ -121,7 +135,7 @@ manformat = {groff -te -Tlatin1 -man /tm # 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 @@ -66,7 +65,7 @@ $NetBSD: patch-aa,v 1.7 2000/09/01 03:14:16 fredb Exp $ # 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 @@ +@@ -349,8 +363,8 @@ tkman: $(srcs) $(libs) Makefile echo 'set manx(mintcl) $(mintcl)' >> tkman echo 'set manx(mintk) $(mintk)' >> tkman echo 'set manx(newuser) $(newuser)' >> tkman @@ -77,13 +76,13 @@ $NetBSD: patch-aa,v 1.7 2000/09/01 03:14:16 fredb Exp $ echo 'set man(zcat) $(zcat)' >> tkman echo 'set man(compress) $(compress)' >> tkman echo 'set man(apropos) $(apropos)' >> tkman -@@ -429,6 +444,9 @@ - echo '}' >> tkman +@@ -428,6 +442,9 @@ tkman: $(srcs) $(libs) Makefile echo 'image create bitmap texRebus -data {' >> tkman cat xbm/tex.xbm >> tkman -+ echo '}' >> tkman + echo '}' >> tkman + echo 'set manx(netbsd-bindings) {' >> tkman + cat contrib/netbsd_bindings.tcl >> tkman - echo '}' >> tkman ++ echo '}' >> tkman echo 'set manx(solaris-bindings) {' >> tkman cat contrib/solaris_bindings.tcl >> tkman + echo '}' >> tkman diff --git a/x11/tkman/patches/patch-ab b/x11/tkman/patches/patch-ab index e145cbee341..c012afda348 100644 --- a/x11/tkman/patches/patch-ab +++ b/x11/tkman/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.4 2000/08/31 03:58:14 fredb Exp $ +$NetBSD: patch-ab,v 1.5 2006/03/03 04:03:28 minskim Exp $ ---- manpath.tcl.orig Thu Jun 22 17:39:42 2000 -+++ manpath.tcl Thu Aug 17 19:48:41 2000 -@@ -19,8 +19,13 @@ +--- manpath.tcl.orig 2003-04-01 15:31:38.000000000 -0800 ++++ manpath.tcl +@@ -24,8 +24,13 @@ proc manManpathCheck {} { # doesn't that's OK (it's got a good whatis organization) # BSDI concatenates all whatis information into single file @@ -14,10 +14,10 @@ $NetBSD: patch-ab,v 1.4 2000/08/31 03:58:14 fredb Exp $ + } else { + set manx(fBSDI) 0 + } - set fDebian [expr {[file readable [set whatis "/usr/man/index.bt"]] || [file readable [set whatis "/var/catman/index.bt"]]}] + set fDebian [expr {[file readable [set whatis "/usr/share/man/index.bt"]] || [file readable [set whatis "/var/cache/man/index.bt"]] || [file readable [set whatis "/usr/man/index.bt"]] || [file readable [set whatis "/var/catman/index.bt"]]}] # HPUX concatenates all whatis information into single file set fHPUX 0; if {!$manx(fBSDI) && !$fDebian} { set fHPUX [file readable [set whatis "/usr/lib/whatis"]] } -@@ -79,10 +84,12 @@ +@@ -84,10 +89,12 @@ proc manManpathCheck {} { lappend manx(pathstat) $man($root) set manx($root,latest) [lfirst [manLatestMan $root]] diff --git a/x11/tkman/patches/patch-ad b/x11/tkman/patches/patch-ad index ce8f19c2cac..7df8748689e 100644 --- a/x11/tkman/patches/patch-ad +++ b/x11/tkman/patches/patch-ad @@ -1,22 +1,22 @@ -$NetBSD: patch-ad,v 1.1 2000/09/01 03:14:16 fredb Exp $ +$NetBSD: patch-ad,v 1.2 2006/03/03 04:03:28 minskim Exp $ ---- tkman.tcl.orig Thu Jun 22 17:39:42 2000 -+++ tkman.tcl Thu Aug 31 21:42:09 2000 -@@ -2353,7 +2353,7 @@ - set os [string tolower $tcl_platform(os)]; set osvers $tcl_platform(osVersion) - set setup ""; # most OSes work without configuration file - -- # three trouble makers -+ # trouble makers - if {[string equal $os "sunos"] && $osvers>=5.0} { - set setup solaris - if {$osvers>=5.7} {append setup "28" -@@ -2363,6 +2363,8 @@ - set setup irix - } elseif {[string equal $os "sco_sv"]} { - set setup $os -+ } elseif {[string match "netbsd*" $os]} { -+ set setup netbsd - } - #puts stderr "\afound $setup" - +--- tkman.tcl.orig 2003-04-01 15:31:38.000000000 -0800 ++++ tkman.tcl +@@ -2355,7 +2355,7 @@ if {$manx(startup) ne "" && ![file exist + set os [string tolower $tcl_platform(os)]; set osvers $tcl_platform(osVersion) + set setup ""; # most OSes work without configuration file + +- # three trouble makers ++ # trouble makers + if {$os eq "sunos" && $osvers>=5.0} { + set setup solaris + if {$osvers>=5.7} {append setup "28" +@@ -2365,6 +2365,8 @@ if {$manx(startup) ne "" && ![file exist + set setup irix + } elseif {$os eq "sco_sv"} { + set setup $os ++ } elseif {[string match "netbsd*" $os]} { ++ set setup netbsd + } + #puts stderr "\afound $setup" + -- cgit v1.2.3