[46512] trunk/dports/fuse/mp3fs
snc at macports.org
snc at macports.org
Thu Feb 5 19:39:28 PST 2009
Revision: 46512
http://trac.macports.org/changeset/46512
Author: snc at macports.org
Date: 2009-02-05 19:39:28 -0800 (Thu, 05 Feb 2009)
Log Message:
-----------
fixing portfile: variables, redefined defaults, etc
Modified Paths:
--------------
trunk/dports/fuse/mp3fs/Portfile
Added Paths:
-----------
trunk/dports/fuse/mp3fs/files/
trunk/dports/fuse/mp3fs/files/patch-mp3fs.diff
Modified: trunk/dports/fuse/mp3fs/Portfile
===================================================================
--- trunk/dports/fuse/mp3fs/Portfile 2009-02-06 03:34:03 UTC (rev 46511)
+++ trunk/dports/fuse/mp3fs/Portfile 2009-02-06 03:39:28 UTC (rev 46512)
@@ -19,28 +19,20 @@
homepage http://mp3fs.sourceforge.net/
-distname mp3fs-${version}
master_sites sourceforge:mp3fs
checksums ${distfiles} md5 fb9b5eb4fb6f69f35430ff7e93a84e0b \
sha1 b246bd747a32256cb8364b7ac0cc8b7a4e1d3f74
-livecheck.distname mp3fs
+depends_build port:pkgconfig
depends_lib port:macfuse \
port:flac \
- port:pkgconfig \
port:lame \
port:libid3tag
-configure.post_args-append "id3tag_CFLAGS=-I/opt/local/include id3tag_LIBS='-L/opt/local/lib /opt/local/lib/libid3tag.dylib'"
+configure.post_args-append "id3tag_CFLAGS=-I${prefix}/include id3tag_LIBS='-L${prefix}/lib /opt/local/lib/libid3tag.dylib'"
-platform darwin {
- patch_sites http://www.uwe-arzt.de/files/mp3fs
- patchfiles mp3fs-${version}-macosx.patch
- checksums-append mp3fs-${version}-macosx.patch md5 3c14c714c9ff9fc39586cfb50ac6f3d2 \
- sha1 3f46e4292a0dac0b0f9d3b8f01b76ff3315b3169
-
- # override patch.pre_args since it defaults to -p0
- patch.pre_args -R -p1
-}
+patchfiles patch-mp3fs.diff
+# override patch.pre_args since it defaults to -p0
+patch.pre_args -R -p1
Added: trunk/dports/fuse/mp3fs/files/patch-mp3fs.diff
===================================================================
--- trunk/dports/fuse/mp3fs/files/patch-mp3fs.diff (rev 0)
+++ trunk/dports/fuse/mp3fs/files/patch-mp3fs.diff 2009-02-06 03:39:28 UTC (rev 46512)
@@ -0,0 +1,137 @@
+diff -u -r mp3fs-0.13/src/class.h mp3fs-0.13.org/src/class.h
+--- mp3fs-0.13/src/class.h 2009-02-03 18:20:27.000000000 +0100
++++ mp3fs-0.13.org/src/class.h 2007-11-15 06:34:32.000000000 +0100
+@@ -171,7 +171,7 @@
+
+ #define CLASS(class,super_class) \
+ typedef struct class *class; \
+- /*inline*/ void class ## _init(void); \
++ inline void class ## _init(void); \
+ void class ## _Alloc(class this); \
+ extern int __ ## class ## _initialised; \
+ extern struct class __ ## class; \
+@@ -209,7 +209,7 @@
+
+ #define VIRTUAL(class,superclass) \
+ struct class __ ## class; \
+- /*inline*/ void class ## _init(void) { \
++ inline void class ## _init(void) { \
+ if(!__ ## class ## _initialised) { \
+ class ## _Alloc(&__ ## class); \
+ __ ## class ## _initialised = 1; \
+@@ -233,7 +233,7 @@
+
+ #define VIRTUAL(class,superclass) \
+ struct class __ ## class; \
+- /*inline*/ void class ## _init(void) { \
++ inline void class ## _init(void) { \
+ if(!__ ## class ## _initialised) { \
+ class ## _Alloc(&__ ## class); \
+ __ ## class ## _initialised = 1; \
+@@ -348,8 +348,8 @@
+ #define GET_CLASS(name) \
+ &__ ## name
+
+-/*inline*/ void Object_init(void);
+-/*inline*/ void Object_Alloc(Object this);
++inline void Object_init(void);
++inline void Object_Alloc(Object this);
+
+ extern struct Object __Object;
+
+diff -u -r mp3fs-0.13/src/mp3fs.c mp3fs-0.13.org/src/mp3fs.c
+--- mp3fs-0.13/src/mp3fs.c 2009-02-03 13:55:02.000000000 +0100
++++ mp3fs-0.13.org/src/mp3fs.c 2008-12-14 06:17:35.000000000 +0100
+@@ -20,7 +20,7 @@
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+-#define FUSE_USE_VERSION 26
++#define FUSE_USE_VERSION 22
+
+ #include <fuse.h>
+ #include <stdio.h>
+@@ -30,7 +30,7 @@
+ #include <fcntl.h>
+ #include <dirent.h>
+ #include <errno.h>
+-/*#include <sys/statfs.h>*/
++#include <sys/statfs.h>
+
+ #include "transcode.h"
+ #include "talloc.h"
+@@ -56,7 +56,7 @@
+ off_t offset, struct fuse_file_info *fi) {
+ DIR *dp;
+ struct dirent *de;
+- char name[256]; /* *ptr; */
++ char name[256], *ptr;
+
+ DEBUG(logfd, "%s: readdir\n", path);
+
+@@ -90,7 +90,7 @@
+ }
+
+ static int mp3fs_getattr(const char *path, struct stat *stbuf) {
+- /* int res; */
++ int res;
+ FileTranscoder f;
+ char name[256];
+ int hold_errno;
+@@ -161,7 +161,7 @@
+ static int mp3fs_read(const char *path, char *buf, size_t size, off_t offset,
+ struct fuse_file_info *fi) {
+ int fd, res;
+- /* struct stat st; */
++ struct stat st;
+ FileTranscoder f=NULL;
+ char name[256];
+
+@@ -195,7 +195,7 @@
+ return f->Read(f, buf, offset, size);
+ }
+
+-static int mp3fs_statfs(const char *path, struct statvfs *stbuf) {
++static int mp3fs_statfs(const char *path, struct statfs *stbuf) {
+ int res;
+ char name[256];
+
+@@ -204,7 +204,7 @@
+ strncpy(name, basepath, sizeof(name));
+ strncat(name, path, sizeof(name) - strlen(name));
+
+- res = statvfs(name, stbuf);
++ res = statfs(name, stbuf);
+ if(res == -1)
+ return -errno;
+
+@@ -269,7 +269,7 @@
+ #endif
+
+ // start FUSE
+- fuse_main(argc-1, argv+1, &mp3fs_ops, NULL);
++ fuse_main(argc-1, argv+1, &mp3fs_ops);
+
+ #ifdef __DEBUG__
+ fclose(logfd);
+diff -u -r mp3fs-0.13/src/transcode.c mp3fs-0.13.org/src/transcode.c
+--- mp3fs-0.13/src/transcode.c 2009-02-03 18:25:55.000000000 +0100
++++ mp3fs-0.13.org/src/transcode.c 2008-12-14 06:24:21.000000000 +0100
+@@ -24,7 +24,7 @@
+ #include <fcntl.h>
+ #include <dirent.h>
+ #include <errno.h>
+-/*#include <sys/statfs.h>*/
++#include <sys/statfs.h>
+
+ #include <FLAC/metadata.h>
+ #ifdef LEGACY_FLAC
+@@ -159,7 +159,7 @@
+ void *client_data)
+ #endif
+ {
+- int len, i/*, count*/;
++ int len, i, count;
+ FileTranscoder trans = (FileTranscoder)client_data;
+
+ if(frame->header.blocksize < 1152) {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090205/9d0c9979/attachment.html>
More information about the macports-changes
mailing list