- Update to 13.07.25.13

- Convert to USES+=tk
- Take maintainership (tcltk@FreeBSD.org)
- Move PORTDOCS into DATADIR, since they're used by the program itself
- STAGE-clean

4 files changed, 50 insertions, 41 deletions

diff --git a/x11-fm/filerunner/Makefile b/x11-fm/filerunner/Makefile
index 77bf6c799ab8..4878537c3dc1 100644
--- a/x11-fm/filerunner/Makefile
+++ b/x11-fm/filerunner/Makefile
@@ -2,12 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	filerunner
-PORTVERSION=	12.05.23.16
+PORTVERSION=	13.07.25.13
 CATEGORIES=	x11-fm tk
-MASTER_SITES=	SF/${PORTNAME}/Release-${PORTVERSION}
+MASTER_SITES=	SF/${PORTNAME}/release-${PORTVERSION:S/.0/./}
 DISTNAME=	fr-${PORTVERSION:S/.0/./}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	tcltk@FreeBSD.org
 COMMENT=	Tcl/Tk-based filemanager with FTP capabilities
 
 LICENSE=	GPLv2
@@ -15,28 +15,25 @@ LICENSE=	GPLv2
 WRKSRC=		${WRKDIR}/${PORTNAME}
 NO_BUILD=	yes
 
-USE_TK_WRAPPER=	yes
+USES+=		tk:run
 
-PORTDOCS=	FAQ HISTORY README *.txt
-
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
+post-patch:
+	${REINPLACE_CMD} -e 's|%%WISH%%|${WISH}|' ${WRKSRC}/fr
 
 do-install:
-	@${MKDIR} ${DATADIR}
-.for file in fr frftp tclIndex *.tcl *.xpm
-	${INSTALL_DATA} ${WRKSRC}/${file} ${DATADIR}
+	@${MKDIR} ${STAGEDIR}${DATADIR}/doc
+.for file in fr frftp tclIndex *.tcl
+	${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DATADIR}
+.endfor
+.for file in FAQ HISTORY README *.txt
+	${INSTALL_DATA} ${WRKSRC}/doc/${file} ${STAGEDIR}${DATADIR}/doc
 .endfor
 .for dir in bitmaps packages
-	@cd ${WRKSRC} && ${COPYTREE_SHARE} ${dir} ${DATADIR}
+	cd ${WRKSRC} && ${COPYTREE_SHARE} ${dir} ${STAGEDIR}${DATADIR}
 .endfor
 .for file in fr frftp frcolor.tcl
-	@${CHMOD} ${BINMODE} ${DATADIR}/${file}
+	@${CHMOD} ${BINMODE} ${STAGEDIR}${DATADIR}/${file}
 .endfor
-	@${LN} -sf ${DATADIR}/fr ${PREFIX}/bin/fr
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
-.endif
+	@${LN} -sf ${DATADIR}/fr ${STAGEDIR}${PREFIX}/bin/fr
 
 .include <bsd.port.mk>
diff --git a/x11-fm/filerunner/distinfo b/x11-fm/filerunner/distinfo
index 69870bb37f06..123cf386c381 100644
--- a/x11-fm/filerunner/distinfo
+++ b/x11-fm/filerunner/distinfo
@@ -1,2 +1,2 @@
-SHA256 (fr-12.5.23.16.tar.gz) = f43e72f3fa97ee9fc5e2efe289f9b9c98e1ad664b7b9258db22e92da16240e78
-SIZE (fr-12.5.23.16.tar.gz) = 426521
+SHA256 (fr-13.7.25.13.tar.gz) = ac96a1b92735d23a80ac6e1d19c318f82885aa8a0073b05edf881ab14c42b518
+SIZE (fr-13.7.25.13.tar.gz) = 486524
diff --git a/x11-fm/filerunner/files/patch-fr b/x11-fm/filerunner/files/patch-fr
index 2860f158dddd..9acff020fadf 100644
--- a/x11-fm/filerunner/files/patch-fr
+++ b/x11-fm/filerunner/files/patch-fr
@@ -1,19 +1,8 @@
---- ./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"
+--- fr.orig	2013-10-15 09:26:02.000000000 +0200
++++ fr	2013-10-15 09:27:49.000000000 +0200
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env wish
++#! %%WISH%%
+ # -*- tcl -*-
  
