diff options
author | hubertf <hubertf> | 1999-02-04 01:20:59 +0000 |
---|---|---|
committer | hubertf <hubertf> | 1999-02-04 01:20:59 +0000 |
commit | 68a07652297b470dc71b1b8733ac4fdf3d2ae6e1 (patch) | |
tree | 8e889d210a4a951b825ddc1c8bd1216a06ce4753 /misc/vfu | |
parent | 39c4fc0c599a8ed699fb774f1427d97a7a633f74 (diff) | |
download | pkgsrc-68a07652297b470dc71b1b8733ac4fdf3d2ae6e1.tar.gz |
Update to v1.42
Changes: Fixed problem with displaying large file-/directory sizes (>2GB)
and added external scanning (panelize).
Diffstat (limited to 'misc/vfu')
-rw-r--r-- | misc/vfu/Makefile | 12 | ||||
-rw-r--r-- | misc/vfu/files/md5 | 4 | ||||
-rw-r--r-- | misc/vfu/patches/patch-aa | 16 | ||||
-rw-r--r-- | misc/vfu/patches/patch-ab | 22 | ||||
-rw-r--r-- | misc/vfu/patches/patch-ac | 18 | ||||
-rw-r--r-- | misc/vfu/patches/patch-ad | 18 | ||||
-rw-r--r-- | misc/vfu/patches/patch-ae | 35 | ||||
-rw-r--r-- | misc/vfu/patches/patch-af | 27 | ||||
-rw-r--r-- | misc/vfu/patches/patch-ag | 15 | ||||
-rw-r--r-- | misc/vfu/patches/patch-ah | 18 |
10 files changed, 34 insertions, 151 deletions
diff --git a/misc/vfu/Makefile b/misc/vfu/Makefile index 5be32a17e2f..a784b3a65ef 100644 --- a/misc/vfu/Makefile +++ b/misc/vfu/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.1.1.1 1999/01/26 23:31:46 hubertf Exp $ +# $NetBSD: Makefile,v 1.2 1999/02/04 01:20:59 hubertf Exp $ # -DISTNAME= vful141s -PKGNAME= vfu-1.41 +DISTNAME= vfu-1.42-source +PKGNAME= vfu-1.42 EXTRACT_SUFX= .tgz CATEGORIES= misc MASTER_SITES= http://www.biscom.net/~cade/away/ @@ -13,11 +13,13 @@ HOMEPAGE= http://www.biscom.net/~cade/vfu/ DEPENDS= ncurses-1.9.9g:../../devel/ncurses WRKSRC= ${WRKDIR}/${PKGNAME} +MAKE_FLAGS+= CCDEF="-I${LOCALBASE}/include -DVFU_RCPATH1=\\\"${PREFIX}/etc/\\\" -DVFU_RCPATH2=\\\"${PREFIX}/\\\"" \ + LDDEF="-L${LOCALBASE}/lib" do-build: - @cd ${WRKSRC}/vslib ; \ + cd ${WRKSRC}/vslib ; \ ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} - @cd ${WRKSRC}/vfu ; \ + cd ${WRKSRC}/vfu ; \ ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} do-install: diff --git a/misc/vfu/files/md5 b/misc/vfu/files/md5 index fb41db39875..55ec631bb84 100644 --- a/misc/vfu/files/md5 +++ b/misc/vfu/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.1.1.1 1999/01/26 23:31:47 hubertf Exp $ +$NetBSD: md5,v 1.2 1999/02/04 01:20:59 hubertf Exp $ -MD5 (vful141s.tgz) = 58153dc223a4f6840540b406ef402312 +MD5 (vfu-1.42-source.tgz) = 15784a20078ccf7c372ef5f2d9253aa6 diff --git a/misc/vfu/patches/patch-aa b/misc/vfu/patches/patch-aa index 5458db6aec9..90b0447e6ab 100644 --- a/misc/vfu/patches/patch-aa +++ b/misc/vfu/patches/patch-aa @@ -1,15 +1,13 @@ -$NetBSD: patch-aa,v 1.1.1.1 1999/01/26 23:31:53 hubertf Exp $ - ---- vslib/makefile.BAK Tue Jan 26 20:52:30 1999 -+++ vslib/makefile Tue Jan 26 20:56:05 1999 +--- vslib/makefile.orig Wed Feb 3 14:47:16 1999 ++++ vslib/makefile Thu Feb 4 01:29:57 1999 @@ -3,8 +3,8 @@ CC = gcc LD = gcc AR = ar rvs --CFLAGS = -I. -I/usr/include/ncurses -O2 --CCFLAGS = -I. -I/usr/include/ncurses -O2 -+CFLAGS = -I. -I${LOCALBASE}/include -O2 -+CCFLAGS = -I. -I${LOCALBASE}/include -O2 - LDFLAGS = +-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 diff --git a/misc/vfu/patches/patch-ab b/misc/vfu/patches/patch-ab index 5ff30eca0d7..81a6aa750ff 100644 --- a/misc/vfu/patches/patch-ab +++ b/misc/vfu/patches/patch-ab @@ -1,13 +1,11 @@ -$NetBSD: patch-ab,v 1.1.1.1 1999/01/26 23:31:53 hubertf Exp $ - ---- vslib/unicon.h.BAK Tue Jan 26 20:55:19 1999 -+++ vslib/unicon.h Tue Jan 26 20:55:25 1999 -@@ -16,7 +16,7 @@ - #endif +--- vfu/vfu.h.orig Thu Feb 4 01:58:22 1999 ++++ vfu/vfu.h Thu Feb 4 01:56:21 1999 +@@ -18,6 +18,8 @@ + #include <sys/stat.h> + #include <sys/wait.h> - #ifdef _TARGET_LINUX_ -- #include <curses.h> -+ #include <ncurses.h> - #endif - - /////////////////////////////////////////////////////////////////////////// ++ #include "target.h" ++ + #ifdef _TARGET_NETBSD_ + #include <sys/param.h> + #include <sys/mount.h> diff --git a/misc/vfu/patches/patch-ac b/misc/vfu/patches/patch-ac index d10fc492ec6..7fd78c8f72b 100644 --- a/misc/vfu/patches/patch-ac +++ b/misc/vfu/patches/patch-ac @@ -1,17 +1,15 @@ -$NetBSD: patch-ac,v 1.1.1.1 1999/01/26 23:31:53 hubertf Exp $ - ---- vfu/makefile.orig Sun Jan 17 00:01:01 1999 -+++ vfu/makefile Tue Jan 26 22:53:56 1999 +--- vfu/makefile.orig Wed Feb 3 14:49:42 1999 ++++ vfu/makefile Thu Feb 4 01:46:58 1999 @@ -3,9 +3,9 @@ CC = gcc LD = gcc AR = ar rvs --CFLAGS = -I../vslib -I/usr/include/ncurses -O2 --CCFLAGS = -I../vslib -I/usr/include/ncurses -O2 --LDFLAGS = -L../vslib -lvslib -lncurses -+CFLAGS = -I../vslib -I${LOCALBASE}/include -O2 -DPREFIX=\"${PREFIX}\" -+CCFLAGS = -I../vslib -I${LOCALBASE}/include -O2 -DPREFIX=\"${PREFIX}\" -+LDFLAGS = -L../vslib -lvslib -L${LOCALBASE}/lib -lncurses +-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 671eb547af2..00000000000 --- a/misc/vfu/patches/patch-ad +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-ad,v 1.1.1.1 1999/01/26 23:31:53 hubertf Exp $ - ---- vfu/vfufiles.cpp.BAK Tue Jan 26 21:09:45 1999 -+++ vfu/vfufiles.cpp Tue Jan 26 21:12:25 1999 -@@ -12,7 +12,12 @@ - #include "vfuview.h" - #include "vfumenu.h" - #include "vfudir.h" --#include <sys/vfs.h> -+#ifdef __Linux__ -+# include <sys/vfs.h> -+#else -+# include <sys/param.h> -+# include <sys/mount.h> -+#endif - - ///////////////////////////////////////////// - // diff --git a/misc/vfu/patches/patch-ae b/misc/vfu/patches/patch-ae deleted file mode 100644 index 2c464bee835..00000000000 --- a/misc/vfu/patches/patch-ae +++ /dev/null @@ -1,35 +0,0 @@ -$NetBSD: patch-ae,v 1.1.1.1 1999/01/26 23:31:53 hubertf Exp $ - -I do not know if this will wotk on LP64 (Alpha, UltraSparc) too... - HF - - ---- vfu/vfucopy.cpp.BAK Tue Jan 26 21:15:28 1999 -+++ vfu/vfucopy.cpp Tue Jan 26 21:18:49 1999 -@@ -13,7 +13,12 @@ - #include "vfuview.h" - #include "vfusys.h" - #include "vfucopy.h" --#include <sys/vfs.h> -+#ifdef __Linux__ -+# include <sys/vfs.h> -+#else -+# include <sys/param.h> -+# include <sys/mount.h> -+#endif - - // #define CopyBuffSize 64000 - #define CopyBuffSize 512*1024 // it's a 1/2 meg -- not too much :) -@@ -137,11 +142,11 @@ - char s_t = (OptTime(stat_src) == OptTime(stat_dst))?'*':' '; // same time - char s_s = (stat_src.st_size == stat_dst.st_size)?'*':' '; // same size - -- TimeStr(OptTime(stat_src), sttime); str = stat_src.st_size; StrComma(str); -+ TimeStr(OptTime(stat_src), sttime); str = (long int)stat_src.st_size; StrComma(str); - sp(sss, "SRC: %s%c %11s%c %s", sttime, s_t, str.asis(), s_s, _fr ); - say1(sss); - -- TimeStr(OptTime(stat_dst), sttime); str = stat_dst.st_size; StrComma(str); -+ TimeStr(OptTime(stat_dst), sttime); str = (long int)stat_dst.st_size; StrComma(str); - sp(sss, "DST: %s%c %11s%c %s", sttime, s_t, str.asis(), s_s, _to ); - say2(sss); - diff --git a/misc/vfu/patches/patch-af b/misc/vfu/patches/patch-af deleted file mode 100644 index 97ecc3d2e12..00000000000 --- a/misc/vfu/patches/patch-af +++ /dev/null @@ -1,27 +0,0 @@ -$NetBSD: patch-af,v 1.1.1.1 1999/01/26 23:31:53 hubertf Exp $ - ---- vfu/vfu.cpp.orig Sun Jan 24 18:55:40 1999 -+++ vfu/vfu.cpp Tue Jan 26 22:48:59 1999 -@@ -18,7 +18,12 @@ - #include "vfuarc.h" - #include "vfutools.h" - #include "grep.h" --#include <sys/vfs.h> -+#ifdef __Linux__ -+# include <sys/vfs.h> -+#else -+# include <sys/param.h> -+# include <sys/mount.h> -+#endif - - //////////////////////////////////////////////////////////////////////// - // -@@ -1725,7 +1730,7 @@ - "` -- Goto preset dir (Alt+0..9 also available on some terminals)\n" - "ESC+ESC -- exits VF/U, `Q' or `q' -- exit here, `X' or `x' -- exit to old dir\n" - "NOTE: Alt-Letter keys are equal to Upper case letters in the commands context\n" --"vfu uses these config files: $HOME/.vfurc or /usr/local/lib/vfurc\n" -+"vfu uses these config files: $HOME/.vfurc or " PREFIX "/etc/vfurc\n" - "\n--press a key---\n\n" - ); - // tcsetattr(1, TCSANOW,&newstate); diff --git a/misc/vfu/patches/patch-ag b/misc/vfu/patches/patch-ag deleted file mode 100644 index b6af89fa2a2..00000000000 --- a/misc/vfu/patches/patch-ag +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ag,v 1.1.1.1 1999/01/26 23:31:53 hubertf Exp $ - ---- vfu/vfuopt.cpp.BAK Tue Jan 26 22:50:19 1999 -+++ vfu/vfuopt.cpp Tue Jan 26 22:51:01 1999 -@@ -103,8 +103,8 @@ - void SetupFiles() - { - #ifdef _TARGET_LINUX_ -- if (access("/usr/local/lib/vfurc", R_OK) == 0) RCFile = "/usr/local/lib/vfurc"; else -- if (access("/usr/local/vfurc", R_OK) == 0) RCFile = "/usr/local/vfurc"; else -+ if (access(PREFIX "/etc/vfurc", R_OK) == 0) RCFile = PREFIX "/etc/vfurc"; else -+ if (access(PREFIX "/vfurc", R_OK) == 0) RCFile = PREFIX "/vfurc"; else - sprintf( MAX_PATH, RCFile,"%s.vfurc", HOME); - sprintf( MAX_PATH, OPTFile,"%s.vfu.opt", HOME); - #endif diff --git a/misc/vfu/patches/patch-ah b/misc/vfu/patches/patch-ah deleted file mode 100644 index a5d7523f355..00000000000 --- a/misc/vfu/patches/patch-ah +++ /dev/null @@ -1,18 +0,0 @@ ---- vfu/vfurc.BAK Tue Jan 26 23:50:23 1999 -+++ vfu/vfurc Tue Jan 26 23:50:49 1999 -@@ -2,7 +2,7 @@ - - TrimTree=/c/ /d/ /e/ /proc/ /tmp/ - --ux=SEE JPEG,ENTER,.jpg.gif.,seejpeg -w -F G800x600x32K -c %f -+ux=SEE JPEG,ENTER,.jpg.gif.,xv %f - ux=SEE HTML,ENTER,.htm.html.shtml.,lynx %F - ux=SEE HTML,INSERT,.htm.html.shtml.,lynx %F - -@@ -11,4 +11,4 @@ - presetdir3=/usr/src - - cMAGENTA=.**.jpg.gif.bmp.xpm.lbm. --cGREEN=.jpg.jpeg.lbm.xpm.tif.gif. -\ No newline at end of file -+cGREEN=.jpg.jpeg.lbm.xpm.tif.gif. |