Update vfu to 3.04. Changes:

   3.04:  24.May.2002
     % 0. This version should be named over `04' as result of
          large number of changes (most internal ones)...
          Still I'll wait next release to be able receive any
          bug reports before major version change...
          (there is about 1.5 years since 3.03:))
     + 1. Added FastSizeCache option -- turns off directory
          resolving for directory size cache which means that
          the cache will act faster but you won't get sizes for
          symlinked dirs.
     + 2. Added `Randomize' function to file list arrange menu.
     ! 3. Rename tools now work on filename only, not on the full
          pathname (usual bug in recursive scanning -- Ctrl+R)
     ! 4. Fixed loops on incremental searches in the files list and
          directory tree.
     + 5. Actual files size is now reported before copy/move.
     + 6. Size chache is now auto-cleaned on dir size recalculation.
     + 7. Now errors on copy/move/symlink/erase can be ignored (always
          skipped quietly).
     ! 8. Temporary files used for view filters are now removed.
     ! 9. Now all temporary files and directories are set owner
          read/write/traverse permission only.
     !10. Fixed problem with browsing/user commands for files inside
          archive.
     !11. Fixed problem when quit unsaved file that cannot be saved
          from the internal editor.
     !12. Fixed `Name###' arrange mode.
     +13. Now file list can be sorted separately by modify, change and
          access time.
     !14. Fixed directory size cache for symlink-ed dirs.
     !15. Now VFU accepts trigger `.automount' just like `automount'.
     !16. Now extension colors loaded from DIR_COLORS are added to
          those from vfu.conf (not overwritten)
     !17. Internal: changed all PSZCluster+StrSplitter to VArray+VTrie
     !18. Fixed configuration file problems (missing archives etc.)
     !19. SIGWINCH finally works, i.e. VFU redraws on terminal resize
          (please report any problems regarding this one!)

   3.03:  31.Dec.2000
     ! 1. Documentation fixed to address directory bookmarks in the
          vfu.conf correctly. ( bookmark#=path )
     ! 2. Added option for VFU to handle Ctrl+Z, Ctrl+C, Ctrl+\ as
          it is expected (suspend,interrupt,quit).
          To use it you have to export UNICON_NO_RAW environment var
          with any value. ( for bash: `export UNICON_NO_RAW=1' )
     ! 3. User menu is fixed.
     + 4. Change directory completion menu is now sorted.
     + 5. Sequential rename function added (Tools/Rename menu)
     + 6. Now directory sizes cache is removed from the directory
          tree, so you can have directory sizes saved even if you
          don't have directory tree built.

   3.02:  01.Aug.2000

     ! 1. Several DJGPP (DOS/Win9x) portability fixups.
     ! 2. Fixed problem with input line for long directory names.
     ! 3. Fixed directory tree sizes calculation.
     + 4. Added inode size cache for directories that are new to
          the currently saved directory tree. (unix version only)

     ! 5. Fixed major bug in file move procedure.
     ! 6. Fixed extension masking `for all' in user externals.
     - 7. Now all path lists in vfu.conf (like TrimTree) are
          `:' separated (or `;' for dos version)

4 files changed, 46 insertions, 51 deletions

diff --git a/misc/vfu/Makefile b/misc/vfu/Makefile
index 3f1e7b0b933..a1c45902c4e 100644
--- a/misc/vfu/Makefile
+++ b/misc/vfu/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.23 2001/07/13 07:09:20 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2002/05/25 15:04:04 hubertf Exp $
 #
 
-DISTNAME=	vfu-3.01
+DISTNAME=	vfu-3.04
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SUNSITE:=utils/file/managers/} \
-		http://www.biscom.net/~cade/away/vfu/
+		http://www.biscom.net/~cade/vfu/
 EXTRACT_SUFX=	.src.tar.gz
 
 MAINTAINER=	hubertf@netbsd.org
@@ -12,7 +12,7 @@ HOMEPAGE=	http://www.biscom.net/~cade/away/vfu/
 COMMENT=	Small, handy, easy-to-use file manager
 
 USE_BUILDLINK_ONLY=	# defined
-USE_PERL5=		# defined
+#USE_PERL5=		# defined
 
 DOCDIR=			${PREFIX}/share/doc/vfu
 EGDIR=			${PREFIX}/share/examples/vfu
@@ -35,21 +35,17 @@ pre-install:
 	${SED} ${FILES_SUBST_SED} ${PKGDIR}/INSTALL > ${INSTALL_FILE}
 
 do-install:
-	cd ${WRKSRC}; ${INSTALL_PROGRAM} vfu/vfu ftparc/ftparc ${PREFIX}/bin
-	cd ${WRKSRC}; for i in rx_auto rx_deb rx_ftp rx_tar rx_zip; do	\
-		${ECHO} $$i;						\
-		${SED} -e "s|/usr/bin/perl|${PERL5}|g"			\
-			rx/$$i > rx/$$i.new;				\
-		${INSTALL_SCRIPT} rx/$$i.new ${PREFIX}/bin/$$i;		\
-	done
+	cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} ${SH} install
+
+post-install:
 	${INSTALL_DATA_DIR} ${DOCDIR} ${EGDIR}
 	cd ${WRKSRC};							\
-	${INSTALL_DATA} COPYING INSTALL vfu/README VFU.txt ${DOCDIR}
+	${INSTALL_DATA} COPYING INSTALL CONFIG FAQ HISTORY NOTES README \
+		README.DOS THANKS.TO TODO XWINDOW.NOTES ${DOCDIR}
 	cd ${WRKSRC};							\
 	${INSTALL_DATA} ${WRKSRC}/vfu.conf ${EGDIR}/vfurc
