summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshattered <shattered@pkgsrc.org>2012-10-21 11:04:40 +0000
committershattered <shattered@pkgsrc.org>2012-10-21 11:04:40 +0000
commitdaa7f04730661f735d92e6dfe4897883b9fd3567 (patch)
tree04dcf07a0ba79aa54f7fa15f6e50e7c9c567b7da
parent8893900e5e83965ef275bb0edd05d7189548a81f (diff)
downloadpkgsrc-daa7f04730661f735d92e6dfe4897883b9fd3567.tar.gz
Call mount() only on Linux -- it has different call signature elsewhere.
-rw-r--r--audio/libgpod/Makefile4
-rw-r--r--audio/libgpod/distinfo3
-rw-r--r--audio/libgpod/patches/patch-aa17
3 files changed, 21 insertions, 3 deletions
diff --git a/audio/libgpod/Makefile b/audio/libgpod/Makefile
index f4238019c1a..6390af5b857 100644
--- a/audio/libgpod/Makefile
+++ b/audio/libgpod/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.30 2012/10/08 23:00:47 adam Exp $
+# $NetBSD: Makefile,v 1.31 2012/10/21 11:04:40 shattered Exp $
DISTNAME= libgpod-0.8.2
-PKGREVISION= 7
+PKGREVISION= 8
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gtkpod/}
EXTRACT_SUFX= .tar.bz2
diff --git a/audio/libgpod/distinfo b/audio/libgpod/distinfo
index ba84dc406b9..56242fec538 100644
--- a/audio/libgpod/distinfo
+++ b/audio/libgpod/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.9 2012/04/13 20:58:54 adam Exp $
+$NetBSD: distinfo,v 1.10 2012/10/21 11:04:41 shattered Exp $
SHA1 (libgpod-0.8.2.tar.bz2) = f9ba70cd6f00ae59cdc6a43cc72c409a4d27606e
RMD160 (libgpod-0.8.2.tar.bz2) = 63e60211cf0e52a60eade6d39e12b6fab023fccb
Size (libgpod-0.8.2.tar.bz2) = 777945 bytes
+SHA1 (patch-aa) = 9b90cf13b94259b50fcab19f1041a4aa41eab8c5
diff --git a/audio/libgpod/patches/patch-aa b/audio/libgpod/patches/patch-aa
new file mode 100644
index 00000000000..ae23e6d7f18
--- /dev/null
+++ b/audio/libgpod/patches/patch-aa
@@ -0,0 +1,17 @@
+$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));