Update to 0.3.2:

Changes for Audio File Library version 0.3.2:

* Fix initialization of byte order in Creative Voice File format.
* Fix calculation of frame count in NIST SPHERE sound files.
* Remove duplicate definition of AFvirtualfile.
* Don't treat compiler warnings as errors by default.

4 files changed, 31 insertions, 30 deletions

diff --git a/audio/libaudiofile/Makefile b/audio/libaudiofile/Makefile
index 3581936f56a..b9d1dbcadd8 100644
--- a/audio/libaudiofile/Makefile
+++ b/audio/libaudiofile/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.49 2011/11/30 11:59:39 wiz Exp $
+# $NetBSD: Makefile,v 1.50 2011/11/30 14:30:57 wiz Exp $
 
-DISTNAME=		audiofile-0.3.1
+DISTNAME=		audiofile-0.3.2
 PKGNAME=		lib${DISTNAME}
-PKGREVISION=		1
 CATEGORIES=		audio
 MASTER_SITES=		http://www.68k.org/~michael/audiofile/
 
diff --git a/audio/libaudiofile/distinfo b/audio/libaudiofile/distinfo
index 08546d32d3b..9b87ce7f819 100644
--- a/audio/libaudiofile/distinfo
+++ b/audio/libaudiofile/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.16 2011/11/30 11:59:39 wiz Exp $
+$NetBSD: distinfo,v 1.17 2011/11/30 14:30:57 wiz Exp $
 
-SHA1 (audiofile-0.3.1.tar.gz) = 39de137a691a7c12ea5dc468566eb7a146880ac3
-RMD160 (audiofile-0.3.1.tar.gz) = 26126ae4e095bc9d37b5184853fa545283684d03
-Size (audiofile-0.3.1.tar.gz) = 722557 bytes
+SHA1 (audiofile-0.3.2.tar.gz) = fb55a3c9153475daa8932d3626797e033d149c1d
+RMD160 (audiofile-0.3.2.tar.gz) = b55598dd1d5a960599b485c966ef39dda2384c40
+Size (audiofile-0.3.2.tar.gz) = 722101 bytes
 SHA1 (patch-af) = 095d0bf52b7545718d8058f6474b6d9c05b6ceab
-SHA1 (patch-configure) = 0bae38fd7634bca62d31173ccf04d2ae3ba140db
-SHA1 (patch-libaudiofile_af__vfs.h) = 45cd5becf0e6f6f844bd8b50e189e45b6f682c9d
+SHA1 (patch-configure) = 011fefbdccf70056eee97896119862bb299ec05e
 SHA1 (patch-libaudiofile_util.cpp) = be175d47b708fc8262926d014dca4f4ff50093e1
diff --git a/audio/libaudiofile/patches/patch-configure b/audio/libaudiofile/patches/patch-configure
index 42318da84c0..e141fb80367 100644
--- a/audio/libaudiofile/patches/patch-configure
+++ b/audio/libaudiofile/patches/patch-configure
@@ -1,10 +1,28 @@
-$NetBSD: patch-configure,v 1.1 2011/11/29 19:39:30 wiz Exp $
+$NetBSD: patch-configure,v 1.2 2011/11/30 14:30:57 wiz Exp $
 
 Fix unportable test(1) construct.
 
---- configure.orig	2011-11-29 18:37:26.000000000 +0000
+--- configure.orig	2011-11-29 18:15:23.000000000 +0000
 +++ configure
-@@ -15241,7 +15241,7 @@ else
+@@ -15246,7 +15246,7 @@ else
+   enable_werror=no
+ fi
+ 
+- if test "$enable_werror" == "yes"; then
++ if test "$enable_werror" = "yes"; then
+   ENABLE_WERROR_TRUE=
+   ENABLE_WERROR_FALSE='#'
+ else
+@@ -15255,7 +15255,7 @@ else
+ fi
+ 
+ 
+-if test "$enable_werror" == "yes"; then :
++if test "$enable_werror" = "yes"; then :
+   WERROR_CFLAGS="-Werror"
+ 
+ fi
+@@ -15267,7 +15267,7 @@ else
    enable_coverage=no
  fi
  
@@ -13,7 +31,7 @@ Fix unportable test(1) construct.
    ENABLE_COVERAGE_TRUE=
    ENABLE_COVERAGE_FALSE='#'
  else
-@@ -15250,7 +15250,7 @@ else
+@@ -15276,7 +15276,7 @@ else
  fi
  
  
@@ -22,7 +40,7 @@ Fix unportable test(1) construct.
    COVERAGE_CFLAGS="-fprofile-arcs -ftest-coverage"
  	COVERAGE_LIBS="-lgcov"
  
-@@ -15354,7 +15354,7 @@ else
+@@ -15380,7 +15380,7 @@ else
    enable_valgrind=no
  fi
  
@@ -31,7 +49,7 @@ Fix unportable test(1) construct.
    ENABLE_VALGRIND_TRUE=
    ENABLE_VALGRIND_FALSE='#'
  else
-@@ -15363,7 +15363,7 @@ else
+@@ -15389,7 +15389,7 @@ else
  fi
  
  
diff --git a/audio/libaudiofile/patches/patch-libaudiofile_af__vfs.h b/audio/libaudiofile/patches/patch-libaudiofile_af__vfs.h
deleted file mode 100644
index 8ee5d235009..00000000000
--- a/audio/libaudiofile/patches/patch-libaudiofile_af__vfs.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-libaudiofile_af__vfs.h,v 1.1 2011/11/30 11:59:39 wiz Exp $
-
-Conflicts with same definition in audiofile.h.
-
---- libaudiofile/af_vfs.h.orig	2011-09-13 03:59:06.000000000 +0000
-+++ libaudiofile/af_vfs.h
-@@ -34,8 +34,6 @@
- extern "C" {
- #endif
- 
--typedef struct _AFvirtualfile AFvirtualfile;
--
- struct _AFvirtualfile
- {
- 	ssize_t (*read) (AFvirtualfile *vfile, void *data, size_t nbytes);