Maintenance update to pulseaudio-2.1.

ok robert@ (maintainer)

audio/pulseaudio/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.29 2012/10/15 12:15:39 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.30 2012/10/17 11:49:08 ajacoutot Exp $
 
 # XXX
 # fix autospawn lock (patch-src_daemon_main_c)
@@ -16,9 +16,8 @@ SHARED_ONLY=		Yes
 
 COMMENT=		cross-platform networked sound server
 
-VERSION=		2.0
+VERSION=		2.1
 DISTNAME=		pulseaudio-${VERSION}
-REVISION=		5
 
 SHARED_LIBS +=  pulse                1.1      # .14.2
 SHARED_LIBS +=  pulse-simple         0.0      # .0.3
@@ -37,8 +36,8 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-WANTLIB += c crypto execinfo gdbm glib-2.0 json ltdl m
-WANTLIB += pcre pthread sndfile sndio speexdsp ssl stdc++
+WANTLIB += c crypto execinfo gdbm glib-2.0 json ltdl m pcre pthread
+WANTLIB += sndfile sndio speexdsp ssl
 
 MASTER_SITES=		http://freedesktop.org/software/pulseaudio/releases/
 TAR=			${LOCALBASE}/bin/gtar
@@ -52,13 +51,14 @@ USE_LIBTOOL=		gnu
 LIBTOOL_FLAGS=		--tag=disable-static
 
 BUILD_DEPENDS=		archivers/gtar
-LIB_DEPENDS=		audio/speex \
+
+LIB_DEPENDS=		audio/libsndfile \
+			audio/speex \
 			databases/gdbm \
-			devel/libexecinfo \
-			devel/libtool,-ltdl>=2.4 \
-			devel/json-c \
 			devel/glib2 \
-			audio/libsndfile
+			devel/json-c \
+			devel/libexecinfo \
+			devel/libtool,-ltdl
 
 AUTOCONF_VERSION=	2.69
 CONFIGURE_STYLE=	autoconf
@@ -104,7 +104,7 @@ CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib \
 				-Wl,-rpath,${TRUEPREFIX}/lib/pulse-${VERSION}/modules"
 
-FAKE_FLAGS=		pulseconfdir="${PREFIX}/share/examples/pulseaudio/pulse/"
+FAKE_FLAGS=		pulseconfdir="${PREFIX}/share/examples/pulseaudio/pulse"
 
 ### SNDIO ###
 CONFIGURE_STYLE=	gnu

audio/pulseaudio/distinfo

@@ -1,5 +1,2 @@
-MD5 (pulseaudio-2.0.tar.gz) = FAZkXRXma+D1MSNXYO3qMg==
-RMD160 (pulseaudio-2.0.tar.gz) = 9R7RRFs/VqoBlByrcRLZ9OxKYE4=
-SHA1 (pulseaudio-2.0.tar.gz) = YPzIepcxLShi4v0eBoshWB+SlN0=
-SHA256 (pulseaudio-2.0.tar.gz) = shOx5CmD7JOmpHIbZqNOwNO8b9NFhcegpiJIbnK9ymg=
-SIZE (pulseaudio-2.0.tar.gz) = 2351890
+SHA256 (pulseaudio-2.1.tar.gz) = 2JUgI3rndctvdpjUDWa4SM2Y/WtGiAU04VKCYw23400=
+SIZE (pulseaudio-2.1.tar.gz) = 2353357

audio/pulseaudio/patches/patch-src_Makefile_am

@@ -1,10 +1,10 @@
-$OpenBSD: patch-src_Makefile_am,v 1.3 2012/10/15 12:15:39 ajacoutot Exp $
+$OpenBSD: patch-src_Makefile_am,v 1.4 2012/10/17 11:49:09 ajacoutot Exp $
 
 libpulse.so and libpulse-mainloop-glib.so are linked "privately" to
 lib/pulseaudio/libpulsecommon.so so add it to the link path.
 
---- src/Makefile.am.orig	Fri Apr 27 09:37:37 2012
-+++ src/Makefile.am	Mon Oct 15 11:31:15 2012
+--- src/Makefile.am.orig	Thu Jul 19 13:29:43 2012
++++ src/Makefile.am	Wed Oct 17 11:26:22 2012
 @@ -602,7 +602,7 @@ libpulsecommon_@PA_MAJORMINOR@_la_SOURCES = \
  
  libpulsecommon_@PA_MAJORMINOR@_la_CFLAGS = $(AM_CFLAGS) $(LIBSNDFILE_CFLAGS)
@@ -48,7 +48,7 @@ lib/pulseaudio/libpulsecommon.so so add it to the link path.
  if HAVE_COREAUDIO
  modlibexec_LTLIBRARIES += \
  		module-coreaudio-detect.la \
-@@ -1298,6 +1301,7 @@ SYMDEF_FILES = \
+@@ -1302,6 +1305,7 @@ SYMDEF_FILES = \
  		module-x11-xsmp-symdef.h \
  		module-x11-cork-request-symdef.h \
  		module-oss-symdef.h \
@@ -56,7 +56,7 @@ lib/pulseaudio/libpulsecommon.so so add it to the link path.
  		module-alsa-sink-symdef.h \
  		module-alsa-source-symdef.h \
  		module-alsa-card-symdef.h \
-@@ -1597,6 +1601,12 @@ liboss_util_la_LIBADD = $(MODULE_LIBADD)
+@@ -1601,6 +1605,12 @@ liboss_util_la_LIBADD = $(MODULE_LIBADD)
  module_oss_la_SOURCES = modules/oss/module-oss.c
  module_oss_la_LDFLAGS = $(MODULE_LDFLAGS)
  module_oss_la_LIBADD = $(MODULE_LIBADD) liboss-util.la