Fix VARBASE and PKG_SYSCONFBASEDIR handling. Bump PKGREVISION.

5 files changed, 27 insertions, 22 deletions

diff --git a/audio/pulseaudio/Makefile b/audio/pulseaudio/Makefile
index 57f4c71705d..0eeb0a0b4bd 100644
--- a/audio/pulseaudio/Makefile
+++ b/audio/pulseaudio/Makefile
@@ -1,8 +1,8 @@
-# $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
@@ -32,6 +32,8 @@ 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
diff --git a/audio/pulseaudio/PLIST b/audio/pulseaudio/PLIST
index f7483997d61..ada358269f3 100644
--- a/audio/pulseaudio/PLIST
+++ b/audio/pulseaudio/PLIST
@@ -1,4 +1,4 @@
-@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
@@ -13,8 +13,8 @@ ${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}etc/xdg/autostart/pulseaudio.desktop
+${PLIST.x11}share/examples/pulseaudio/pulseaudio-kde.desktop
+${PLIST.x11}share/examples/pulseaudio/pulseaudio.desktop
 include/pulse/cdecl.h
 include/pulse/channelmap.h
 include/pulse/context.h
diff --git a/audio/pulseaudio/distinfo b/audio/pulseaudio/distinfo
index db18ff1245b..0fb4bff9777 100644
--- a/audio/pulseaudio/distinfo
+++ b/audio/pulseaudio/distinfo
@@ -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
diff --git a/audio/pulseaudio/patches/patch-configure b/audio/pulseaudio/patches/patch-configure
index 996b1987e9e..cce71de8de2 100644
--- a/audio/pulseaudio/patches/patch-configure
+++ b/audio/pulseaudio/patches/patch-configure
@@ -1,6 +1,5 @@
-$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
 
@@ -48,12 +47,3 @@ $NetBSD: patch-configure,v 1.2 2013/01/29 15:02:24 tsutsui Exp $
  
  $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
  
-@@ -26138,7 +26138,7 @@ _ACEOF
- PA_SOEXT=.so
- 
- 
--pulseconfdir="${sysconfdir}/pulse"
-+pulseconfdir="${EGDIR}"
- 
- 
-   prefix_NONE=
diff --git a/audio/pulseaudio/patches/patch-src_Makefile.in b/audio/pulseaudio/patches/patch-src_Makefile.in
index f0b88950f96..2c13196f9d1 100644
--- a/audio/pulseaudio/patches/patch-src_Makefile.in
+++ b/audio/pulseaudio/patches/patch-src_Makefile.in
@@ -1,11 +1,24 @@
-$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
- @HAVE_X11_TRUE@xdgautostartdir = $(sysconfdir)/xdg/autostart
+@@ -2927,7 +2927,7 @@ pdfdir = @pdfdir@
+ 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