- add libsndfile to bl3 - don't invoke git when running autoreconf - bump pkgrevisiondiff -r1.33 -r1.34 pkgsrc/audio/pulseaudio/Makefile
(jmcneill)
@@ -1,20 +1,20 @@ | @@ -1,20 +1,20 @@ | |||
1 | # $NetBSD: Makefile,v 1.33 2010/02/01 17:38:07 tnn Exp $ | 1 | # $NetBSD: Makefile,v 1.34 2010/02/02 12:39:14 jmcneill Exp $ | |
2 | 2 | |||
3 | # NOTE: Please send a copy of any patches that are not pkgsrc-specific | 3 | # NOTE: Please send a copy of any patches that are not pkgsrc-specific | |
4 | # to <pulseaudio-discuss@mail.0pointer.de> | 4 | # to <pulseaudio-discuss@mail.0pointer.de> | |
5 | 5 | |||
6 | PULSEAUDIO_VER= 0.9.21 | 6 | PULSEAUDIO_VER= 0.9.21 | |
7 | PKGREVISION= 1 | 7 | PKGREVISION= 2 | |
8 | DISTNAME= pulseaudio-${PULSEAUDIO_VER} | 8 | DISTNAME= pulseaudio-${PULSEAUDIO_VER} | |
9 | CATEGORIES= audio | 9 | CATEGORIES= audio | |
10 | MASTER_SITES= http://0pointer.de/lennart/projects/pulseaudio/ | 10 | MASTER_SITES= http://0pointer.de/lennart/projects/pulseaudio/ | |
11 | 11 | |||
12 | MAINTAINER= pkgsrc-users@NetBSD.org | 12 | MAINTAINER= pkgsrc-users@NetBSD.org | |
13 | HOMEPAGE= http://www.pulseaudio.org/ | 13 | HOMEPAGE= http://www.pulseaudio.org/ | |
14 | COMMENT= Sound server for POSIX and Win32 systems | 14 | COMMENT= Sound server for POSIX and Win32 systems | |
15 | LICENSE= gnu-lgpl-v2.1 AND gnu-gpl-v2 | 15 | LICENSE= gnu-lgpl-v2.1 AND gnu-gpl-v2 | |
16 | 16 | |||
17 | PKG_DESTDIR_SUPPORT= user-destdir | 17 | PKG_DESTDIR_SUPPORT= user-destdir | |
18 | 18 | |||
19 | GNU_CONFIGURE= yes | 19 | GNU_CONFIGURE= yes | |
20 | USE_LIBTOOL= yes | 20 | USE_LIBTOOL= yes |
@@ -1,24 +1,25 @@ | @@ -1,24 +1,25 @@ | |||
1 | # $NetBSD: buildlink3.mk,v 1.4 2009/07/07 10:44:18 obache Exp $ | 1 | # $NetBSD: buildlink3.mk,v 1.5 2010/02/02 12:39:14 jmcneill Exp $ | |
2 | 2 | |||
3 | BUILDLINK_TREE+= pulseaudio | 3 | BUILDLINK_TREE+= pulseaudio | |
4 | 4 | |||
5 | .if !defined(PULSEAUDIO_BUILDLINK3_MK) | 5 | .if !defined(PULSEAUDIO_BUILDLINK3_MK) | |
6 | PULSEAUDIO_BUILDLINK3_MK:= | 6 | PULSEAUDIO_BUILDLINK3_MK:= | |
7 | 7 | |||
8 | BUILDLINK_API_DEPENDS.pulseaudio+= pulseaudio>=0.9.13 | 8 | BUILDLINK_API_DEPENDS.pulseaudio+= pulseaudio>=0.9.13 | |
9 | BUILDLINK_PKGSRCDIR.pulseaudio?= ../../audio/pulseaudio | 9 | BUILDLINK_PKGSRCDIR.pulseaudio?= ../../audio/pulseaudio | |
10 | 10 | |||
11 | .include "../../mk/bsd.fast.prefs.mk" | 11 | .include "../../mk/bsd.fast.prefs.mk" | |
12 | 12 | |||
13 | .if ${OPSYS} == "NetBSD" && !exists(/usr/include/sys/atomic.h) | 13 | .if ${OPSYS} == "NetBSD" && !exists(/usr/include/sys/atomic.h) | |
14 | .include "../../devel/libatomic_ops/buildlink3.mk" | 14 | .include "../../devel/libatomic_ops/buildlink3.mk" | |
15 | .endif | 15 | .endif | |
16 | 16 | |||
17 | .include "../../audio/libsndfile/buildlink3.mk" | |||
17 | .include "../../databases/gdbm/buildlink3.mk" | 18 | .include "../../databases/gdbm/buildlink3.mk" | |
18 | .include "../../devel/glib2/buildlink3.mk" | 19 | .include "../../devel/glib2/buildlink3.mk" | |
19 | .include "../../x11/libICE/buildlink3.mk" | 20 | .include "../../x11/libICE/buildlink3.mk" | |
20 | .include "../../x11/libSM/buildlink3.mk" | 21 | .include "../../x11/libSM/buildlink3.mk" | |
21 | .include "../../x11/libX11/buildlink3.mk" | 22 | .include "../../x11/libX11/buildlink3.mk" | |
22 | .endif # PULSEAUDIO_BUILDLINK3_MK | 23 | .endif # PULSEAUDIO_BUILDLINK3_MK | |
23 | 24 | |||
24 | BUILDLINK_TREE+= -pulseaudio | 25 | BUILDLINK_TREE+= -pulseaudio |
@@ -1,16 +1,17 @@ | @@ -1,16 +1,17 @@ | |||
1 | $NetBSD: distinfo,v 1.18 2010/02/01 15:00:20 jmcneill Exp $ | 1 | $NetBSD: distinfo,v 1.19 2010/02/02 12:39:14 jmcneill Exp $ | |
2 | 2 | |||
3 | SHA1 (pulseaudio-0.9.21.tar.gz) = 0309c97f7e0812e243c1bb80a4b74dc26369ac22 | 3 | SHA1 (pulseaudio-0.9.21.tar.gz) = 0309c97f7e0812e243c1bb80a4b74dc26369ac22 | |
4 | RMD160 (pulseaudio-0.9.21.tar.gz) = 6db0725253228b673a78cbfae4824fadce2198ed | 4 | RMD160 (pulseaudio-0.9.21.tar.gz) = 6db0725253228b673a78cbfae4824fadce2198ed | |
5 | Size (pulseaudio-0.9.21.tar.gz) = 2056896 bytes | 5 | Size (pulseaudio-0.9.21.tar.gz) = 2056896 bytes | |
6 | SHA1 (patch-aa) = 078dd540b56f2db5d676835ab37cd4e8bbe33650 | 6 | SHA1 (patch-aa) = 078dd540b56f2db5d676835ab37cd4e8bbe33650 | |
7 | SHA1 (patch-ab) = 1cf47a55b1c794b315646379ae03d633dc1d348f | 7 | SHA1 (patch-ab) = 1cf47a55b1c794b315646379ae03d633dc1d348f | |
8 | SHA1 (patch-ac) = b42e6ef8ff2851ea78a6eae6cb6241c94d74b2d0 | 8 | SHA1 (patch-ac) = b42e6ef8ff2851ea78a6eae6cb6241c94d74b2d0 | |
9 | SHA1 (patch-ad) = 7340114467bc6d2fedb604e0b01ffbf1d319adc1 | 9 | SHA1 (patch-ad) = 7340114467bc6d2fedb604e0b01ffbf1d319adc1 | |
10 | SHA1 (patch-ae) = 5e6957e73ffd96d2e63e5ea4eb9b0ca9ea016b30 | 10 | SHA1 (patch-ae) = 5e6957e73ffd96d2e63e5ea4eb9b0ca9ea016b30 | |
11 | SHA1 (patch-af) = e11fb419787e3cd1f305b66c995915f11276770e | 11 | SHA1 (patch-af) = e11fb419787e3cd1f305b66c995915f11276770e | |
12 | SHA1 (patch-ag) = 523743b49476a219f76b108a605b2b57ea63098a | 12 | SHA1 (patch-ag) = 523743b49476a219f76b108a605b2b57ea63098a | |
13 | SHA1 (patch-ca) = 3016b290943c006392bff01d6eae75a432a7e171 | 13 | SHA1 (patch-ca) = 3016b290943c006392bff01d6eae75a432a7e171 | |
14 | SHA1 (patch-da) = d56957d37bec15bd41d77b99ce60bcdea0ef4f20 | 14 | SHA1 (patch-da) = d56957d37bec15bd41d77b99ce60bcdea0ef4f20 | |
15 | SHA1 (patch-db) = e1e48577618b4eb2586d8b37953b2474e2dcc864 | 15 | SHA1 (patch-db) = e1e48577618b4eb2586d8b37953b2474e2dcc864 | |
16 | SHA1 (patch-dc) = d814e1a1d5aed3e3604d6df44621fe789c625982 | 16 | SHA1 (patch-dc) = d814e1a1d5aed3e3604d6df44621fe789c625982 | |
17 | SHA1 (patch-dd) = 83e51035ff871cef9c39bf670173e30705df8fe5 |
$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)