Fix buildling on Mac OS X; clean up

4 files changed, 41 insertions, 19 deletions

diff --git a/audio/libsamplerate/Makefile b/audio/libsamplerate/Makefile
index 8cd1238f15a..db301e1530f 100644
--- a/audio/libsamplerate/Makefile
+++ b/audio/libsamplerate/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.23 2011/03/02 06:31:35 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.24 2012/07/04 08:58:09 adam Exp $
 
-DISTNAME=	libsamplerate-0.1.7
+DISTNAME=	libsamplerate-0.1.8
 CATEGORIES=	audio
 MASTER_SITES=	http://www.mega-nerd.com/SRC/
 
@@ -12,17 +11,10 @@ LICENSE=	gnu-gpl-v2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-# remove on next update
-DIST_SUBDIR=	libsamplerate-0.1.7-repack
-
-GNU_CONFIGURE=	YES
-USE_LIBTOOL=	YES
-USE_TOOLS+=	pkg-config
-PKGCONFIG_OVERRIDE+= ${WRKSRC}/samplerate.pc.in
-
-.if exists(/Developer/Headers/FlatCarbon)
-BUILDLINK_PASSTHRU_DIRS+=		/Developer/Headers/FlatCarbon
-.endif
+USE_LIBTOOL=		yes
+USE_TOOLS+=		pkg-config
+GNU_CONFIGURE=		yes
+PKGCONFIG_OVERRIDE+=	${WRKSRC}/samplerate.pc.in
 
 TEST_TARGET=	check
 
diff --git a/audio/libsamplerate/PLIST b/audio/libsamplerate/PLIST
index 1e25d71ed89..168263b7a70 100644
--- a/audio/libsamplerate/PLIST
+++ b/audio/libsamplerate/PLIST
@@ -1,5 +1,20 @@
-@comment $NetBSD: PLIST,v 1.5 2004/09/22 08:09:16 jlam Exp $
+@comment $NetBSD: PLIST,v 1.6 2012/07/04 08:58:09 adam Exp $
 bin/sndfile-resample
 include/samplerate.h
 lib/libsamplerate.la
 lib/pkgconfig/samplerate.pc
+share/doc/libsamplerate0-dev/html/SRC.css
+share/doc/libsamplerate0-dev/html/SRC.png
+share/doc/libsamplerate0-dev/html/api.html
+share/doc/libsamplerate0-dev/html/api_callback.html
+share/doc/libsamplerate0-dev/html/api_full.html
+share/doc/libsamplerate0-dev/html/api_misc.html
+share/doc/libsamplerate0-dev/html/api_simple.html
+share/doc/libsamplerate0-dev/html/download.html
+share/doc/libsamplerate0-dev/html/faq.html
+share/doc/libsamplerate0-dev/html/history.html
+share/doc/libsamplerate0-dev/html/index.html
+share/doc/libsamplerate0-dev/html/license.html
+share/doc/libsamplerate0-dev/html/lists.html
+share/doc/libsamplerate0-dev/html/quality.html
+share/doc/libsamplerate0-dev/html/win32.html
diff --git a/audio/libsamplerate/distinfo b/audio/libsamplerate/distinfo
index b8fbe8af864..af54e562ba8 100644
--- a/audio/libsamplerate/distinfo
+++ b/audio/libsamplerate/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.8 2011/03/02 06:31:35 wiz Exp $
+$NetBSD: distinfo,v 1.9 2012/07/04 08:58:09 adam Exp $
 
-SHA1 (libsamplerate-0.1.7-repack/libsamplerate-0.1.7.tar.gz) = f3f803ec5feae5a3fdb0fa3937277669e854386e
-RMD160 (libsamplerate-0.1.7-repack/libsamplerate-0.1.7.tar.gz) = a00f12571098fd6c50a8b9f8867cdcc3f36c1f60
-Size (libsamplerate-0.1.7-repack/libsamplerate-0.1.7.tar.gz) = 4340619 bytes
+SHA1 (libsamplerate-0.1.8.tar.gz) = e5fe82c4786be2fa33ca6bd4897db4868347fe70
+RMD160 (libsamplerate-0.1.8.tar.gz) = 74fe910bbc47cafad391932763afac2a29282ac5
+Size (libsamplerate-0.1.8.tar.gz) = 4303330 bytes
+SHA1 (patch-examples_audio_out.c) = 7b6cbcdc31e8e7da1d3453f9a59ee910296e4109
diff --git a/audio/libsamplerate/patches/patch-examples_audio_out.c b/audio/libsamplerate/patches/patch-examples_audio_out.c
new file mode 100644
index 00000000000..7e8b8a20f85
--- /dev/null
+++ b/audio/libsamplerate/patches/patch-examples_audio_out.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-examples_audio_out.c,v 1.1 2012/07/04 08:59:23 adam Exp $
+
+Fix building on Mac OS X.
+
+--- examples/audio_out.c.orig	2012-06-22 20:14:44.000000000 +0000
++++ examples/audio_out.c
+@@ -168,7 +168,6 @@ linux_close (AUDIO_OUT *audio_out)
+ 
+ #if (defined (__MACH__) && defined (__APPLE__)) /* MacOSX */
+ 
+-#include <Carbon.h>
+ #include <CoreAudio/AudioHardware.h>
+ 
+ #define	MACOSX_MAGIC	MAKE_MAGIC ('M', 'a', 'c', ' ', 'O', 'S', ' ', 'X')