Update to V2.4.2, fixing PR 5190 by Lennart Augustsson.

3 files changed, 24 insertions, 31 deletions

diff --git a/x11/filerunner/Makefile b/x11/filerunner/Makefile
index 4db5351d546..ee646ed236b 100644
--- a/x11/filerunner/Makefile
+++ b/x11/filerunner/Makefile
@@ -1,39 +1,37 @@
 # New ports collection makefile for:	filerunner
-# Version required:	2.4.1
-# Date created:		3 August 1996
-# Whom:			lukin
+# Version required:	2.4.2
+# Date created:		24th March 1998
+# Whom:			hubertf
 #
-# $NetBSD: Makefile,v 1.3 1998/03/24 09:54:56 tron Exp $
+# $NetBSD: Makefile,v 1.4 1998/03/24 11:00:12 hubertf Exp $
 # $FreeBSD 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
-MASTER_SITES=	${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR=	utilities
-EXTRACT_SUFX=	.tgz
+MASTER_SITES=	${MASTER_SITE_SUNSITE}
+MASTER_SITE_SUBDIR=	X11/desktop
 
-MAINTAINER=	vanilla@FreeBSD.ORG
+MAINTAINER=	packages@netbsd.org
 
 LIB_DEPENDS=	tk80.1:${PORTSDIR}/x11/tk80
 
 USE_X11=	yes
-WRKSRC=		${WRKDIR}/FileRunner_2.4.1
 
 post-extract:
-	@${RM} ${WRKSRC}/ext.so
-	@${CP} ${WRKSRC}/Makefiles/Makefile.netbsd ${WRKSRC}/Makefile
+	${RM} ${WRKSRC}/ext.so
+	${CP} ${WRKSRC}/Makefiles/Makefile.netbsd_gcc ${WRKSRC}/Makefile
 
 do-install:
-	@${MKDIR} ${PREFIX}/lib/FileRunner/bitmaps
-	@${INSTALL_SCRIPT} ${WRKSRC}/fr ${PREFIX}/lib/FileRunner
-	@ln -sf ${PREFIX}/lib/FileRunner/fr ${PREFIX}/bin
+	${MKDIR} ${PREFIX}/lib/FileRunner/bitmaps
+	${INSTALL_SCRIPT} ${WRKSRC}/fr ${PREFIX}/lib/FileRunner
+	ln -sf ${PREFIX}/lib/FileRunner/fr ${PREFIX}/bin
 .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 tclIndex
-		@${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/lib/FileRunner
+		${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
-		@${INSTALL_DATA} ${WRKSRC}/bitmaps/${map} ${PREFIX}/lib/FileRunner/bitmaps
+		${INSTALL_DATA} ${WRKSRC}/bitmaps/${map} ${PREFIX}/lib/FileRunner/bitmaps
 .endfor
 
 .include <bsd.port.mk>
diff --git a/x11/filerunner/files/md5 b/x11/filerunner/files/md5
index 25f8495e40f..52af56bc59a 100644
--- a/x11/filerunner/files/md5
+++ b/x11/filerunner/files/md5
@@ -1 +1 @@
-MD5 (FileRunner_2.4.1.tgz) = f2973d3ceedf5d2e85aa06785998f8b6
+MD5 (FileRunner-2.4.2.tar.gz) = c13c392e1fca529a754fcd2843d625e0
diff --git a/x11/filerunner/patches/patch-aa b/x11/filerunner/patches/patch-aa
index 9abf8ffc307..75a7c96b4b8 100644
--- a/x11/filerunner/patches/patch-aa
+++ b/x11/filerunner/patches/patch-aa
@@ -1,18 +1,13 @@
---- Makefile.orig	Sun Mar  8 21:35:00 1998
-+++ Makefile	Sun Mar  8 21:35:26 1998
-@@ -2,11 +2,11 @@
- # It has been tested under NetBSD 1.2.
- 
+--- Makefile.orig	Tue Mar 24 11:24:06 1998
++++ Makefile	Tue Mar 24 11:25:50 1998
+@@ -1,7 +1,7 @@
  # Change this if you have this stuff somewhere else.
--TCLINC = /usr/local/include
--TKINC  = /usr/local/include
--X11INC = /usr/X11R6/include
+-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
 +X11INC = ${X11BASE}/include
  
--CFLAGS = -D__FreeBSD__ -Wall -fPIC -O3 -I$(TCLINC) -I$(TKINC) -I$(X11INC)
-+CFLAGS = -D__FreeBSD__ -Wall -fPIC -O2 -I${TCLINC} -I${TKINC} -I${X11INC}
- 
- CC = gcc
+ CFLAGS = -D__FreeBSD__ -Wall -fPIC -O3 -I$(TCLINC) -I$(TKINC) -I$(X11INC)