summaryrefslogtreecommitdiffstats
path: root/audio/pulseaudio
diff options
context:
space:
mode:
authormarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2007-10-25 11:37:29 +0800
committermarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2007-10-25 11:37:29 +0800
commite934b106497f17545e236bb9644bed935cd118ad (patch)
tree29839e0cbcfadbf35eac8fc26b9ad2afe1301370 /audio/pulseaudio
parent14c9f603eb5d9868d374e46ac865925da109a838 (diff)
downloadmarcuscom-ports-e934b106497f17545e236bb9644bed935cd118ad.tar
marcuscom-ports-e934b106497f17545e236bb9644bed935cd118ad.tar.gz
marcuscom-ports-e934b106497f17545e236bb9644bed935cd118ad.tar.bz2
marcuscom-ports-e934b106497f17545e236bb9644bed935cd118ad.tar.lz
marcuscom-ports-e934b106497f17545e236bb9644bed935cd118ad.tar.xz
marcuscom-ports-e934b106497f17545e236bb9644bed935cd118ad.tar.zst
marcuscom-ports-e934b106497f17545e236bb9644bed935cd118ad.zip
Remove these now that they have been committed to the FreeBSD ports tree.
Next stop GNOME 2.21. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@9875 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'audio/pulseaudio')
-rw-r--r--audio/pulseaudio/Makefile93
-rw-r--r--audio/pulseaudio/distinfo3
-rw-r--r--audio/pulseaudio/files/patch-configure36
-rw-r--r--audio/pulseaudio/files/patch-libpulse-browse.pc.in11
-rw-r--r--audio/pulseaudio/files/patch-libpulse-mainloop-glib.pc.in11
-rw-r--r--audio/pulseaudio/files/patch-libpulse-simple.pc.in11
-rw-r--r--audio/pulseaudio/files/patch-libpulse.pc.in9
-rw-r--r--audio/pulseaudio/files/patch-src_daemon_default.pa.in11
-rw-r--r--audio/pulseaudio/files/patch-src_daemon_main.c10
-rw-r--r--audio/pulseaudio/files/patch-src_modules_oss-util.c25
-rw-r--r--audio/pulseaudio/files/patch-src_pulse_thread-mainloop.c14
-rw-r--r--audio/pulseaudio/files/patch-src_pulsecore_atomic.h98
-rw-r--r--audio/pulseaudio/files/patch-src_pulsecore_core-util.c49
-rw-r--r--audio/pulseaudio/files/patch-src_pulsecore_mutex-posix.c13
-rw-r--r--audio/pulseaudio/files/patch-src_pulsecore_pstream.c42
-rw-r--r--audio/pulseaudio/files/patch-src_pulsecore_refcnt.h11
-rw-r--r--audio/pulseaudio/files/patch-src_pulsecore_shm.c10
-rw-r--r--audio/pulseaudio/pkg-descr8
-rw-r--r--audio/pulseaudio/pkg-install63
-rw-r--r--audio/pulseaudio/pkg-plist276
20 files changed, 0 insertions, 804 deletions
diff --git a/audio/pulseaudio/Makefile b/audio/pulseaudio/Makefile
deleted file mode 100644
index 0981bc59e..000000000
--- a/audio/pulseaudio/Makefile
+++ /dev/null
@@ -1,93 +0,0 @@
-# New ports collection makefile for: polypaudio
-# Date created: 29 October 2004
-# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
-#
-# $FreeBSD$
-# $MCom$
-#
-
-PORTNAME= pulseaudio
-PORTVERSION= 0.9.6
-PORTREVISION= 4
-CATEGORIES= audio
-MASTER_SITES= http://0pointer.de/lennart/projects/${PORTNAME}/
-
-MAINTAINER= gnome@FreeBSD.org
-COMMENT= Sound server for UNIX
-
-LIB_DEPENDS= samplerate.1:${PORTSDIR}/audio/libsamplerate \
- oil-0.3.1:${PORTSDIR}/devel/liboil
-
-CONFLICTS= polypaudio-[1-9]*
-
-USE_GNOME= gnometarget gnomehack glib20 ltverhack
-USE_XLIB= yes
-USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:15 libltdl:15
-USE_GMAKE= yes
-USE_GETOPT_LONG=yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib" \
- PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
- PTHREAD_LIBS="${PTHREAD_LIBS}" \
- LIBS="-lm"
-
-CONFIGURE_ARGS= --localstatedir=/var \
- --disable-lirc # untested
-
-OPTIONS= JACK "JACK audio support" Off \
- AVAHI "Enable Avahi mDNS support" On \
- HAL "Enable HAL support" On \
- GCONF "Enable GConf support" On
-
-PULSE_VERSION= ${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
-PLIST_SUB= PULSE_VERSION=${PULSE_VERSION}
-
-.include <bsd.port.pre.mk>
-
-.if defined(WITH_JACK)
-LIB_DEPENDS+= jack.0:${PORTSDIR}/audio/jack
-PLIST_SUB+= JACK=""
-.else
-PLIST_SUB+= JACK="@comment "
-CONFIGURE_ARGS+=--disable-jack
-.endif
-
-.if !defined(WITHOUT_AVAHI)
-LIB_DEPENDS+= avahi-core.5:${PORTSDIR}/net/avahi
-PLIST_SUB+= AVAHI=""
-.else
-CONFIGURE_ARGS+=--disable-avahi
-PLIST_SUB+= AVAHI="@comment "
-.endif
-
-.if !defined(WITHOUT_HAL)
-LIB_DEPENDS+= hal.1:${PORTSDIR}/sysutils/hal
-PLIST_SUB+= HAL=""
-.else
-CONFIGURE_ARGS+=--disable-hal
-PLIST_SUB+= HAL="@comment "
-.endif
-
-.if !defined(WITHOUT_GCONF)
-USE_GNOME+= gconf2
-PLIST_SUB+= GCONF=""
-.else
-CONFIGURE_ARGS+=--disable-gconf
-PLIST_SUB+= GCONF="@comment "
-.endif
-
-post-patch:
- @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
- ${WRKSRC}/src/daemon/default.pa.in
-
-post-install:
-.for ii in default.pa daemon.conf client.conf
- ${INSTALL_DATA} ${WRKSRC}/src/${ii} \
- ${PREFIX}/etc/pulse/${ii}-dist
-.endfor
-.if !defined(PACKAGE_BUILDING)
- @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/audio/pulseaudio/distinfo b/audio/pulseaudio/distinfo
deleted file mode 100644
index dae2a4c98..000000000
--- a/audio/pulseaudio/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (pulseaudio-0.9.6.tar.gz) = 669d52a70fb9a7a83c2507005bfa2a6f
-SHA256 (pulseaudio-0.9.6.tar.gz) = b7a5f14eb8cf7076f1df8fb78d4a05c83e1e655474688c48364fa1b96f478d64
-SIZE (pulseaudio-0.9.6.tar.gz) = 1157647
diff --git a/audio/pulseaudio/files/patch-configure b/audio/pulseaudio/files/patch-configure
deleted file mode 100644
index 32d08b68d..000000000
--- a/audio/pulseaudio/files/patch-configure
+++ /dev/null
@@ -1,36 +0,0 @@
---- configure.orig Sun Jul 8 18:17:17 2007
-+++ configure Sun Jul 8 18:41:18 2007
-@@ -25255,6 +25255,7 @@ echo $ECHO_N "checking whether to check
- check_inconsistencies=yes
- case "${host_cpu}-${host_os}" in
- *-darwin*) check_inconsistencies=no ;;
-+ *-freebsd*) check_inconsistencies=no ;;
- esac
- if test x"$GCC" != xyes -o "x$check_inconsistencies" != xyes ; then
- { echo "$as_me:$LINENO: result: no" >&5
-@@ -28924,9 +28925,9 @@ _ACEOF
-
- else
-
--{ { echo "$as_me:$LINENO: error: *** libatomic-ops headers not found" >&5
--echo "$as_me: error: *** libatomic-ops headers not found" >&2;}
-- { (exit 1); exit 1; }; }
-+#{ { echo "$as_me:$LINENO: error: *** libatomic-ops headers not found" >&5
-+#echo "$as_me: error: *** libatomic-ops headers not found" >&2;}
-+# { (exit 1); exit 1; }; }
-
- fi
-
-@@ -28934,9 +28935,9 @@ done
-
-
- # Win32 does not need the lib and breaks horribly if we try to include it
--if test "x$os_is_win32" != "x1" ; then
-- LIBS="$LIBS -latomic_ops"
--fi
-+#if test "x$os_is_win32" != "x1" ; then
-+# LIBS="$LIBS -latomic_ops"
-+#fi
-
- #### OSS support (optional) ####
-
diff --git a/audio/pulseaudio/files/patch-libpulse-browse.pc.in b/audio/pulseaudio/files/patch-libpulse-browse.pc.in
deleted file mode 100644
index 96299a084..000000000
--- a/audio/pulseaudio/files/patch-libpulse-browse.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- libpulse-browse.pc.in.orig Sun Apr 29 19:26:35 2007
-+++ libpulse-browse.pc.in Sun Apr 29 19:26:54 2007
-@@ -6,6 +6,6 @@ includedir=${prefix}/include
- Name: libpulse-browse
- Description: PulseAudio Network Browsing API
- Version: @PACKAGE_VERSION@
--Libs: -L${libdir} -lpulse-browse
--Cflags: -D_REENTRANT -I${includedir}
-+Libs: -L${libdir} @PTHREAD_LIBS@ -lpulse-browse
-+Cflags: -D_REENTRANT @PTHREAD_CFLAGS@ -I${includedir}
- Requires: libpulse
diff --git a/audio/pulseaudio/files/patch-libpulse-mainloop-glib.pc.in b/audio/pulseaudio/files/patch-libpulse-mainloop-glib.pc.in
deleted file mode 100644
index 8b99e2d57..000000000
--- a/audio/pulseaudio/files/patch-libpulse-mainloop-glib.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- libpulse-mainloop-glib.pc.in.orig Sun Apr 29 19:27:05 2007
-+++ libpulse-mainloop-glib.pc.in Sun Apr 29 19:27:20 2007
-@@ -6,6 +6,6 @@ includedir=${prefix}/include
- Name: libpulse-mainloop-glib
- Description: GLIB 2.0 Main Loop Wrapper for PulseAudio
- Version: @PACKAGE_VERSION@
--Libs: -L${libdir} -lpulse-mainloop-glib
--Cflags: -D_REENTRANT -I${includedir}
-+Libs: -L${libdir} @PTHREAD_LIBS@ -lpulse-mainloop-glib
-+Cflags: -D_REENTRANT @PTHREAD_CFLAGS@ -I${includedir}
- Requires: libpulse glib-2.0
diff --git a/audio/pulseaudio/files/patch-libpulse-simple.pc.in b/audio/pulseaudio/files/patch-libpulse-simple.pc.in
deleted file mode 100644
index 623dbf713..000000000
--- a/audio/pulseaudio/files/patch-libpulse-simple.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- libpulse-simple.pc.in.orig Sun Apr 29 19:26:00 2007
-+++ libpulse-simple.pc.in Sun Apr 29 19:26:18 2007
-@@ -6,6 +6,6 @@ includedir=${prefix}/include
- Name: libpulse-simple
- Description: Simplified Synchronous Client Interface to PulseAudio
- Version: @PACKAGE_VERSION@
--Libs: -L${libdir} -lpulse-simple
--Cflags: -D_REENTRANT -I${includedir}
-+Libs: -L${libdir} @PTHREAD_LIBS@ -lpulse-simple
-+Cflags: -D_REENTRANT @PTHREAD_CFLAGS@ -I${includedir}
- Requires: libpulse
diff --git a/audio/pulseaudio/files/patch-libpulse.pc.in b/audio/pulseaudio/files/patch-libpulse.pc.in
deleted file mode 100644
index 85fea12d1..000000000
--- a/audio/pulseaudio/files/patch-libpulse.pc.in
+++ /dev/null
@@ -1,9 +0,0 @@
---- libpulse.pc.in.orig Sat Sep 2 10:57:19 2006
-+++ libpulse.pc.in Sun Jul 8 17:40:02 2007
-@@ -7,5 +7,5 @@ Name: libpulse
- Description: Client Interface to PulseAudio
- Version: @PACKAGE_VERSION@
- Libs: -L${libdir} -lpulse @PTHREAD_LIBS@
--Cflags: -D_REENTRANT -I${includedir}
-+Cflags: -D_REENTRANT -I${includedir} @PTHREAD_CFLAGS@
- Requires:
diff --git a/audio/pulseaudio/files/patch-src_daemon_default.pa.in b/audio/pulseaudio/files/patch-src_daemon_default.pa.in
deleted file mode 100644
index 3d6c892f4..000000000
--- a/audio/pulseaudio/files/patch-src_daemon_default.pa.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/daemon/default.pa.in.orig Sat Jul 22 11:58:50 2006
-+++ src/daemon/default.pa.in Sat Jul 22 12:22:20 2006
-@@ -60,7 +60,7 @@
- .nofail
-
- ### Load something to the sample cache
--load-sample x11-bell /usr/share/sounds/gtk-events/activate.wav
-+load-sample x11-bell %%LOCALBASE%%/share/sounds/gtk-events/activate.wav
- #load-sample-dir-lazy /usr/share/sounds/*.wav
-
- ### Load X11 bell module
diff --git a/audio/pulseaudio/files/patch-src_daemon_main.c b/audio/pulseaudio/files/patch-src_daemon_main.c
deleted file mode 100644
index 1b96327a8..000000000
--- a/audio/pulseaudio/files/patch-src_daemon_main.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/daemon/main.c.orig Thu Jul 12 00:04:22 2007
-+++ src/daemon/main.c Thu Jul 12 00:04:40 2007
-@@ -40,6 +40,7 @@
- #include <unistd.h>
- #include <locale.h>
- #include <sys/types.h>
-+#include <sys/stat.h>
-
- #include <liboil/liboil.h>
-
diff --git a/audio/pulseaudio/files/patch-src_modules_oss-util.c b/audio/pulseaudio/files/patch-src_modules_oss-util.c
deleted file mode 100644
index bee800d5d..000000000
--- a/audio/pulseaudio/files/patch-src_modules_oss-util.c
+++ /dev/null
@@ -1,25 +0,0 @@
---- src/modules/oss-util.c.orig Sun Apr 29 19:53:31 2007
-+++ src/modules/oss-util.c Sun Apr 29 19:55:24 2007
-@@ -40,6 +40,22 @@
-
- #include "oss-util.h"
-
-+#ifndef DSP_CAP_COPROC
-+#define DSP_CAP_COPROC 0x00000800
-+#endif
-+#ifndef DSP_CAP_TRIGGER
-+#define DSP_CAP_TRIGGER 0x00001000
-+#endif
-+#ifndef DSP_CAP_MMAP
-+#define DSP_CAP_MMAP 0x00002000
-+#endif
-+#ifndef DSP_CAP_MULTI
-+#define DSP_CAP_MULTI 0x00004000
-+#endif
-+#ifndef DSP_CAP_BIND
-+#define DSP_CAP_BIND 0x00008000
-+#endif
-+
- int pa_oss_open(const char *device, int *mode, int* pcaps) {
- int fd = -1;
- int caps;
diff --git a/audio/pulseaudio/files/patch-src_pulse_thread-mainloop.c b/audio/pulseaudio/files/patch-src_pulse_thread-mainloop.c
deleted file mode 100644
index 314cb6778..000000000
--- a/audio/pulseaudio/files/patch-src_pulse_thread-mainloop.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/pulse/thread-mainloop.c.orig Thu Jul 12 00:01:48 2007
-+++ src/pulse/thread-mainloop.c Thu Jul 12 00:03:32 2007
-@@ -30,6 +30,11 @@
- #include <signal.h>
- #include <stdio.h>
-
-+#ifdef HAVE_PTHREAD
-+#include <pthread.h>
-+#include <signal.h>
-+#endif
-+
- #ifdef HAVE_SYS_POLL_H
- #include <sys/poll.h>
- #else
diff --git a/audio/pulseaudio/files/patch-src_pulsecore_atomic.h b/audio/pulseaudio/files/patch-src_pulsecore_atomic.h
deleted file mode 100644
index 086d5feef..000000000
--- a/audio/pulseaudio/files/patch-src_pulsecore_atomic.h
+++ /dev/null
@@ -1,98 +0,0 @@
---- src/pulsecore/atomic.h.orig Sun May 27 16:38:18 2007
-+++ src/pulsecore/atomic.h Sun Jul 8 20:29:53 2007
-@@ -24,7 +24,9 @@
- USA.
- ***/
-
--#include <atomic_ops.h>
-+#include <sys/cdefs.h>
-+#include <sys/types.h>
-+#include <machine/atomic.h>
-
- /* atomic_ops guarantees us that sizeof(AO_t) == sizeof(void*).
- *
-@@ -32,7 +34,7 @@
- * however very likely. */
-
- typedef struct pa_atomic_int {
-- volatile AO_t value;
-+ volatile unsigned long value;
- } pa_atomic_int_t;
-
- #define PA_ATOMIC_INIT(v) { .value = (v) }
-@@ -42,47 +44,64 @@ typedef struct pa_atomic_int {
- * suffixes to the function names */
-
- static inline int pa_atomic_load(const pa_atomic_int_t *a) {
-- return (int) AO_load_full((AO_t*) &a->value);
-+ return (int) atomic_load_acq_int((unsigned int *) &a->value);
- }
-
- static inline void pa_atomic_store(pa_atomic_int_t *a, int i) {
-- AO_store_full(&a->value, (AO_t) i);
-+ atomic_store_rel_int((unsigned int *) &a->value, i);
- }
-
- static inline int pa_atomic_add(pa_atomic_int_t *a, int i) {
-- return AO_fetch_and_add_full(&a->value, (AO_t) i);
-+ atomic_add_int((unsigned int *) &a->value, i);
-+ return (int) a->value;
- }
-
- static inline int pa_atomic_sub(pa_atomic_int_t *a, int i) {
-- return AO_fetch_and_add_full(&a->value, (AO_t) -i);
-+ atomic_subtract_int((unsigned int *) &a->value, i);
-+ return (int) a->value;
- }
-
- static inline int pa_atomic_inc(pa_atomic_int_t *a) {
-- return AO_fetch_and_add1_full(&a->value);
-+ atomic_add_int((unsigned int *) &a->value, 1);
-+ return (int) a->value;
- }
-
- static inline int pa_atomic_dec(pa_atomic_int_t *a) {
-- return AO_fetch_and_sub1_full(&a->value);
-+ atomic_subtract_int((unsigned int *) &a->value, 1);
-+ return (int) a->value;
- }
-
- static inline int pa_atomic_cmpxchg(pa_atomic_int_t *a, int old_i, int new_i) {
-- return AO_compare_and_swap_full(&a->value, old_i, new_i);
-+ atomic_cmpset_int((unsigned int *) &a->value, old_i, new_i);
-+ return (int) a->value;
- }
-
- typedef struct pa_atomic_ptr {
-- volatile AO_t value;
-+ volatile unsigned long value;
- } pa_atomic_ptr_t;
-
- static inline void* pa_atomic_ptr_load(const pa_atomic_ptr_t *a) {
-- return (void*) AO_load_full((AO_t*) &a->value);
-+#ifdef atomic_load_acq_64
-+ return (void*) atomic_load_acq_ptr((unsigned long *) &a->value);
-+#else
-+ return (void*) atomic_load_acq_ptr((unsigned int *) &a->value);
-+#endif
- }
-
- static inline void pa_atomic_ptr_store(pa_atomic_ptr_t *a, void *p) {
-- AO_store_full(&a->value, (AO_t) p);
-+#ifdef atomic_load_acq_64
-+ atomic_store_rel_ptr(&a->value, (unsigned long) p);
-+#else
-+ atomic_store_rel_ptr((unsigned int *) &a->value, (unsigned int) p);
-+#endif
- }
-
- static inline int pa_atomic_ptr_cmpxchg(pa_atomic_ptr_t *a, void *old_p, void* new_p) {
-- return AO_compare_and_swap_full(&a->value, (AO_t) old_p, (AO_t) new_p);
-+#ifdef atomic_load_acq_64
-+ return atomic_cmpset_ptr(&a->value, (unsigned long) old_p, (unsigned long) new_p);
-+#else
-+ return atomic_cmpset_ptr((unsigned int *) &a->value, (unsigned int) old_p, (unsigned int) new_p);
-+#endif
- }
-
- #endif
diff --git a/audio/pulseaudio/files/patch-src_pulsecore_core-util.c b/audio/pulseaudio/files/patch-src_pulsecore_core-util.c
deleted file mode 100644
index cb91964ad..000000000
--- a/audio/pulseaudio/files/patch-src_pulsecore_core-util.c
+++ /dev/null
@@ -1,49 +0,0 @@
---- src/pulsecore/core-util.c.orig Sun Jul 8 18:35:21 2007
-+++ src/pulsecore/core-util.c Sun Jul 8 18:39:04 2007
-@@ -40,6 +40,7 @@
- #include <time.h>
- #include <ctype.h>
- #include <sys/types.h>
-+#include <sys/socket.h>
- #include <sys/stat.h>
- #include <sys/time.h>
-
-@@ -544,6 +545,7 @@ fail:
- cap_free(caps);
- }
- #endif
-+ ;
- }
-
- /* Reset the priority to normal, inverting the changes made by pa_raise_priority() */
-@@ -838,22 +840,22 @@ int pa_check_in_group(gid_t g) {
- (advisory on UNIX, mandatory on Windows) */
- int pa_lock_fd(int fd, int b) {
- #ifdef F_SETLKW
-- struct flock flock;
-+ struct flock pa_flock;
-
- /* Try a R/W lock first */
-
-- flock.l_type = b ? F_WRLCK : F_UNLCK;
-- flock.l_whence = SEEK_SET;
-- flock.l_start = 0;
-- flock.l_len = 0;
-+ pa_flock.l_type = b ? F_WRLCK : F_UNLCK;
-+ pa_flock.l_whence = SEEK_SET;
-+ pa_flock.l_start = 0;
-+ pa_flock.l_len = 0;
-
-- if (fcntl(fd, F_SETLKW, &flock) >= 0)
-+ if (fcntl(fd, F_SETLKW, &pa_flock) >= 0)
- return 0;
-
- /* Perhaps the file descriptor qas opened for read only, than try again with a read lock. */
- if (b && errno == EBADF) {
-- flock.l_type = F_RDLCK;
-- if (fcntl(fd, F_SETLKW, &flock) >= 0)
-+ pa_flock.l_type = F_RDLCK;
-+ if (fcntl(fd, F_SETLKW, &pa_flock) >= 0)
- return 0;
- }
-
diff --git a/audio/pulseaudio/files/patch-src_pulsecore_mutex-posix.c b/audio/pulseaudio/files/patch-src_pulsecore_mutex-posix.c
deleted file mode 100644
index 96b6ff69b..000000000
--- a/audio/pulseaudio/files/patch-src_pulsecore_mutex-posix.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/pulsecore/mutex-posix.c.orig 2007-05-12 19:21:39.000000000 -0400
-+++ src/pulsecore/mutex-posix.c 2007-07-09 01:28:06.000000000 -0400
-@@ -28,7 +28,9 @@
- #include <assert.h>
- #include <pthread.h>
-
--#include <atomic_ops.h>
-+#include <sys/types.h>
-+#include <sys/cdefs.h>
-+#include <machine/atomic.h>
-
- #include <pulse/xmalloc.h>
-
diff --git a/audio/pulseaudio/files/patch-src_pulsecore_pstream.c b/audio/pulseaudio/files/patch-src_pulsecore_pstream.c
deleted file mode 100644
index e3036c3ee..000000000
--- a/audio/pulseaudio/files/patch-src_pulsecore_pstream.c
+++ /dev/null
@@ -1,42 +0,0 @@
---- src/pulsecore/pstream.c.orig Wed Jul 11 23:57:46 2007
-+++ src/pulsecore/pstream.c Wed Jul 11 23:57:49 2007
-@@ -178,14 +178,17 @@ static void do_something(pa_pstream *p)
- p->mainloop->defer_enable(p->defer_event, 0);
-
- if (!p->dead && pa_iochannel_is_readable(p->io)) {
-- if (do_read(p) < 0)
-+ if (do_read(p) < 0) {
- goto fail;
-- } else if (!p->dead && pa_iochannel_is_hungup(p->io))
-+ }
-+ } else if (!p->dead && pa_iochannel_is_hungup(p->io)) {
- goto fail;
-+ }
-
- if (!p->dead && pa_iochannel_is_writable(p->io)) {
-- if (do_write(p) < 0)
-+ if (do_write(p) < 0) {
- goto fail;
-+ }
- }
-
- pa_mutex_unlock(p->mutex);
-@@ -197,12 +200,13 @@ fail:
-
- p->dead = 1;
-
-- if (p->die_callback)
-+ if (p->die_callback) {
-+ pa_mutex_unlock(p->mutex);
- p->die_callback(p, p->die_callback_userdata);
--
-- pa_mutex_unlock(p->mutex);
--
-- pa_pstream_unref(p);
-+ } else {
-+ pa_mutex_unlock(p->mutex);
-+ pa_pstream_unref(p);
-+ }
- }
-
- static void io_callback(pa_iochannel*io, void *userdata) {
diff --git a/audio/pulseaudio/files/patch-src_pulsecore_refcnt.h b/audio/pulseaudio/files/patch-src_pulsecore_refcnt.h
deleted file mode 100644
index c44c4c0e1..000000000
--- a/audio/pulseaudio/files/patch-src_pulsecore_refcnt.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/pulsecore/refcnt.h.orig Wed Jul 11 23:44:24 2007
-+++ src/pulsecore/refcnt.h Wed Jul 11 23:49:59 2007
-@@ -36,7 +36,7 @@
- pa_atomic_inc(&p->_ref)
-
- #define PA_REFCNT_DEC(p) \
-- (pa_atomic_dec(&p->_ref)-1)
-+ pa_atomic_dec(&p->_ref)
-
- #define PA_REFCNT_VALUE(p) \
- pa_atomic_load(&p->_ref)
diff --git a/audio/pulseaudio/files/patch-src_pulsecore_shm.c b/audio/pulseaudio/files/patch-src_pulsecore_shm.c
deleted file mode 100644
index 9c501dd4b..000000000
--- a/audio/pulseaudio/files/patch-src_pulsecore_shm.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/pulsecore/shm.c.orig Thu May 17 11:57:56 2007
-+++ src/pulsecore/shm.c Thu May 17 11:58:10 2007
-@@ -50,7 +50,7 @@
- #define MAX_SHM_SIZE (1024*1024*20)
-
- static char *segment_name(char *fn, size_t l, unsigned id) {
-- snprintf(fn, l, "/pulse-shm-%u", id);
-+ snprintf(fn, l, "/tmp/pulse-shm-%u", id);
- return fn;
- }
diff --git a/audio/pulseaudio/pkg-descr b/audio/pulseaudio/pkg-descr
deleted file mode 100644
index 45634a1f7..000000000
--- a/audio/pulseaudio/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
-PulseAudio, previously known as Polypaudio, is a sound server for POSIX and
-Win32 systems. A sound server is basically a proxy for your sound applications.
-It allows you to do advanced operations on your sound data as it passes between
-your application and your hardware. Things like transferring the audio to a
-different machine, changing the sample format or channel count and mixing
-several sounds into one are easily achieved using a sound server.
-
-WWW: http://pulseaudio.org/
diff --git a/audio/pulseaudio/pkg-install b/audio/pulseaudio/pkg-install
deleted file mode 100644
index 2c316a5e6..000000000
--- a/audio/pulseaudio/pkg-install
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/bin/sh
-
-case $2 in
-POST-INSTALL)
- RGROUP=pulse-rt
- SUSER=pulse
- SGROUP=${SUSER}
- AGROUP=pulse-access
- SUID=563
- RGID=557
- SGID=${SUID}
- AGID=564
- PW=/usr/sbin/pw
-
- if ${PW} group show "${RGROUP}" 2>/dev/null; then
- echo "You already have a group \"${RGROUP}\", so I will use it."
- else
- if ${PW} groupadd ${RGROUP} -g ${RGID}; then
- echo "Added group \"${RGROUP}\"."
- else
- echo "Adding group \"${RGROUP}\" failed..."
- exit 1
- fi
- fi
-
- if ${PW} group show "${SGROUP}" 2>/dev/null; then
- echo "You already have a group \"${SGROUP}\", so I will use it."
- else
- if ${PW} groupadd ${SGROUP} -g ${SGID}; then
- echo "Added group \"${SGROUP}\"."
- else
- echo "Adding group \"${SGROUP}\" failed..."
- exit 1
- fi
- fi
-
- if ${PW} group show "${AGROUP}" 2>/dev/null; then
- echo "You already have a group \"${AGROUP}\", so I will use it."
- else
- if ${PW} groupadd ${AGROUP} -g ${AGID}; then
- echo "Added group \"${AGROUP}\"."
- else
- echo "Adding group \"${AGROUP}\" failed..."
- exit 1
- fi
- fi
-
- if ${PW} user show "${SUSER}" 2>/dev/null; then
- echo "You already have a user \"${SUSER}\", so I will use it."
- else
- if ${PW} useradd ${SUSER} -u ${SUID} -g ${SGROUP} -h - \
- -d "/nonexistent" -s /sbin/nologin -c "PulseAudio System User"
- then
- echo "Added user \"${SUSER}\"."
- else
- echo "Adding user \"${SUSER}\" failed..."
- exit 1
- fi
- fi
-
- exit 0
- ;;
-esac
diff --git a/audio/pulseaudio/pkg-plist b/audio/pulseaudio/pkg-plist
deleted file mode 100644
index 0d2804b33..000000000
--- a/audio/pulseaudio/pkg-plist
+++ /dev/null
@@ -1,276 +0,0 @@
-bin/esdcompat
-%%AVAHI%%bin/pabrowse
-bin/pacat
-bin/pacmd
-bin/pactl
-bin/padsp
-bin/paplay
-bin/parec
-bin/pax11publish
-bin/pulseaudio
-@unexec if cmp -s %D/etc/pulse/client.conf %D/etc/pulse/client.conf-dist; then rm -f %D/etc/pulse/client.conf; fi
-etc/pulse/client.conf-dist
-@unexec if cmp -s %D/etc/pulse/daemon.conf %D/etc/pulse/daemon.conf-dist; then rm -f %D/etc/pulse/daemon.conf; fi
-etc/pulse/daemon.conf-dist
-@unexec if cmp -s %D/etc/pulse/default.pa %D/etc/pulse/default.pa-dist; then rm -f %D/etc/pulse/default.pa; fi
-etc/pulse/default.pa-dist
-%%AVAHI%%include/pulse/browser.h
-include/pulse/cdecl.h
-include/pulse/channelmap.h
-include/pulse/context.h
-include/pulse/def.h
-include/pulse/error.h
-include/pulse/glib-mainloop.h
-include/pulse/introspect.h
-include/pulse/mainloop-api.h
-include/pulse/mainloop-signal.h
-include/pulse/mainloop.h
-include/pulse/operation.h
-include/pulse/pulseaudio.h
-include/pulse/sample.h
-include/pulse/scache.h
-include/pulse/simple.h
-include/pulse/stream.h
-include/pulse/subscribe.h
-include/pulse/thread-mainloop.h
-include/pulse/timeval.h
-include/pulse/utf8.h
-include/pulse/util.h
-include/pulse/version.h
-include/pulse/volume.h
-include/pulse/xmalloc.h
-include/pulsecore/atomic.h
-include/pulsecore/authkey-prop.h
-include/pulsecore/authkey.h
-include/pulsecore/autoload.h
-%%AVAHI%%include/pulsecore/avahi-wrap.h
-include/pulsecore/cli-command.h
-include/pulsecore/cli-text.h
-include/pulsecore/cli.h
-include/pulsecore/client.h
-include/pulsecore/conf-parser.h
-include/pulsecore/core-def.h
-include/pulsecore/core-scache.h
-include/pulsecore/core-subscribe.h
-include/pulsecore/core-util.h
-include/pulsecore/core.h
-include/pulsecore/creds.h
-include/pulsecore/dynarray.h
-include/pulsecore/esound.h
-include/pulsecore/g711.h
-include/pulsecore/hashmap.h
-include/pulsecore/idxset.h
-include/pulsecore/iochannel.h
-include/pulsecore/ioline.h
-include/pulsecore/ipacl.h
-include/pulsecore/llist.h
-include/pulsecore/log.h
-include/pulsecore/mcalign.h
-include/pulsecore/memblock.h
-include/pulsecore/memblockq.h
-include/pulsecore/memchunk.h
-include/pulsecore/modargs.h
-include/pulsecore/modinfo.h
-include/pulsecore/module.h
-include/pulsecore/mutex.h
-include/pulsecore/namereg.h
-include/pulsecore/native-common.h
-include/pulsecore/once.h
-include/pulsecore/packet.h
-include/pulsecore/parseaddr.h
-include/pulsecore/pdispatch.h
-include/pulsecore/pid.h
-include/pulsecore/play-memblockq.h
-include/pulsecore/play-memchunk.h
-include/pulsecore/props.h
-include/pulsecore/protocol-cli.h
-include/pulsecore/protocol-esound.h
-include/pulsecore/protocol-http.h
-include/pulsecore/protocol-native.h
-include/pulsecore/protocol-simple.h
-include/pulsecore/pstream-util.h
-include/pulsecore/pstream.h
-include/pulsecore/queue.h
-include/pulsecore/random.h
-include/pulsecore/refcnt.h
-include/pulsecore/resampler.h
-include/pulsecore/sample-util.h
-include/pulsecore/sconv.h
-include/pulsecore/shm.h
-include/pulsecore/sink-input.h
-include/pulsecore/sink.h
-include/pulsecore/sioman.h
-include/pulsecore/socket-client.h
-include/pulsecore/socket-server.h
-include/pulsecore/socket-util.h
-include/pulsecore/sound-file-stream.h
-include/pulsecore/sound-file.h
-include/pulsecore/source-output.h
-include/pulsecore/source.h
-include/pulsecore/strbuf.h
-include/pulsecore/strlist.h
-include/pulsecore/tagstruct.h
-include/pulsecore/thread.h
-include/pulsecore/tokenizer.h
-include/pulsecore/x11prop.h
-include/pulsecore/x11wrap.h
-%%AVAHI%%lib/libpulse-browse.a
-%%AVAHI%%lib/libpulse-browse.la
-%%AVAHI%%lib/libpulse-browse.so
-%%AVAHI%%lib/libpulse-browse.so.0
-lib/libpulse-mainloop-glib.a
-lib/libpulse-mainloop-glib.la
-lib/libpulse-mainloop-glib.so
-lib/libpulse-mainloop-glib.so.0
-lib/libpulse-simple.a
-lib/libpulse-simple.la
-lib/libpulse-simple.so
-lib/libpulse-simple.so.0
-lib/libpulse.a
-lib/libpulse.la
-lib/libpulse.so
-lib/libpulse.so.0
-lib/libpulsecore.a
-lib/libpulsecore.la
-lib/libpulsecore.so
-lib/libpulsecore.so.3
-lib/libpulsedsp.so
-lib/pulse-%%PULSE_VERSION%%/modules/libauthkey-prop.la
-lib/pulse-%%PULSE_VERSION%%/modules/libauthkey-prop.so
-lib/pulse-%%PULSE_VERSION%%/modules/libauthkey.la
-lib/pulse-%%PULSE_VERSION%%/modules/libauthkey.so
-%%AVAHI%%lib/pulse-%%PULSE_VERSION%%/modules/libavahi-wrap.la
-%%AVAHI%%lib/pulse-%%PULSE_VERSION%%/modules/libavahi-wrap.so
-lib/pulse-%%PULSE_VERSION%%/modules/libcli.la
-lib/pulse-%%PULSE_VERSION%%/modules/libcli.so
-%%HAL%%lib/pulse-%%PULSE_VERSION%%/modules/libdbus-util.la
-%%HAL%%lib/pulse-%%PULSE_VERSION%%/modules/libdbus-util.so
-lib/pulse-%%PULSE_VERSION%%/modules/libiochannel.la
-lib/pulse-%%PULSE_VERSION%%/modules/libiochannel.so
-lib/pulse-%%PULSE_VERSION%%/modules/libioline.la
-lib/pulse-%%PULSE_VERSION%%/modules/libioline.so
-lib/pulse-%%PULSE_VERSION%%/modules/libipacl.la
-lib/pulse-%%PULSE_VERSION%%/modules/libipacl.so
-lib/pulse-%%PULSE_VERSION%%/modules/liboss-util.la
-lib/pulse-%%PULSE_VERSION%%/modules/liboss-util.so
-lib/pulse-%%PULSE_VERSION%%/modules/libpacket.la
-lib/pulse-%%PULSE_VERSION%%/modules/libpacket.so
-lib/pulse-%%PULSE_VERSION%%/modules/libparseaddr.la
-lib/pulse-%%PULSE_VERSION%%/modules/libparseaddr.so
-lib/pulse-%%PULSE_VERSION%%/modules/libpdispatch.la
-lib/pulse-%%PULSE_VERSION%%/modules/libpdispatch.so
-lib/pulse-%%PULSE_VERSION%%/modules/libprotocol-cli.la
-lib/pulse-%%PULSE_VERSION%%/modules/libprotocol-cli.so
-lib/pulse-%%PULSE_VERSION%%/modules/libprotocol-esound.la
-lib/pulse-%%PULSE_VERSION%%/modules/libprotocol-esound.so
-lib/pulse-%%PULSE_VERSION%%/modules/libprotocol-http.la
-lib/pulse-%%PULSE_VERSION%%/modules/libprotocol-http.so
-lib/pulse-%%PULSE_VERSION%%/modules/libprotocol-native.la
-lib/pulse-%%PULSE_VERSION%%/modules/libprotocol-native.so
-lib/pulse-%%PULSE_VERSION%%/modules/libprotocol-simple.la
-lib/pulse-%%PULSE_VERSION%%/modules/libprotocol-simple.so
-lib/pulse-%%PULSE_VERSION%%/modules/libpstream-util.la
-lib/pulse-%%PULSE_VERSION%%/modules/libpstream-util.so
-lib/pulse-%%PULSE_VERSION%%/modules/libpstream.la
-lib/pulse-%%PULSE_VERSION%%/modules/libpstream.so
-lib/pulse-%%PULSE_VERSION%%/modules/librtp.la
-lib/pulse-%%PULSE_VERSION%%/modules/librtp.so
-lib/pulse-%%PULSE_VERSION%%/modules/libsocket-client.la
-lib/pulse-%%PULSE_VERSION%%/modules/libsocket-client.so
-lib/pulse-%%PULSE_VERSION%%/modules/libsocket-server.la
-lib/pulse-%%PULSE_VERSION%%/modules/libsocket-server.so
-lib/pulse-%%PULSE_VERSION%%/modules/libsocket-util.la
-lib/pulse-%%PULSE_VERSION%%/modules/libsocket-util.so
-lib/pulse-%%PULSE_VERSION%%/modules/libstrlist.la
-lib/pulse-%%PULSE_VERSION%%/modules/libstrlist.so
-lib/pulse-%%PULSE_VERSION%%/modules/libtagstruct.la
-lib/pulse-%%PULSE_VERSION%%/modules/libtagstruct.so
-lib/pulse-%%PULSE_VERSION%%/modules/libx11prop.la
-lib/pulse-%%PULSE_VERSION%%/modules/libx11prop.so
-lib/pulse-%%PULSE_VERSION%%/modules/libx11wrap.la
-lib/pulse-%%PULSE_VERSION%%/modules/libx11wrap.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-cli-protocol-tcp.la
-lib/pulse-%%PULSE_VERSION%%/modules/module-cli-protocol-tcp.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-cli-protocol-unix.la
-lib/pulse-%%PULSE_VERSION%%/modules/module-cli-protocol-unix.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-cli.la
-lib/pulse-%%PULSE_VERSION%%/modules/module-cli.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-combine.la
-lib/pulse-%%PULSE_VERSION%%/modules/module-combine.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-detect.la
-lib/pulse-%%PULSE_VERSION%%/modules/module-detect.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-esound-compat-spawnfd.la
-lib/pulse-%%PULSE_VERSION%%/modules/module-esound-compat-spawnfd.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-esound-compat-spawnpid.la
-lib/pulse-%%PULSE_VERSION%%/modules/module-esound-compat-spawnpid.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-esound-protocol-tcp.la
-lib/pulse-%%PULSE_VERSION%%/modules/module-esound-protocol-tcp.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-esound-protocol-unix.la
-lib/pulse-%%PULSE_VERSION%%/modules/module-esound-protocol-unix.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-esound-sink.la
-lib/pulse-%%PULSE_VERSION%%/modules/module-esound-sink.so
-%%GCONF%%lib/pulse-%%PULSE_VERSION%%/modules/module-gconf.la
-%%GCONF%%lib/pulse-%%PULSE_VERSION%%/modules/module-gconf.so
-%%HAL%%lib/pulse-%%PULSE_VERSION%%/modules/module-hal-detect.la
-%%HAL%%lib/pulse-%%PULSE_VERSION%%/modules/module-hal-detect.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-http-protocol-tcp.la
-lib/pulse-%%PULSE_VERSION%%/modules/module-http-protocol-tcp.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-http-protocol-unix.la
-lib/pulse-%%PULSE_VERSION%%/modules/module-http-protocol-unix.so
-%%JACK%%lib/pulse-%%PULSE_VERSION%%/modules/module-jack-sink.la
-%%JACK%%lib/pulse-%%PULSE_VERSION%%/modules/module-jack-sink.so
-%%JACK%%lib/pulse-%%PULSE_VERSION%%/modules/module-jack-source.la
-%%JACK%%lib/pulse-%%PULSE_VERSION%%/modules/module-jack-source.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-match.la
-lib/pulse-%%PULSE_VERSION%%/modules/module-match.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-native-protocol-fd.la
-lib/pulse-%%PULSE_VERSION%%/modules/module-native-protocol-fd.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-native-protocol-tcp.la
-lib/pulse-%%PULSE_VERSION%%/modules/module-native-protocol-tcp.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-native-protocol-unix.la
-lib/pulse-%%PULSE_VERSION%%/modules/module-native-protocol-unix.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-null-sink.la
-lib/pulse-%%PULSE_VERSION%%/modules/module-null-sink.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-oss-mmap.la
-lib/pulse-%%PULSE_VERSION%%/modules/module-oss-mmap.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-oss.la
-lib/pulse-%%PULSE_VERSION%%/modules/module-oss.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-pipe-sink.la
-lib/pulse-%%PULSE_VERSION%%/modules/module-pipe-sink.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-pipe-source.la
-lib/pulse-%%PULSE_VERSION%%/modules/module-pipe-source.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-rescue-streams.la
-lib/pulse-%%PULSE_VERSION%%/modules/module-rescue-streams.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-rtp-recv.la
-lib/pulse-%%PULSE_VERSION%%/modules/module-rtp-recv.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-rtp-send.la
-lib/pulse-%%PULSE_VERSION%%/modules/module-rtp-send.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-simple-protocol-tcp.la
-lib/pulse-%%PULSE_VERSION%%/modules/module-simple-protocol-tcp.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-simple-protocol-unix.la
-lib/pulse-%%PULSE_VERSION%%/modules/module-simple-protocol-unix.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-sine.la
-lib/pulse-%%PULSE_VERSION%%/modules/module-sine.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-tunnel-sink.la
-lib/pulse-%%PULSE_VERSION%%/modules/module-tunnel-sink.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-tunnel-source.la
-lib/pulse-%%PULSE_VERSION%%/modules/module-tunnel-source.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-volume-restore.la
-lib/pulse-%%PULSE_VERSION%%/modules/module-volume-restore.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-x11-bell.la
-lib/pulse-%%PULSE_VERSION%%/modules/module-x11-bell.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-x11-publish.la
-lib/pulse-%%PULSE_VERSION%%/modules/module-x11-publish.so
-%%AVAHI%%lib/pulse-%%PULSE_VERSION%%/modules/module-zeroconf-publish.la
-%%AVAHI%%lib/pulse-%%PULSE_VERSION%%/modules/module-zeroconf-publish.so
-%%AVAHI%%libdata/pkgconfig/libpulse-browse.pc
-libdata/pkgconfig/libpulse-mainloop-glib.pc
-libdata/pkgconfig/libpulse-simple.pc
-libdata/pkgconfig/libpulse.pc
-%%GCONF%%libexec/pulse/gconf-helper
-%%GCONF%%@dirrm libexec/pulse
-@dirrm lib/pulse-%%PULSE_VERSION%%/modules
-@dirrm lib/pulse-%%PULSE_VERSION%%
-@dirrm include/pulsecore
-@dirrm include/pulse
-@dirrm etc/pulse