9 files changed, 34 insertions, 32 deletions

diff --git a/x11-fm/filerunner/Makefile b/x11-fm/filerunner/Makefile
index c83a2046a8c7..700c0d959879 100644
--- a/x11-fm/filerunner/Makefile
+++ b/x11-fm/filerunner/Makefile
@@ -6,16 +6,17 @@
 #
 
 PORTNAME=	filerunner
-PORTVERSION=	2.5
-CATEGORIES=	x11-fm tk82
-MASTER_SITES=	${MASTER_SITE_SUNSITE}
+PORTVERSION=	2.5.1
+CATEGORIES=	x11-fm tk84
+MASTER_SITES=	http://www.cd.chalmers.se/~hch/ \
+		${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	X11/desktop
 DISTNAME=	FileRunner-${PORTVERSION}
 
 MAINTAINER=	andrew.nau.ua@gmail.com
 COMMENT=	Filemanager with FTP capabilities. Uses Tcl/Tk
 
-LIB_DEPENDS=	tk82.1:${PORTSDIR}/x11-toolkits/tk82
+LIB_DEPENDS=	tk84.1:${PORTSDIR}/x11-toolkits/tk84
 
 MAKEFILE=	Makefile.freebsd_gcc
 MAKE_ENV+=	X11BASE=${X11BASE}
@@ -30,7 +31,7 @@ do-install:
 	@ ${INSTALL_SCRIPT} ${WRKSRC}/frcolor ${PREFIX}/lib/FileRunner
 	@ ${INSTALL_SCRIPT} ${WRKSRC}/frftp ${PREFIX}/lib/FileRunner
 	@ ${LN} -sf ${PREFIX}/lib/FileRunner/fr ${PREFIX}/bin
-.for file in FAQ HISTORY QuickStart.txt Tips.txt Users_Guide.txt chmod.tcl cmd.tcl config.tcl dialog_about.tcl ext.so font.tcl ftp.tcl http.tcl tclIndex
+.for file in COPYING FAQ HISTORY KnownBugs.txt QuickStart.txt README Tips.txt Users_Guide.txt chmod.tcl cmd.tcl config.tcl dialog.tcl ext.so font.tcl ftp.tcl http.tcl tclIndex
 		@ ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/lib/FileRunner
 .endfor
 .for map in cross.bit frterm.bit larger.bit left.bit max.bit pgdown.bit pgup.bit right.bit smaller.bit toggle.bit tree.bit up.bit update.bit xterm.bit
diff --git a/x11-fm/filerunner/distinfo b/x11-fm/filerunner/distinfo
index 1e2a1b422837..663b22808ca3 100644
--- a/x11-fm/filerunner/distinfo
+++ b/x11-fm/filerunner/distinfo
@@ -1,2 +1,2 @@
-MD5 (FileRunner-2.5.tar.gz) = 5b05b0c165ce82b176cf12de074bc2c3
-SIZE (FileRunner-2.5.tar.gz) = 124263
+MD5 (FileRunner-2.5.1.tar.gz) = dc46234d75c906972696242cd330847d
+SIZE (FileRunner-2.5.1.tar.gz) = 122795
diff --git a/x11-fm/filerunner/files/patch-aa b/x11-fm/filerunner/files/patch-aa
index 9885f04ca0b0..c99e323fd747 100644
--- a/x11-fm/filerunner/files/patch-aa
+++ b/x11-fm/filerunner/files/patch-aa
@@ -1,13 +1,13 @@
---- Makefiles/Makefile.freebsd_gcc.orig	Mon Mar  9 14:17:58 1998
-+++ Makefiles/Makefile.freebsd_gcc	Mon Mar  9 14:19:07 1998
+--- Makefiles/Makefile.freebsd_gcc.orig	Wed Oct 12 17:56:27 2005
++++ Makefiles/Makefile.freebsd_gcc	Thu Dec 30 19:21:49 1999
 @@ -1,10 +1,10 @@
  
  # Change this if you have this stuff somewhere else.
 -TCLINC = /usr/local/lib/tcl8.0
 -TKINC  = /usr/local/lib/tk8.0
 -X11INC = /usr/X11/include
-+TCLINC = ${PREFIX}/include/tcl8.2
-+TKINC  = ${PREFIX}/include/tk8.2
++TCLINC = ${PREFIX}/include/tcl8.4
++TKINC   = ${PREFIX}/include/tk8.4
 +X11INC = ${X11BASE}/include
  
 -CFLAGS = -Wall -fPIC -O3 -I$(TCLINC) -I$(TKINC) -I$(X11INC)
diff --git a/x11-fm/filerunner/files/patch-ab b/x11-fm/filerunner/files/patch-ab
index 8b11c20abe94..beb53d9dd5e1 100644
--- a/x11-fm/filerunner/files/patch-ab
+++ b/x11-fm/filerunner/files/patch-ab
@@ -1,18 +1,16 @@
---- fr.orig	Mon Feb 16 04:09:54 1998
-+++ fr	Thu Mar 12 09:49:30 1998
+--- fr.orig	Wed Oct 12 18:13:36 2005
++++ fr	Wed Oct 12 18:15:47 2005
 @@ -1,6 +1,6 @@
  #! /bin/sh
  # -*- tcl -*- \
--exec wish8.0 $0 wish8.0 $*
-+exec wish8.2 $0 wish8.2 $*
+-exec wish $0 wish $*
++exec wish8.4 $0 wish8.4 $*
  
- set glob(version) 2.4.2
- 
-@@ -3162,11 +3162,12 @@
+ set glob(version) 2.5.1
  
+@@ -3301,10 +3301,10 @@
  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"
diff --git a/x11-fm/filerunner/files/patch-ac b/x11-fm/filerunner/files/patch-ac
index e3992272dccb..215eb6b4681a 100644
--- a/x11-fm/filerunner/files/patch-ac
+++ b/x11-fm/filerunner/files/patch-ac
@@ -1,5 +1,5 @@
---- ext.c.orig	Wed Jun 10 05:55:32 1998
-+++ ext.c	Sat Sep  2 23:56:45 2000
+--- ext.c.orig	Wed Oct 12 18:22:46 2005
++++ ext.c	Wed Oct 12 18:22:22 2005
 @@ -123,11 +123,12 @@
    HANDLE2(*p != '\0', "Error converting arg to int");
  
@@ -8,10 +8,10 @@
    if (dateformat)
 -    sprintf(interp->result, "%02d%02d%02d %02d:%02d:%02d", time_s->tm_mday, time_s->tm_mon+1,
 +    sprintf(interp->result, "%02d%02d%04d %02d:%02d:%02d", time_s->tm_mday, time_s->tm_mon+1,
-           time_s->tm_year, time_s->tm_hour, time_s->tm_min, time_s->tm_sec);
+           time_s->tm_year % 100, time_s->tm_hour, time_s->tm_min, time_s->tm_sec);
    else
--    sprintf(interp->result, "%02d%02d%02d %02d:%02d:%02d", time_s->tm_year, time_s->tm_mon+1,
-+    sprintf(interp->result, "%04d%02d%02d %02d:%02d:%02d", time_s->tm_year, time_s->tm_mon+1,
+-    sprintf(interp->result, "%02d%02d%02d %02d:%02d:%02d", time_s->tm_year % 100, time_s->tm_mon+1,
++    sprintf(interp->result, "%04d%02d%02d %02d:%02d:%02d", time_s->tm_year % 100, time_s->tm_mon+1,
            time_s->tm_mday, time_s->tm_hour, time_s->tm_min, time_s->tm_sec);
    return TCL_OK;
  }
diff --git a/x11-fm/filerunner/files/patch-frcolor b/x11-fm/filerunner/files/patch-frcolor
index ecd58213e3d4..6d577941148e 100644
--- a/x11-fm/filerunner/files/patch-frcolor
+++ b/x11-fm/filerunner/files/patch-frcolor
@@ -1,10 +1,10 @@
---- frcolor.orig	Thu Feb 15 03:32:30 2001
-+++ frcolor	Thu Feb 15 03:32:42 2001
+--- frcolor.orig	Wed Oct 12 18:25:44 2005
++++ frcolor	Wed Oct 12 18:22:46 2005
 @@ -1,6 +1,6 @@
  #!/bin/sh
  # the next line restarts using wish \
 -exec wish8.0 "$0" "$@"
-+exec wish8.2 "$0" "$@"
++exec wish8.4 "$0" "$@"
  
  # tcolor --
  # This script implements a simple color editor, where you can
diff --git a/x11-fm/filerunner/files/patch-frftp b/x11-fm/filerunner/files/patch-frftp
index 76cec96fe2f1..d06b3d5adea5 100644
--- a/x11-fm/filerunner/files/patch-frftp
+++ b/x11-fm/filerunner/files/patch-frftp
@@ -1,10 +1,10 @@
---- frftp.orig	Thu Feb 15 03:32:34 2001
-+++ frftp	Thu Feb 15 03:32:53 2001
+--- frftp.orig	Wed Oct 12 18:25:26 2005
++++ frftp	Wed Oct 12 18:22:46 2005
 @@ -1,6 +1,6 @@
  #! /bin/sh
  # the next line restarts using wish \
 -exec wish8.0 $0 wish8.0 $*
-+exec wish8.2 $0 wish8.2 $*
++exec wish8.4 $0 wish8.4 $*
  
  
  proc ShowWindow { realhost file } {
diff --git a/x11-fm/filerunner/pkg-descr b/x11-fm/filerunner/pkg-descr
index 0b5efc33206f..f6e08be579bb 100644
--- a/x11-fm/filerunner/pkg-descr
+++ b/x11-fm/filerunner/pkg-descr
@@ -2,4 +2,4 @@ Filemanager with FTP capabilities. Uses Tcl/Tk.
 Author: hch@cd.chalmers.se <Henrik Harmsen>
 
 FileRunner is distributed under the GNU General Public License since
-FileRunner version 2.5
+FileRunner version 2.5.1
diff --git a/x11-fm/filerunner/pkg-plist b/x11-fm/filerunner/pkg-plist
index 35279980981e..13aac8712502 100644
--- a/x11-fm/filerunner/pkg-plist
+++ b/x11-fm/filerunner/pkg-plist
@@ -1,12 +1,15 @@
+lib/FileRunner/COPYING
 lib/FileRunner/FAQ
 lib/FileRunner/HISTORY
+lib/FileRunner/KnownBugs.txt
 lib/FileRunner/QuickStart.txt
+lib/FileRunner/README
 lib/FileRunner/Tips.txt
 lib/FileRunner/Users_Guide.txt
 lib/FileRunner/chmod.tcl
 lib/FileRunner/cmd.tcl
 lib/FileRunner/config.tcl
-lib/FileRunner/dialog_about.tcl
+lib/FileRunner/dialog.tcl
 lib/FileRunner/ext.so
 lib/FileRunner/font.tcl
 lib/FileRunner/fr