Merge changes in the main trunk into the buildlink2 branch for thosebuildlink2

packages that have been converted to USE_BUILDLINK2.

1 files changed, 0 insertions, 30 deletions

diff --git a/audio/vorbis-tools/patches/patch-aa b/audio/vorbis-tools/patches/patch-aa
deleted file mode 100644
index 142541b93c4..00000000000
--- a/audio/vorbis-tools/patches/patch-aa
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2002/03/19 07:48:44 lukem Exp $
-
---- ogg123/buffer.c.orig	Thu Dec 20 11:24:53 2001
-+++ ogg123/buffer.c
-@@ -85,12 +85,6 @@
-   buf_t *buf = (buf_t *)arg;
- 
-   DEBUG("Enter buffer_thread_cleanup");
--
--  /* Cleanup thread data structures */
--  pthread_mutex_unlock(&buf->mutex);
--  pthread_mutex_destroy(&buf->mutex);
--  pthread_cond_destroy(&buf->playback_cond);
--  pthread_cond_destroy(&buf->write_cond);
- }
- 
- 
-@@ -430,6 +424,12 @@
- void buffer_destroy (buf_t *buf)
- {
-   DEBUG("buffer_destroy");
-+
-+  /* Cleanup pthread variables */
-+  pthread_mutex_destroy(&buf->mutex);
-+  pthread_cond_destroy(&buf->write_cond);
-+  pthread_cond_destroy(&buf->playback_cond);
-+  
-   free(buf);
- }
-