Sun Oct 21 11:04:42 2012 UTC ()
Call mount() only on Linux -- it has different call signature elsewhere.
(shattered)
diff -r1.30 -r1.31 pkgsrc/audio/libgpod/Makefile
diff -r1.9 -r1.10 pkgsrc/audio/libgpod/distinfo
diff -r0 -r1.5 pkgsrc/audio/libgpod/patches/patch-aa
--- pkgsrc/audio/libgpod/Makefile 2012/10/08 23:00:47 1.30
+++ pkgsrc/audio/libgpod/Makefile 2012/10/21 11:04:40 1.31
| @@ -1,17 +1,17 @@ | | | @@ -1,17 +1,17 @@ |
| 1 | # $NetBSD: Makefile,v 1.30 2012/10/08 23:00:47 adam Exp $ | | 1 | # $NetBSD: Makefile,v 1.31 2012/10/21 11:04:40 shattered Exp $ |
| 2 | | | 2 | |
| 3 | DISTNAME= libgpod-0.8.2 | | 3 | DISTNAME= libgpod-0.8.2 |
| 4 | PKGREVISION= 7 | | 4 | PKGREVISION= 8 |
| 5 | CATEGORIES= audio | | 5 | CATEGORIES= audio |
| 6 | MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gtkpod/} | | 6 | MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gtkpod/} |
| 7 | EXTRACT_SUFX= .tar.bz2 | | 7 | EXTRACT_SUFX= .tar.bz2 |
| 8 | | | 8 | |
| 9 | MAINTAINER= srp@tworoads.net | | 9 | MAINTAINER= srp@tworoads.net |
| 10 | HOMEPAGE= http://www.gtkpod.org/wiki/Libgpod | | 10 | HOMEPAGE= http://www.gtkpod.org/wiki/Libgpod |
| 11 | COMMENT= Library for accessing iPod onboard databases, playlists, etc | | 11 | COMMENT= Library for accessing iPod onboard databases, playlists, etc |
| 12 | LICENSE= gnu-lgpl-v2 | | 12 | LICENSE= gnu-lgpl-v2 |
| 13 | | | 13 | |
| 14 | PKGCONFIG_OVERRIDE= libgpod-1.0.pc.in | | 14 | PKGCONFIG_OVERRIDE= libgpod-1.0.pc.in |
| 15 | | | 15 | |
| 16 | USE_LIBTOOL= yes | | 16 | USE_LIBTOOL= yes |
| 17 | USE_PKGLOCALEDIR= yes | | 17 | USE_PKGLOCALEDIR= yes |
--- pkgsrc/audio/libgpod/distinfo 2012/04/13 20:58:54 1.9
+++ pkgsrc/audio/libgpod/distinfo 2012/10/21 11:04:41 1.10
| @@ -1,5 +1,6 @@ | | | @@ -1,5 +1,6 @@ |
| 1 | $NetBSD: distinfo,v 1.9 2012/04/13 20:58:54 adam Exp $ | | 1 | $NetBSD: distinfo,v 1.10 2012/10/21 11:04:41 shattered Exp $ |
| 2 | | | 2 | |
| 3 | SHA1 (libgpod-0.8.2.tar.bz2) = f9ba70cd6f00ae59cdc6a43cc72c409a4d27606e | | 3 | SHA1 (libgpod-0.8.2.tar.bz2) = f9ba70cd6f00ae59cdc6a43cc72c409a4d27606e |
| 4 | RMD160 (libgpod-0.8.2.tar.bz2) = 63e60211cf0e52a60eade6d39e12b6fab023fccb | | 4 | RMD160 (libgpod-0.8.2.tar.bz2) = 63e60211cf0e52a60eade6d39e12b6fab023fccb |
| 5 | Size (libgpod-0.8.2.tar.bz2) = 777945 bytes | | 5 | Size (libgpod-0.8.2.tar.bz2) = 777945 bytes |
| | | 6 | SHA1 (patch-aa) = 9b90cf13b94259b50fcab19f1041a4aa41eab8c5 |
$NetBSD: patch-aa,v 1.5 2012/10/21 11:04:42 shattered Exp $
--- tools/generic-callout.c.orig 2011-07-24 11:03:29.000000000 +0000
+++ tools/generic-callout.c
@@ -601,7 +601,12 @@ static char *mount_ipod (const char *dev
return NULL;
}
g_assert (tmpname == filename);
+#if !defined(__linux__)
+ result = -1;
+#else
result = mount (dev_path, tmpname, fstype, 0, NULL);
+#endif
+
if (result != 0) {
g_debug("failed to mount device %s at %s: %s",
dev_path, tmpname, strerror(errno));