Update to 1.0.18:

Version 1.0.18 (2009-02-07)
  * Add Ogg/Vorbis support (thanks to John ffitch).
  * Remove captive FLAC library.
  * Many new features and bug fixes.
  * Generate Win32 and Win64 pre-compiled binaries.

Add ogg and vorbis dependencies to bl3.mk and increase ABI depends.

9 files changed, 29 insertions, 210 deletions

diff --git a/audio/libsndfile/Makefile b/audio/libsndfile/Makefile
index 71ad6b4da47..5a534974d06 100644
--- a/audio/libsndfile/Makefile
+++ b/audio/libsndfile/Makefile
@@ -1,14 +1,9 @@
-# $NetBSD: Makefile,v 1.47 2009/01/13 12:13:45 drochner Exp $
+# $NetBSD: Makefile,v 1.48 2009/02/21 13:20:45 wiz Exp $
 
-DISTNAME=	libsndfile-1.0.17
-PKGREVISION=	5
+DISTNAME=	libsndfile-1.0.18
 CATEGORIES=	audio
 MASTER_SITES=	http://www.mega-nerd.com/libsndfile/
 
-PATCHFILES=	libsndfile-1.0.17+flac-1.1.3.patch.bz2
-PATCH_SITES=	${MASTER_SITE_GENTOO:=distfiles/}
-PATCH_DIST_STRIP=	-p1
-
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.mega-nerd.com/libsndfile/
 COMMENT=	Library for reading and writing audio files
@@ -16,16 +11,22 @@ COMMENT=	Library for reading and writing audio files
 PKG_DESTDIR_SUPPORT=	user-destdir
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
+USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
+USE_TOOLS=		pkg-config
 PKGCONFIG_OVERRIDE=	sndfile.pc.in
 GNU_CONFIGURE=		yes
 
 MAKE_JOBS_SAFE=		no
 
+SUBST_CLASSES+=		vorbis
+SUBST_FILES.vorbis=	configure
+SUBST_SED.vorbis=	"s/1\.2\.1/1.2.0/g"
+SUBST_STAGE.vorbis=	pre-configure
+SUBST_MESSAGE.vorbis=	Allowing libvorbis-1.2.0.
+
 # This package compiles with gcc2, but its configure script doesn't know that
 CONFIGURE_ENV+=		ac_cv_c_struct_hack=yes
-# Avoid an ICE in gcc2 on sparc64
-CONFIGURE_ENV+=		F77=${FALSE:Q}
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -36,4 +37,8 @@ BUILDLINK_PASSTHRU_DIRS+=	/Developer
 .endif
 
 .include "../../audio/flac/buildlink3.mk"
+#BUILDLINK_API_DEPENDS.libvorbis+=	libvorbis>=1.2.1
+.include "../../audio/libvorbis/buildlink3.mk"
+BUILDLINK_API_DEPENDS.libogg+=	libogg>=1.1.3
+.include "../../multimedia/libogg/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/libsndfile/PLIST b/audio/libsndfile/PLIST
index a405db3585e..590ac27c7c2 100644
--- a/audio/libsndfile/PLIST
+++ b/audio/libsndfile/PLIST
@@ -1,6 +1,10 @@
-@comment $NetBSD: PLIST,v 1.14 2006/09/01 06:02:23 adam Exp $
+@comment $NetBSD: PLIST,v 1.15 2009/02/21 13:20:45 wiz Exp $
+bin/sndfile-cmp
 bin/sndfile-convert
 bin/sndfile-info
+bin/sndfile-jackplay
+bin/sndfile-metadata-get
+bin/sndfile-metadata-set
 bin/sndfile-play
 bin/sndfile-regtest
 include/sndfile.h
@@ -24,12 +28,7 @@ share/doc/libsndfile1-dev/html/new_file_type.HOWTO
 share/doc/libsndfile1-dev/html/octave.html
 share/doc/libsndfile1-dev/html/pkgconfig.html
 share/doc/libsndfile1-dev/html/sndfile_info.html
+share/doc/libsndfile1-dev/html/tutorial.html
 share/doc/libsndfile1-dev/html/win32.html
-share/octave/site/m/sndfile_load.m
-share/octave/site/m/sndfile_play.m
-share/octave/site/m/sndfile_save.m
 @dirrm share/doc/libsndfile1-dev/html
 @dirrm share/doc/libsndfile1-dev
