Upgrade to 2.4.2.

4 files changed, 30 insertions, 42 deletions

diff --git a/x11-fm/filerunner/Makefile b/x11-fm/filerunner/Makefile
index 8af31c0e02c9..82fcae4d613b 100644
--- a/x11-fm/filerunner/Makefile
+++ b/x11-fm/filerunner/Makefile
@@ -1,29 +1,27 @@
 # New ports collection makefile for:	filerunner
-# Version required:	2.4.1
+# Version required:	2.4.2
 # Date created:		3 August 1996
 # Whom:			lukin
 #
-# $Id: Makefile,v 1.11 1998/01/19 13:21:37 vanilla Exp $
+# $Id: Makefile,v 1.12 1998/02/24 21:43:11 jseger Exp $
 #
 
-DISTNAME=	FileRunner_2.4.1
-PKGNAME=	filerunner-2.4.1
+DISTNAME=	FileRunner-2.4.2
+PKGNAME=	filerunner-2.4.2
 CATEGORIES=	x11 tk81
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	X11/desktop
-EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	vanilla@FreeBSD.ORG
 
 LIB_DEPENDS=	tk81\\.1:${PORTSDIR}/x11/tk81
 
-WRKSRC=		${WRKDIR}/FileRunner_2.4.1
-MAKEFILE=	Makefile.freebsd
+MAKEFILE=	Makefile.freebsd_gcc
 MAKE_ENV+=	X11BASE=${X11BASE}
 
 pre-build:
-	@ ${RM} ${WRKSRC}/ext.so
-	@ ${CP} ${WRKSRC}/Makefiles/Makefile.freebsd ${WRKSRC}
+#	@ ${RM} ${WRKSRC}/ext.so
+	@ ${CP} ${WRKSRC}/Makefiles/Makefile.freebsd_gcc ${WRKSRC}
 
 do-install:
 	@ ${MKDIR} ${PREFIX}/lib/FileRunner/bitmaps
diff --git a/x11-fm/filerunner/distinfo b/x11-fm/filerunner/distinfo
index 25f8495e40f5..52af56bc59a0 100644
--- a/x11-fm/filerunner/distinfo
+++ b/x11-fm/filerunner/distinfo
@@ -1 +1 @@
-MD5 (FileRunner_2.4.1.tgz) = f2973d3ceedf5d2e85aa06785998f8b6
+MD5 (FileRunner-2.4.2.tar.gz) = c13c392e1fca529a754fcd2843d625e0
diff --git a/x11-fm/filerunner/files/patch-aa b/x11-fm/filerunner/files/patch-aa
index 692d074162e9..c23f56f42719 100644
--- a/x11-fm/filerunner/files/patch-aa
+++ b/x11-fm/filerunner/files/patch-aa
@@ -1,7 +1,6 @@
---- Makefiles/Makefile.freebsd.orig	Fri Aug  8 21:56:08 1997
-+++ Makefiles/Makefile.freebsd	Mon Sep 22 12:03:44 1997
-@@ -2,11 +2,11 @@
- # It has been tested under FreeBSD 2.1.5.
+--- Makefiles/Makefile.freebsd_gcc.orig	Mon Mar  9 14:17:58 1998
++++ Makefiles/Makefile.freebsd_gcc	Mon Mar  9 14:19:07 1998
+@@ -1,10 +1,10 @@
  
  # Change this if you have this stuff somewhere else.
 -TCLINC = /usr/local/lib/tcl8.0
diff --git a/x11-fm/filerunner/files/patch-ab b/x11-fm/filerunner/files/patch-ab
index 098c910749c7..07f8d8f4a063 100644
--- a/x11-fm/filerunner/files/patch-ab
+++ b/x11-fm/filerunner/files/patch-ab
@@ -1,28 +1,19 @@
-*** 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) ]
-  
+--- fr.orig	Mon Mar  9 14:20:12 1998
++++ fr	Mon Mar  9 14:20:52 1998
+@@ -3162,11 +3162,12 @@
+ 
+ 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
+-}
++#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) ]
+