remove some patches which were intended to make the code compile

on older compilers but cause crashes (and possible security problems)
instead
bump PKGREVISION

6 files changed, 3 insertions, 59 deletions

diff --git a/audio/libsndfile/Makefile b/audio/libsndfile/Makefile
index c03e485d302..71ad6b4da47 100644
--- a/audio/libsndfile/Makefile
+++ b/audio/libsndfile/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.46 2008/07/24 22:39:30 obache Exp $
+# $NetBSD: Makefile,v 1.47 2009/01/13 12:13:45 drochner Exp $
 
 DISTNAME=	libsndfile-1.0.17
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	audio
 MASTER_SITES=	http://www.mega-nerd.com/libsndfile/
 
diff --git a/audio/libsndfile/distinfo b/audio/libsndfile/distinfo
index 96a652a4b38..b05a64a1a72 100644
--- a/audio/libsndfile/distinfo
+++ b/audio/libsndfile/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.24 2008/04/07 15:36:19 bjs Exp $
+$NetBSD: distinfo,v 1.25 2009/01/13 12:13:46 drochner 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
@@ -7,11 +7,7 @@ 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-ab) = 007a93229bc8cbcb1b27e6223e8c10e8a2e3c6eb
 SHA1 (patch-ac) = ee4b99239e21fe1104bcec4b5579fe2b1039619c
 SHA1 (patch-ad) = b730de6bb0716bece5f83c3100f9fc0f8eb2ae7d
-SHA1 (patch-ae) = 628700514d3d2e6e12abb182c697311a233c1bd9
-SHA1 (patch-af) = 9ac0dd446a2f24c2d39e20063489a3b778fcda36
-SHA1 (patch-ag) = 10d0fcda9377fc6afa2dce9e4782f49889a4f4a3
 SHA1 (patch-ah) = 8c936316ca1191f8893579a562ff705c8dde6f92
 SHA1 (patch-ba) = 92ec08d4e021f121d2255760d601625df71e3805
diff --git a/audio/libsndfile/patches/patch-ab b/audio/libsndfile/patches/patch-ab
deleted file mode 100644
index 929d3f92133..00000000000
--- a/audio/libsndfile/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.7 2006/01/21 23:04:08 adam Exp $
-
---- src/common.h.orig	2006-01-21 04:53:40.000000000 +0100
-+++ src/common.h
-@@ -152,7 +152,7 @@ typedef struct
- 
- #if HAVE_FLEXIBLE_ARRAY
- 	/* the per channel peak info */
--	PEAK_POS		peaks [] ;
-+	PEAK_POS		*peaks ;
- #else
- 	/*
- 	** This is not ISO compliant C. It works on some compilers which
diff --git a/audio/libsndfile/patches/patch-ae b/audio/libsndfile/patches/patch-ae
deleted file mode 100644
index e544ec917cd..00000000000
--- a/audio/libsndfile/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.5 2006/01/21 23:04:08 adam Exp $
-
---- src/ima_adpcm.c.orig	2005-10-28 17:42:36.000000000 +0200
-+++ src/ima_adpcm.c
-@@ -38,7 +38,7 @@ typedef struct IMA_ADPCM_PRIVATE_tag
- 	unsigned char	*block ;
- 	short			*samples ;
- #if HAVE_FLEXIBLE_ARRAY
--	short			data	[] ; /* ISO C99 struct flexible array. */
-+	short			*data ; /* ISO C99 struct flexible array. */
- #else
- 	short			data	[0] ; /* This is a hack and might not work. */
- #endif
diff --git a/audio/libsndfile/patches/patch-af b/audio/libsndfile/patches/patch-af
deleted file mode 100644
index 5a260c7a887..00000000000
--- a/audio/libsndfile/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.5 2006/01/21 23:04:08 adam Exp $
-
---- src/ms_adpcm.c.orig	2005-10-28 17:42:36.000000000 +0200
-+++ src/ms_adpcm.c
-@@ -45,7 +45,7 @@ typedef struct
- 	short			*samples ;
- 	unsigned char	*block ;
- #if HAVE_FLEXIBLE_ARRAY
--	short			dummydata [] ; /* ISO C99 struct flexible array. */
-+	short			*dummydata ; /* ISO C99 struct flexible array. */
- #else
- 	short			dummydata [0] ; /* This is a hack an might not work. */
- #endif
diff --git a/audio/libsndfile/patches/patch-ag b/audio/libsndfile/patches/patch-ag
deleted file mode 100644
index 4465a1a5b83..00000000000
--- a/audio/libsndfile/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.2 2004/06/28 08:14:03 adam Exp $
-
---- src/paf.c.orig	2004-06-16 10:17:04.000000000 +0000
-+++ src/paf.c
-@@ -65,7 +65,7 @@ typedef struct
- 	int				*samples ;
- 	unsigned char	*block ;
- #if HAVE_FLEXIBLE_ARRAY
--	int				data [] ; /* ISO C99 struct flexible array. */
-+	int				*data ; /* ISO C99 struct flexible array. */
- #else
- 	int				data [1] ; /* This is a hack and may not work. */
- #endif