- #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 ee5d5845c968..ede15d7757ec 100644
--- a/x11-fm/filerunner/pkg-plist
+++ b/x11-fm/filerunner/pkg-plist
@@ -1,5 +1,6 @@
 bin/fr
 %%DATADIR%%/FontControl.tcl
+%%DATADIR%%/aftp.tcl
 %%DATADIR%%/balloon.tcl
 %%DATADIR%%/bitmaps/bitmapeditor
 %%DATADIR%%/bitmaps/cross.bit
@@ -20,32 +21,54 @@ bin/fr
 %%DATADIR%%/bitmaps/up.bit
 %%DATADIR%%/bitmaps/update.bit
 %%DATADIR%%/bitmaps/xterm.bit
+%%DATADIR%%/centerWin.tcl
 %%DATADIR%%/chmod.tcl
 %%DATADIR%%/cmd.tcl
+%%DATADIR%%/cmdcomplete.tcl
+%%DATADIR%%/colorList.tcl
 %%DATADIR%%/config.tcl
 %%DATADIR%%/cript.tcl
-%%DATADIR%%/dialog.tcl
-%%DATADIR%%/displays.tcl
 %%DATADIR%%/editfont.tcl
+%%DATADIR%%/entrydialog.tcl
 %%DATADIR%%/font.tcl
 %%DATADIR%%/fr
 %%DATADIR%%/frcolor.tcl
 %%DATADIR%%/frftp
+%%DATADIR%%/frputs.tcl
 %%DATADIR%%/frutils.tcl
 %%DATADIR%%/ftp.tcl
 %%DATADIR%%/ftp_control.tcl
 %%DATADIR%%/http.tcl
-%%DATADIR%%/icon.xpm
+%%DATADIR%%/packages/expect/expect.tcl
+%%DATADIR%%/packages/expect/pkgIndex.tcl
 %%DATADIR%%/packages/ftp/ftp.tcl
 %%DATADIR%%/packages/ftp/pkgIndex.tcl
-%%DATADIR%%/packages/list
+%%DATADIR%%/packages/inotify/i686/libinotify1.4.1.so
+%%DATADIR%%/packages/inotify/i686/pkgIndex.tcl
+%%DATADIR%%/packages/inotify/x86_64/libinotify1.4.1.so
+%%DATADIR%%/packages/inotify/x86_64/pkgIndex.tcl
 %%DATADIR%%/packages/log/log.tcl
 %%DATADIR%%/packages/log/pkgIndex.tcl
+%%DATADIR%%/replacetearoff.tcl
 %%DATADIR%%/sftp.tcl
+%%DATADIR%%/smart_dialog.tcl
 %%DATADIR%%/tclIndex
 %%DATADIR%%/tclmultilistbox.tcl
+%%DATADIR%%/textsearch.tcl
+%%DATADIR%%/doc/FAQ
+%%DATADIR%%/doc/HISTORY
+%%DATADIR%%/doc/KnownBugs.txt
+%%DATADIR%%/doc/QuickStart.txt
+%%DATADIR%%/doc/README
+%%DATADIR%%/doc/Tips.txt
+%%DATADIR%%/doc/Users_Guide.txt
 @dirrm %%DATADIR%%/packages/log
+@dirrm %%DATADIR%%/packages/inotify/x86_64
+@dirrm %%DATADIR%%/packages/inotify/i686
+@dirrm %%DATADIR%%/packages/inotify
 @dirrm %%DATADIR%%/packages/ftp
+@dirrm %%DATADIR%%/packages/expect
 @dirrm %%DATADIR%%/packages
+@dirrm %%DATADIR%%/doc
 @dirrm %%DATADIR%%/bitmaps
 @dirrm %%DATADIR%%