Make Vtcl work with Tcl/Tk 8.5.

Take maintinership.

Ok landry@
This commit is contained in:
stu 2012-08-10 04:03:25 +00:00
parent 2fe0e477e3
commit 1b2c447dc3
5 changed files with 41 additions and 7 deletions

View File

@ -1,10 +1,11 @@
# $OpenBSD: Makefile,v 1.6 2010/11/04 17:51:46 jasper Exp $
# $OpenBSD: Makefile,v 1.7 2012/08/10 04:03:25 stu Exp $
COMMENT= Visual Tcl development environment
DISTNAME= vtcl-1.6.1a1
REVISION= 0
REVISION= 1
CATEGORIES= devel
MAINTAINER = Stuart Cassoff <stwo@users.sourceforge.net>
HOMEPAGE= http://vtcl.sourceforge.net/
@ -16,8 +17,6 @@ PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=vtcl/}
MODTCL_VERSION= 8.4
MODTK_VERSION= 8.4
MODULES= x11/tk
NO_BUILD= Yes
RUN_DEPENDS= ${MODTK_RUN_DEPENDS}
@ -26,6 +25,7 @@ pre-patch:
@cd ${WRKSRC}; perl -i -pe 's/\r$$//' `find . -type f`
do-install:
rm ${WRKSRC}/lib/propmgr.tcl.orig ${WRKSRC}/lib/tkcon.tcl.orig
${INSTALL_DATA_DIR} ${PREFIX}/lib/vtcl
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/vtcl
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/vtcl

View File

@ -1,5 +1,2 @@
MD5 (vtcl-1.6.1a1.tar.gz) = e772w3G2XBlTDEZBfw9Xjw==
RMD160 (vtcl-1.6.1a1.tar.gz) = QXsy73Ltx2SLzC9mOy14u+ZyvJ0=
SHA1 (vtcl-1.6.1a1.tar.gz) = HjfOU2WTWIKOw5wC2T3brn3iXvM=
SHA256 (vtcl-1.6.1a1.tar.gz) = KvEix8aXIG6P3Lw3wlRQWr3+buX3fEqYQ09dxMKWj0U=
SIZE (vtcl-1.6.1a1.tar.gz) = 599864

View File

@ -0,0 +1,13 @@
$OpenBSD: patch-lib_propmgr_tcl,v 1.1 2012/08/10 04:03:25 stu Exp $
--- lib/propmgr.tcl.orig Wed Apr 25 17:52:28 2012
+++ lib/propmgr.tcl Wed Apr 25 18:00:47 2012
@@ -484,7 +484,8 @@ proc vTcl:prop:color_update {w val} {
}
proc vTcl:prop:new_attr {top option variable config_cmd config_args prefix {isGeomOpt ""}} {
- global vTcl $variable options specialOpts propmgrLabels
+ global vTcl options specialOpts propmgrLabels
+ global [regsub {(.+)\(.+\)} $variable {\1}]
set base $top.t${option}

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-lib_tkcon_tcl,v 1.1 2012/08/10 04:03:25 stu Exp $
--- lib/tkcon.tcl.orig Wed Apr 25 16:44:53 2012
+++ lib/tkcon.tcl Wed Apr 25 16:45:04 2012
@@ -40,7 +40,7 @@
if {$tcl_version < 8.0} {
return -code error "tkcon requires at least Tcl/Tk8"
} else {
- package require -exact Tk $tcl_version
+ package require Tk
}
# We need to load some package to get what's available, and we

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-vtcl_tcl,v 1.1 2012/08/10 04:03:25 stu Exp $
--- vtcl.tcl.orig Wed Apr 25 16:41:02 2012
+++ vtcl.tcl Wed Apr 25 16:45:19 2012
@@ -248,7 +248,7 @@ proc vTcl:setup_gui {} {
## We use our own version of Bwidgets with some bug fixes. Will submit them the
## bugs when time permits.
- package require -exact BWidget 1.3.1
+ package require BWidget
if {$tcl_platform(platform) == "macintosh"} {
set vTcl(pr,balloon) 0