CVS commit: pkgsrc/filesystems/fuse-ext2

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Wed Apr 10 21:37:51 UTC 2019

Modified Files:
        pkgsrc/filesystems/fuse-ext2: Makefile distinfo
        pkgsrc/filesystems/fuse-ext2/patches: patch-aa patch-af patch-ag

Log Message:
fuse-ext2: do a configure check for fuse_version, because netbsd's about to
provide it. bump pkgrevision


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/filesystems/fuse-ext2/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/filesystems/fuse-ext2/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/filesystems/fuse-ext2/patches/patch-aa
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/filesystems/fuse-ext2/patches/patch-af \
    pkgsrc/filesystems/fuse-ext2/patches/patch-ag

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

Modified files:

Index: pkgsrc/filesystems/fuse-ext2/Makefile
diff -u pkgsrc/filesystems/fuse-ext2/Makefile:1.7 pkgsrc/filesystems/fuse-ext2/Makefile:1.8
--- pkgsrc/filesystems/fuse-ext2/Makefile:1.7   Sun Oct 11 10:56:43 2015
+++ pkgsrc/filesystems/fuse-ext2/Makefile       Wed Apr 10 21:37:51 2019
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2015/10/11 10:56:43 tron Exp $
+# $NetBSD: Makefile,v 1.8 2019/04/10 21:37:51 maya Exp $
 
 DISTNAME=      fuse-ext2-0.0.7
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    filesystems
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=fuse-ext2/fuse-ext2/${DISTNAME}/}
 

Index: pkgsrc/filesystems/fuse-ext2/distinfo
diff -u pkgsrc/filesystems/fuse-ext2/distinfo:1.5 pkgsrc/filesystems/fuse-ext2/distinfo:1.6
--- pkgsrc/filesystems/fuse-ext2/distinfo:1.5   Tue Nov  3 00:15:00 2015
+++ pkgsrc/filesystems/fuse-ext2/distinfo       Wed Apr 10 21:37:51 2019
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.5 2015/11/03 00:15:00 agc Exp $
+$NetBSD: distinfo,v 1.6 2019/04/10 21:37:51 maya Exp $
 
 SHA1 (fuse-ext2-0.0.7.tar.gz) = cdfef525838d2de07a4da6d60b65efce5a1cffa0
 RMD160 (fuse-ext2-0.0.7.tar.gz) = 29cb85f033b65fba4d82d14de907dd4458173c2b
 SHA512 (fuse-ext2-0.0.7.tar.gz) = ac3e9a5bd5587cd382d5119bc7e5716a057be290045d67c03ce8308da36647382065e645124d8e5862304e8ecb61a54c4474fcebb8524233c76e0f27d979846d
 Size (fuse-ext2-0.0.7.tar.gz) = 570156 bytes
-SHA1 (patch-aa) = 51605e31f82da8919ec5a01e10298a2f1784dc56
+SHA1 (patch-aa) = d9f8189f4bbed569cc2b4bb8f160dcf231cc76ff
 SHA1 (patch-ab) = 830bc968c55b13125700a6fbeff9808610d065f0
 SHA1 (patch-ac) = 253561f1e6a67b5d66d7409af3bf26477ad57b2c
-SHA1 (patch-af) = ced88c0a278c4924ee9fb6585271093742f0eb09
-SHA1 (patch-ag) = 93c6b2f3d0be517a3bfb4e5aaf198fbf782ab10c
+SHA1 (patch-af) = d182a026a599ceb73ce2e2ed81c888eed23e58ca
+SHA1 (patch-ag) = 67f70cb05298890c25672e4551092fa25bce3af0
 SHA1 (patch-e2fsprogs-1.41.9_ext2fs_bitops.h) = 61b1e0258e55c7639ee4e8228ce576488b4f40e3
 SHA1 (patch-e2fsprogs-1.41.9_ext2fs_ext2fs.h) = 2377307af7b081d84e4097f88e7aa10086a45781
 SHA1 (patch-e2fsprogs-1.41.9_ext2fs_icount.c) = f00b80bb633e46589a39bc8972e5c136f3f6e0a9

Index: pkgsrc/filesystems/fuse-ext2/patches/patch-aa
diff -u pkgsrc/filesystems/fuse-ext2/patches/patch-aa:1.2 pkgsrc/filesystems/fuse-ext2/patches/patch-aa:1.3
--- pkgsrc/filesystems/fuse-ext2/patches/patch-aa:1.2   Thu May 10 10:49:49 2012
+++ pkgsrc/filesystems/fuse-ext2/patches/patch-aa       Wed Apr 10 21:37:51 2019
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2012/05/10 10:49:49 wiz Exp $
+$NetBSD: patch-aa,v 1.3 2019/04/10 21:37:51 maya Exp $
 
 Make automake-1.12 happy.
 Add NetBSD support.
