CVS commit: pkgsrc/sysutils/vifm

["Makoto Fujiwara" <mef%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   mef
Date:           Wed Feb  1 14:17:21 UTC 2017

Modified Files:
        pkgsrc/sysutils/vifm: Makefile PLIST distinfo
        pkgsrc/sysutils/vifm/patches: patch-src_utils_mntent.c

Log Message:
Updated sysutils/vifm 0.7.8 to 0.8.2
------------------------------------
Changes found in NEWS file is too lengthy, just quote the first part of it.

vifm v0.8.2
-----------
This release brings a bit of user-friendliness in form of key suggestions and
various descriptions provided in the interface.  Matching of files has been
extended in many ways and become significantly more powerful than before.
Menu mode also got several enhancements.


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 pkgsrc/sysutils/vifm/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/sysutils/vifm/PLIST
cvs rdiff -u -r1.4 -r1.5 pkgsrc/sysutils/vifm/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/sysutils/vifm/patches/patch-src_utils_mntent.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/vifm/Makefile
diff -u pkgsrc/sysutils/vifm/Makefile:1.26 pkgsrc/sysutils/vifm/Makefile:1.27
--- pkgsrc/sysutils/vifm/Makefile:1.26  Thu Jan  5 21:33:23 2017
+++ pkgsrc/sysutils/vifm/Makefile       Wed Feb  1 14:17:21 2017
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2017/01/05 21:33:23 roy Exp $
+# $NetBSD: Makefile,v 1.27 2017/02/01 14:17:21 mef Exp $
 #
 
-DISTNAME=      vifm-0.7.8
-PKGREVISION=   4
+DISTNAME=      vifm-0.8.2
 CATEGORIES=    sysutils
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=vifm/}
 EXTRACT_SUFX=  .tar.bz2
@@ -10,21 +9,14 @@ EXTRACT_SUFX=        .tar.bz2
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://vifm.info/
 COMMENT=       Curses based file manager with vi like keybindings
+LICENSE=       gnu-gpl-v2
 
 GNU_CONFIGURE= yes
 USE_TOOLS+=    gmake perl
 
 USE_CURSES=    resize_term wide
 FAKE_NCURSES=  yes
-
-ppre-configure:
-       @${SED} -e "s/cfg.use_screen = 0/cfg.use_screen = 1/" \
-               -e "s,/usr/local,${PREFIX},g" \
-               ${WRKSRC}/src/config.c > ${WRKSRC}/src/config.c.new && \
-               ${MV} ${WRKSRC}/src/config.c.new ${WRKSRC}/src/config.c
-       @${SED} -e "s/USE_SCREEN=0/USE_SCREEN=1/" \
-               ${WRKSRC}/src/vifmrc0.1 > ${WRKSRC}/src/vifmrc0.1.new && \
-               ${MV} ${WRKSRC}/src/vifmrc0.1.new ${WRKSRC}/src/vifmrc0.1
+REPLACE_PERL=  src/vifm-convert-dircolors
 
 .include "../../mk/curses.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"

Index: pkgsrc/sysutils/vifm/PLIST
diff -u pkgsrc/sysutils/vifm/PLIST:1.3 pkgsrc/sysutils/vifm/PLIST:1.4
--- pkgsrc/sysutils/vifm/PLIST:1.3      Sun Feb 15 12:50:53 2015
+++ pkgsrc/sysutils/vifm/PLIST  Wed Feb  1 14:17:21 2017
@@ -1,14 +1,33 @@
-@comment $NetBSD: PLIST,v 1.3 2015/02/15 12:50:53 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.4 2017/02/01 14:17:21 mef Exp $
 bin/vifm
+bin/vifm-convert-dircolors
 bin/vifm-pause
-bin/vifmrc-converter
+bin/vifm-screen-split
+man/man1/vifm-convert-dircolors.1
 man/man1/vifm-pause.1
+man/man1/vifm-screen-split.1
 man/man1/vifm.1
-man/man1/vifmrc-converter.1
 share/applications/vifm.desktop
+share/doc/vifm/AUTHORS
+share/doc/vifm/BUGS
+share/doc/vifm/COPYING
+share/doc/vifm/ChangeLog
+share/doc/vifm/FAQ
+share/doc/vifm/INSTALL
+share/doc/vifm/NEWS
+share/doc/vifm/README
+share/doc/vifm/TODO
 share/pixmaps/vifm.png
+share/vifm/colors/astrell-root.vifm
+share/vifm/colors/astrell-user.vifm
+share/vifm/colors/dmilith-root.vifm
+share/vifm/colors/dmilith-user.vifm
+share/vifm/colors/istib-solarized-dark.vifm
+share/vifm/colors/juef-zenburn.vifm
+share/vifm/colors/reicheltd-light.vifm
 share/vifm/vifm-help.txt
 share/vifm/vifmrc
+share/vifm/vifmrc-osx
 share/vifm/vim-doc/doc/tags
 share/vifm/vim-doc/doc/vifm-app.txt
 share/vifm/vim/autoload/vifm/edit.vim

Index: pkgsrc/sysutils/vifm/distinfo
diff -u pkgsrc/sysutils/vifm/distinfo:1.4 pkgsrc/sysutils/vifm/distinfo:1.5
--- pkgsrc/sysutils/vifm/distinfo:1.4   Wed Nov  4 01:32:34 2015
+++ pkgsrc/sysutils/vifm/distinfo       Wed Feb  1 14:17:21 2017
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2015/11/04 01:32:34 agc Exp $
+$NetBSD: distinfo,v 1.5 2017/02/01 14:17:21 mef Exp $
 
