Upgrade to 2.4.

PR:		4569
Submitted by:	Vanill I. Shu <vanilla@MinJe.com.TW>

5 files changed, 52 insertions, 22 deletions

diff --git a/x11-fm/filerunner/Makefile b/x11-fm/filerunner/Makefile
index 796406b12d34..08d696ade3f5 100644
--- a/x11-fm/filerunner/Makefile
+++ b/x11-fm/filerunner/Makefile
@@ -1,26 +1,28 @@
 # New ports collection makefile for:	filerunner
-# Version required:	2.1
+# Version required:	2.4
 # Date created:		3 August 1996
 # Whom:			lukin
 #
-# $Id: Makefile,v 1.6 1997/05/24 09:16:59 obrien Exp $
+# $Id: Makefile,v 1.7 1997/05/24 17:08:36 obrien Exp $
 #
 
-DISTNAME=	FileRunner_2.3
-PKGNAME=	filerunner-2.3
-CATEGORIES=	x11 tk41
+DISTNAME=	FileRunner-2.4
+PKGNAME=	filerunner-2.4
+CATEGORIES=	x11 tk80
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	X11/desktop
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	lukin@okbmei.msk.su
 
-LIB_DEPENDS=	tk42\\.1:${PORTSDIR}/x11/tk42
+LIB_DEPENDS=	tk80\\.1:${PORTSDIR}/x11/tk80
 
+WRKSRC=		${WRKDIR}/FileRunner_2.4
 MAKEFILE=	Makefile.freebsd
 MAKE_ENV+=	X11BASE=${X11BASE}
 
 pre-build:
+	@ ${RM} ${WRKSRC}/ext.o
 	@ ${RM} ${WRKSRC}/ext.so
 	@ ${CP} ${WRKSRC}/Makefiles/Makefile.freebsd ${WRKSRC}
 
@@ -28,10 +30,10 @@ do-install:
 	@ ${MKDIR} ${PREFIX}/lib/FileRunner/bitmaps
 	@ ${INSTALL_SCRIPT} ${WRKSRC}/fr ${PREFIX}/lib/FileRunner
 	@ ln -sf ${PREFIX}/lib/FileRunner/fr ${PREFIX}/bin
-.for file in FAQ QuickStart.txt Users_Guide.txt chmod.tcl cmd.tcl config.tcl dialog_about.tcl ext.so font.tcl frcolor frftp ftp.tcl palette.tcl tclIndex HISTORY
+.for file in FAQ HISTORY QuickStart.txt Tips Users_Guide.txt chmod.tcl cmd.tcl config.tcl dialog_about.tcl ext.so font.tcl frcolor frftp ftp.tcl http.tcl palette.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 up.bit update.bit xterm.bit
+.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
 		@ ${INSTALL_DATA} ${WRKSRC}/bitmaps/${map} ${PREFIX}/lib/FileRunner/bitmaps
 .endfor
 
diff --git a/x11-fm/filerunner/distinfo b/x11-fm/filerunner/distinfo
index 9c1d5c356a38..7fd09d5623e8 100644
--- a/x11-fm/filerunner/distinfo
+++ b/x11-fm/filerunner/distinfo
@@ -1 +1 @@
-MD5 (FileRunner_2.3.tgz) = 4afe940178c82b7d9cd73d972352f37f
+MD5 (FileRunner-2.4.tgz) = e58a5455eb35bf2d1491e5821384b0bf
diff --git a/x11-fm/filerunner/files/patch-aa b/x11-fm/filerunner/files/patch-aa
index 6636e442ebd5..1515bc67936d 100644
--- a/x11-fm/filerunner/files/patch-aa
+++ b/x11-fm/filerunner/files/patch-aa
@@ -1,18 +1,15 @@
---- ./Makefiles/Makefile.freebsd.org	Mon May 19 23:59:20 1997
-+++ ./Makefiles/Makefile.freebsd	Tue May 20 00:01:05 1997
-@@ -2,11 +2,11 @@
+--- Makefiles/Makefile.freebsd.orig	Fri Aug  8 21:56:08 1997
++++ Makefiles/Makefile.freebsd	Fri Sep 19 08:59:04 1997
+@@ -2,9 +2,9 @@
  # It has been tested under FreeBSD 2.1.5.
  
  # Change this if you have this stuff somewhere else.
--TCLINC = /usr/local/lib/tcl7.6
--TKINC  = /usr/local/lib/tk4.2
+-TCLINC = /usr/local/lib/tcl8.0
+-TKINC  = /usr/local/lib/tk8.0
 -X11INC = /usr/X11/include
-+TCLINC = /usr/local/include/tcl7.6
-+TKINC  = /usr/local/include/tk4.2
-+X11INC = /usr/X11R6/include
++TCLINC = ${PREFIX}/include/tcl8.0
++TKINC  = ${PREFIX}/include/tk8.0
++X11INC = ${X11BASE}/include
  
--CFLAGS = -Wall -fPIC -O3 -I$(TCLINC) -I$(TKINC) -I$(X11INC)
-+CFLAGS += -Wall -fpic -DPIC -I$(TCLINC) -I$(TKINC) -I$(X11INC)
- 
- CC = gcc
+ 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
new file mode 100644
index 000000000000..098c910749c7
--- /dev/null
+++ b/x11-fm/filerunner/files/patch-ab
@@ -0,0 +1,28 @@
+*** 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-fm/filerunner/pkg-plist b/x11-fm/filerunner/pkg-plist
index e9404fbf4c63..75db38e72804 100644
--- a/x11-fm/filerunner/pkg-plist
+++ b/x11-fm/filerunner/pkg-plist
@@ -1,11 +1,11 @@
 lib/FileRunner/FAQ
 lib/FileRunner/HISTORY
 lib/FileRunner/QuickStart.txt
+lib/FileRunner/Tips
 lib/FileRunner/Users_Guide.txt
 lib/FileRunner/chmod.tcl
 lib/FileRunner/cmd.tcl
 lib/FileRunner/config.tcl
-lib/FileRunner/bitmaps/cross.bit
 lib/FileRunner/dialog_about.tcl
 lib/FileRunner/ext.so
 lib/FileRunner/font.tcl
@@ -13,8 +13,10 @@ lib/FileRunner/fr
 lib/FileRunner/frcolor
 lib/FileRunner/frftp
 lib/FileRunner/ftp.tcl
+lib/FileRunner/http.tcl
 lib/FileRunner/palette.tcl
 lib/FileRunner/tclIndex
+lib/FileRunner/bitmaps/cross.bit
 lib/FileRunner/bitmaps/frterm.bit
 lib/FileRunner/bitmaps/larger.bit
 lib/FileRunner/bitmaps/left.bit
@@ -23,6 +25,7 @@ lib/FileRunner/bitmaps/pgdown.bit
 lib/FileRunner/bitmaps/pgup.bit
 lib/FileRunner/bitmaps/right.bit
 lib/FileRunner/bitmaps/smaller.bit
+lib/FileRunner/bitmaps/tree.bit
 lib/FileRunner/bitmaps/toggle.bit
 lib/FileRunner/bitmaps/up.bit
 lib/FileRunner/bitmaps/update.bit