Updated vfu to 3.00. Changes:

   3.00:  xx.Apr.2000

     % 0. Hello again! :)
          The VFU development was suspended nearly an year
          ago. Now it is resumed and a lot of changes took place!
          First of all -- VFU was completely rewritten/revised(!),
          so many (internal?) features were added, some removed,
          other changed. Below I will list some key features in
          this version, but probably I'll forget some things or
          else...

     % 1. There are no big changes in the user interface and feel.

     - 2. Now reading/extracting archives is removed from inside
          VFU to external (perl) utilities. This will help adding
          new archives and debugging existing ones.

     - 3. Now archives' structure is followed as the local file
          system, i.e. you will browse directory by directory
          but not the whole archive content as before. Perhaps
          option for recursive (whole content) browsing will be
          added in the future.

     + 4. Now you can cancel copy/move procedures at stage you
          want even during single file copy process!
          (It was not possible in older versions)

     ! 5. The rare problem of showing total percentages over 100%
          during copy/move is finally (and hopefully:)) fixed.

     + 6. Now files in archive can be masked and files mask can
          be changed inside archive.

     ! 7. Some access/terminal emulation problems are fixed.
          ( i.e. some `difficult' key functions are accessible
          and from menus etc. )

9 files changed, 62 insertions, 95 deletions

diff --git a/misc/vfu/Makefile b/misc/vfu/Makefile
index 9a6f837cfd2..b170591118c 100644
--- a/misc/vfu/Makefile
+++ b/misc/vfu/Makefile
@@ -1,30 +1,31 @@
-# $NetBSD: Makefile,v 1.11 2000/01/15 18:46:31 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2000/05/22 00:49:52 hubertf Exp $
 #
 
-DISTNAME=	vfu-1.51
+DISTNAME=	vfu-3.00
 CATEGORIES=	misc
-MASTER_SITES=	http://www.biscom.net/~cade/away/
-EXTRACT_SUFX=	-source.tgz
+MASTER_SITES=	http://www.biscom.net/~cade/away/vfu/ \
+		ftp://metalab.unc.edu/pub/Linux/utils/file/managers/
+EXTRACT_SUFX=	.src.tar.gz
 
 MAINTAINER=	hubertf@netbsd.org
-HOMEPAGE=	http://www.biscom.net/~cade/vfu/
+HOMEPAGE=	http://www.biscom.net/~cade/away/vfu/
 
-DEPENDS=	ncurses>=4.2:../../devel/ncurses
+DEPENDS=	ncurses>=5.0:../../devel/ncurses
 
-MAKE_FLAGS+=	CCDEF="-DVFU_RCPATH1=\\\"${PREFIX}/etc/\\\" -DVFU_RCPATH2=\\\"${PREFIX}/\\\" -D__unix__" \
-		LDDEF="${LDFLAGS}"
+USE_PERL5=	yes
 
 do-build:
-	cd ${WRKSRC}/vslib ; \
-	 ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS}
-	cd ${WRKSRC}/vfu ; \
-	 ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS}
-	cd ${WRKSRC}/ftparc ; \
-	 ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS}
+	cd ${WRKSRC} ; \
+	 ${SETENV} ${MAKE_ENV} ${SH} build.netbsd
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/vfu/vfu  ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/ftparc/ftparc  ${PREFIX}/bin
+	cd ${WRKSRC} ; \
+	${INSTALL_PROGRAM} vfu/vfu ftparc/ftparc ${PREFIX}/bin
+	for i in rx_auto rx_deb rx_ftp rx_tar rx_zip ; do \
+		echo $$i ; \
+		${SED} 's,/usr/bin/perl,${LOCALBASE}/bin/perl,' <${WRKSRC}/rx/$$i >${WRKSRC}/rx/$$i.new ; \
+		${INSTALL_SCRIPT} ${WRKSRC}/rx/$$i.new ${PREFIX}/bin/$$i ; \
+	done
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/vfu
 	${INSTALL_DATA} \
 		${WRKSRC}/COPYING \
diff --git a/misc/vfu/files/md5 b/misc/vfu/files/md5
index 423efad266c..daa050f3705 100644
--- a/misc/vfu/files/md5
+++ b/misc/vfu/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.8 1999/06/05 21:41:51 hubertf Exp $
+$NetBSD: md5,v 1.9 2000/05/22 00:49:53 hubertf Exp $
 
-MD5 (vfu-1.51-source.tgz) = f3b2ee81a574b36c3871bb7fb02486ca
+MD5 (vfu-3.00.src.tar.gz) = f90093ec22387e5719c553852eb50373
diff --git a/misc/vfu/files/patch-sum b/misc/vfu/files/patch-sum
index 48cfa69145a..6cb29f8f5ba 100644
--- a/misc/vfu/files/patch-sum
+++ b/misc/vfu/files/patch-sum
@@ -1,7 +1,4 @@
-$NetBSD: patch-sum,v 1.3 2000/04/29 04:15:40 mycroft Exp $
+$NetBSD: patch-sum,v 1.4 2000/05/22 00:49:53 hubertf Exp $
 
-MD5 (patch-aa) = ecb4d77342321b34adfca047b97a7020
-MD5 (patch-ab) = 6698c767242da2e5a507deeb1f1bf2cb
-MD5 (patch-ac) = 0a2b0f414bde099a2786a2f521ddc2fa
-MD5 (patch-ad) = 2606bb1322dffe86a0a48f1aa1ccc878
-MD5 (patch-ae) = 89644852fa4a6881f35feb13a8fed322
+MD5 (patch-aa) = ba3297b367973d90468b61f1302e71eb
+MD5 (patch-ab) = d3432f6f69cd3a8bb545d150119933d7
diff --git a/misc/vfu/patches/patch-aa b/misc/vfu/patches/patch-aa
index 8d2d9e4d572..e612ed7388d 100644
--- a/misc/vfu/patches/patch-aa
+++ b/misc/vfu/patches/patch-aa
@@ -1,15 +1,24 @@
-$NetBSD: patch-aa,v 1.4 1999/11/27 23:03:54 rh Exp $
+$NetBSD: patch-aa,v 1.5 2000/05/22 00:49:53 hubertf Exp $
 
---- vslib/makefile.orig	Sun Nov 28 00:01:29 1999
-+++ vslib/makefile	Sun Nov 28 00:01:29 1999
-@@ -3,8 +3,8 @@
- CC      = g++
- LD      = g++
- AR      = ar rvs
--CFLAGS  =  -I. -I/usr/include/ncurses -O2 $(CCDEF)
--CCFLAGS =  -I. -I/usr/include/ncurses -O2 $(CCDEF)
-+CFLAGS  =  -I. -I${LOCALBASE}/include -O2 $(CCDEF)
-+CCFLAGS =  -I. -I${LOCALBASE}/include -O2 $(CCDEF)
- LDFLAGS = $(LDDEF)
- ARFLAGS = 
- TARGET  = libvslib.a
+--- build.netbsd.orig	Mon May 22 01:48:50 2000
++++ build.netbsd	Mon May 22 01:58:16 2000
+@@ -4,7 +4,7 @@
+ 
+ echo Compiling VSLIB...
+ cd vslib
+-make CCDEF="-I${LOCALBASE}/include"
++make CCDEF="-I${LOCALBASE}/include" LDDEF="-Wl,-R${PREFIX}/lib -L${PREFIX}/lib"
+ if [ -e libvslib.a ]; then
+   echo VSLIB compiled ok.
+ else
+@@ -26,10 +26,10 @@
+ 
+ echo Compiling ftparc...
+ cd ftparc
+-make
++make CCDEF="-I${LOCALBASE}/include -D__unix__" LDDEF="-Wl,-R${PREFIX}/lib -L${PREFIX}/lib"
+ if [ -e ftparc ]; then
+   echo ftparc compiled ok.
+ else
+   echo ftparc compilation failed...
+ fi
diff --git a/misc/vfu/patches/patch-ab b/misc/vfu/patches/patch-ab
index 95376985eb3..26adb22ba7b 100644
--- a/misc/vfu/patches/patch-ab
+++ b/misc/vfu/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.4 1999/11/27 23:03:54 rh Exp $
+$NetBSD: patch-ab,v 1.5 2000/05/22 00:49:53 hubertf Exp $
 
---- vfu/vfu.h.orig	Sun Nov 28 00:01:30 1999
-+++ vfu/vfu.h	Sun Nov 28 00:01:31 1999
-@@ -33,6 +33,8 @@
+--- vslib/unicon.cpp.orig	Mon May 22 02:00:33 2000
++++ vslib/unicon.cpp	Mon May 22 02:01:57 2000
+@@ -192,8 +192,6 @@
+   {
+     delwin(conio_scr);
+     endwin();
+-    echo();
+-    nl();
+   };
  
-   #include <vslib.h>
- 
-+  #include "target.h"
-+
-   #ifdef _TARGET_NETBSD_
-     #include <sys/param.h>
-     #include <sys/mount.h>
+   void con_suspend()
diff --git a/misc/vfu/patches/patch-ac b/misc/vfu/patches/patch-ac
deleted file mode 100644
index 640da5913e7..00000000000
--- a/misc/vfu/patches/patch-ac
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ac,v 1.4 1999/11/27 23:03:54 rh Exp $
-
---- vfu/makefile.orig	Sun Nov 28 00:01:32 1999
-+++ vfu/makefile	Sun Nov 28 00:01:32 1999
-@@ -3,9 +3,9 @@
- CC      = g++
- LD      = g++
- AR      = ar rvs
--CFLAGS  =  -I../vslib -I/usr/include/ncurses -O2 $(CCDEF)
--CCFLAGS =  -I../vslib -I/usr/include/ncurses -O2 $(CCDEF)
--LDFLAGS = -L../vslib -lvslib -lncurses $(LDDEF)
-+CFLAGS  =  -I../vslib -I${LOCALBASE}/include -O2 $(CCDEF)
-+CCFLAGS =  -I../vslib -I${LOCALBASE}/include -O2 $(CCDEF)
-+LDFLAGS = -L../vslib -lvslib  -L${LOCALBASE}/lib -lncurses $(LDDEF)
- ARFLAGS = 
- TARGET  = vfu
- 
diff --git a/misc/vfu/patches/patch-ad b/misc/vfu/patches/patch-ad
deleted file mode 100644
index 84d93abb650..00000000000
--- a/misc/vfu/patches/patch-ad
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ad,v 1.5 1999/07/06 08:05:51 jlam Exp $
-
---- ftparc/makefile.orig	Wed Mar  3 14:33:58 1999
-+++ ftparc/makefile	Fri Jul  2 09:42:37 1999
-@@ -3,8 +3,8 @@
- CC      = g++
- LD      = g++
- AR      = ar rvs
--CFLAGS  =  -I../vslib -O2     $(CCDEF)
--CCFLAGS =  -I../vslib -O2     $(CCDEF)
-+CFLAGS  =  -I../vslib -I${LOCALBASE}/include -O2     $(CCDEF)
-+CCFLAGS =  -I../vslib -I${LOCALBASE}/include -O2     $(CCDEF)
- LDFLAGS = -L../vslib -lvslib $(LDDEF)
- ARFLAGS = 
- TARGET  = ftparc
diff --git a/misc/vfu/patches/patch-ae b/misc/vfu/patches/patch-ae
deleted file mode 100644
index a5ddaa76a57..00000000000
--- a/misc/vfu/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2000/04/29 04:15:41 mycroft Exp $
-
---- vslib/unicon.cpp.orig	Fri Apr 28 21:11:45 2000
-+++ vslib/unicon.cpp	Fri Apr 28 21:12:27 2000
-@@ -202,8 +202,6 @@
-   {
-     delwin(conio_scr);
-     endwin();
--    echo();
--    nl();
-   };
- 
-   void ConSuspend()
diff --git a/misc/vfu/pkg/PLIST b/misc/vfu/pkg/PLIST
index 927cc824f21..6eb25d9dae4 100644
--- a/misc/vfu/pkg/PLIST
+++ b/misc/vfu/pkg/PLIST
@@ -1,6 +1,11 @@
-@comment $NetBSD: PLIST,v 1.4 1999/06/05 21:41:52 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.5 2000/05/22 00:49:54 hubertf Exp $
 bin/vfu
 bin/ftparc
+bin/rx_auto
+bin/rx_deb
+bin/rx_ftp
+bin/rx_tar
+bin/rx_zip
 share/doc/vfu/vfurc.example
 @exec [ -f %D/etc/vfurc ] || /bin/cp -p %D/%F %D/etc/vfurc
 share/doc/vfu/COPYING