-
-post-install:
 	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
 
 .include "../../devel/ncurses/buildlink.mk"
+.include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/vfu/PLIST b/misc/vfu/PLIST
index fcb8deba1d7..e164951c1c1 100644
--- a/misc/vfu/PLIST
+++ b/misc/vfu/PLIST
@@ -1,15 +1,24 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:29:51 zuntum Exp $
-bin/vfu
+@comment $NetBSD: PLIST,v 1.2 2002/05/25 15:04:04 hubertf Exp $
 bin/ftparc
 bin/rx_auto
 bin/rx_deb
 bin/rx_ftp
 bin/rx_tar
 bin/rx_zip
+bin/vfu
+etc/vfu.conf
+man/man1/vfu.1
+share/doc/vfu/CONFIG
 share/doc/vfu/COPYING
+share/doc/vfu/FAQ
+share/doc/vfu/HISTORY
 share/doc/vfu/INSTALL
+share/doc/vfu/NOTES
 share/doc/vfu/README
-share/doc/vfu/VFU.txt
+share/doc/vfu/README.DOS
+share/doc/vfu/THANKS.TO
+share/doc/vfu/TODO
+share/doc/vfu/XWINDOW.NOTES
 share/examples/vfu/vfurc
 @dirrm share/examples/vfu
 @dirrm share/doc/vfu
diff --git a/misc/vfu/distinfo b/misc/vfu/distinfo
index 85437cfa8ca..0c5f8ca1b08 100644
--- a/misc/vfu/distinfo
+++ b/misc/vfu/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.3 2001/06/20 05:27:32 jlam Exp $
+$NetBSD: distinfo,v 1.4 2002/05/25 15:04:04 hubertf Exp $
 
-SHA1 (vfu-3.01.src.tar.gz) = d605b22d410fcf5e44cf2179ebe7fe2104535826
-Size (vfu-3.01.src.tar.gz) = 264831 bytes
-SHA1 (patch-aa) = 01170386c285275f7918609dac099eb8e383bbe1
-SHA1 (patch-ab) = 9de01899c0fc6e90826abad196a379f9dfeb7a47
-SHA1 (patch-ac) = d718ada60a94b77391bc3efda12987461243d39d
+SHA1 (vfu-3.04.src.tar.gz) = 75e87d102114dc08136420e7927e687f72a52dfd
+Size (vfu-3.04.src.tar.gz) = 187519 bytes
+SHA1 (patch-aa) = 379405096d8e86fb52493c6a1b7bdc5866c10822
diff --git a/misc/vfu/patches/patch-aa b/misc/vfu/patches/patch-aa
index 6580af074c9..6abc4af79b2 100644
--- a/misc/vfu/patches/patch-aa
+++ b/misc/vfu/patches/patch-aa
@@ -1,32 +1,24 @@
-$NetBSD: patch-aa,v 1.8 2001/06/20 05:27:33 jlam Exp $
+$NetBSD: patch-aa,v 1.9 2002/05/25 15:04:04 hubertf Exp $
 
---- build.netbsd.orig	Tue May 23 17:57:08 2000
-+++ build.netbsd
-@@ -4,7 +4,7 @@
+--- install.orig	Sun Oct 28 15:12:15 2001
++++ install
+@@ -16,14 +16,14 @@
+   exit;
+ fi
  
- echo Compiling VSLIB...
- cd vslib
--make CCDEF="-I${LOCALBASE}/include" LDDEF="-Wl,-R${PREFIX}/lib -L${PREFIX}/lib"
-+make CCDEF="${CFLAGS}" LDDEF="${LDFLAGS}"
- if [ -e libvslib.a ]; then
-   echo VSLIB compiled ok.
- else
-@@ -15,7 +15,7 @@
+-echo "Press ENTER to install vfu,ftparc,rx_* to /usr/local/bin"
++echo "Press ENTER to install vfu,ftparc,rx_* to ${PREFIX}/bin"
+ echo "Or press Ctrl+C to cancel"
+ read
  
- echo Compiling VFU...
- cd vfu
--make CCDEF="-I${LOCALBASE}/include -DFILENAME_CONF_GLOBAL0=\"${PREFIX}/etc/\" -DFILENAME_CONF_GLOBAL1=\"${PREFIX}/\" " LDDEF="-L${LOCALBASE}/lib"
-+make CCDEF="${CFLAGS} -DFILENAME_CONF_GLOBAL0=\\\"${PREFIX}/etc/\\\" -DFILENAME_CONF_GLOBAL1=\\\"${PREFIX}/\\\" " LDDEF="${LDFLAGS}"
- if [ -e vfu ]; then
-   echo VFU compiled ok.
- else
-@@ -26,8 +26,8 @@
+-cp vfu/vfu ftparc/ftparc rx/rx_* /usr/local/bin
+-cp vfu.1 /usr/local/man/man1
+-cp vfu.conf /usr/local/etc
+-cd /usr/local/bin
++cp vfu/vfu ftparc/ftparc rx/rx_* ${PREFIX}/bin
++cp vfu.1 ${PREFIX}/man/man1
++cp vfu.conf ${PREFIX}/etc
++cd ${PREFIX}/bin
+ chmod 755 vfu ftparc rx_*
  
- echo Compiling ftparc...
- cd ftparc
--make CCDEF="-I${LOCALBASE}/include -D__unix__" LDDEF="-Wl,-R${PREFIX}/lib -L${PREFIX}/lib"
-+make CCDEF="${CFLAGS} -D__unix__" LDDEF="${LDFLAGS}"
- if [ -e ftparc ]; then
-   echo ftparc compiled ok.
- else
-   echo ftparc compilation failed...
+ echo "done."