Upgrade to 2.2. Port Makefile cleanup.

Become maintainer, use Tcl/Tk 8.5, add
canvas out-of-range bugfix from upstream.

ok landry@, sebastia@
This commit is contained in:
stu 2011-01-05 17:34:17 +00:00
parent de4c19506f
commit 1601bb8ec0
5 changed files with 55 additions and 51 deletions

View File

@ -1,35 +1,35 @@
# $OpenBSD: Makefile,v 1.22 2010/11/19 07:23:12 espie Exp $
# $OpenBSD: Makefile,v 1.23 2011/01/05 17:34:17 stu Exp $
COMMENT= Tcl/Tk-based manual browser
COMMENT = Tcl/Tk-based manual browser
DISTNAME= tkman-2.1
REVISION= 1
CATEGORIES= misc
HOMEPAGE= http://tkman.sourceforge.net/
DISTNAME = tkman-2.2
CATEGORIES = misc
HOMEPAGE = http://www.sourceforge.net/projects/tkman
MAINTAINER = Stuart Cassoff <stwo@users.sourceforge.net>
# Artistic License
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
PERMIT_PACKAGE_CDROM = Yes
PERMIT_PACKAGE_FTP = Yes
PERMIT_DISTFILES_CDROM =Yes
PERMIT_DISTFILES_FTP = Yes
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tkman/}
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=tkman/}
MODULES = x11/tk
MODULES= x11/tk
MODTCL_VERSION= 8.4
MODTK_VERSION= 8.4
RUN_DEPENDS= ${MODTK_RUN_DEPENDS} \
RUN_DEPENDS = ${MODTK_RUN_DEPENDS} \
textproc/rman \
textproc/glimpse
NO_REGRESS= Yes
NO_REGRESS = Yes
pre-patch:
perl -pi -e 's!\r\n$$!\n!g;' ${WRKSRC}/Makefile
do-install:
@${MODTCL_WISH_ADJ} ${WRKSRC}/tkman ${WRKSRC}/retkman
${INSTALL_SCRIPT} ${WRKSRC}/tkman ${PREFIX}/bin
${INSTALL_SCRIPT} ${WRKSRC}/retkman ${PREFIX}/bin
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/tkman
${INSTALL_DATA} ${WRKSRC}/tkman-help.html ${PREFIX}/share/doc/tkman
${INSTALL_DATA} ${WRKSRC}/manual.html ${PREFIX}/share/doc/tkman
.include <bsd.port.mk>

View File

@ -1,5 +1,5 @@
MD5 (tkman-2.1.tar.gz) = yeyqz4OjDzbtCZW6Uf3TPw==
RMD160 (tkman-2.1.tar.gz) = nAQNaKnWg3l8kfpjalwN497DB5Y=
SHA1 (tkman-2.1.tar.gz) = BHTL4nBO5csBFVxlVZTGadhE5us=
SHA256 (tkman-2.1.tar.gz) = mJd6mEdFyjVBMolPr4uZd95m5+VT7+hKFa7r3Ht4Itk=
SIZE (tkman-2.1.tar.gz) = 224735
MD5 (tkman-2.2.tar.gz) = DoFzXJOrJQDWEF/zMJXD6A==
RMD160 (tkman-2.2.tar.gz) = patDECw/Sj1jJ8Rt1Mo+1O7TzhU=
SHA1 (tkman-2.2.tar.gz) = xAa3VbMiksqjITl+W3b7op1PcLc=
SHA256 (tkman-2.2.tar.gz) = ri/eAnBfFUwRnHbKLZxBMvAXBjWdIYUItoJlLIz7MXM=
SIZE (tkman-2.2.tar.gz) = 229273

View File

