- add libsndfile to bl3

- don't invoke git when running autoreconf
- bump pkgrevision

4 files changed, 89 insertions, 4 deletions

diff --git a/audio/pulseaudio/Makefile b/audio/pulseaudio/Makefile
index ecb94208507..2ffe851dc0c 100644
--- a/audio/pulseaudio/Makefile
+++ b/audio/pulseaudio/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.33 2010/02/01 17:38:07 tnn Exp $
+# $NetBSD: Makefile,v 1.34 2010/02/02 12:39:14 jmcneill Exp $
 
 # NOTE: Please send a copy of any patches that are not pkgsrc-specific
 # to <pulseaudio-discuss@mail.0pointer.de>
 
 PULSEAUDIO_VER=	0.9.21
-PKGREVISION=	1
+PKGREVISION=	2
 DISTNAME=	pulseaudio-${PULSEAUDIO_VER}
 CATEGORIES=	audio
 MASTER_SITES=	http://0pointer.de/lennart/projects/pulseaudio/
diff --git a/audio/pulseaudio/buildlink3.mk b/audio/pulseaudio/buildlink3.mk
index 7d853be1679..99b195f1fb2 100644
--- a/audio/pulseaudio/buildlink3.mk
+++ b/audio/pulseaudio/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2009/07/07 10:44:18 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2010/02/02 12:39:14 jmcneill Exp $
 
 BUILDLINK_TREE+=	pulseaudio
 
@@ -14,6 +14,7 @@ BUILDLINK_PKGSRCDIR.pulseaudio?=	../../audio/pulseaudio
 .include "../../devel/libatomic_ops/buildlink3.mk"
 .endif
 
+.include "../../audio/libsndfile/buildlink3.mk"
 .include "../../databases/gdbm/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../x11/libICE/buildlink3.mk"
diff --git a/audio/pulseaudio/distinfo b/audio/pulseaudio/distinfo
index 6579d142c1c..18b47c54df4 100644
--- a/audio/pulseaudio/distinfo
+++ b/audio/pulseaudio/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.18 2010/02/01 15:00:20 jmcneill Exp $
+$NetBSD: distinfo,v 1.19 2010/02/02 12:39:14 jmcneill Exp $
 
 SHA1 (pulseaudio-0.9.21.tar.gz) = 0309c97f7e0812e243c1bb80a4b74dc26369ac22
 RMD160 (pulseaudio-0.9.21.tar.gz) = 6db0725253228b673a78cbfae4824fadce2198ed
@@ -14,3 +14,4 @@ SHA1 (patch-ca) = 3016b290943c006392bff01d6eae75a432a7e171
 SHA1 (patch-da) = d56957d37bec15bd41d77b99ce60bcdea0ef4f20
 SHA1 (patch-db) = e1e48577618b4eb2586d8b37953b2474e2dcc864
 SHA1 (patch-dc) = d814e1a1d5aed3e3604d6df44621fe789c625982
+SHA1 (patch-dd) = 83e51035ff871cef9c39bf670173e30705df8fe5
diff --git a/audio/pulseaudio/patches/patch-dd b/audio/pulseaudio/patches/patch-dd
new file mode 100644
index 00000000000..27c6346a9db
--- /dev/null
+++ b/audio/pulseaudio/patches/patch-dd
@@ -0,0 +1,83 @@
+$NetBSD: patch-dd,v 1.1 2010/02/02 12:39:14 jmcneill Exp $
+
+--- git-version-gen.orig	2010-02-02 06:54:03.000000000 -0500
++++ git-version-gen	2010-02-02 06:55:16.000000000 -0500
+@@ -74,76 +74,10 @@ case $# in
+ esac
+ 
+ tarball_version_file=$1
+-nl='
+-'
+-
+-# First see if there is a tarball-only version file.
+-# then try "git describe", then default.
+-if test -f $tarball_version_file
+-then
+-    v=`cat $tarball_version_file` || exit 1
+-    case $v in
+-	*$nl*) v= ;; # reject multi-line output
+-	[0-9]*) ;;
+-	*) v= ;;
+-    esac
+-    test -z "$v" \
+-	&& echo "$0: WARNING: $tarball_version_file seems to be damaged" 1>&2
+-fi
+-
+-if test -n "$v"
+-then
+-    : # use $v
+-elif test -d .git \
+-    && v=`git describe --abbrev=4 --match='v*' HEAD 2>/dev/null \
+-	  || git describe --abbrev=4 HEAD 2>/dev/null` \
+-    && case $v in
+-	 v[0-9]*) ;;
+-	 *) (exit 1) ;;
+-       esac
+-then
+-    # Is this a new git that lists number of commits since the last
+-    # tag or the previous older version that did not?
+-    #   Newer: v6.10-77-g0f8faeb
+-    #   Older: v6.10-g0f8faeb
+-#    case $v in
+-#	*-*-*) : git describe is okay three part flavor ;;
+-#	*-*)
+-#	    : git describe is older two part flavor
+-#	    # Recreate the number of commits and rewrite such that the
+-#	    # result is the same as if we were using the newer version
+-#	    # of git describe.
+-#	    vtag=`echo "$v" | sed 's/-.*//'`
+-#	    numcommits=`git rev-list "$vtag"..HEAD | wc -l`
+-#	    v=`echo "$v" | sed "s/\(.*\)-\(.*\)/\1-$numcommits-\2/"`;
+-#	    ;;
+-#    esac
+-
+-    # Change the first '-' to a '.', so version-comparing tools work properly.
+-    # Remove the "g" in git describe's output string, to save a byte.
+-#    v=`echo "$v" | sed 's/-/./;s/\(.*\)-g/\1-/'`;
+-    :
+-else
+-    v=UNKNOWN
+-fi
+-
+-v=`echo "$v" |sed 's/^v//'`
+-
+-# Don't declare a version "dirty" merely because a time stamp has changed.
+-git status > /dev/null 2>&1
+-
+-dirty=`sh -c 'git diff-index --name-only HEAD' 2>/dev/null` || dirty=
+-case "$dirty" in
+-    '') ;;
+-    *) # Append the suffix only if there isn't one already.
+-	case $v in
+-	  *-dirty) ;;
+-	  *) v="$v-dirty" ;;
+-	esac ;;
+-esac
++v=`cat ${tarball_version_file}`
+ 
+ # Omit the trailing newline, so that m4_esyscmd can use the result directly.
+-echo "$v" | tr -d '\012'
++echo "${v}" | tr -d '\012'
+ 
+ # Local variables:
+ # eval: (add-hook 'write-file-hooks 'time-stamp)