@@ -19,7 +19,16 @@ Add NetBSD support.
       *)                       arch=unknown;;
  esac
  
-@@ -137,7 +140,7 @@ AC_CHECK_FUNCS([   \
+@@ -96,6 +99,8 @@ dnl Check to see if ssize_t was decleare
+ AC_CHECK_TYPE(ssize_t,[AC_DEFINE(HAVE_TYPE_SSIZE_T, 1, [Define to 1 if you have the `ssize_t' prototype.])],,
+               [#include <sys/types.h>])
+ 
++AC_CHECK_DECLS([fuse_version], [], [], [[#include <fuse.h>]])
++
+ # Checks for library functions.
+ AC_FUNC_VPRINTF
+ AC_FUNC_CHOWN
+@@ -137,7 +142,7 @@ AC_CHECK_FUNCS([   \
  ])
  
  # Checks for libraries
@@ -28,7 +37,7 @@ Add NetBSD support.
  
  AC_MSG_CHECKING([if FUSE on this system is too new for us])
  AC_EGREP_CPP([fuse_version_yes], [
-@@ -193,6 +196,7 @@ AC_SUBST(pkgconfigdir)
+@@ -193,6 +198,7 @@ AC_SUBST(pkgconfigdir)
  
  AM_CONDITIONAL(LINUX, test "$arch" = linux)
  AM_CONDITIONAL(DARWIN, test "$arch" = darwin)

Index: pkgsrc/filesystems/fuse-ext2/patches/patch-af
diff -u pkgsrc/filesystems/fuse-ext2/patches/patch-af:1.1.1.1 pkgsrc/filesystems/fuse-ext2/patches/patch-af:1.2
--- pkgsrc/filesystems/fuse-ext2/patches/patch-af:1.1.1.1       Sat Jul  9 15:27:11 2011
+++ pkgsrc/filesystems/fuse-ext2/patches/patch-af       Wed Apr 10 21:37:51 2019
@@ -1,14 +1,14 @@
-$NetBSD: patch-af,v 1.1.1.1 2011/07/09 15:27:11 tron Exp $
+$NetBSD: patch-af,v 1.2 2019/04/10 21:37:51 maya Exp $
 
 Fix build under NetBSD.
 
 --- fuse-ext2/fuse-ext2.c.orig 2009-11-09 15:28:02.000000000 +0000
-+++ fuse-ext2/fuse-ext2.c      2011-07-09 12:52:23.000000000 +0100
-@@ -78,6 +78,13 @@
++++ fuse-ext2/fuse-ext2.c
+@@ -78,6 +78,13 @@ static int strappend (char **dest, const
        return 0;
  }
  
-+#ifdef __NetBSD__
++#if !HAVE_DECL_FUSE_VERSION
 +static int fuse_version (void)
 +{
 +      return FUSE_VERSION;
Index: pkgsrc/filesystems/fuse-ext2/patches/patch-ag
diff -u pkgsrc/filesystems/fuse-ext2/patches/patch-ag:1.1.1.1 pkgsrc/filesystems/fuse-ext2/patches/patch-ag:1.2
--- pkgsrc/filesystems/fuse-ext2/patches/patch-ag:1.1.1.1       Sat Jul  9 15:27:11 2011
+++ pkgsrc/filesystems/fuse-ext2/patches/patch-ag       Wed Apr 10 21:37:51 2019
@@ -1,14 +1,14 @@
-$NetBSD: patch-ag,v 1.1.1.1 2011/07/09 15:27:11 tron Exp $
+$NetBSD: patch-ag,v 1.2 2019/04/10 21:37:51 maya Exp $
 
 Fix build under NetBSD.
 
 --- fuse-ext2/fuse-ext2.probe.c.orig   2009-11-03 13:50:57.000000000 +0000
-+++ fuse-ext2/fuse-ext2.probe.c        2011-07-09 14:05:33.000000000 +0100
-@@ -35,6 +35,13 @@
++++ fuse-ext2/fuse-ext2.probe.c
+@@ -35,6 +35,13 @@ static const char *usage_msg =
  "%s\n"
  "\n";
  
-+#ifdef __NetBSD__
++#if !HAVE_DECL_FUSE_VERSION
 +static int fuse_version (void)
 +{
 +      return FUSE_VERSION;