-@dirrm share/octave/site/m
-@dirrm share/octave/site
-@dirrm share/octave
diff --git a/audio/libsndfile/buildlink3.mk b/audio/libsndfile/buildlink3.mk
index 2d587f888d5..076b2ff37cd 100644
--- a/audio/libsndfile/buildlink3.mk
+++ b/audio/libsndfile/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2007/01/07 12:25:52 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2009/02/21 13:20:45 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBSNDFILE_BUILDLINK3_MK:=	${LIBSNDFILE_BUILDLINK3_MK}+
@@ -12,11 +12,13 @@ BUILDLINK_PACKAGES+=	libsndfile
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libsndfile
 
 .if !empty(LIBSNDFILE_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.libsndfile+=		libsndfile>=1.0.0
-BUILDLINK_ABI_DEPENDS.libsndfile+=	libsndfile>=1.0.17nb1
+BUILDLINK_API_DEPENDS.libsndfile+=	libsndfile>=1.0.0
+BUILDLINK_ABI_DEPENDS.libsndfile+=	libsndfile>=1.0.18
 BUILDLINK_PKGSRCDIR.libsndfile?=	../../audio/libsndfile
 .endif	# LIBSNDFILE_BUILDLINK3_MK
 
+.include "../../audio/libvorbis/buildlink3.mk"
 .include "../../audio/flac/buildlink3.mk"
+.include "../../multimedia/libogg/buildlink3.mk"
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/libsndfile/distinfo b/audio/libsndfile/distinfo
index b05a64a1a72..a702ace14b1 100644
--- a/audio/libsndfile/distinfo
+++ b/audio/libsndfile/distinfo
@@ -1,13 +1,5 @@
-$NetBSD: distinfo,v 1.25 2009/01/13 12:13:46 drochner Exp $
+$NetBSD: distinfo,v 1.26 2009/02/21 13:20:45 wiz Exp $
 
-SHA1 (libsndfile-1.0.17+flac-1.1.3.patch.bz2) = 10e0d19dfc8cf2a6bf499e0fa0d1ab17dca4c519
-RMD160 (libsndfile-1.0.17+flac-1.1.3.patch.bz2) = fc6e6f03069c1ad8ee43f600f6ac2aa6e97bb1f5
-Size (libsndfile-1.0.17+flac-1.1.3.patch.bz2) = 3127 bytes
-SHA1 (libsndfile-1.0.17.tar.gz) = 2f66798d596a15491fbd1191ded8125ed71ef411
-RMD160 (libsndfile-1.0.17.tar.gz) = ae93822a4c587dcdd7c70d043d2a38ed2fe3a188
-Size (libsndfile-1.0.17.tar.gz) = 819456 bytes
-SHA1 (patch-aa) = a3bb33cc28c10c9aa23a0b066339a512dbd7b0e2
-SHA1 (patch-ac) = ee4b99239e21fe1104bcec4b5579fe2b1039619c
-SHA1 (patch-ad) = b730de6bb0716bece5f83c3100f9fc0f8eb2ae7d
-SHA1 (patch-ah) = 8c936316ca1191f8893579a562ff705c8dde6f92
-SHA1 (patch-ba) = 92ec08d4e021f121d2255760d601625df71e3805
+SHA1 (libsndfile-1.0.18.tar.gz) = d0fb643dc5b1030cf769e06d1260c70320fc877e
+RMD160 (libsndfile-1.0.18.tar.gz) = 15b19f4df1d8ced6c25e234258fb3d88fe3cd2ae
+Size (libsndfile-1.0.18.tar.gz) = 923666 bytes
diff --git a/audio/libsndfile/patches/patch-aa b/audio/libsndfile/patches/patch-aa
deleted file mode 100644
index 59771748172..00000000000
--- a/audio/libsndfile/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.13 2006/09/01 06:02:23 adam Exp $
-
---- src/Makefile.in.orig	2006-08-31 12:55:38.000000000 +0200
-+++ src/Makefile.in
-@@ -864,7 +864,7 @@ cygsndfile.def: create_symbols_file.py
- 	./create_symbols_file.py cygwin $(VERSION) > cygsndfile.def
- 
- # Fake dependancy to force the creation of these files.
--sndfile.c : Symbols.linux Symbols.darwin libsndfile.def cygsndfile.def
-+sndfile.c :
- 
- # Dependancies.
- 
diff --git a/audio/libsndfile/patches/patch-ac b/audio/libsndfile/patches/patch-ac
deleted file mode 100644
index 4859db982ca..00000000000
--- a/audio/libsndfile/patches/patch-ac
+++ /dev/null
@@ -1,100 +0,0 @@
-$NetBSD: patch-ac,v 1.9 2008/04/07 15:36:19 bjs Exp $
-
---- examples/sndfile-play.c.orig	2006-08-31 05:22:07.000000000 -0400
-+++ examples/sndfile-play.c
-@@ -34,16 +34,21 @@
- 	#include <sys/time.h>
- #endif
- 
--#if defined (__linux__)
-+#if defined (__linux__) || defined(USE_OSS)
- 	#include 	<fcntl.h>
- 	#include 	<sys/ioctl.h>
- 	#include 	<sys/soundcard.h>
- 
-+	#ifndef DEV_DSP
-+	#define DEV_DSP	"/dev/dsp"
-+	#endif
-+
- #elif (defined (__MACH__) && defined (__APPLE__))
- 	#include <Carbon.h>
- 	#include <CoreAudio/AudioHardware.h>
- 
--#elif (defined (sun) && defined (unix))
-+#elif (defined (sun) && defined (unix)) || \
-+      defined (USE_SUN)
- 	#include <fcntl.h>
- 	#include <sys/ioctl.h>
- 	#include <sys/audioio.h>
-@@ -339,7 +344,7 @@ alsa_write_float (snd_pcm_t *alsa_dev, f
- **	Linux/OSS functions for playing a sound.
- */
- 
--#if defined (__linux__)
-+#if defined (__linux__) || defined(USE_OSS)
- 
- static	int	linux_open_dsp_device (int channels, int srate) ;
- 
-@@ -408,7 +413,7 @@ static int
- linux_open_dsp_device (int channels, int srate)
- {	int fd, stereo, fmt ;
- 
--	if ((fd = open ("/dev/dsp", O_WRONLY, 0)) == -1 &&
-+	if ((fd = open (DEV_DSP, O_WRONLY, 0)) == -1 &&
- 		(fd = open ("/dev/sound/dsp", O_WRONLY, 0)) == -1)
- 	{	perror ("linux_open_dsp_device : open ") ;
- 		exit (1) ;
-@@ -819,7 +824,12 @@ win32_play (int argc, char *argv [])
- **	Solaris.
- */
- 
--#if (defined (sun) && defined (unix)) /* ie Solaris */
-+#if (defined (sun) && defined (unix)) || \
-+    defined (USE_SUN)
-+
-+#ifndef SUN_DEV
-+#define SUN_DEV "/dev/audio"
-+#endif
- 
- static void
- solaris_play (int argc, char *argv [])
-@@ -844,8 +854,8 @@ solaris_play (int argc, char *argv [])
- 			} ;
- 
- 		/* open the audio device - write only, non-blocking */
--		if ((audio_fd = open ("/dev/audio", O_WRONLY | O_NONBLOCK)) < 0)
--		{	perror ("open (/dev/audio) failed") ;
-+		if ((audio_fd = open (SUN_DEV, O_WRONLY | O_NONBLOCK)) < 0)
-+		{	perror ("open ("SUN_DEV") failed") ;
- 			return ;
- 			} ;
- 
-@@ -858,6 +868,9 @@ solaris_play (int argc, char *argv [])
- 		audio_info.play.encoding = AUDIO_ENCODING_LINEAR ;
- 		audio_info.play.gain = AUDIO_MAX_GAIN ;
- 		audio_info.play.balance = AUDIO_MID_BALANCE ;
-+#if defined(__NetBSD__) || defined(__OpenBSD__)
-+		audio_info.mode = AUMODE_PLAY | AUMODE_PLAY_ALL;
-+#endif
- 
- 		if ((error = ioctl (audio_fd, AUDIO_SETINFO, &audio_info)))
- 		{	perror ("ioctl (AUDIO_SETINFO) failed") ;
-@@ -926,7 +939,7 @@ main (int argc, char *argv [])
- 		return 1 ;
- 		} ;
- 
--#if defined (__linux__)
-+#if defined (__linux__) || defined (USE_OSS)
- 	#if HAVE_ALSA_ASOUNDLIB_H
- 		if (access ("/proc/asound/cards", R_OK) == 0)
- 			alsa_play (argc, argv) ;
-@@ -935,7 +948,8 @@ main (int argc, char *argv [])
- 		linux_play (argc, argv) ;
- #elif (defined (__MACH__) && defined (__APPLE__))
- 	macosx_play (argc, argv) ;
--#elif (defined (sun) && defined (unix))
-+#elif (defined (sun) && defined (unix)) || \
-+      defined (USE_SUN)
- 	solaris_play (argc, argv) ;
- #elif (OS_IS_WIN32 == 1)
- 	win32_play (argc, argv) ;
diff --git a/audio/libsndfile/patches/patch-ad b/audio/libsndfile/patches/patch-ad
deleted file mode 100644
index b6dd33c1c27..00000000000
--- a/audio/libsndfile/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.10 2006/09/01 06:02:23 adam Exp $
-
---- examples/Makefile.in.orig	2006-08-31 12:55:32.000000000 +0200
-+++ examples/Makefile.in
-@@ -238,7 +238,7 @@ INCLUDES = -I$(srcdir)/$(SNDFILEDIR) $(O
- sndfile_info_SOURCES = sndfile-info.c 
- sndfile_info_LDADD = $(SNDFILEDIR)/libsndfile.la
- sndfile_play_SOURCES = sndfile-play.c 
--sndfile_play_LDADD = $(SNDFILEDIR)/libsndfile.la $(OS_SPECIFIC_LINKS) $(ALSA_LIBS)
-+sndfile_play_LDADD = $(SNDFILEDIR)/libsndfile.la $(OS_SPECIFIC_LINKS) $(ALSA_LIBS) $(LIBOSSAUDIO)
- sndfile_convert_SOURCES = sndfile-convert.c 
- sndfile_convert_LDADD = $(SNDFILEDIR)/libsndfile.la
- make_sine_SOURCES = make_sine.c 
diff --git a/audio/libsndfile/patches/patch-ah b/audio/libsndfile/patches/patch-ah
deleted file mode 100644
index 1c5d346718f..00000000000
--- a/audio/libsndfile/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2006/09/01 06:02:23 adam Exp $
-
---- Makefile.in.orig	2006-09-01 07:54:23.000000000 +0200
-+++ Makefile.in
-@@ -209,7 +209,7 @@ target_alias = @target_alias@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
--SUBDIRS = man doc Win32 Octave src examples regtest tests
-+SUBDIRS = man doc Win32 Octave src examples regtest
- DIST_SUBDIRS = $(SUBDIRS)
- EXTRA_DIST = reconfigure.mk acinclude.m4 libsndfile.spec.in \
- 			sndfile.pc.in Mingw-make-dist.sh
diff --git a/audio/libsndfile/patches/patch-ba b/audio/libsndfile/patches/patch-ba
deleted file mode 100644
index 7837bf097f5..00000000000
--- a/audio/libsndfile/patches/patch-ba
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-ba,v 1.1 2008/01/07 17:34:37 drochner Exp $
-
---- src/flac.c.orig	2008-01-03 17:13:00.000000000 +0100
-+++ src/flac.c
-@@ -57,7 +57,7 @@ flac_open (SF_PRIVATE *psf)
- ** Private static functions.
- */
- 
--#define ENC_BUFFER_SIZE 4096
-+#define ENC_BUFFER_SIZE 8192
- 
- typedef enum
- {	PFLAC_PCM_SHORT = 0,
-@@ -202,6 +202,17 @@ flac_buffer_copy (SF_PRIVATE *psf)
- 	const FLAC__int32* const *buffer = pflac->wbuffer ;
- 	unsigned i = 0, j, offset ;
- 
-+	/*
-+	**	frame->header.blocksize is variable and we're using a constant blocksize
-+	**	of FLAC__MAX_BLOCK_SIZE.
-+	**	Check our assumptions here.
-+	*/
-+	if (frame->header.blocksize > FLAC__MAX_BLOCK_SIZE)
-+	{	psf_log_printf (psf, "Ooops : frame->header.blocksize (%d) > FLAC__MAX_BLOCK_SIZE (%d)\n", __func__, __LINE__, frame->header.blocksize, FLAC__MAX_BLOCK_SIZE) ;
-+		psf->error = SFE_INTERNAL ;
-+		return 0 ;
-+		} ;
-+
- 	if (pflac->ptr == NULL)
- 	{	/*
- 		**	Not sure why this code is here and not elsewhere.
-@@ -210,7 +221,7 @@ flac_buffer_copy (SF_PRIVATE *psf)
- 		pflac->bufferbackup = SF_TRUE ;
- 		for (i = 0 ; i < frame->header.channels ; i++)
- 		{	if (pflac->rbuffer [i] == NULL)
--				pflac->rbuffer [i] = calloc (frame->header.blocksize, sizeof (FLAC__int32)) ;
-+				pflac->rbuffer [i] = calloc (FLAC__MAX_BLOCK_SIZE, sizeof (FLAC__int32)) ;
- 			memcpy (pflac->rbuffer [i], buffer [i], frame->header.blocksize * sizeof (FLAC__int32)) ;
- 			} ;
- 		pflac->wbuffer = (const FLAC__int32* const*) pflac->rbuffer ;