Adapt this package to tk-8.3.2.

7 files changed, 43 insertions, 38 deletions

diff --git a/x11/filerunner/Makefile b/x11/filerunner/Makefile
index 2fe4b7b2d99..d4f1aac4ea7 100644
--- a/x11/filerunner/Makefile
+++ b/x11/filerunner/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2000/02/05 15:42:24 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2000/08/31 17:40:46 jwise Exp $
 # $FreeBSD Id: Makefile,v 1.12 1998/02/24 21:43:11 jseger Exp
 #
 
@@ -10,7 +10,7 @@ MASTER_SITES=	${MASTER_SITE_SUNSITE:=X11/desktop/}
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.cd.chalmers.se/~hch/filerunner.html
 
-DEPENDS+=	tk-8.0.5:../../x11/tk80
+DEPENDS+=	tk-8.3.2:../../x11/tk
 
 USE_X11BASE=	yes
 
diff --git a/x11/filerunner/files/patch-sum b/x11/filerunner/files/patch-sum
index 482e55a55ee..219a5a1f0d6 100644
--- a/x11/filerunner/files/patch-sum
+++ b/x11/filerunner/files/patch-sum
@@ -1,4 +1,6 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 14:23:23 agc Exp $
+$NetBSD: patch-sum,v 1.2 2000/08/31 17:40:48 jwise Exp $
 
-MD5 (patch-aa) = 0fbf9ea921a3f81184f9206bd02ce40f
-MD5 (patch-ab) = ce1c1b6644d623d8a4ae89708e803a99
+MD5 (patch-aa) = 4599d6f40ee0fe74cee52b75aac14519
+MD5 (patch-ac) = c47bc448c499d9c3d931315208d13d5f
+MD5 (patch-ad) = 4745499ff3623dcf0bc4dc0cf919f4f0
+MD5 (patch-ae) = 5c734f492d89baff38bef11a48d4fd8f
diff --git a/x11/filerunner/patches/patch-aa b/x11/filerunner/patches/patch-aa
index 93014b4c59c..0d472c117c1 100644
--- a/x11/filerunner/patches/patch-aa
+++ b/x11/filerunner/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.4 1998/08/07 11:17:58 agc Exp $
+$NetBSD: patch-aa,v 1.5 2000/08/31 17:40:48 jwise Exp $
 
 --- Makefile.orig	Tue Mar 24 11:24:06 1998
 +++ Makefile	Tue Mar 24 11:25:50 1998
@@ -7,8 +7,8 @@ $NetBSD: patch-aa,v 1.4 1998/08/07 11:17:58 agc Exp $
 -TCLINC = /usr/local/lib/tcl8.0
 -TKINC  = /usr/local/lib/tk8.0
 -X11INC = /usr/X11/include
-+TCLINC = ${LOCALBASE}/include/tcl8.0
-+TKINC  = ${LOCALBASE}/include/tk8.0
++TCLINC = ${LOCALBASE}/include
++TKINC  = ${LOCALBASE}/include
 +X11INC = ${X11BASE}/include
  
  CFLAGS = -D__FreeBSD__ -Wall -fPIC -O3 -I$(TCLINC) -I$(TKINC) -I$(X11INC)
diff --git a/x11/filerunner/patches/patch-ab b/x11/filerunner/patches/patch-ab
deleted file mode 100644
index 445b367a771..00000000000
--- a/x11/filerunner/patches/patch-ab
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-ab,v 1.2 1998/08/07 11:17:58 agc Exp $
-
-*** fr.orig	Thu Sep 18 22:55:04 1997
---- fr	Thu Sep 18 22:57:08 1997
-*************** CheckCmdLineArgs
-*** 3125,3135 ****
-  
-  FindLibfr
-  
-  # Load patches for 8.0...
-! if {$tk_patchLevel == "8.0"} {
-!   #puts "Buggy 8.0 menu.tcl file, applying patch"
-!   source $glob(lib_fr)/menu_80_patch.tcl
-! }
-  
-  set auto_path [linsert $auto_path 0 $glob(lib_fr) ]
-  
---- 3125,3136 ----
-  
-  FindLibfr
-  
-+ # FreeBSD fix the bug already..
-  # Load patches for 8.0...
-! #if {$tk_patchLevel == "8.0"} {
-! #  #puts "Buggy 8.0 menu.tcl file, applying patch"
-! #  source $glob(lib_fr)/menu_80_patch.tcl
-! #}
-  
-  set auto_path [linsert $auto_path 0 $glob(lib_fr) ]
-  
diff --git a/x11/filerunner/patches/patch-ac b/x11/filerunner/patches/patch-ac
new file mode 100644
index 00000000000..2160ab08655
--- /dev/null
+++ b/x11/filerunner/patches/patch-ac
@@ -0,0 +1,11 @@
+$NetBSD: patch-ac,v 1.1 2000/08/31 17:40:48 jwise Exp $
+--- frcolor.orig	Thu Aug 31 13:23:11 2000
++++ frcolor	Thu Aug 31 13:24:16 2000
+@@ -1,6 +1,6 @@
+ #!/bin/sh
+ # the next line restarts using wish \
+-exec wish8.0 "$0" "$@"
++exec wish "$0" "$@"
+ 
+ # tcolor --
+ # This script implements a simple color editor, where you can
diff --git a/x11/filerunner/patches/patch-ad b/x11/filerunner/patches/patch-ad
new file mode 100644
index 00000000000..4370a59b191
--- /dev/null
+++ b/x11/filerunner/patches/patch-ad
@@ -0,0 +1,11 @@
+$NetBSD: patch-ad,v 1.1 2000/08/31 17:40:48 jwise Exp $
+--- frftp.orig	Thu Aug 31 13:23:26 2000
++++ frftp	Thu Aug 31 13:24:22 2000
+@@ -1,6 +1,6 @@
+ #! /bin/sh
+ # the next line restarts using wish \
+-exec wish8.0 $0 wish8.0 $*
++exec wish $0 wish $*
+ 
+ 
+ proc ShowWindow { realhost file } {
diff --git a/x11/filerunner/patches/patch-ae b/x11/filerunner/patches/patch-ae
new file mode 100644
index 00000000000..4b4067a9422
--- /dev/null
+++ b/x11/filerunner/patches/patch-ae
@@ -0,0 +1,11 @@
+$NetBSD: patch-ae,v 1.1 2000/08/31 17:40:48 jwise Exp $
+--- fr.orig	Thu Aug 31 13:23:06 2000
++++ fr	Thu Aug 31 13:24:11 2000
+@@ -1,6 +1,6 @@
+ #! /bin/sh
+ # -*- tcl -*- \
+-exec wish8.0 $0 wish8.0 $*
++exec wish $0 wish $*
+ 
+ set glob(version) 2.4.2
+