 @@ -1,18 +1,18 @@
-# $NetBSD: Makefile,v 1.69 2013/02/16 11:20:17 wiz Exp $
+# $NetBSD: Makefile,v 1.70 2013/05/06 20:44:18 markd Exp $
+#
 DISTNAME=	pulseaudio-2.1
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	http://freedesktop.org/software/pulseaudio/releases/
 EXTRACT_SUFX=	.tar.xz
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.freedesktop.org/wiki/Software/PulseAudio
 COMMENT=	Sound server for POSIX and Win32 systems
 LICENSE=	gnu-lgpl-v2.1 AND gnu-gpl-v2
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 USE_TOOLS+=	gmake gm4 intltool msgfmt pkg-config
 USE_LANGUAGES=	c c++
 @@ -22,26 +22,28 @@ USE_LANGUAGES=	c c++
 .if ${OPSYS} == "NetBSD"
 CONFIGURE_ARGS+=	--disable-default-build-tests
 .endif
 .if ${OPSYS} == "NetBSD" && !empty(OS_VERSION:M[45].*)
 # broken test for TLS
 CONFIGURE_ENV+=		ac_cv_tls=none
 .endif
 CONFIGURE_ENV+=		EGDIR=${EGDIR}
 MAKE_ENV+=		EGDIR=${EGDIR}
 CONFIGURE_ARGS+=	--enable-samplerate
 CONFIGURE_ARGS+=	--disable-tcpwrap
 CONFIGURE_ARGS+=	--localstatedir=${VARBASE:Q}
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASEDIR:Q}
 # Use native atomic ops on NetBSD >= 5.0, otherwise
 # fallback to libatomic_ops
 .if !(${OPSYS} == "NetBSD" && exists(/usr/include/sys/atomic.h))
 .include "../../devel/libatomic_ops/buildlink3.mk"
 .endif
 # Build module-mmkbd-evdev.so under Linux
 .if ${OPSYS} == "Linux" && exists(/usr/include/linux/input.h)
 PLIST.evdev=		yes
 .endif
 .include "options.mk"

 @@ -1,30 +1,30 @@
-@comment $NetBSD: PLIST,v 1.11 2012/11/17 22:20:48 markd Exp $
+@comment $NetBSD: PLIST,v 1.12 2013/05/06 20:44:18 markd Exp $
 bin/esdcompat
 bin/pacat
 bin/pacmd
 bin/pactl
 ${PLIST.oss}bin/padsp
 bin/pamon
 bin/paplay
 bin/parec
 bin/parecord
 bin/pasuspender
 ${PLIST.x11}bin/pax11publish
 bin/pulseaudio
 ${PLIST.x11}bin/start-pulseaudio-kde
 ${PLIST.x11}bin/start-pulseaudio-x11
-${PLIST.x11}etc/xdg/autostart/pulseaudio-kde.desktop
+${PLIST.x11}share/examples/pulseaudio/pulseaudio-kde.desktop
-${PLIST.x11}etc/xdg/autostart/pulseaudio.desktop
+${PLIST.x11}share/examples/pulseaudio/pulseaudio.desktop
 include/pulse/cdecl.h
 include/pulse/channelmap.h
 include/pulse/context.h
 include/pulse/def.h
 include/pulse/error.h
 include/pulse/ext-device-manager.h
 include/pulse/ext-device-restore.h
 include/pulse/ext-stream-restore.h
 include/pulse/format.h
 include/pulse/gccmacro.h
 include/pulse/glib-mainloop.h
 include/pulse/introspect.h
 include/pulse/mainloop-api.h

 @@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.35 2013/01/29 15:34:55 wiz Exp $
+$NetBSD: distinfo,v 1.36 2013/05/06 20:44:18 markd Exp $
 SHA1 (pulseaudio-2.1.tar.xz) = 56b4ad9207ea3aec0ad1b8be4b55793b426a4f01
 RMD160 (pulseaudio-2.1.tar.xz) = 87f6051bbbe59c26e505a9765f388d3ee4d3a485
 Size (pulseaudio-2.1.tar.xz) = 1355004 bytes
 SHA1 (patch-aa) = 59dbd4e6670bc401d2254226b6ba1f4549f35ff7
