CVS commit: pkgsrc/filesystems/fuse-pod

["Masatake Daimon" <pho%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   pho
Date:           Sat Jan 22 18:45:13 UTC 2022

Modified Files:
        pkgsrc/filesystems/fuse-pod: Makefile distinfo
        pkgsrc/filesystems/fuse-pod/patches: patch-aa

Log Message:
Conditionalise workarounds for old NetBSD librefuse


To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 pkgsrc/filesystems/fuse-pod/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/filesystems/fuse-pod/distinfo
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/filesystems/fuse-pod/patches/patch-aa

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-pod/Makefile
diff -u pkgsrc/filesystems/fuse-pod/Makefile:1.43 pkgsrc/filesystems/fuse-pod/Makefile:1.44
--- pkgsrc/filesystems/fuse-pod/Makefile:1.43   Wed Dec  8 16:04:21 2021
+++ pkgsrc/filesystems/fuse-pod/Makefile        Sat Jan 22 18:45:13 2022
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.43 2021/12/08 16:04:21 adam Exp $
+# $NetBSD: Makefile,v 1.44 2022/01/22 18:45:13 pho Exp $
 #
 
 DISTNAME=      fusepod-0.5.1
 PKGNAME=       fuse-pod-0.5.1
-PKGREVISION=   37
+PKGREVISION=   38
 CATEGORIES=    filesystems
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=fusepod/}
 EXTRACT_SUFX=  .tar.bz2
@@ -11,6 +11,7 @@ EXTRACT_SUFX= .tar.bz2
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://fusepod.sourceforge.net/
 COMMENT=       FUSE-based filesystem for iPod
+LICENSE=       gnu-gpl-v2
 
 GNU_CONFIGURE= yes
 USE_LANGUAGES+=        c c++03

Index: pkgsrc/filesystems/fuse-pod/distinfo
diff -u pkgsrc/filesystems/fuse-pod/distinfo:1.5 pkgsrc/filesystems/fuse-pod/distinfo:1.6
--- pkgsrc/filesystems/fuse-pod/distinfo:1.5    Tue Oct 26 10:25:28 2021
+++ pkgsrc/filesystems/fuse-pod/distinfo        Sat Jan 22 18:45:13 2022
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.5 2021/10/26 10:25:28 nia Exp $
+$NetBSD: distinfo,v 1.6 2022/01/22 18:45:13 pho Exp $
 
 BLAKE2s (fusepod-0.5.1.tar.bz2) = 761fcac8d17829efc153b43e1b38337a346c3f48e0219a0a00f6870bf65ffcf6
 SHA512 (fusepod-0.5.1.tar.bz2) = 3a4d526bdd2cd7f2cc28458898399fc2c50aca989a19d2bc2d9921eaf841195eaa0f9f6a86ac5ebccc8ab56117464a64081e510afef1456817297eebcd7465f8
 Size (fusepod-0.5.1.tar.bz2) = 78547 bytes
-SHA1 (patch-aa) = cb2aceb2aefaa8b99dc95fce70835edb85ab1a92
+SHA1 (patch-aa) = a2897d44503c6018c7aec02773a0aeee307197ea
 SHA1 (patch-ab) = 923f7f7449c85d2ea537845b779aebec6aede1e8
 SHA1 (patch-src_fusepod__util.h) = 71485be8dfdecc1f2be61d1c5c08ac9d3447c0c5

Index: pkgsrc/filesystems/fuse-pod/patches/patch-aa
diff -u pkgsrc/filesystems/fuse-pod/patches/patch-aa:1.1.1.1 pkgsrc/filesystems/fuse-pod/patches/patch-aa:1.2
--- pkgsrc/filesystems/fuse-pod/patches/patch-aa:1.1.1.1        Fri May  4 23:48:33 2007
+++ pkgsrc/filesystems/fuse-pod/patches/patch-aa        Sat Jan 22 18:45:13 2022
@@ -1,13 +1,19 @@
-$NetBSD: patch-aa,v 1.1.1.1 2007/05/04 23:48:33 agc Exp $
+$NetBSD: patch-aa,v 1.2 2022/01/22 18:45:13 pho Exp $
 
---- src/fusepod.cpp    2007/05/04 23:21:09     1.1
-+++ src/fusepod.cpp    2007/05/04 23:23:52
-@@ -672,7 +672,7 @@
+NetBSD librefuse used to have a wrong prototype for init() in FUSE 2.5
+API. Already fixed in HEAD.
+
+--- src/fusepod.cpp.orig       2006-08-07 14:39:18.000000000 +0000
++++ src/fusepod.cpp
+@@ -672,7 +672,11 @@ static vector<string> get_string_desc ()
      return paths;
  }
  
--void * fusepod_init () {
++#if defined(__NetBSD__) && FUSE_H_ < 20211204
 +void * fusepod_init (fuse_conn_info *connection) {
++#else
+ void * fusepod_init () {
++#endif
      syncing = false;
      syncing_file = "";