Wed Apr 10 21:37:51 2019 UTC ()
fuse-ext2: do a configure check for fuse_version, because netbsd's about to
provide it. bump pkgrevision


(maya)
diff -r1.7 -r1.8 pkgsrc/filesystems/fuse-ext2/Makefile
diff -r1.5 -r1.6 pkgsrc/filesystems/fuse-ext2/distinfo
diff -r1.2 -r1.3 pkgsrc/filesystems/fuse-ext2/patches/patch-aa
diff -r1.1.1.1 -r1.2 pkgsrc/filesystems/fuse-ext2/patches/patch-af
diff -r1.1.1.1 -r1.2 pkgsrc/filesystems/fuse-ext2/patches/patch-ag
cvs diff -r1.7 -r1.8 pkgsrc/filesystems/fuse-ext2/Makefile (expand / switch to unified diff)

--- pkgsrc/filesystems/fuse-ext2/Makefile 2015/10/11 10:56:43 1.7
+++ pkgsrc/filesystems/fuse-ext2/Makefile 2019/04/10 21:37:51 1.8
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.7 2015/10/11 10:56:43 tron Exp $ 1# $NetBSD: Makefile,v 1.8 2019/04/10 21:37:51 maya Exp $
2 2
3DISTNAME= fuse-ext2-0.0.7 3DISTNAME= fuse-ext2-0.0.7
4PKGREVISION= 1 4PKGREVISION= 2
5CATEGORIES= filesystems 5CATEGORIES= filesystems
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fuse-ext2/fuse-ext2/${DISTNAME}/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fuse-ext2/fuse-ext2/${DISTNAME}/}
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://alperakcan.net/projects/fuse-ext2/ 9HOMEPAGE= http://alperakcan.net/projects/fuse-ext2/
10COMMENT= FUSE file-system to mount ext2 and ext3 file system 10COMMENT= FUSE file-system to mount ext2 and ext3 file system
11LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
12 12
13ONLY_FOR_PLATFORM= Linux-*-* NetBSD-*-* 13ONLY_FOR_PLATFORM= Linux-*-* NetBSD-*-*
14 14
15GNU_CONFIGURE= yes 15GNU_CONFIGURE= yes
16USE_LIBTOOL= yes 16USE_LIBTOOL= yes
17USE_TOOLS+= autoheader automake autoreconf gmake pkg-config 17USE_TOOLS+= autoheader automake autoreconf gmake pkg-config
cvs diff -r1.5 -r1.6 pkgsrc/filesystems/fuse-ext2/distinfo (expand / switch to unified diff)

