4 files changed, 90 insertions, 68 deletions

diff --git a/x11-fm/filerunner/Makefile b/x11-fm/filerunner/Makefile
index 5569c7a66088..a333a8ba69e6 100644
--- a/x11-fm/filerunner/Makefile
+++ b/x11-fm/filerunner/Makefile
@@ -1,39 +1,41 @@
-# New ports collection makefile for:	filerunner
-# Date created:		3 August 1996
-# Whom:			lukin
-#
+# Created by: lukin
 # $FreeBSD$
-#
 
 PORTNAME=	filerunner
-PORTVERSION=	12.03.30.12
+PORTVERSION=	12.05.23.16
 CATEGORIES=	x11-fm tk
 MASTER_SITES=	SF/${PORTNAME}/Release-${PORTVERSION}
-DISTNAME=	fr-12.3.30.12
+DISTNAME=	fr-${PORTVERSION:S/.0/./}
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Filemanager with FTP capabilities. Uses Tcl/Tk
+COMMENT=	Tcl/Tk-based filemanager with FTP capabilities
 
 LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/COPYING
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 NO_BUILD=	yes
 
 USE_TK_WRAPPER=	yes
 
+PORTDOCS=	FAQ HISTORY README *.txt
+
+.include <bsd.port.options.mk>
+
 do-install:
