[pkgsrc/trunk]: pkgsrc/audio/pulseaudio Fix some overly aggressive cut and pa...

[dsainty <dsainty%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b89174975c0b
branches:  trunk
changeset: 552022:b89174975c0b
user:      dsainty <dsainty%pkgsrc.org@localhost>
date:      Tue Dec 23 08:58:01 2008 +0000

description:
Fix some overly aggressive cut and pasting that breaks the build under Linux.

It still doesn't build, but it gets further.  The fixes here are obvious and
trivial pastos.

diffstat:

 audio/pulseaudio/distinfo         |   4 ++--
 audio/pulseaudio/patches/patch-aa |  10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diffs (46 lines):

diff -r c420047ed82a -r b89174975c0b audio/pulseaudio/distinfo
--- a/audio/pulseaudio/distinfo Tue Dec 23 02:58:44 2008 +0000
+++ b/audio/pulseaudio/distinfo Tue Dec 23 08:58:01 2008 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.6 2008/12/23 02:15:27 hasso Exp $
+$NetBSD: distinfo,v 1.7 2008/12/23 08:58:01 dsainty Exp $
 
 SHA1 (pulseaudio-0.9.13.tar.gz) = c8482f1bb42d5213bfdbe2154e1a55b7bc04c915
 RMD160 (pulseaudio-0.9.13.tar.gz) = 07cea9939dfb4fc76f13bf01dfe22ab6d0fd8459
 Size (pulseaudio-0.9.13.tar.gz) = 1308493 bytes
-SHA1 (patch-aa) = 8cc076c1301fa90ee0bb113ec3fee885ba99fbb4
+SHA1 (patch-aa) = b29591d8d338a4521d4aa0fb1dcd726368cb2304
 SHA1 (patch-ab) = b894cf1797a2f02e8131be8abc8250774bfec1ec
 SHA1 (patch-ac) = 8f61cf7c4a6681ab53c9ddf1007acb1bf524fe15
 SHA1 (patch-ad) = 40474c4e04dffe836c41ff348d959c821da527fd
diff -r c420047ed82a -r b89174975c0b audio/pulseaudio/patches/patch-aa
--- a/audio/pulseaudio/patches/patch-aa Tue Dec 23 02:58:44 2008 +0000
+++ b/audio/pulseaudio/patches/patch-aa Tue Dec 23 08:58:01 2008 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2008/12/18 18:43:52 jmcneill Exp $
+$NetBSD: patch-aa,v 1.3 2008/12/23 08:58:01 dsainty Exp $
 
 --- src/utils/padsp.c.orig     2008-10-01 19:05:01.000000000 -0400
 +++ src/utils/padsp.c
@@ -125,8 +125,8 @@
  
      if (!filename ||
          ( strcmp(filename, "/dev/dsp") != 0 &&
-+        strcmp(pathname, "/dev/sound") != 0 &&
-+        strcmp(pathname, "/dev/audio") != 0 &&
++        strcmp(filename, "/dev/sound") != 0 &&
++        strcmp(filename, "/dev/audio") != 0 &&
            strcmp(filename, "/dev/adsp") != 0 &&
            strcmp(filename, "/dev/sndstat") != 0 &&
            strcmp(filename, "/dev/mixer") != 0 )) {
@@ -161,8 +161,8 @@
      if (!filename ||
          !mode ||
          ( strcmp(filename, "/dev/dsp") != 0 &&
-+        strcmp(pathname, "/dev/sound") != 0 &&
-+        strcmp(pathname, "/dev/audio") != 0 &&
++        strcmp(filename, "/dev/sound") != 0 &&
++        strcmp(filename, "/dev/audio") != 0 &&
            strcmp(filename, "/dev/adsp") != 0 &&
            strcmp(filename, "/dev/sndstat") != 0 &&
            strcmp(filename, "/dev/mixer") != 0 )) {