Downgrade to 0.13 since that version works on NetBSD.

7 files changed, 126 insertions, 34 deletions

diff --git a/filesystems/fuse-mp3fs/Makefile b/filesystems/fuse-mp3fs/Makefile
index a255164cc13..57914fee689 100644
--- a/filesystems/fuse-mp3fs/Makefile
+++ b/filesystems/fuse-mp3fs/Makefile
@@ -1,23 +1,24 @@
-# $NetBSD: Makefile,v 1.4 2014/11/23 19:33:16 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2014/11/26 22:31:41 wiz Exp $
+#
 
-DISTNAME=	mp3fs-0.91
+DISTNAME=	mp3fs-0.13
 PKGNAME=	fuse-${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	filesystems
-MASTER_SITES=	https://github.com/khenriks/mp3fs/releases/download/v${PKGVERSION_NOREV}/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mp3fs/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://khenriks.github.io/mp3fs/
+HOMEPAGE=	http://mp3fs.sourceforge.net/
 COMMENT=	MP3 transcoding FUSE file system
 LICENSE=	gnu-gpl-v3
 
 GNU_CONFIGURE=		yes
-USE_LANGUAGES=		c c++
 USE_TOOLS=		pkg-config
 
 INSTALLATION_DIRS=	share/doc/fuse-mp3fs
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/README.md ${DESTDIR}${PREFIX}/share/doc/fuse-mp3fs
+	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/fuse-mp3fs
 
 .include "../../audio/flac/buildlink3.mk"
 .include "../../audio/lame/buildlink3.mk"
diff --git a/filesystems/fuse-mp3fs/PLIST b/filesystems/fuse-mp3fs/PLIST
index f70f519a287..b1e69e97c84 100644
--- a/filesystems/fuse-mp3fs/PLIST
+++ b/filesystems/fuse-mp3fs/PLIST
@@ -1,4 +1,3 @@
-@comment $NetBSD: PLIST,v 1.2 2014/11/23 19:33:16 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2014/11/26 22:31:41 wiz Exp $
 bin/mp3fs
-man/man1/mp3fs.1
-share/doc/fuse-mp3fs/README.md
+share/doc/fuse-mp3fs/README
diff --git a/filesystems/fuse-mp3fs/distinfo b/filesystems/fuse-mp3fs/distinfo
index f2da7328681..9e67571aa1f 100644
--- a/filesystems/fuse-mp3fs/distinfo
+++ b/filesystems/fuse-mp3fs/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.6 2014/11/23 19:33:16 wiz Exp $
+$NetBSD: distinfo,v 1.7 2014/11/26 22:31:41 wiz Exp $
 
-SHA1 (mp3fs-0.91.tar.gz) = a9e65b8453f4444ec6faba045120e7efb18da20e
-RMD160 (mp3fs-0.91.tar.gz) = 1992a61ba191dc8e73f5fcf29ef1a2aae040587c
-Size (mp3fs-0.91.tar.gz) = 357098 bytes
-SHA1 (patch-configure) = 8d62bab94726d9749b4172977216c005cd52c4c0
+SHA1 (mp3fs-0.13.tar.gz) = b246bd747a32256cb8364b7ac0cc8b7a4e1d3f74
+RMD160 (mp3fs-0.13.tar.gz) = 6ad1126ee22b35fe4987dd6addbc41a25c74a508
+Size (mp3fs-0.13.tar.gz) = 301642 bytes
+SHA1 (patch-aa) = 0013f729158988403ea7ed7aa3a3102e9531ef91
+SHA1 (patch-ab) = 0e76e444566e2e0ff0c31a6aa64dcd82a931f397
+SHA1 (patch-src_class.h) = 2a0c03c20ffce50c1270d552215edb052f3ecf50
diff --git a/filesystems/fuse-mp3fs/patches/patch-aa b/filesystems/fuse-mp3fs/patches/patch-aa
new file mode 100644
index 00000000000..3955f3d3a21
--- /dev/null
+++ b/filesystems/fuse-mp3fs/patches/patch-aa
@@ -0,0 +1,51 @@
+$NetBSD: patch-aa,v 1.5 2014/11/26 22:31:41 wiz Exp $
+
+--- src/mp3fs.c.orig	2008-12-14 06:17:35.000000000 +0100
++++ src/mp3fs.c
+@@ -30,7 +30,11 @@
+ #include <fcntl.h>
+ #include <dirent.h>
+ #include <errno.h>
++#if defined (__NetBSD__) || defined (__DragonFly__)
++#include <sys/statvfs.h>
++#else
+ #include <sys/statfs.h>
++#endif
+ 
+ #include "transcode.h"
+ #include "talloc.h"
+@@ -195,7 +199,12 @@ static int mp3fs_read(const char *path, 
+   return f->Read(f, buf, offset, size);
+ }
+ 
+-static int mp3fs_statfs(const char *path, struct statfs *stbuf) {
++#if defined (__NetBSD__) || defined (__DragonFly__)
++static int mp3fs_statfs(const char *path, struct statvfs *stbuf)
++#else
++static int mp3fs_statfs(const char *path, struct statfs *stbuf)
++#endif
++{
+   int res;
+   char name[256];
+ 
+@@ -204,7 +213,11 @@ static int mp3fs_statfs(const char *path
+   strncpy(name, basepath, sizeof(name));
+   strncat(name, path, sizeof(name) - strlen(name));
+ 
++#if defined (__NetBSD__) || defined (__DragonFly__)
++  res = statvfs(name, stbuf);
++#else
+   res = statfs(name, stbuf);
++#endif
+   if(res == -1)
+     return -errno;
+   
+@@ -252,7 +265,7 @@ int main(int argc, char *argv[]) {
+   basepath = argv[1];
+   bitrate = 0;
+ 
+-  rate = strchr(basepath, ',');
++  rate = strrchr(basepath, ',');
+   if(rate) {
+     rate[0] = '\0';
+     bitrate = atoi(rate + 1);
diff --git a/filesystems/fuse-mp3fs/patches/patch-ab b/filesystems/fuse-mp3fs/patches/patch-ab
new file mode 100644
index 00000000000..88bee512e58
--- /dev/null
+++ b/filesystems/fuse-mp3fs/patches/patch-ab
@@ -0,0 +1,15 @@
+$NetBSD: patch-ab,v 1.4 2014/11/26 22:31:41 wiz Exp $
+
+Add inttypes.h for PRIu64.
+
+--- src/transcode.c.orig	2008-12-14 05:24:21.000000000 +0000
++++ src/transcode.c
+@@ -24,7 +24,7 @@
+ #include <fcntl.h>
+ #include <dirent.h>
+ #include <errno.h>
+-#include <sys/statfs.h>
++#include <inttypes.h>
+ 
+ #include <FLAC/metadata.h>
+ #ifdef LEGACY_FLAC
diff --git a/filesystems/fuse-mp3fs/patches/patch-configure b/filesystems/fuse-mp3fs/patches/patch-configure
deleted file mode 100644
index 83fb1eedbf7..00000000000
--- a/filesystems/fuse-mp3fs/patches/patch-configure
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-configure,v 1.1 2014/11/23 19:33:16 wiz Exp $
-
-Fix unportable test(1) comparison operator.
-
---- configure.orig	2014-05-14 19:48:57.000000000 +0000
-+++ configure
-@@ -5259,11 +5259,11 @@ else
- fi
- 
- 
--if test "$with_mp3" == no; then :
-+if test "$with_mp3" = no; then :
-   as_fn_error $? "No encoders enabled. Ensure --with-mp3 is given." "$LINENO" 5
- fi
- 
--if test "$with_flac" == no; then :
-+if test "$with_flac" = no; then :
-   as_fn_error $? "No decoders enabled. Ensure --with-flac is given." "$LINENO" 5
- fi
- 
diff --git a/filesystems/fuse-mp3fs/patches/patch-src_class.h b/filesystems/fuse-mp3fs/patches/patch-src_class.h
new file mode 100644
index 00000000000..fd76bade78a
--- /dev/null
+++ b/filesystems/fuse-mp3fs/patches/patch-src_class.h
@@ -0,0 +1,44 @@
+$NetBSD: patch-src_class.h,v 1.3 2014/11/26 22:31:41 wiz Exp $
+
+Fix build with clang-3.1.
+
+--- src/class.h.orig	2007-11-15 05:34:32.000000000 +0000
++++ src/class.h
+@@ -171,7 +171,7 @@ super.add as well.
+ 
+ #define CLASS(class,super_class)			\
+   typedef struct class *class;				\
+-  inline void class ## _init(void);			\
++  void class ## _init(void);			\
+   void class ## _Alloc(class this);			\
+   extern int __ ## class ## _initialised;		\
+   extern struct class __ ## class;			\
+@@ -209,7 +209,7 @@ super.add as well.
+ 
+ #define VIRTUAL(class,superclass)				\
+   struct class __ ## class;					\
+-  inline void class ## _init(void) {					\
++  void class ## _init(void) {					\
+     if(!__ ## class ## _initialised) {					\
+       class ## _Alloc(&__ ## class);					\
+       __ ## class ## _initialised = 1;					\
+@@ -233,7 +233,7 @@ super.add as well.
+ 
+ #define VIRTUAL(class,superclass)				\
+   struct class __ ## class;					\
+-  inline void class ## _init(void) {					\
++  void class ## _init(void) {					\
+     if(!__ ## class ## _initialised) {					\
+       class ## _Alloc(&__ ## class);					\
+       __ ## class ## _initialised = 1;					\
+@@ -348,8 +348,8 @@ struct Object {
+ #define GET_CLASS(name)				\
+   &__ ## name
+ 
+-inline void Object_init(void);
+-inline void Object_Alloc(Object this);
++void Object_init(void);
++void Object_Alloc(Object this);
+ 
+ extern struct Object __Object;
+