-SHA1 (patch-configure) = 74eb6cbc606103c9a7c1a9e196a0fd58abc839d3
+SHA1 (patch-configure) = 79f938c79a2c3a714d9c81b22030084a421da360
 SHA1 (patch-dc) = 48baff12528f09940d63c6bdaf4369cab7e56de3
-SHA1 (patch-src_Makefile.in) = 50f5903cf93e2b59318be177e38bd49a7a34557e
+SHA1 (patch-src_Makefile.in) = 21daf6069ae067dd235de6d43a013e4e70bbca78

 @@ -1,16 +1,15 @@
-$NetBSD: patch-configure,v 1.2 2013/01/29 15:02:24 tsutsui Exp $
+$NetBSD: patch-configure,v 1.3 2013/05/06 20:44:18 markd Exp $
 - use ${EGDIR} for config file
 - always use atomic_ops(3) on NetBSD, even on arm
 - kill test(1) bash'ism
 --- configure.orig	2012-07-19 11:30:11.000000000 +0000
 +++ configure
 @@ -7995,6 +7995,11 @@ else
      { $as_echo "$as_me:${as_lineno-$LINENO}: checking architecture for native atomic operations" >&5
  $as_echo_n "checking architecture for native atomic operations... " >&6; }
      case $host in
 +        *-netbsd*)
 +            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 +$as_echo "yes" >&6; }
 +            need_libatomic_ops=no
 @@ -38,22 +37,13 @@ $NetBSD: patch-configure,v 1.2 2013/01/2
 +if test "$ac_cv_tls" = "__thread"; then :
  $as_echo "#define SUPPORT_TLS___THREAD 1" >>confdefs.h
 @@ -20146,7 +20146,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
  fi
 -if test "x$ax_pthread_ok" == "xyes"; then :
 +if test "x$ax_pthread_ok" = "xyes"; then :
  $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
@@ -26138,7 +26138,7 @@ _ACEOF
  PA_SOEXT=.so
 -pulseconfdir="${sysconfdir}/pulse"
 +pulseconfdir="${EGDIR}"
    prefix_NONE=

 @@ -1,15 +1,28 @@
-$NetBSD: patch-src_Makefile.in,v 1.2 2013/01/29 15:34:47 wiz Exp $
+$NetBSD: patch-src_Makefile.in,v 1.3 2013/05/06 20:44:18 markd Exp $
 Use pkgsrc infrastructure for config files.
 --- src/Makefile.in.orig	2012-07-19 11:30:13.000000000 +0000
 +++ src/Makefile.in
-@@ -2943,7 +2943,7 @@ pulselibexecdir = $(libexecdir)/pulse
+@@ -2927,7 +2927,7 @@ pdfdir = @pdfdir@
- @HAVE_X11_TRUE@xdgautostartdir = $(sysconfdir)/xdg/autostart
+ prefix = @prefix@
  program_transform_name = @program_transform_name@
  psdir = @psdir@
 -pulseconfdir = @pulseconfdir@
 +pulseconfdir = ${EGDIR}
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
  srcdir = @srcdir@
@@ -2940,10 +2940,10 @@ udevrulesdir = @udevrulesdir@
  pulseincludedir = $(includedir)/pulse
  pulsecoreincludedir = $(includedir)/pulsecore
  pulselibexecdir = $(libexecdir)/pulse
 -@HAVE_X11_TRUE@xdgautostartdir = $(sysconfdir)/xdg/autostart
 +@HAVE_X11_TRUE@xdgautostartdir = ${EGDIR}
  @HAVE_ALSA_TRUE@alsaprofilesetsdir = $(datadir)/pulseaudio/alsa-mixer/profile-sets
  @HAVE_ALSA_TRUE@alsapathsdir = $(datadir)/pulseaudio/alsa-mixer/paths
 -@HAVE_DBUS_TRUE@dbuspolicydir = $(sysconfdir)/dbus-1/system.d
 +@HAVE_DBUS_TRUE@dbuspolicydir = ${EGDIR}
  ###################################
  #     Compiler/linker flags       #