Adapt this package to NetBSD.

3 files changed, 24 insertions, 23 deletions

diff --git a/x11/filerunner/Makefile b/x11/filerunner/Makefile
index 0bd352e582b..bf1ef727cf8 100644
--- a/x11/filerunner/Makefile
+++ b/x11/filerunner/Makefile
@@ -3,37 +3,37 @@
 # Date created:		3 August 1996
 # Whom:			lukin
 #
+# $NetBSD: Makefile,v 1.2 1998/03/08 21:19:30 tron 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
-CATEGORIES=	x11 tk81
+CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	X11/desktop
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	vanilla@FreeBSD.ORG
 
-LIB_DEPENDS=	tk81\\.1:${PORTSDIR}/x11/tk81
+LIB_DEPENDS=	tk80.1:${PORTSDIR}/x11/tk80
 
+USE_X11=	yes
 WRKSRC=		${WRKDIR}/FileRunner_2.4.1
-MAKEFILE=	Makefile.freebsd
-MAKE_ENV+=	X11BASE=${X11BASE}
 
-pre-build:
-	@ ${RM} ${WRKSRC}/ext.so
-	@ ${CP} ${WRKSRC}/Makefiles/Makefile.freebsd ${WRKSRC}
+post-extract:
+	@${RM} ${WRKSRC}/ext.so
+	@${CP} ${WRKSRC}/Makefiles/Makefile.netbsd ${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/patches/patch-aa b/x11/filerunner/patches/patch-aa
index 692d074162e..9abf8ffc307 100644
--- a/x11/filerunner/patches/patch-aa
+++ b/x11/filerunner/patches/patch-aa
@@ -1,18 +1,18 @@
---- Makefiles/Makefile.freebsd.orig	Fri Aug  8 21:56:08 1997
-+++ Makefiles/Makefile.freebsd	Mon Sep 22 12:03:44 1997
+--- 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 FreeBSD 2.1.5.
+ # It has been tested under NetBSD 1.2.
  
  # 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.1
-+TKINC  = ${PREFIX}/include/tk8.1
+-TCLINC = /usr/local/include
+-TKINC  = /usr/local/include
+-X11INC = /usr/X11R6/include
++TCLINC = ${LOCALBASE}/include/tcl8.0
++TKINC  = ${LOCALBASE}/include/tk8.0
 +X11INC = ${X11BASE}/include
  
--CFLAGS = -Wall -fPIC -O3 -I$(TCLINC) -I$(TKINC) -I$(X11INC)
-+CFLAGS += -Wall -fPIC -I$(TCLINC) -I$(TKINC) -I$(X11INC)
+-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
  
diff --git a/x11/filerunner/pkg/PLIST b/x11/filerunner/pkg/PLIST
index b41fc05be41..7daeec29a6d 100644
--- a/x11/filerunner/pkg/PLIST
+++ b/x11/filerunner/pkg/PLIST
@@ -1,3 +1,5 @@
+@comment $NetBSD: PLIST,v 1.2 1998/03/08 21:19:30 tron Exp $
+bin/fr
 lib/FileRunner/FAQ
 lib/FileRunner/HISTORY
 lib/FileRunner/QuickStart.txt
@@ -29,6 +31,5 @@ lib/FileRunner/bitmaps/toggle.bit
 lib/FileRunner/bitmaps/up.bit
 lib/FileRunner/bitmaps/update.bit
 lib/FileRunner/bitmaps/xterm.bit
-bin/fr
 @dirrm lib/FileRunner/bitmaps
 @dirrm lib/FileRunner