From 1b2c447dc35b903fe902367e64f4d0acc05d4fef Mon Sep 17 00:00:00 2001
From: stu <stu@openbsd.org>
Date: Fri, 10 Aug 2012 04:03:25 +0000
Subject: [PATCH] Make Vtcl work with Tcl/Tk 8.5. Take maintinership.

Ok landry@
---
 devel/vtcl/Makefile                      |  8 ++++----
 devel/vtcl/distinfo                      |  3 ---
 devel/vtcl/patches/patch-lib_propmgr_tcl | 13 +++++++++++++
 devel/vtcl/patches/patch-lib_tkcon_tcl   | 12 ++++++++++++
 devel/vtcl/patches/patch-vtcl_tcl        | 12 ++++++++++++
 5 files changed, 41 insertions(+), 7 deletions(-)
 create mode 100644 devel/vtcl/patches/patch-lib_propmgr_tcl
 create mode 100644 devel/vtcl/patches/patch-lib_tkcon_tcl
 create mode 100644 devel/vtcl/patches/patch-vtcl_tcl

diff --git a/devel/vtcl/Makefile b/devel/vtcl/Makefile
index d1281d0fc3d..498bc677296 100644
--- a/devel/vtcl/Makefile
+++ b/devel/vtcl/Makefile
@@ -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
diff --git a/devel/vtcl/distinfo b/devel/vtcl/distinfo
index 52a6e7667c4..15b4582ea83 100644
--- a/devel/vtcl/distinfo
+++ b/devel/vtcl/distinfo
@@ -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
diff --git a/devel/vtcl/patches/patch-lib_propmgr_tcl b/devel/vtcl/patches/patch-lib_propmgr_tcl
new file mode 100644
index 00000000000..843defd6853
--- /dev/null
+++ b/devel/vtcl/patches/patch-lib_propmgr_tcl
@@ -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}
+ 
diff --git a/devel/vtcl/patches/patch-lib_tkcon_tcl b/devel/vtcl/patches/patch-lib_tkcon_tcl
new file mode 100644
index 00000000000..0880f30092d
--- /dev/null
+++ b/devel/vtcl/patches/patch-lib_tkcon_tcl
@@ -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
diff --git a/devel/vtcl/patches/patch-vtcl_tcl b/devel/vtcl/patches/patch-vtcl_tcl
new file mode 100644
index 00000000000..41b08a36763
--- /dev/null
+++ b/devel/vtcl/patches/patch-vtcl_tcl
@@ -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