pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/sysutils/vifm vifm: remove a patch which has unclear m...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/2784348f8da3
branches:  trunk
changeset: 358438:2784348f8da3
user:      maya <maya%pkgsrc.org@localhost>
date:      Mon Feb 13 00:11:35 2017 +0000

description:
vifm: remove a patch which has unclear motives (possibly a legacy patch
to fix a compilation problem on netbsd that is no longer relevant) that is
breaking compilation on macos.

PR pkg/51960

diffstat:

 sysutils/vifm/Makefile                         |   3 +-
 sysutils/vifm/distinfo                         |   3 +-
 sysutils/vifm/patches/patch-src_utils_mntent.c |  47 --------------------------
 3 files changed, 3 insertions(+), 50 deletions(-)

diffs (76 lines):

diff -r 546685efe34d -r 2784348f8da3 sysutils/vifm/Makefile
--- a/sysutils/vifm/Makefile    Sun Feb 12 22:29:13 2017 +0000
+++ b/sysutils/vifm/Makefile    Mon Feb 13 00:11:35 2017 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.27 2017/02/01 14:17:21 mef Exp $
+# $NetBSD: Makefile,v 1.28 2017/02/13 00:11:35 maya Exp $
 #
 
 DISTNAME=      vifm-0.8.2
+PKGREVISION=   1
 CATEGORIES=    sysutils
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=vifm/}
 EXTRACT_SUFX=  .tar.bz2
diff -r 546685efe34d -r 2784348f8da3 sysutils/vifm/distinfo
--- a/sysutils/vifm/distinfo    Sun Feb 12 22:29:13 2017 +0000
+++ b/sysutils/vifm/distinfo    Mon Feb 13 00:11:35 2017 +0000
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.5 2017/02/01 14:17:21 mef Exp $
+$NetBSD: distinfo,v 1.6 2017/02/13 00:11:35 maya Exp $
 
 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
diff -r 546685efe34d -r 2784348f8da3 sysutils/vifm/patches/patch-src_utils_mntent.c
--- a/sysutils/vifm/patches/patch-src_utils_mntent.c    Sun Feb 12 22:29:13 2017 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-$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/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 statfs *mntbuf);
- static char * flags2opts(int flags);
- static char * catopt(char s0[], const char s1[]);
- 
-@@ -82,7 +82,7 @@ getmntent(FILE *fp)
-       static int pos = -1;
-       static int mntsize = -1;
- 
--      static struct statfs *mntbuf;
-+      static struct statvfs *mntbuf;
- 
-       if(pos == -1 || mntsize == -1)
-       {
-@@ -96,11 +96,11 @@ getmntent(FILE *fp)
-               return NULL;
-       }
- 
--      return statfs_to_mntent(&mntbuf[pos]);
-+      return statvfs_to_mntent(&mntbuf[pos]);
- }
- 
- static struct mntent *
--statfs_to_mntent(struct statfs *mntbuf)
-+statvfs_to_mntent(struct statvfs *mntbuf)
- {
-       static struct mntent _mntent;
-       static char opts_buf[40], *tmp;
-@@ -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;
--      tmp = flags2opts (mntbuf->f_flags);
-+      tmp = flags2opts (mntbuf->f_flag);
-       if(tmp != NULL)
-       {
-               opts_buf[sizeof(opts_buf) - 1] = '\0';



Home | Main Index | Thread Index | Old Index