@ -1,24 +1,16 @@
$OpenBSD: patch-Makefile,v 1.3 2009/03/13 22:36:38 sthen Exp $
--- Makefile.orig Thu Jun 22 23:39:42 2000
+++ Makefile Fri Mar 13 22:27:07 2009
@@ -26,14 +26,13 @@ mintk = 8.3
$OpenBSD: patch-Makefile,v 1.4 2011/01/05 17:34:17 stu Exp $
--- Makefile.orig Fri Dec 10 19:26:34 2010
+++ Makefile Fri Dec 10 19:35:54 2010
@@ -25,7 +25,7 @@ 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 = 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 = /usr/local/bin
# OPTIONAL
@@ -81,9 +80,9 @@ rfcdir = ""
@@ -80,9 +80,9 @@ 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.
@ -30,7 +22,7 @@ $OpenBSD: patch-Makefile,v 1.3 2009/03/13 22:36:38 sthen Exp $
#masterbin = "/usr/bin /usr/local/bin /usr/sww/bin /usr/sww/share/bin /usr/sww/share/X11R5/bin"
@@ -114,7 +113,7 @@ dpis = "75 100"
@@ -113,7 +113,7 @@ dpis = "75 100"
# Lines are cached in .../man/cat<n>@<line-length>;
# that is, the line length is appended to the usual cache directory names
#manformat = {groff -te -Tascii -man /tmp/ll -}
@ -39,7 +31,7 @@ $OpenBSD: patch-Makefile,v 1.3 2009/03/13 22:36:38 sthen 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 +121,7 @@ manformat = {groff -te -Tlatin1 -man /tmp/ll -}
@@ -121,7 +121,7 @@ manformat = {groff -te -Tlatin1 -man /tmp/ll -}
# 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
@ -48,7 +40,7 @@ $OpenBSD: patch-Makefile,v 1.3 2009/03/13 22:36:38 sthen Exp $
# BSDI
#manformat = {tbl | eqn -Tascii | nroff -man }
# It's actually legal to leave this empty if all the pages you'll ever
@@ -166,14 +165,14 @@ zlist = {gz z Z}
@@ -165,14 +165,14 @@ zlist = {gz z Z}
# pick a printing pipeline for which your platform has all the constituants
@ -65,16 +57,17 @@ $OpenBSD: patch-Makefile,v 1.3 2009/03/13 22:36:38 sthen Exp $
# printing string for preformatted pages without [tn]roff source
#catprint = lpr
#catprint = "lpr -h"
@@ -202,7 +201,7 @@ shortnames = 0
@@ -201,14 +201,15 @@ shortnames = 0
# the right-topmost menu's Rebuild Database/Glimpse Index menu choice.
# BY DEFAULT ON (Boolean scope set to entire file)
# BY DEFAULT OFF
-glimpse = ""
+#glimpse = ""
# Glimpse on, with 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
#glimpse = ""
# give the full path, if you'd like
@@ -210,6 +209,7 @@ glimpse = "glimpse -W"
#glimpse = /usr/sww/bin/glimpse
# variations (refer to the Glimpse manual page)
# no characters treated as meta characters:
#glimpse = "glimpse -Wk"
@ -82,7 +75,7 @@ $OpenBSD: patch-Makefile,v 1.3 2009/03/13 22:36:38 sthen Exp $
# compressed manual pages are handled automatically; don't add -z to above
# glimpseindex indexes the manual pages, for each component of one's MANPATH,
@@ -462,7 +462,7 @@ install: tkman retkman
@@ -460,7 +461,7 @@ install: tkman retkman
chmod +rx $(BINDIR)/tkman
$(CP) retkman $(BINDIR)
chmod +rx $(BINDIR)/retkman

View File

@ -0,0 +1,11 @@
$OpenBSD: patch-gui_tcl,v 1.1 2011/01/05 17:34:17 stu Exp $
--- gui.tcl.orig Fri Dec 10 20:44:34 2010
+++ gui.tcl Fri Dec 10 20:46:05 2010
@@ -746,6 +746,7 @@ proc manManTabSet {w} {
set repstr "ETRNIOASM aaabcdeeeefghiijklmnnooprrsttuy"; set replen [string length $repstr]
set rm [expr {[winfo width $t]-2*[$t cget -padx]-10}]
+ if {$rm <= 150} { set rm 151 }
$t tag configure info -tabs [list 0.3i $rm right]
$t tag configure census -tabs [list [expr {$rm-150}] right $rm right]
$t tag configure high -tabs [list $rm right]

View File

@ -1,5 +1,5 @@
@comment $OpenBSD: PLIST,v 1.3 2004/09/15 17:54:17 espie Exp $
@comment $OpenBSD: PLIST,v 1.4 2011/01/05 17:34:17 stu Exp $
bin/retkman
bin/tkman
share/doc/tkman/
share/doc/tkman/tkman-help.html
share/doc/tkman/manual.html