--- pkgsrc/filesystems/fuse-ext2/distinfo 2015/11/03 00:15:00 1.5
+++ pkgsrc/filesystems/fuse-ext2/distinfo 2019/04/10 21:37:51 1.6
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1$NetBSD: distinfo,v 1.5 2015/11/03 00:15:00 agc Exp $ 1$NetBSD: distinfo,v 1.6 2019/04/10 21:37:51 maya Exp $
2 2
3SHA1 (fuse-ext2-0.0.7.tar.gz) = cdfef525838d2de07a4da6d60b65efce5a1cffa0 3SHA1 (fuse-ext2-0.0.7.tar.gz) = cdfef525838d2de07a4da6d60b65efce5a1cffa0
4RMD160 (fuse-ext2-0.0.7.tar.gz) = 29cb85f033b65fba4d82d14de907dd4458173c2b 4RMD160 (fuse-ext2-0.0.7.tar.gz) = 29cb85f033b65fba4d82d14de907dd4458173c2b
5SHA512 (fuse-ext2-0.0.7.tar.gz) = ac3e9a5bd5587cd382d5119bc7e5716a057be290045d67c03ce8308da36647382065e645124d8e5862304e8ecb61a54c4474fcebb8524233c76e0f27d979846d 5SHA512 (fuse-ext2-0.0.7.tar.gz) = ac3e9a5bd5587cd382d5119bc7e5716a057be290045d67c03ce8308da36647382065e645124d8e5862304e8ecb61a54c4474fcebb8524233c76e0f27d979846d
6Size (fuse-ext2-0.0.7.tar.gz) = 570156 bytes 6Size (fuse-ext2-0.0.7.tar.gz) = 570156 bytes
7SHA1 (patch-aa) = 51605e31f82da8919ec5a01e10298a2f1784dc56 7SHA1 (patch-aa) = d9f8189f4bbed569cc2b4bb8f160dcf231cc76ff
8SHA1 (patch-ab) = 830bc968c55b13125700a6fbeff9808610d065f0 8SHA1 (patch-ab) = 830bc968c55b13125700a6fbeff9808610d065f0
9SHA1 (patch-ac) = 253561f1e6a67b5d66d7409af3bf26477ad57b2c 9SHA1 (patch-ac) = 253561f1e6a67b5d66d7409af3bf26477ad57b2c
10SHA1 (patch-af) = ced88c0a278c4924ee9fb6585271093742f0eb09 10SHA1 (patch-af) = d182a026a599ceb73ce2e2ed81c888eed23e58ca
11SHA1 (patch-ag) = 93c6b2f3d0be517a3bfb4e5aaf198fbf782ab10c 11SHA1 (patch-ag) = 67f70cb05298890c25672e4551092fa25bce3af0
12SHA1 (patch-e2fsprogs-1.41.9_ext2fs_bitops.h) = 61b1e0258e55c7639ee4e8228ce576488b4f40e3 12SHA1 (patch-e2fsprogs-1.41.9_ext2fs_bitops.h) = 61b1e0258e55c7639ee4e8228ce576488b4f40e3
13SHA1 (patch-e2fsprogs-1.41.9_ext2fs_ext2fs.h) = 2377307af7b081d84e4097f88e7aa10086a45781 13SHA1 (patch-e2fsprogs-1.41.9_ext2fs_ext2fs.h) = 2377307af7b081d84e4097f88e7aa10086a45781
14SHA1 (patch-e2fsprogs-1.41.9_ext2fs_icount.c) = f00b80bb633e46589a39bc8972e5c136f3f6e0a9 14SHA1 (patch-e2fsprogs-1.41.9_ext2fs_icount.c) = f00b80bb633e46589a39bc8972e5c136f3f6e0a9
15SHA1 (patch-e2fsprogs-1.41.9_ext2fs_test__io.c) = 49c14b89229cf08789ff91bcdb1ecdd26239d809 15SHA1 (patch-e2fsprogs-1.41.9_ext2fs_test__io.c) = 49c14b89229cf08789ff91bcdb1ecdd26239d809
cvs diff -r1.2 -r1.3 pkgsrc/filesystems/fuse-ext2/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/filesystems/fuse-ext2/patches/Attic/patch-aa 2012/05/10 10:49:49 1.2
+++ pkgsrc/filesystems/fuse-ext2/patches/Attic/patch-aa 2019/04/10 21:37:51 1.3
@@ -1,38 +1,47 @@ @@ -1,38 +1,47 @@
1$NetBSD: patch-aa,v 1.2 2012/05/10 10:49:49 wiz Exp $ 1$NetBSD: patch-aa,v 1.3 2019/04/10 21:37:51 maya Exp $
2 2
3Make automake-1.12 happy. 3Make automake-1.12 happy.
4Add NetBSD support. 4Add NetBSD support.
5 5
6--- configure.ac.orig 2009-12-24 12:38:06.000000000 +0000 6--- configure.ac.orig 2009-12-24 12:38:06.000000000 +0000
7+++ configure.ac 7+++ configure.ac
8@@ -11,10 +11,13 @@ AC_PROG_CC 8@@ -11,10 +11,13 @@ AC_PROG_CC
9 AC_PROG_INSTALL 9 AC_PROG_INSTALL
10 AC_PROG_LIBTOOL 10 AC_PROG_LIBTOOL
11 AC_PATH_PROG(CHMOD, chmod, :) 11 AC_PATH_PROG(CHMOD, chmod, :)
12+AM_PROG_AR 12+AM_PROG_AR
13+AM_PROG_CC_C_O 13+AM_PROG_CC_C_O
14  14
15 case $target_os in 15 case $target_os in
16 *linux*) arch=linux;; 16 *linux*) arch=linux;;
17 *darwin*) arch=darwin;; 17 *darwin*) arch=darwin;;
18+ *netbsd*) arch=netbsd;; 18+ *netbsd*) arch=netbsd;;
19 *) arch=unknown;; 19 *) arch=unknown;;
20 esac 20 esac
21  21
22@@ -137,7 +140,7 @@ AC_CHECK_FUNCS([ \ 22@@ -96,6 +99,8 @@ dnl Check to see if ssize_t was decleare
 23 AC_CHECK_TYPE(ssize_t,[AC_DEFINE(HAVE_TYPE_SSIZE_T, 1, [Define to 1 if you have the `ssize_t' prototype.])],,
 24 [#include <sys/types.h>])
 25
 26+AC_CHECK_DECLS([fuse_version], [], [], [[#include <fuse.h>]])
 27+
 28 # Checks for library functions.
 29 AC_FUNC_VPRINTF
 30 AC_FUNC_CHOWN
 31@@ -137,7 +142,7 @@ AC_CHECK_FUNCS([ \
23 ]) 32 ])
24  33
25 # Checks for libraries 34 # Checks for libraries
26-AC_CHECK_LIB([fuse], [fuse_main], [FUSE_LIBS="-lfuse"], [AC_MSG_ERROR([Can't find libfuse, please install it])]) 35-AC_CHECK_LIB([fuse], [fuse_main], [FUSE_LIBS="-lfuse"], [AC_MSG_ERROR([Can't find libfuse, please install it])])
27+AC_CHECK_LIB([fuse], [fuse_exit], [FUSE_LIBS="-lfuse"], [AC_MSG_ERROR([Can't find libfuse, please install it])]) 36+AC_CHECK_LIB([fuse], [fuse_exit], [FUSE_LIBS="-lfuse"], [AC_MSG_ERROR([Can't find libfuse, please install it])])
28  37
29 AC_MSG_CHECKING([if FUSE on this system is too new for us]) 38 AC_MSG_CHECKING([if FUSE on this system is too new for us])
30 AC_EGREP_CPP([fuse_version_yes], [ 39 AC_EGREP_CPP([fuse_version_yes], [
31@@ -193,6 +196,7 @@ AC_SUBST(pkgconfigdir) 40@@ -193,6 +198,7 @@ AC_SUBST(pkgconfigdir)
32  41
33 AM_CONDITIONAL(LINUX, test "$arch" = linux) 42 AM_CONDITIONAL(LINUX, test "$arch" = linux)
34 AM_CONDITIONAL(DARWIN, test "$arch" = darwin) 43 AM_CONDITIONAL(DARWIN, test "$arch" = darwin)
35+AM_CONDITIONAL(NETBSD, test "$arch" = netbsd) 44+AM_CONDITIONAL(NETBSD, test "$arch" = netbsd)
36  45
37 AC_CONFIG_FILES([ 46 AC_CONFIG_FILES([
38 fuse-ext2.pc 47 fuse-ext2.pc
cvs diff -r1.1.1.1 -r1.2 pkgsrc/filesystems/fuse-ext2/patches/Attic/patch-af (expand / switch to unified diff)

--- pkgsrc/filesystems/fuse-ext2/patches/Attic/patch-af 2011/07/09 15:27:11 1.1.1.1
+++ pkgsrc/filesystems/fuse-ext2/patches/Attic/patch-af 2019/04/10 21:37:51 1.2
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1$NetBSD: patch-af,v 1.1.1.1 2011/07/09 15:27:11 tron Exp $ 1$NetBSD: patch-af,v 1.2 2019/04/10 21:37:51 maya Exp $
2 2
3Fix build under NetBSD. 3Fix build under NetBSD.
4 4
5--- fuse-ext2/fuse-ext2.c.orig 2009-11-09 15:28:02.000000000 +0000 5--- fuse-ext2/fuse-ext2.c.orig 2009-11-09 15:28:02.000000000 +0000
6+++ fuse-ext2/fuse-ext2.c 2011-07-09 12:52:23.000000000 +0100 6+++ fuse-ext2/fuse-ext2.c
7@@ -78,6 +78,13 @@ 7@@ -78,6 +78,13 @@ static int strappend (char **dest, const
8 return 0; 8 return 0;
9 } 9 }
10  10
11+#ifdef __NetBSD__ 11+#if !HAVE_DECL_FUSE_VERSION
12+static int fuse_version (void) 12+static int fuse_version (void)
13+{ 13+{
14+ return FUSE_VERSION; 14+ return FUSE_VERSION;
15+} 15+}
16+#endif 16+#endif
17+ 17+
18 static void usage (void) 18 static void usage (void)
19 { 19 {
20 printf(usage_msg, PACKAGE, VERSION, fuse_version(), PACKAGE, HOME); 20 printf(usage_msg, PACKAGE, VERSION, fuse_version(), PACKAGE, HOME);
cvs diff -r1.1.1.1 -r1.2 pkgsrc/filesystems/fuse-ext2/patches/Attic/patch-ag (expand / switch to unified diff)

--- pkgsrc/filesystems/fuse-ext2/patches/Attic/patch-ag 2011/07/09 15:27:11 1.1.1.1
+++ pkgsrc/filesystems/fuse-ext2/patches/Attic/patch-ag 2019/04/10 21:37:51 1.2
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1$NetBSD: patch-ag,v 1.1.1.1 2011/07/09 15:27:11 tron Exp $ 1$NetBSD: patch-ag,v 1.2 2019/04/10 21:37:51 maya Exp $
2 2
3Fix build under NetBSD. 3Fix build under NetBSD.
4 4
5--- fuse-ext2/fuse-ext2.probe.c.orig 2009-11-03 13:50:57.000000000 +0000 5--- fuse-ext2/fuse-ext2.probe.c.orig 2009-11-03 13:50:57.000000000 +0000
6+++ fuse-ext2/fuse-ext2.probe.c 2011-07-09 14:05:33.000000000 +0100 6+++ fuse-ext2/fuse-ext2.probe.c
7@@ -35,6 +35,13 @@ 7@@ -35,6 +35,13 @@ static const char *usage_msg =
8 "%s\n" 8 "%s\n"
9 "\n"; 9 "\n";
10  10
11+#ifdef __NetBSD__ 11+#if !HAVE_DECL_FUSE_VERSION
12+static int fuse_version (void) 12+static int fuse_version (void)
13+{ 13+{
14+ return FUSE_VERSION; 14+ return FUSE_VERSION;
15+} 15+}
16+#endif 16+#endif
17+ 17+
18 static void usage (void) 18 static void usage (void)
19 { 19 {
20 printf(usage_msg, PACKAGE, VERSION, fuse_version(), PACKAGE, HOME); 20 printf(usage_msg, PACKAGE, VERSION, fuse_version(), PACKAGE, HOME);