-SHA1 (vifm-0.7.8.tar.bz2) = 644c49df27bb5b89dac93757152f99b65dee9363
-RMD160 (vifm-0.7.8.tar.bz2) = 46247edf337e5c0b383de4995fe10ea1e259a6da
-SHA512 (vifm-0.7.8.tar.bz2) = ac70055739aeee915ccf5b22bd497ff691d159d9c0aaa4d38de69db33538a5360c9cabe0678ce51f7bce26adfc5657860d071725a14adf577f263bd180fab676
-Size (vifm-0.7.8.tar.bz2) = 623154 bytes
-SHA1 (patch-src_utils_mntent.c) = 8fe977c3c7647cbb4cdeec6e64e8842fda3ee870
+SHA1 (vifm-0.8.2.tar.bz2) = 1ae4179b2b9a43c440290af0ecc91b9235203be7
+RMD160 (vifm-0.8.2.tar.bz2) = 2e451ba17197b01b63c65e245d656e5e361ac990
+SHA512 (vifm-0.8.2.tar.bz2) = e2c9f84b8a24542f7153ef8a27b38ba8c251cb0ded72401f5e93fa92540d51b5c368a73147b9fa4a883dda5f880c1d8585c1b4879d46c0e00dea87eacecfdb25
+Size (vifm-0.8.2.tar.bz2) = 892414 bytes
+SHA1 (patch-src_utils_mntent.c) = bde775d1942d8ce6097c55af5f03bdb99635d144

Index: pkgsrc/sysutils/vifm/patches/patch-src_utils_mntent.c
diff -u pkgsrc/sysutils/vifm/patches/patch-src_utils_mntent.c:1.1 pkgsrc/sysutils/vifm/patches/patch-src_utils_mntent.c:1.2
--- pkgsrc/sysutils/vifm/patches/patch-src_utils_mntent.c:1.1   Sun Feb 15 12:50:53 2015
+++ pkgsrc/sysutils/vifm/patches/patch-src_utils_mntent.c       Wed Feb  1 14:17:21 2017
@@ -1,19 +1,19 @@
-$NetBSD: patch-src_utils_mntent.c,v 1.1 2015/02/15 12:50:53 ryoon Exp $
+$NetBSD: patch-src_utils_mntent.c,v 1.2 2017/02/01 14:17:21 mef Exp $
 
 * I have no idea how to test this...
 
---- src/utils/mntent.c.orig    2014-10-25 15:09:35.000000000 +0000
-+++ src/utils/mntent.c
-@@ -47,7 +47,7 @@
- #include <stdlib.h>
- #include <string.h>
+--- src/compat/mntent.c.orig   2015-10-09 01:52:00.000000000 +0900
++++ src/compat/mntent.c        2017-02-01 22:41:54.000000000 +0900
+@@ -53,7 +53,7 @@
+ #define f_flags f_flag
+ #endif
  
 -static struct mntent * statfs_to_mntent(struct statfs *mntbuf);
-+static struct mntent * statvfs_to_mntent(struct statvfs *mntbuf);
++static struct mntent * statvfs_to_mntent(struct statfs *mntbuf);
  static char * flags2opts(int flags);
  static char * catopt(char s0[], const char s1[]);
  
-@@ -76,7 +76,7 @@ getmntent(FILE *fp)
+@@ -82,7 +82,7 @@ getmntent(FILE *fp)
        static int pos = -1;
        static int mntsize = -1;
  
@@ -22,7 +22,7 @@ $NetBSD: patch-src_utils_mntent.c,v 1.1 
  
        if(pos == -1 || mntsize == -1)
        {
-@@ -90,11 +90,11 @@ getmntent(FILE *fp)
+@@ -96,11 +96,11 @@ getmntent(FILE *fp)
                return NULL;
        }
  
@@ -36,7 +36,7 @@ $NetBSD: patch-src_utils_mntent.c,v 1.1 
  {
        static struct mntent _mntent;
        static char opts_buf[40], *tmp;
-@@ -102,7 +102,7 @@ statfs_to_mntent(struct statfs *mntbuf)
+@@ -108,7 +108,7 @@ statfs_to_mntent(struct statfs *mntbuf)
        _mntent.mnt_fsname = mntbuf->f_mntfromname;
        _mntent.mnt_dir = mntbuf->f_mntonname;
        _mntent.mnt_type = mntbuf->f_fstypename;
@@ -45,12 +45,3 @@ $NetBSD: patch-src_utils_mntent.c,v 1.1 
        if(tmp != NULL)
        {
                opts_buf[sizeof(opts_buf) - 1] = '\0';
-@@ -128,7 +128,7 @@ flags2opts(int flags)
-       if(flags & MNT_UNION)       res = catopt(res, "union");
-       if(flags & MNT_ASYNC)       res = catopt(res, "async");
-       if(flags & MNT_NOATIME)     res = catopt(res, "noatime");
--#ifndef __APPLE__
-+#if !(defined(__APPLE__) || defined(__NetBSD__))
-       if(flags & MNT_NOCLUSTERR)  res = catopt(res, "noclusterr");
-       if(flags & MNT_NOCLUSTERW)  res = catopt(res, "noclusterw");
-       if(flags & MNT_NOSYMFOLLOW) res = catopt(res, "nosymfollow");