4 files changed, 43 insertions, 30 deletions

diff --git a/x11-fm/filerunner/Makefile b/x11-fm/filerunner/Makefile
index 0579446fcf6e..71ec31a040b0 100644
--- a/x11-fm/filerunner/Makefile
+++ b/x11-fm/filerunner/Makefile
@@ -3,32 +3,37 @@
 # Date created:		3 August 1996
 # Whom:			lukin
 #
-# $Id: Makefile,v 1.3 1996/11/18 10:36:49 asami Exp $
+# $Id: Makefile,v 1.4 1997/04/20 13:19:53 wosch Exp $
 #
 
-DISTNAME=	FileRunner_2.0
-PKGNAME=	filerunner-2.0
+DISTNAME=	FileRunner_2.3
+PKGNAME=	filerunner-2.3
 CATEGORIES=	x11 tk41
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR=	X11/xutils/managers
+MASTER_SITE_SUBDIR=	X11/desktop
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	lukin@okbmei.msk.su
 
-LIB_DEPENDS=	tk41\\.1:${PORTSDIR}/x11/tk41
+LIB_DEPENDS=	tk42\\.1:${PORTSDIR}/x11/tk42
 
 MAKEFILE=	Makefile.freebsd
 MAKE_ENV+=	X11BASE=${X11BASE}
 
 pre-build:
 	@ ${RM} ${WRKSRC}/ext.so
+	@ cp ${WRKSRC}/Makefiles/Makefile.freebsd ${WRKSRC}
 
 do-install:
 	@ ${MKDIR} -p ${PREFIX}/lib/FileRunner
+	@ ${MKDIR} -p ${PREFIX}/lib/FileRunner/bitmaps
 	@ ${INSTALL_SCRIPT} ${WRKSRC}/fr ${PREFIX}/lib/FileRunner
 	@ ln -sf ${PREFIX}/lib/FileRunner/fr ${PREFIX}/bin
-	@ for file in cmd.tcl config.tcl cross.bit ext.so font.tcl frcolor frftp frterm.bit ftp.tcl guide larger.bit left.bit max.bit pgdown.bit pgup.bit quickstart right.bit smaller.bit tclIndex up.bit update.bit xterm.bit; do \
+	@ 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; do \
 		${INSTALL_DATA} ${WRKSRC}/$$file ${PREFIX}/lib/FileRunner; \
 	done
+	@ 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; do \
+		${INSTALL_DATA} ${WRKSRC}/bitmaps/$$map ${PREFIX}/lib/FileRunner/bitmaps; \
+	done
 
 .include <bsd.port.mk>
diff --git a/x11-fm/filerunner/distinfo b/x11-fm/filerunner/distinfo
index 2164447134ed..9c1d5c356a38 100644
--- a/x11-fm/filerunner/distinfo
+++ b/x11-fm/filerunner/distinfo
@@ -1 +1 @@
-MD5 (FileRunner_2.0.tgz) = 5011ca2d5ff56bcd2c9d26a673f60da1
+MD5 (FileRunner_2.3.tgz) = 4afe940178c82b7d9cd73d972352f37f
diff --git a/x11-fm/filerunner/files/patch-aa b/x11-fm/filerunner/files/patch-aa
index 9502db833817..6636e442ebd5 100644
--- a/x11-fm/filerunner/files/patch-aa
+++ b/x11-fm/filerunner/files/patch-aa
@@ -1,15 +1,18 @@
---- Makefile.freebsd.orig	Sun Nov  3 12:10:48 1996
-+++ Makefile.freebsd	Sun Nov  3 12:12:19 1996
-@@ -2,9 +2,9 @@
+--- ./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 @@
  # It has been tested under FreeBSD 2.1.5.
  
  # Change this if you have this stuff somewhere else.
--TCLINC = /usr/local/lib/tcl7.5
--TKINC  = /usr/local/lib/tk4.1
+-TCLINC = /usr/local/lib/tcl7.6
+-TKINC  = /usr/local/lib/tk4.2
 -X11INC = /usr/X11/include
-+TCLINC = /usr/include
-+TKINC  = ${LOCALBASE}/include
-+X11INC = ${X11BASE}/include
++TCLINC = /usr/local/include/tcl7.6
++TKINC  = /usr/local/include/tk4.2
++X11INC = /usr/X11R6/include
  
- CFLAGS = -Wall -fPIC -O3 -I$(TCLINC) -I$(TKINC) -I$(X11INC)
+-CFLAGS = -Wall -fPIC -O3 -I$(TCLINC) -I$(TKINC) -I$(X11INC)
++CFLAGS += -Wall -fpic -DPIC -I$(TCLINC) -I$(TKINC) -I$(X11INC)
+ 
+ CC = gcc
  
diff --git a/x11-fm/filerunner/pkg-plist b/x11-fm/filerunner/pkg-plist
index 44d2addb7ac8..ff97ac8f7176 100644
--- a/x11-fm/filerunner/pkg-plist
+++ b/x11-fm/filerunner/pkg-plist
@@ -1,25 +1,30 @@
+lib/FileRunner/FAQ
+lib/FileRunner/QuickStart.txt
+lib/FileRunner/Users_Guide.txt
+lib/FileRunner/chmod.tcl
 lib/FileRunner/cmd.tcl
 lib/FileRunner/config.tcl
-lib/FileRunner/cross.bit
+lib/FileRunner/bitmaps/cross.bit
+lib/FileRunner/dialog_about.tcl
 lib/FileRunner/ext.so
 lib/FileRunner/font.tcl
 lib/FileRunner/fr
 lib/FileRunner/frcolor
 lib/FileRunner/frftp
-lib/FileRunner/frterm.bit
+lib/FileRunner/bitmaps/frterm.bit
 lib/FileRunner/ftp.tcl
-lib/FileRunner/guide
-lib/FileRunner/larger.bit
-lib/FileRunner/left.bit
-lib/FileRunner/max.bit
-lib/FileRunner/pgdown.bit
-lib/FileRunner/pgup.bit
-lib/FileRunner/quickstart
-lib/FileRunner/right.bit
-lib/FileRunner/smaller.bit
+lib/FileRunner/bitmaps/larger.bit
+lib/FileRunner/bitmaps/left.bit
+lib/FileRunner/bitmaps/max.bit
+lib/FileRunner/palette.tcl
+lib/FileRunner/bitmaps/pgdown.bit
+lib/FileRunner/bitmaps/pgup.bit
+lib/FileRunner/bitmaps/right.bit
+lib/FileRunner/bitmaps/smaller.bit
 lib/FileRunner/tclIndex
-lib/FileRunner/up.bit
-lib/FileRunner/update.bit
-lib/FileRunner/xterm.bit
+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