-	@${MKDIR} ${PREFIX}/lib/FileRunner
-.for file in COPYING FAQ HISTORY README fr frftp tclIndex *.tcl *.txt *.xpm
-	${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/lib/FileRunner
+	@${MKDIR} ${DATADIR}
+.for file in fr frftp tclIndex *.tcl *.xpm
+	${INSTALL_DATA} ${WRKSRC}/${file} ${DATADIR}
 .endfor
-	@${MKDIR} ${PREFIX}/lib/FileRunner/bitmaps
-.for file in *.bit
-	${INSTALL_DATA} ${WRKSRC}/bitmaps/${file} ${PREFIX}/lib/FileRunner/bitmaps
+.for dir in bitmaps packages
+	@cd ${WRKSRC} && ${COPYTREE_SHARE} ${dir} ${DATADIR}
 .endfor
 .for file in fr frftp frcolor.tcl
-	@${CHMOD} ${BINMODE} ${PREFIX}/lib/FileRunner/${file}
+	@${CHMOD} ${BINMODE} ${DATADIR}/${file}
 .endfor
-	@${LN} -sf ${PREFIX}/lib/FileRunner/fr ${PREFIX}/bin/fr
+	@${LN} -sf ${DATADIR}/fr ${PREFIX}/bin/fr
+.if ${PORT_OPTIONS:MDOCS}
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
+.endif
 
 .include <bsd.port.mk>
diff --git a/x11-fm/filerunner/distinfo b/x11-fm/filerunner/distinfo
index ccb5d6bf3911..69870bb37f06 100644
--- a/x11-fm/filerunner/distinfo
+++ b/x11-fm/filerunner/distinfo
@@ -1,2 +1,2 @@
-SHA256 (fr-12.3.30.12.tar.gz) = 0dfe47e91829eae07cdfc0fb452659d1558dadaa962fd33690d942b6672086dd
-SIZE (fr-12.3.30.12.tar.gz) = 392100
+SHA256 (fr-12.5.23.16.tar.gz) = f43e72f3fa97ee9fc5e2efe289f9b9c98e1ad664b7b9258db22e92da16240e78
+SIZE (fr-12.5.23.16.tar.gz) = 426521
diff --git a/x11-fm/filerunner/files/patch-fr b/x11-fm/filerunner/files/patch-fr
new file mode 100644
index 000000000000..2860f158dddd
--- /dev/null
+++ b/x11-fm/filerunner/files/patch-fr
@@ -0,0 +1,19 @@
+--- ./fr.orig	2012-10-26 06:24:13.000000000 -0400
++++ ./fr	2012-10-26 06:25:32.000000000 -0400
+@@ -1,6 +1,6 @@
+ #! /bin/sh
+ # -*- tcl -*- \
+-    exec wish "$0" "$@"
++    exec wish "$0"
+ 
+ #set g }
+ 
+@@ -4509,7 +4509,7 @@
+   }
+   
+   if { ! [info exists glob(doclib_fr)] } {
+-    set glob(doclib_fr) $glob(lib_fr)
++    set glob(doclib_fr) $glob(lib_fr)/../doc/filerunner
+   }
+   foreach pkg [split [read [open $glob(lib_fr)/packages/list ]] "\n" ] {
+ #    puts ">$pkg<"
diff --git a/x11-fm/filerunner/pkg-plist b/x11-fm/filerunner/pkg-plist
index 343dc6d34bcb..ee5d5845c968 100644
--- a/x11-fm/filerunner/pkg-plist
+++ b/x11-fm/filerunner/pkg-plist
@@ -1,50 +1,51 @@
 bin/fr
-lib/FileRunner/COPYING
-lib/FileRunner/FAQ
-lib/FileRunner/FontControl.tcl
-lib/FileRunner/HISTORY
-lib/FileRunner/KnownBugs.txt
-lib/FileRunner/QuickStart.txt
-lib/FileRunner/README
-lib/FileRunner/Tips.txt
-lib/FileRunner/To_Do.txt
-lib/FileRunner/Users_Guide.txt
-lib/FileRunner/balloon.tcl
-lib/FileRunner/bitmaps/cross.bit
-lib/FileRunner/bitmaps/frterm.bit
-lib/FileRunner/bitmaps/larger.bit
-lib/FileRunner/bitmaps/left.bit
-lib/FileRunner/bitmaps/max.bit
-lib/FileRunner/bitmaps/pgdown.bit
-lib/FileRunner/bitmaps/pgup.bit
-lib/FileRunner/bitmaps/right.bit
-lib/FileRunner/bitmaps/smaller.bit
-lib/FileRunner/bitmaps/small-equ.bit
-lib/FileRunner/bitmaps/small-noeq.bit
-lib/FileRunner/bitmaps/small-right.bit
-lib/FileRunner/bitmaps/small-left.bit
-lib/FileRunner/bitmaps/toggle.bit
-lib/FileRunner/bitmaps/tree.bit
-lib/FileRunner/bitmaps/up.bit
-lib/FileRunner/bitmaps/update.bit
-lib/FileRunner/bitmaps/xterm.bit
-lib/FileRunner/chmod.tcl
-lib/FileRunner/cmd.tcl
-lib/FileRunner/config.tcl
-lib/FileRunner/dialog.tcl
-lib/FileRunner/displays.tcl
-lib/FileRunner/editfont.tcl
-lib/FileRunner/font.tcl
-lib/FileRunner/fr
-lib/FileRunner/frcolor.tcl
-lib/FileRunner/frftp
-lib/FileRunner/frutils.tcl
-lib/FileRunner/ftp.tcl
-lib/FileRunner/ftp_control.tcl
-lib/FileRunner/http.tcl
-lib/FileRunner/sftp.tcl
-lib/FileRunner/icon.xpm
-lib/FileRunner/tclIndex
-lib/FileRunner/tclmultilistbox.tcl
-@dirrm lib/FileRunner/bitmaps
-@dirrm lib/FileRunner
+%%DATADIR%%/FontControl.tcl
+%%DATADIR%%/balloon.tcl
+%%DATADIR%%/bitmaps/bitmapeditor
+%%DATADIR%%/bitmaps/cross.bit
+%%DATADIR%%/bitmaps/frterm.bit
+%%DATADIR%%/bitmaps/larger.bit
+%%DATADIR%%/bitmaps/left.bit
+%%DATADIR%%/bitmaps/max.bit
+%%DATADIR%%/bitmaps/pgdown.bit
+%%DATADIR%%/bitmaps/pgup.bit
+%%DATADIR%%/bitmaps/right.bit
+%%DATADIR%%/bitmaps/small-equ.bit
+%%DATADIR%%/bitmaps/small-left.bit
+%%DATADIR%%/bitmaps/small-noeq.bit
+%%DATADIR%%/bitmaps/small-right.bit
+%%DATADIR%%/bitmaps/smaller.bit
+%%DATADIR%%/bitmaps/toggle.bit
+%%DATADIR%%/bitmaps/tree.bit
+%%DATADIR%%/bitmaps/up.bit
+%%DATADIR%%/bitmaps/update.bit
+%%DATADIR%%/bitmaps/xterm.bit
+%%DATADIR%%/chmod.tcl
+%%DATADIR%%/cmd.tcl
+%%DATADIR%%/config.tcl
+%%DATADIR%%/cript.tcl
+%%DATADIR%%/dialog.tcl
+%%DATADIR%%/displays.tcl
+%%DATADIR%%/editfont.tcl
+%%DATADIR%%/font.tcl
+%%DATADIR%%/fr
+%%DATADIR%%/frcolor.tcl
+%%DATADIR%%/frftp
+%%DATADIR%%/frutils.tcl
+%%DATADIR%%/ftp.tcl
+%%DATADIR%%/ftp_control.tcl
+%%DATADIR%%/http.tcl
+%%DATADIR%%/icon.xpm
+%%DATADIR%%/packages/ftp/ftp.tcl
+%%DATADIR%%/packages/ftp/pkgIndex.tcl
+%%DATADIR%%/packages/list
+%%DATADIR%%/packages/log/log.tcl
+%%DATADIR%%/packages/log/pkgIndex.tcl
+%%DATADIR%%/sftp.tcl
+%%DATADIR%%/tclIndex
+%%DATADIR%%/tclmultilistbox.tcl
+@dirrm %%DATADIR%%/packages/log
+@dirrm %%DATADIR%%/packages/ftp
+@dirrm %%DATADIR%%/packages
+@dirrm %%DATADIR%%/bitmaps
+@dirrm %%DATADIR%%