diff options
| author | kwm <kwm@FreeBSD.org> | 2010-07-25 20:35:50 +0800 |
|---|---|---|
| committer | kwm <kwm@FreeBSD.org> | 2010-07-25 20:35:50 +0800 |
| commit | 34bf966445c334ec0fac1ccffc666d55a7ac12d8 (patch) | |
| tree | 0288a1c9f8d0517f43fd881bc073c1d21e253d7f /audio | |
| parent | c2795992de2585a9e7b55e83cb2eb6696d0ea375 (diff) | |
| download | freebsd-ports-gnome-34bf966445c334ec0fac1ccffc666d55a7ac12d8.tar.gz freebsd-ports-gnome-34bf966445c334ec0fac1ccffc666d55a7ac12d8.tar.zst freebsd-ports-gnome-34bf966445c334ec0fac1ccffc666d55a7ac12d8.zip | |
Don't overwrite config files when reinstalling. [1]
Don't detect /dev/dspN.0 instead of /dev/dpsN. We should not reference a
virtual channel 0, which is automatically cloned from /dev/dspN. [2]
Reported by: someone on #bsdports [1]
jkim@ [2]
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/pulseaudio/Makefile | 9 | ||||
| -rw-r--r-- | audio/pulseaudio/files/patch-src_Makefile.in | 10 |
2 files changed, 12 insertions, 7 deletions
diff --git a/audio/pulseaudio/Makefile b/audio/pulseaudio/Makefile index 678316cc8c65..468b26b2267b 100644 --- a/audio/pulseaudio/Makefile +++ b/audio/pulseaudio/Makefile @@ -3,7 +3,7 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/audio/pulseaudio/Makefile,v 1.21 2009/11/28 19:08:20 marcus Exp $ +# $MCom: ports-stable/audio/pulseaudio/Makefile,v 1.7 2010/06/25 20:35:01 kwm Exp $ # # !!!NOTE!!! Any PORTVERSION update to this port must be accompanied by # PORTREVISION bumps to audio/gnome-media, sysutils/gnome-settings-daemon, @@ -12,7 +12,7 @@ PORTNAME= pulseaudio PORTVERSION= 0.9.21 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= audio MASTER_SITES= http://0pointer.de/lennart/projects/${PORTNAME}/ @@ -117,9 +117,14 @@ post-patch: ${WRKSRC}/configure post-install: + ${MKDIR} ${PREFIX}/etc/pulse .for ii in default.pa daemon.conf client.conf system.pa ${INSTALL_DATA} ${WRKSRC}/src/${ii} \ ${PREFIX}/etc/pulse/${ii}-dist +. if !exists(${PREFIX}/etc/pulse/${II}) + ${INSTALL_DATA} ${WRKSRC}/src/${ii} \ + ${PREFIX}/etc/pulse/${ii} +. endif .endfor .include <bsd.port.post.mk> diff --git a/audio/pulseaudio/files/patch-src_Makefile.in b/audio/pulseaudio/files/patch-src_Makefile.in index e77cc9f9ad4c..a4a6231f5ed9 100644 --- a/audio/pulseaudio/files/patch-src_Makefile.in +++ b/audio/pulseaudio/files/patch-src_Makefile.in @@ -1,6 +1,6 @@ ---- src/Makefile.in.orig 2009-09-11 21:23:13.000000000 -0400 -+++ src/Makefile.in 2009-09-11 21:24:41.000000000 -0400 -@@ -2890,7 +2890,7 @@ libpulsecommon_@PA_MAJORMINORMICRO@_la_C +--- src/Makefile.in.orig 2010-06-25 21:42:58.000000000 +0200 ++++ src/Makefile.in 2010-06-25 21:52:27.000000000 +0200 +@@ -2914,7 +2914,7 @@ libpulsecommon_@PA_MAJORMINORMICRO@_la_LDFLAGS = $(AM_LDFLAGS) \ -avoid-version $(am__append_14) libpulsecommon_@PA_MAJORMINORMICRO@_la_LIBADD = $(AM_LIBADD) \ @@ -9,14 +9,14 @@ $(LIBSNDFILE_LIBS) $(am__append_16) $(am__append_20) ################################### -@@ -7745,9 +7745,8 @@ info: info-am +@@ -7778,9 +7778,8 @@ info-am: -install-data-am: install-alsapathsDATA install-alsaprofilesetsDATA \ - install-dbuspolicyDATA install-pulseconfDATA \ - install-pulseincludeHEADERS install-udevrulesDATA \ -+install-data-am: install-dbuspolicyDATA install-pulseconfDATA \ ++install-data-am: install-dbuspolicyDATA \ + install-pulseincludeHEADERS \ install-xdgautostartDATA |